qwt_abstract_scale_draw.h   qwt_abstract_scale_draw.h 
skipping to change at line 45 skipping to change at line 45
*/ */
class QWT_EXPORT QwtAbstractScaleDraw class QWT_EXPORT QwtAbstractScaleDraw
{ {
public: public:
/*! /*!
Components of a scale Components of a scale
- Backbone - Backbone
- Ticks - Ticks
- Label - Labels
\sa QwtAbstractScaleDraw::enableComponent, \sa QwtAbstractScaleDraw::enableComponent,
QwtAbstractScaleDraw::hasComponent QwtAbstractScaleDraw::hasComponent
*/ */
enum ScaleComponent enum ScaleComponent
{ {
Backbone = 1, Backbone = 1,
Ticks = 2, Ticks = 2,
Labels = 4 Labels = 4
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_double_rect.h   qwt_double_rect.h 
/* -*- mode: C++ ; c-file-style: "stroustrup" -*- ************************* **** /* -*- mode: C++ ; c-file-style: "stroustrup" -*- ************************* ****
* Qwt Widget Library * Qwt Widget Library
* Copyright (C) 1997 Josef Wilgen * Copyright (C) 1997 Josef Wilgen
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
/*! \file */
#ifndef QWT_DOUBLE_RECT_H #ifndef QWT_DOUBLE_RECT_H
#define QWT_DOUBLE_RECT_H 1 #define QWT_DOUBLE_RECT_H 1
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_array.h" #include "qwt_array.h"
#if QT_VERSION >= 0x040000 #if QT_VERSION >= 0x040000
#include <QPointF> #include <QPointF>
#include <QSizeF> #include <QSizeF>
#include <QRectF> #include <QRectF>
/*!
\typedef QPointF QwtDoublePoint
\brief This is a typedef, see Trolltech Documentation for QPointF
in QT assistant 4.x. As soon as Qt3 compatibility is dropped
this typedef will disappear.
*/
typedef QPointF QwtDoublePoint; typedef QPointF QwtDoublePoint;
/*!
\typedef QSizeF QwtDoubleSize
\brief This is a typedef, see Trolltech Documentation for QSizeF
in QT assistant 4.x. As soon as Qt3 compatibility is dropped
this typedef will disappear.
*/
typedef QSizeF QwtDoubleSize; typedef QSizeF QwtDoubleSize;
/*!
\typedef QRectF QwtDoubleRect
\brief This is a typedef, see Trolltech Documentation for QRectF
in QT assistant 4.x. As soon as Qt3 compatibility is dropped
this typedef will disappear.
*/
typedef QRectF QwtDoubleRect; typedef QRectF QwtDoubleRect;
#else #else
#include <qpoint.h> #include <qpoint.h>
#include <qsize.h> #include <qsize.h>
#include <qrect.h> #include <qrect.h>
/*! /*!
The QwtDoublePoint class defines a point in double coordinates \brief The QwtDoublePoint class defines a point in double coordinates
*/ */
class QWT_EXPORT QwtDoublePoint class QWT_EXPORT QwtDoublePoint
{ {
public: public:
QwtDoublePoint(); QwtDoublePoint();
QwtDoublePoint(double x, double y); QwtDoublePoint(double x, double y);
QwtDoublePoint(const QPoint &); QwtDoublePoint(const QPoint &);
QPoint toPoint() const; QPoint toPoint() const;
skipping to change at line 128 skipping to change at line 149
The QwtDoubleRect class defines a size in double coordinates. The QwtDoubleRect class defines a size in double coordinates.
*/ */
class QWT_EXPORT QwtDoubleRect class QWT_EXPORT QwtDoubleRect
{ {
public: public:
QwtDoubleRect(); QwtDoubleRect();
QwtDoubleRect(double left, double top, double width, double height); QwtDoubleRect(double left, double top, double width, double height);
QwtDoubleRect(const QwtDoublePoint&, const QwtDoubleSize &); QwtDoubleRect(const QwtDoublePoint&, const QwtDoubleSize &);
QwtDoubleRect(const QRect &);
QRect toRect() const;
bool isNull() const; bool isNull() const;
bool isEmpty() const; bool isEmpty() const;
bool isValid() const; bool isValid() const;
QwtDoubleRect normalized() const; QwtDoubleRect normalized() const;
double x() const; double x() const;
double y() const; double y() const;
double left() const; double left() const;
skipping to change at line 187 skipping to change at line 211
bool operator!=( const QwtDoubleRect &) const; bool operator!=( const QwtDoubleRect &) const;
bool contains(const QwtDoublePoint &p, bool proper = false) const; bool contains(const QwtDoublePoint &p, bool proper = false) const;
bool contains(double x, double y, bool proper = false) const; bool contains(double x, double y, bool proper = false) const;
bool contains(const QwtDoubleRect &r, bool proper=false) const; bool contains(const QwtDoubleRect &r, bool proper=false) const;
QwtDoubleRect unite(const QwtDoubleRect &) const; QwtDoubleRect unite(const QwtDoubleRect &) const;
QwtDoubleRect intersect(const QwtDoubleRect &) const; QwtDoubleRect intersect(const QwtDoubleRect &) const;
bool intersects(const QwtDoubleRect &) const; bool intersects(const QwtDoubleRect &) const;
QwtDoublePoint bottomRight() const;
QwtDoublePoint topRight() const;
QwtDoublePoint topLeft() const;
QwtDoublePoint bottomLeft() const;
private: private:
double d_left; double d_left;
double d_right; double d_right;
double d_top; double d_top;
double d_bottom; double d_bottom;
}; };
/*! /*!
Returns true if the point is null; otherwise returns false. Returns true if the point is null; otherwise returns false.
skipping to change at line 449 skipping to change at line 478
/*! /*!
Moves the top left corner of the rectangle to p, Moves the top left corner of the rectangle to p,
without changing the rectangles size. without changing the rectangles size.
*/ */
inline void QwtDoubleRect::moveTo(const QwtDoublePoint &p) inline void QwtDoubleRect::moveTo(const QwtDoublePoint &p)
{ {
moveTo(p.x(), p.y()); moveTo(p.x(), p.y());
} }
inline QwtDoublePoint QwtDoubleRect::bottomRight() const
{
return QwtDoublePoint(bottom(), right());
}
inline QwtDoublePoint QwtDoubleRect::topRight() const
{
return QwtDoublePoint(top(), right());
}
inline QwtDoublePoint QwtDoubleRect::topLeft() const
{
return QwtDoublePoint(top(), left());
}
inline QwtDoublePoint QwtDoubleRect::bottomLeft() const
{
return QwtDoublePoint(bottom(), left());
}
#endif // QT_VERSION < 0x040000 #endif // QT_VERSION < 0x040000
#endif // QWT_DOUBLE_RECT_H #endif // QWT_DOUBLE_RECT_H
 End of changes. 8 change blocks. 
1 lines changed or deleted 50 lines changed or added


 qwt_global.h   qwt_global.h 
skipping to change at line 22 skipping to change at line 22
#ifndef QWT_GLOBAL_H #ifndef QWT_GLOBAL_H
#define QWT_GLOBAL_H #define QWT_GLOBAL_H
#include <qglobal.h> #include <qglobal.h>
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#include <qmodules.h> #include <qmodules.h>
#endif #endif
// QWT_VERSION is (major << 16) + (minor << 8) + patch. // QWT_VERSION is (major << 16) + (minor << 8) + patch.
#define QWT_VERSION 0x050002 #define QWT_VERSION 0x050100
#define QWT_VERSION_STR "5.0.2" #define QWT_VERSION_STR "5.1.0"
#if defined(Q_WS_WIN) #if defined(Q_WS_WIN)
#if defined(_MSC_VER) /* MSVC Compiler */ #if defined(_MSC_VER) /* MSVC Compiler */
/* template-class specialization 'identifier' is already instantiated */ /* template-class specialization 'identifier' is already instantiated */
#pragma warning(disable: 4660) #pragma warning(disable: 4660)
#endif // _MSC_VER #endif // _MSC_VER
#ifdef QWT_DLL #ifdef QWT_DLL
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 qwt_legend.h   qwt_legend.h 
skipping to change at line 24 skipping to change at line 24
#include <qframe.h> #include <qframe.h>
#include "qwt_global.h" #include "qwt_global.h"
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#include <qvaluelist.h> #include <qvaluelist.h>
#else #else
#include <qlist.h> #include <qlist.h>
#endif #endif
class QScrollBar; class QScrollBar;
class QwtPlotItem; class QwtLegendItemManager;
/*! /*!
\brief The legend widget \brief The legend widget
The QwtLegend widget is a tabular arrangement of legend items. Legend The QwtLegend widget is a tabular arrangement of legend items. Legend
items might be any type of widget, but in general they will be items might be any type of widget, but in general they will be
a QwtLegendItem. a QwtLegendItem.
\sa QwtLegendItem, QwtPlot \sa QwtLegendItem, QwtLegendItemManager QwtPlot
*/ */
class QWT_EXPORT QwtLegend : public QFrame class QWT_EXPORT QwtLegend : public QFrame
{ {
Q_OBJECT Q_OBJECT
public: public:
/*! /*!
\brief Display policy \brief Display policy
skipping to change at line 91 skipping to change at line 91
LegendDisplayPolicy displayPolicy() const; LegendDisplayPolicy displayPolicy() const;
void setItemMode(LegendItemMode); void setItemMode(LegendItemMode);
LegendItemMode itemMode() const; LegendItemMode itemMode() const;
int identifierMode() const; int identifierMode() const;
QWidget *contentsWidget(); QWidget *contentsWidget();
const QWidget *contentsWidget() const; const QWidget *contentsWidget() const;
void insert(const QwtPlotItem *, QWidget *); void insert(const QwtLegendItemManager *, QWidget *);
void remove(const QwtPlotItem *); void remove(const QwtLegendItemManager *);
QWidget *find(const QwtPlotItem *) const; QWidget *find(const QwtLegendItemManager *) const;
QwtPlotItem *find(const QWidget *) const; QwtLegendItemManager *find(const QWidget *) const;
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
virtual QValueList<QWidget *> legendItems() const; virtual QValueList<QWidget *> legendItems() const;
#else #else
virtual QList<QWidget *> legendItems() const; virtual QList<QWidget *> legendItems() const;
#endif #endif
void clear(); void clear();
bool isEmpty() const; bool isEmpty() const;
 End of changes. 4 change blocks. 
6 lines changed or deleted 6 lines changed or added


 qwt_math.h   qwt_math.h 
skipping to change at line 13 skipping to change at line 13
* Copyright (C) 1997 Josef Wilgen * Copyright (C) 1997 Josef Wilgen
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_MATH_H #ifndef QWT_MATH_H
#define QWT_MATH_H #define QWT_MATH_H
#include <math.h> #include <cmath>
#include <qpoint.h> #include <qpoint.h>
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_double_rect.h"
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#define qwtMax QMAX #define qwtMax QMAX
#define qwtMin QMIN #define qwtMin QMIN
#define qwtAbs QABS #define qwtAbs QABS
#else // QT_VERSION >= 0x040000 #else // QT_VERSION >= 0x040000
#define qwtMax qMax #define qwtMax qMax
skipping to change at line 154 skipping to change at line 155
if ( x < xmin ) if ( x < xmin )
rv = xmin; rv = xmin;
else if ( x > xmax ) else if ( x > xmax )
rv = xmax; rv = xmax;
else else
rv = x; rv = x;
return rv; return rv;
} }
inline QPoint qwtPolar2Pos(const QPoint &center, inline QPoint qwtPolar2Pos(const QPoint &pole,
double radius, double angle) double radius, double angle)
{ {
const double x = center.x() + radius * cos(angle); const double x = pole.x() + radius * ::cos(angle);
const double y = center.y() - radius * sin(angle); const double y = pole.y() - radius * ::sin(angle);
return QPoint(qRound(x), qRound(y)); return QPoint(qRound(x), qRound(y));
} }
inline QPoint qwtDegree2Pos(const QPoint &center, inline QPoint qwtDegree2Pos(const QPoint &pole,
double radius, double angle) double radius, double angle)
{ {
return qwtPolar2Pos(center, radius, angle / 180.0 * M_PI); return qwtPolar2Pos(pole, radius, angle / 180.0 * M_PI);
}
inline QwtDoublePoint qwtPolar2Pos(const QwtDoublePoint &pole,
double radius, double angle)
{
const double x = pole.x() + radius * ::cos(angle);
const double y = pole.y() - radius * ::sin(angle);
return QPoint(qRound(x), qRound(y));
}
inline QwtDoublePoint qwtDegree2Pos(const QwtDoublePoint &pole,
double radius, double angle)
{
return qwtPolar2Pos(pole, radius, angle / 180.0 * M_PI);
}
//! Rounding of doubles, like qRound for integers
inline double qwtRound(double value)
{
return ::floor(value + 0.5); // MSVC has no ::round().
} }
#endif #endif
 End of changes. 6 change blocks. 
6 lines changed or deleted 28 lines changed or added


 qwt_panner.h   qwt_panner.h 
skipping to change at line 54 skipping to change at line 54
bool isEnabled() const; bool isEnabled() const;
void setMouseButton(int button, int buttonState = Qt::NoButton); void setMouseButton(int button, int buttonState = Qt::NoButton);
void getMouseButton(int &button, int &buttonState) const; void getMouseButton(int &button, int &buttonState) const;
void setAbortKey(int key, int state = Qt::NoButton); void setAbortKey(int key, int state = Qt::NoButton);
void getAbortKey(int &key, int &state) const; void getAbortKey(int &key, int &state) const;
void setCursor(const QCursor &); void setCursor(const QCursor &);
const QCursor cursor() const; const QCursor cursor() const;
#if QT_VERSION >= 0x040000
void setOrientations(Qt::Orientations);
Qt::Orientations orientations() const;
#else
void enableOrientation(Qt::Orientation, bool enable);
#endif
bool isOrientationEnabled(Qt::Orientation) const;
virtual bool eventFilter(QObject *, QEvent *); virtual bool eventFilter(QObject *, QEvent *);
signals: signals:
/*! /*!
Signal emitted, when panning is done Signal emitted, when panning is done
\param dx Offset in horizontal direction \param dx Offset in horizontal direction
\param dy Offset in vertical direction \param dy Offset in vertical direction
*/ */
void panned(int dx, int dy); void panned(int dx, int dy);
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 qwt_picker.h   qwt_picker.h 
skipping to change at line 38 skipping to change at line 38
/*! /*!
\brief QwtPicker provides selections on a widget \brief QwtPicker provides selections on a widget
QwtPicker filters all mouse and keyboard events of a widget QwtPicker filters all mouse and keyboard events of a widget
and translates them into an array of selected points. Depending and translates them into an array of selected points. Depending
on the QwtPicker::SelectionType the selection might be a single point, on the QwtPicker::SelectionType the selection might be a single point,
a rectangle or a polygon. The selection process is supported by a rectangle or a polygon. The selection process is supported by
optional rubberbands (rubberband selection) and position trackers. optional rubberbands (rubberband selection) and position trackers.
QwtPicker is useful for widgets where the event handlers QwtPicker is useful for widgets where the event handlers
can can't be overloaded, like for components of composite widgets.
It offers alternative handlers for mouse and key events. It offers alternative handlers for mouse and key events.
\par Example \par Example
\verbatim #include <qwt_picker.h> \verbatim #include <qwt_picker.h>
QwtPicker *picker = new QwtPicker(widget); QwtPicker *picker = new QwtPicker(widget);
picker->setTrackerMode(QwtPicker::ActiveOnly); picker->setTrackerMode(QwtPicker::ActiveOnly);
connect(picker, SIGNAL(selected(const QwtPolygon &)), ...); connect(picker, SIGNAL(selected(const QwtPolygon &)), ...);
// emit the position of clicks on widget // emit the position of clicks on widget
skipping to change at line 100 skipping to change at line 100
Q_PROPERTY(QFont trackerFont READ trackerFont WRITE setTrackerFont) Q_PROPERTY(QFont trackerFont READ trackerFont WRITE setTrackerFont)
Q_PROPERTY(RubberBand rubberBand READ rubberBand WRITE setRubberBand) Q_PROPERTY(RubberBand rubberBand READ rubberBand WRITE setRubberBand)
Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode) Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
Q_PROPERTY(bool isEnabled READ isEnabled WRITE setEnabled) Q_PROPERTY(bool isEnabled READ isEnabled WRITE setEnabled)
Q_PROPERTY(QPen trackerPen READ trackerPen WRITE setTrackerPen) Q_PROPERTY(QPen trackerPen READ trackerPen WRITE setTrackerPen)
Q_PROPERTY(QPen rubberBandPen READ rubberBandPen WRITE setRubberBandPen ) Q_PROPERTY(QPen rubberBandPen READ rubberBandPen WRITE setRubberBandPen )
public: public:
/*! /*!
This enum type describes the type of a selection. It can be or This enum type describes the type of a selection. It can be or'd
with QwtPicker::RectSelectionType and QwtPicker::SelectionMode with QwtPicker::RectSelectionType and QwtPicker::SelectionMode
and passed to QwtPicker::setSelectionFlags() and passed to QwtPicker::setSelectionFlags()
- NoSelection\n - NoSelection\n
Selection is disabled. Note this is different to the disabled Selection is disabled. Note this is different to the disabled
state, as you might have a tracker. state, as you might have a tracker.
- PointSelection\n - PointSelection\n
Select a single point. Select a single point.
- RectSelection\n - RectSelection\n
Select a rectangle. Select a rectangle.
- PolygonSelection\n - PolygonSelection\n
skipping to change at line 128 skipping to change at line 128
{ {
NoSelection = 0, NoSelection = 0,
PointSelection = 1, PointSelection = 1,
RectSelection = 2, RectSelection = 2,
PolygonSelection = 4 PolygonSelection = 4
}; };
/*! /*!
\brief Selection subtype for RectSelection \brief Selection subtype for RectSelection
This enum type describes the type of rectangle selections. This enum type describes the type of rectangle selections.
It can be or It can be or'd with QwtPicker::RectSelectionType and
QwtPicker::SelectionMode and passed to QwtPicker::setSelectionFlags() . QwtPicker::SelectionMode and passed to QwtPicker::setSelectionFlags() .
- CornerToCorner\n - CornerToCorner\n
The first and the second selected point are the corners The first and the second selected point are the corners
of the rectangle. of the rectangle.
- CenterToCorner\n - CenterToCorner\n
The first point is the center, the second a corner of the The first point is the center, the second a corner of the
rectangle. rectangle.
- CenterToRadius\n - CenterToRadius\n
The first point is the center of a quadrat, calculated by the maxim um The first point is the center of a quadrat, calculated by the maxim um
of the x- and y-distance. of the x- and y-distance.
skipping to change at line 151 skipping to change at line 151
\sa QwtPicker::setSelectionFlags(), QwtPicker::selectionFlags() \sa QwtPicker::setSelectionFlags(), QwtPicker::selectionFlags()
*/ */
enum RectSelectionType enum RectSelectionType
{ {
CornerToCorner = 64, CornerToCorner = 64,
CenterToCorner = 128, CenterToCorner = 128,
CenterToRadius = 256 CenterToRadius = 256
}; };
/*! /*!
Values of this enum type or Values of this enum type or'd together with a SelectionType value
identifies which state machine should be used for the selection. identifies which state machine should be used for the selection.
The default value is ClickSelection. The default value is ClickSelection.
\sa stateMachine() \sa stateMachine()
*/ */
enum SelectionMode enum SelectionMode
{ {
ClickSelection = 1024, ClickSelection = 1024,
DragSelection = 2048 DragSelection = 2048
}; };
skipping to change at line 285 skipping to change at line 285
QWidget *parentWidget(); QWidget *parentWidget();
const QWidget *parentWidget() const; const QWidget *parentWidget() const;
virtual QRect pickRect() const; virtual QRect pickRect() const;
const QwtPolygon &selection() const; const QwtPolygon &selection() const;
virtual void drawRubberBand(QPainter *) const; virtual void drawRubberBand(QPainter *) const;
virtual void drawTracker(QPainter *) const; virtual void drawTracker(QPainter *) const;
virtual QwtText trackerText(const QPoint &pos) const;
QPoint trackerPosition() const;
QRect trackerRect(const QFont &) const;
signals: signals:
/*! /*!
A signal emitting the selected points, A signal emitting the selected points,
at the end of a selection. at the end of a selection.
\param pa Selected points \param pa Selected points
*/ */
void selected(const QwtPolygon &pa); void selected(const QwtPolygon &pa);
/*! /*!
skipping to change at line 338 skipping to change at line 342
*/ */
virtual bool accept(QwtPolygon &selection) const; virtual bool accept(QwtPolygon &selection) const;
virtual void transition(const QEvent *); virtual void transition(const QEvent *);
virtual void begin(); virtual void begin();
virtual void append(const QPoint &); virtual void append(const QPoint &);
virtual void move(const QPoint &); virtual void move(const QPoint &);
virtual bool end(bool ok = true); virtual bool end(bool ok = true);
virtual void reset();
virtual void widgetMousePressEvent(QMouseEvent *); virtual void widgetMousePressEvent(QMouseEvent *);
virtual void widgetMouseReleaseEvent(QMouseEvent *); virtual void widgetMouseReleaseEvent(QMouseEvent *);
virtual void widgetMouseDoubleClickEvent(QMouseEvent *); virtual void widgetMouseDoubleClickEvent(QMouseEvent *);
virtual void widgetMouseMoveEvent(QMouseEvent *); virtual void widgetMouseMoveEvent(QMouseEvent *);
virtual void widgetWheelEvent(QWheelEvent *); virtual void widgetWheelEvent(QWheelEvent *);
virtual void widgetKeyPressEvent(QKeyEvent *); virtual void widgetKeyPressEvent(QKeyEvent *);
virtual void widgetKeyReleaseEvent(QKeyEvent *); virtual void widgetKeyReleaseEvent(QKeyEvent *);
virtual void widgetLeaveEvent(QEvent *); virtual void widgetLeaveEvent(QEvent *);
QRect trackerRect(QPainter *painter) const;
virtual void stretchSelection(const QSize &oldSize, virtual void stretchSelection(const QSize &oldSize,
const QSize &newSize); const QSize &newSize);
virtual QwtText trackerText(const QPoint &pos) const;
virtual QwtPickerMachine *stateMachine(int) const; virtual QwtPickerMachine *stateMachine(int) const;
virtual void updateDisplay(); virtual void updateDisplay();
const QWidget *rubberBandWidget() const; const QWidget *rubberBandWidget() const;
const QWidget *trackerWidget() const; const QWidget *trackerWidget() const;
private: private:
void init(QWidget *, int selectionFlags, RubberBand rubberBand, void init(QWidget *, int selectionFlags, RubberBand rubberBand,
DisplayMode trackerMode); DisplayMode trackerMode);
void setStateMachine(QwtPickerMachine *); void setStateMachine(QwtPickerMachine *);
void setMouseTracking(bool); void setMouseTracking(bool);
class PickerWidget;
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 9 change blocks. 
8 lines changed or deleted 11 lines changed or added


 qwt_plot.h   qwt_plot.h 
skipping to change at line 186 skipping to change at line 186
void enableAxis(int axisId, bool tf = true); void enableAxis(int axisId, bool tf = true);
bool axisEnabled(int axisId) const; bool axisEnabled(int axisId) const;
void setAxisFont(int axisId, const QFont &f); void setAxisFont(int axisId, const QFont &f);
QFont axisFont(int axisId) const; QFont axisFont(int axisId) const;
void setAxisScale(int axisId, double min, double max, double step = 0); void setAxisScale(int axisId, double min, double max, double step = 0);
void setAxisScaleDiv(int axisId, const QwtScaleDiv &); void setAxisScaleDiv(int axisId, const QwtScaleDiv &);
void setAxisScaleDraw(int axisId, QwtScaleDraw *); void setAxisScaleDraw(int axisId, QwtScaleDraw *);
double axisStepSize(int axisId) const;
const QwtScaleDiv *axisScaleDiv(int axisId) const; const QwtScaleDiv *axisScaleDiv(int axisId) const;
QwtScaleDiv *axisScaleDiv(int axisId); QwtScaleDiv *axisScaleDiv(int axisId);
const QwtScaleDraw *axisScaleDraw(int axisId) const; const QwtScaleDraw *axisScaleDraw(int axisId) const;
QwtScaleDraw *axisScaleDraw(int axisId); QwtScaleDraw *axisScaleDraw(int axisId);
const QwtScaleWidget *axisWidget(int axisId) const; const QwtScaleWidget *axisWidget(int axisId) const;
QwtScaleWidget *axisWidget(int axisId); QwtScaleWidget *axisWidget(int axisId);
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
skipping to change at line 257 skipping to change at line 259
selected legend item selected legend item
\param on True when the legen item is checked \param on True when the legen item is checked
\note clicks are disabled as default \note clicks are disabled as default
\sa QwtLegend::setItemMode, QwtLegend::itemMode \sa QwtLegend::setItemMode, QwtLegend::itemMode
*/ */
void legendChecked(QwtPlotItem *plotItem, bool on); void legendChecked(QwtPlotItem *plotItem, bool on);
public slots: public slots:
void clear(); virtual void clear();
virtual void replot(); virtual void replot();
void autoRefresh(); void autoRefresh();
protected slots: protected slots:
virtual void legendItemClicked(); virtual void legendItemClicked();
virtual void legendItemChecked(bool); virtual void legendItemChecked(bool);
protected: protected:
static bool axisValid(int axisId); static bool axisValid(int axisId);
skipping to change at line 284 skipping to change at line 286
virtual void updateTabOrder(); virtual void updateTabOrder();
void updateAxes(); void updateAxes();
virtual void resizeEvent(QResizeEvent *e); virtual void resizeEvent(QResizeEvent *e);
virtual void printLegendItem(QPainter *, virtual void printLegendItem(QPainter *,
const QWidget *, const QRect &) const; const QWidget *, const QRect &) const;
virtual void printTitle(QPainter *, const QRect &) const; virtual void printTitle(QPainter *, const QRect &) const;
virtual void printScale(QPainter *, int axisId, int startDist, int endD ist, virtual void printScale(QPainter *, int axisId, int startDist, int endD ist,
int baseDist, const QRect &) const; int baseDist, const QRect &) const;
virtual void printCanvas(QPainter *, const QRect &,
virtual void printCanvas(QPainter *,
const QRect &boundingRect, const QRect &canvasRect,
const QwtScaleMap maps[axisCnt], const QwtPlotPrintFilter &) const; const QwtScaleMap maps[axisCnt], const QwtPlotPrintFilter &) const;
virtual void printLegend(QPainter *, const QRect &) const; virtual void printLegend(QPainter *, const QRect &) const;
private: private:
void initAxesData(); void initAxesData();
void deleteAxesData(); void deleteAxesData();
void updateScaleDiv(); void updateScaleDiv();
void initPlot(const QwtText &title); void initPlot(const QwtText &title);
class AxisData; class AxisData;
 End of changes. 5 change blocks. 
2 lines changed or deleted 8 lines changed or added


 qwt_plot_canvas.h   qwt_plot_canvas.h 
skipping to change at line 23 skipping to change at line 23
#define QWT_PLOT_CANVAS_H #define QWT_PLOT_CANVAS_H
#include <qframe.h> #include <qframe.h>
#include <qpen.h> #include <qpen.h>
#include "qwt_global.h" #include "qwt_global.h"
class QwtPlot; class QwtPlot;
class QPixmap; class QPixmap;
/*! /*!
\brief Canvas of a QwtPlot. Canvas of a QwtPlot.
\sa QwtPlot
\sa QwtPlot
*/ */
class QWT_EXPORT QwtPlotCanvas : public QFrame class QWT_EXPORT QwtPlotCanvas : public QFrame
{ {
Q_OBJECT Q_OBJECT
friend class QwtPlot;
public: public:
/*! /*!
\brief Paint attributes \brief Paint attributes
- PaintCached\n - PaintCached\n
Paint double buffered and reuse the content of the pixmap buffer Paint double buffered and reuse the content of the pixmap buffer
for some spontaneous repaints that happen when a plot gets unhidden , for some spontaneous repaints that happen when a plot gets unhidden ,
deiconified or changes the focus. deiconified or changes the focus.
skipping to change at line 87 skipping to change at line 84
\sa setFocusIndicator(), focusIndicator(), paintFocus() \sa setFocusIndicator(), focusIndicator(), paintFocus()
*/ */
enum FocusIndicator enum FocusIndicator
{ {
NoFocusIndicator, NoFocusIndicator,
CanvasFocusIndicator, CanvasFocusIndicator,
ItemFocusIndicator ItemFocusIndicator
}; };
explicit QwtPlotCanvas(QwtPlot *);
virtual ~QwtPlotCanvas();
QwtPlot *plot();
const QwtPlot *plot() const;
void setFocusIndicator(FocusIndicator); void setFocusIndicator(FocusIndicator);
FocusIndicator focusIndicator() const; FocusIndicator focusIndicator() const;
void setPaintAttribute(PaintAttribute, bool on = true); void setPaintAttribute(PaintAttribute, bool on = true);
bool testPaintAttribute(PaintAttribute) const; bool testPaintAttribute(PaintAttribute) const;
QPixmap *paintCache(); QPixmap *paintCache();
const QPixmap *paintCache() const; const QPixmap *paintCache() const;
void invalidatePaintCache(); void invalidatePaintCache();
protected: protected:
explicit QwtPlotCanvas(QwtPlot *);
virtual ~QwtPlotCanvas();
virtual void hideEvent(QHideEvent *); virtual void hideEvent(QHideEvent *);
virtual void paintEvent(QPaintEvent *); virtual void paintEvent(QPaintEvent *);
virtual void drawContents(QPainter *); virtual void drawContents(QPainter *);
virtual void drawFocusIndicator(QPainter *); virtual void drawFocusIndicator(QPainter *);
void drawCanvas(QPainter *painter = NULL); void drawCanvas(QPainter *painter = NULL);
private: private:
 End of changes. 5 change blocks. 
8 lines changed or deleted 8 lines changed or added


 qwt_plot_dict.h   qwt_plot_dict.h 
skipping to change at line 12 skipping to change at line 12
* Qwt Widget Library * Qwt Widget Library
* Copyright (C) 1997 Josef Wilgen * Copyright (C) 1997 Josef Wilgen
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
// vim: expandtab // vim: expandtab
/*! \file !*/
#ifndef QWT_PLOT_DICT #ifndef QWT_PLOT_DICT
#define QWT_PLOT_DICT #define QWT_PLOT_DICT
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_plot_item.h" #include "qwt_plot_item.h"
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#include <qvaluelist.h> #include <qvaluelist.h>
typedef QValueListConstIterator<QwtPlotItem *> QwtPlotItemIterator; typedef QValueListConstIterator<QwtPlotItem *> QwtPlotItemIterator;
/// \var typedef QValueList< QwtPlotItem *> QwtPlotItemList
/// \brief See QT 3.x assistant documentation for QValueList
typedef QValueList<QwtPlotItem *> QwtPlotItemList; typedef QValueList<QwtPlotItem *> QwtPlotItemList;
#else #else
#include <qlist.h> #include <qlist.h>
typedef QList<QwtPlotItem *>::ConstIterator QwtPlotItemIterator; typedef QList<QwtPlotItem *>::ConstIterator QwtPlotItemIterator;
/// \var typedef QList< QwtPlotItem *> QwtPlotItemList
/// \brief See QT 4.x assistant documentation for QList
typedef QList<QwtPlotItem *> QwtPlotItemList; typedef QList<QwtPlotItem *> QwtPlotItemList;
#endif #endif
/*! /*!
\brief A dictionary for plot items \brief A dictionary for plot items
QwtPlotDict organizes plot items in increasing z-order. QwtPlotDict organizes plot items in increasing z-order.
If autoDelete() is enabled, all attached items will be deleted If autoDelete() is enabled, all attached items will be deleted
in the destructor of the dictionary. in the destructor of the dictionary.
 End of changes. 3 change blocks. 
0 lines changed or deleted 5 lines changed or added


 qwt_plot_grid.h   qwt_plot_grid.h 
skipping to change at line 29 skipping to change at line 29
class QwtScaleMap; class QwtScaleMap;
class QwtScaleDiv; class QwtScaleDiv;
/*! /*!
\brief A class which draws a coordinate grid \brief A class which draws a coordinate grid
The QwtPlotGrid class can be used to draw a coordinate grid. The QwtPlotGrid class can be used to draw a coordinate grid.
A coordinate grid consists of major and minor vertical A coordinate grid consists of major and minor vertical
and horizontal gridlines. The locations of the gridlines and horizontal gridlines. The locations of the gridlines
are determined by the X and Y scale divisions which can are determined by the X and Y scale divisions which can
be assigned with QwtPlotGrid::setXDiv and QwtPlotGrid::setYDiv() be assigned with setXDiv() and setYDiv().
The draw() member draws the grid within a bounding The draw() member draws the grid within a bounding
rectangle. rectangle.
*/ */
class QWT_EXPORT QwtPlotGrid: public QwtPlotItem class QWT_EXPORT QwtPlotGrid: public QwtPlotItem
{ {
public: public:
explicit QwtPlotGrid(); explicit QwtPlotGrid();
virtual ~QwtPlotGrid(); virtual ~QwtPlotGrid();
skipping to change at line 72 skipping to change at line 72
void setMajPen(const QPen &p); void setMajPen(const QPen &p);
const QPen& majPen() const; const QPen& majPen() const;
void setMinPen(const QPen &p); void setMinPen(const QPen &p);
const QPen& minPen() const; const QPen& minPen() const;
virtual void draw(QPainter *p, virtual void draw(QPainter *p,
const QwtScaleMap &xMap, const QwtScaleMap &yMap, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &rect) const; const QRect &rect) const;
virtual void updateScaleDiv(const QwtScaleDiv&, virtual void updateScaleDiv(const QwtScaleDiv &xMap,
const QwtScaleDiv&); const QwtScaleDiv &yMap);
private: private:
void drawLines(QPainter *painter, const QRect &, void drawLines(QPainter *painter, const QRect &,
Qt::Orientation orientation, const QwtScaleMap &, Qt::Orientation orientation, const QwtScaleMap &,
const QwtValueList &) const; const QwtValueList &) const;
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 qwt_plot_item.h   qwt_plot_item.h 
skipping to change at line 14 skipping to change at line 14
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_PLOT_ITEM_H #ifndef QWT_PLOT_ITEM_H
#define QWT_PLOT_ITEM_H #define QWT_PLOT_ITEM_H
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_legend_itemmanager.h"
#include "qwt_text.h" #include "qwt_text.h"
#include "qwt_double_rect.h" #include "qwt_double_rect.h"
class QString; class QString;
class QRect; class QRect;
class QPainter; class QPainter;
class QWidget; class QWidget;
class QwtPlot; class QwtPlot;
class QwtLegend; class QwtLegend;
class QwtScaleMap; class QwtScaleMap;
class QwtScaleDiv; class QwtScaleDiv;
/*! /*!
\brief Base class for items on the plot canvas \brief Base class for items on the plot canvas
*/ */
class QWT_EXPORT QwtPlotItem class QWT_EXPORT QwtPlotItem: public QwtLegendItemManager
{ {
public: public:
enum RttiValues enum RttiValues
{ {
Rtti_PlotItem = 0, Rtti_PlotItem = 0,
Rtti_PlotGrid, Rtti_PlotGrid,
Rtti_PlotScale,
Rtti_PlotMarker, Rtti_PlotMarker,
Rtti_PlotCurve, Rtti_PlotCurve,
Rtti_PlotHistogram, Rtti_PlotHistogram,
Rtti_PlotSpectrogram, Rtti_PlotSpectrogram,
Rtti_PlotSVG, Rtti_PlotSVG,
Rtti_PlotUserItem = 1000 Rtti_PlotUserItem = 1000
}; };
enum ItemAttribute enum ItemAttribute
skipping to change at line 64 skipping to change at line 66
enum RenderHint enum RenderHint
{ {
RenderAntialiased = 1 RenderAntialiased = 1
}; };
#endif #endif
explicit QwtPlotItem(const QwtText &title = QwtText()); explicit QwtPlotItem(const QwtText &title = QwtText());
virtual ~QwtPlotItem(); virtual ~QwtPlotItem();
void attach(QwtPlot *plot); void attach(QwtPlot *plot);
/*!
\brief This method detaches a QwtPlotItem from any QwtPlot it has be
en
associated with.
detach() is equivalent to calling attach( NULL )
\sa attach( QwtPlot* plot )
*/
void detach() { attach(NULL); } void detach() { attach(NULL); }
QwtPlot *plot() const; QwtPlot *plot() const;
void setTitle(const QString &title); void setTitle(const QString &title);
void setTitle(const QwtText &title); void setTitle(const QwtText &title);
const QwtText &title() const; const QwtText &title() const;
virtual int rtti() const; virtual int rtti() const;
 End of changes. 4 change blocks. 
1 lines changed or deleted 12 lines changed or added


 qwt_plot_magnifier.h   qwt_plot_magnifier.h 
skipping to change at line 14 skipping to change at line 14
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_PLOT_MAGNIFIER_H #ifndef QWT_PLOT_MAGNIFIER_H
#define QWT_PLOT_MAGNIFIER_H 1 #define QWT_PLOT_MAGNIFIER_H 1
#include "qwt_global.h" #include "qwt_global.h"
#include <qobject.h> #include "qwt_magnifier.h"
class QwtPlotCanvas; class QwtPlotCanvas;
class QwtPlot; class QwtPlot;
class QMouseEvent;
class QWheelEvent;
class QKeyEvent;
/*! /*!
\brief QwtPlotMagnifier provides zooming, by magnifying in steps. \brief QwtPlotMagnifier provides zooming, by magnifying in steps.
Using QwtPlotMagnifier a plot can be zoomed in/out in steps using
keys, the mouse wheel or moving a mouse button in vertical direction.
Together with QwtPlotZoomer and QwtPlotPanner it is possible to implement Together with QwtPlotZoomer and QwtPlotPanner it is possible to implement
individual and powerful navigation of the plot canvas. individual and powerful navigation of the plot canvas.
\sa QwtPlotZoomer, QwtPlotPanner, QwtPlot \sa QwtPlotZoomer, QwtPlotPanner, QwtPlot
*/ */
class QWT_EXPORT QwtPlotMagnifier: public QObject class QWT_EXPORT QwtPlotMagnifier: public QwtMagnifier
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QwtPlotMagnifier(QwtPlotCanvas *); explicit QwtPlotMagnifier(QwtPlotCanvas *);
virtual ~QwtPlotMagnifier(); virtual ~QwtPlotMagnifier();
void setEnabled(bool);
bool isEnabled() const;
void setAxisEnabled(int axis, bool on); void setAxisEnabled(int axis, bool on);
bool isAxisEnabled(int axis) const; bool isAxisEnabled(int axis) const;
// mouse
void setMouseFactor(double);
double mouseFactor() const;
void setMouseButton(int button, int buttonState = Qt::NoButton);
void getMouseButton(int &button, int &buttonState) const;
// mouse wheel
void setWheelFactor(double);
double wheelFactor() const;
void setWheelButtonState(int buttonState);
int wheelButtonState() const;
// keyboard
void setKeyFactor(double);
double keyFactor() const;
void setZoomInKey(int key, int buttonState);
void getZoomInKey(int &key, int &buttonState);
void setZoomOutKey(int key, int buttonState);
void getZoomOutKey(int &key, int &buttonState);
QwtPlotCanvas *canvas(); QwtPlotCanvas *canvas();
const QwtPlotCanvas *canvas() const; const QwtPlotCanvas *canvas() const;
QwtPlot *plot(); QwtPlot *plot();
const QwtPlot *plot() const; const QwtPlot *plot() const;
virtual bool eventFilter(QObject *, QEvent *);
protected: protected:
virtual void rescale(double factor); virtual void rescale(double factor);
virtual void widgetMousePressEvent(QMouseEvent *);
virtual void widgetMouseReleaseEvent(QMouseEvent *);
virtual void widgetMouseMoveEvent(QMouseEvent *);
virtual void widgetWheelEvent(QWheelEvent *);
virtual void widgetKeyPressEvent(QKeyEvent *);
virtual void widgetKeyReleaseEvent(QKeyEvent *);
private: private:
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 8 change blocks. 
41 lines changed or deleted 5 lines changed or added


 qwt_plot_printfilter.h   qwt_plot_printfilter.h 
skipping to change at line 40 skipping to change at line 40
class QWT_EXPORT QwtPlotPrintFilter class QWT_EXPORT QwtPlotPrintFilter
{ {
public: public:
//! Print options //! Print options
enum Options enum Options
{ {
PrintMargin = 1, PrintMargin = 1,
PrintTitle = 2, PrintTitle = 2,
PrintLegend = 4, PrintLegend = 4,
PrintGrid = 8, PrintGrid = 8,
PrintCanvasBackground = 16, PrintBackground = 16,
PrintWidgetBackground = 32, PrintFrameWithScales = 32,
PrintAll = ~PrintWidgetBackground PrintAll = ~PrintFrameWithScales
}; };
//! Print items //! Print items
enum Item enum Item
{ {
Title, Title,
Legend, Legend,
Curve, Curve,
CurveSymbol, CurveSymbol,
Marker, Marker,
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 qwt_plot_zoomer.h   qwt_plot_zoomer.h 
skipping to change at line 62 skipping to change at line 62
public: public:
explicit QwtPlotZoomer(QwtPlotCanvas *, bool doReplot = true); explicit QwtPlotZoomer(QwtPlotCanvas *, bool doReplot = true);
explicit QwtPlotZoomer(int xAxis, int yAxis, explicit QwtPlotZoomer(int xAxis, int yAxis,
QwtPlotCanvas *, bool doReplot = true); QwtPlotCanvas *, bool doReplot = true);
explicit QwtPlotZoomer(int xAxis, int yAxis, int selectionFlags, explicit QwtPlotZoomer(int xAxis, int yAxis, int selectionFlags,
DisplayMode trackerMode, QwtPlotCanvas *, DisplayMode trackerMode, QwtPlotCanvas *,
bool doReplot = true); bool doReplot = true);
virtual ~QwtPlotZoomer(); virtual ~QwtPlotZoomer();
virtual void setZoomBase(); virtual void setZoomBase(bool doReplot = true);
virtual void setZoomBase(const QwtDoubleRect &); virtual void setZoomBase(const QwtDoubleRect &);
QwtDoubleRect zoomBase() const; QwtDoubleRect zoomBase() const;
QwtDoubleRect zoomRect() const; QwtDoubleRect zoomRect() const;
virtual void setAxis(int xAxis, int yAxis); virtual void setAxis(int xAxis, int yAxis);
void setMaxStackDepth(int); void setMaxStackDepth(int);
int maxStackDepth() const; int maxStackDepth() const;
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
const QValueStack<QwtDoubleRect> &zoomStack() const; const QValueStack<QwtDoubleRect> &zoomStack() const;
void setZoomStack(const QValueStack<QwtDoubleRect> &,
int zoomRectIndex = -1);
#else #else
const QStack<QwtDoubleRect> &zoomStack() const; const QStack<QwtDoubleRect> &zoomStack() const;
void setZoomStack(const QStack<QwtDoubleRect> &,
int zoomRectIndex = -1);
#endif #endif
uint zoomRectIndex() const; uint zoomRectIndex() const;
virtual void setSelectionFlags(int); virtual void setSelectionFlags(int);
public slots: public slots:
void moveBy(double x, double y); void moveBy(double x, double y);
virtual void move(double x, double y); virtual void move(double x, double y);
virtual void zoom(const QwtDoubleRect &); virtual void zoom(const QwtDoubleRect &);
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 qwt_polygon.h   qwt_polygon.h 
skipping to change at line 23 skipping to change at line 23
#define QWT_POLYGON_H #define QWT_POLYGON_H
#include "qwt_global.h" #include "qwt_global.h"
/*! /*!
\def QwtPolygon \def QwtPolygon
*/ */
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#include <qpointarray.h> #include <qpointarray.h>
#include "qwt_double_rect.h"
typedef QPointArray QwtPolygon; typedef QPointArray QwtPolygon;
typedef QMemArray<QwtDoublePoint> QwtPolygonF;
#else #else
#include <qpolygon.h> #include <qpolygon.h>
typedef QPolygon QwtPolygon; typedef QPolygon QwtPolygon;
typedef QPolygonF QwtPolygonF;
#endif #endif
#endif #endif
 End of changes. 4 change blocks. 
0 lines changed or deleted 6 lines changed or added


 qwt_rect.h   qwt_rect.h 
skipping to change at line 18 skipping to change at line 18
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_RECT_H #ifndef QWT_RECT_H
#define QWT_RECT_H #define QWT_RECT_H
#include <qrect.h> #include <qrect.h>
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_polygon.h" #include "qwt_polygon.h"
/*! /*!
\brief Some extensions for QRect Some extensions for QRect
\deprecated Use QwtClipper instead.
*/ */
class QWT_EXPORT QwtRect : public QRect class QWT_EXPORT QwtRect : public QRect
{ {
public: public:
QwtRect(); QwtRect();
QwtRect(const QRect &r); QwtRect(const QRect &r);
QwtPolygon clip(const QwtPolygon &) const;
private: private:
enum Edge { Left, Top, Right, Bottom, NEdges }; QwtPolygon clip(const QwtPolygon &) const;
void clipEdge(Edge, const QwtPolygon &, QwtPolygon &) const;
bool insideEdge(const QPoint &, Edge edge) const;
QPoint intersectEdge(const QPoint &p1,
const QPoint &p2, Edge edge) const;
}; };
#endif #endif
 End of changes. 3 change blocks. 
9 lines changed or deleted 3 lines changed or added


 qwt_scale_div.h   qwt_scale_div.h 
skipping to change at line 15 skipping to change at line 15
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_SCALE_DIV_H #ifndef QWT_SCALE_DIV_H
#define QWT_SCALE_DIV_H #define QWT_SCALE_DIV_H
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_valuelist.h" #include "qwt_valuelist.h"
#include "qwt_double_interval.h"
class QwtDoubleInterval; class QwtDoubleInterval;
/*! /*!
\brief A class representing a scale division \brief A class representing a scale division
A scale division consists of its limits and 3 list A scale division consists of its limits and 3 list
of tick values qualified as major, medium and minor ticks. of tick values qualified as major, medium and minor ticks.
In most cases scale divisions are calculated by a QwtScaleEngine. In most cases scale divisions are calculated by a QwtScaleEngine.
skipping to change at line 52 skipping to change at line 53
explicit QwtScaleDiv(); explicit QwtScaleDiv();
explicit QwtScaleDiv(const QwtDoubleInterval &, explicit QwtScaleDiv(const QwtDoubleInterval &,
QwtValueList[NTickTypes]); QwtValueList[NTickTypes]);
explicit QwtScaleDiv(double lBound, double rBound, explicit QwtScaleDiv(double lBound, double rBound,
QwtValueList[NTickTypes]); QwtValueList[NTickTypes]);
int operator==(const QwtScaleDiv &s) const; int operator==(const QwtScaleDiv &s) const;
int operator!=(const QwtScaleDiv &s) const; int operator!=(const QwtScaleDiv &s) const;
void setInterval(double lBound, double rBound);
void setInterval(const QwtDoubleInterval &);
QwtDoubleInterval interval() const;
inline double lBound() const; inline double lBound() const;
inline double hBound() const; inline double hBound() const;
inline double range() const; inline double range() const;
bool contains(double v) const; bool contains(double v) const;
void setTicks(int type, const QwtValueList &);
const QwtValueList &ticks(int type) const; const QwtValueList &ticks(int type) const;
void invalidate(); void invalidate();
bool isValid() const; bool isValid() const;
void invert(); void invert();
private: private:
double d_lBound; double d_lBound;
double d_hBound; double d_hBound;
QwtValueList d_ticks[NTickTypes]; QwtValueList d_ticks[NTickTypes];
bool d_isValid; bool d_isValid;
}; };
/*! /*!
Change the interval
\lBound left bound
\rBound right bound
*/
inline void QwtScaleDiv::setInterval(double lBound, double hBound)
{
d_lBound = lBound;
d_hBound = hBound;
}
/*!
\return lBound -> hBound
*/
inline QwtDoubleInterval QwtScaleDiv::interval() const
{
return QwtDoubleInterval(d_lBound, d_hBound);
}
/*!
\return left bound \return left bound
\sa QwtScaleDiv::hBound \sa QwtScaleDiv::hBound
*/ */
inline double QwtScaleDiv::lBound() const inline double QwtScaleDiv::lBound() const
{ {
return d_lBound; return d_lBound;
} }
/*! /*!
\return right bound \return right bound
 End of changes. 4 change blocks. 
0 lines changed or deleted 25 lines changed or added


 qwt_scale_draw.h   qwt_scale_draw.h 
skipping to change at line 83 skipping to change at line 83
double labelRotation() const; double labelRotation() const;
int maxLabelHeight(const QFont &) const; int maxLabelHeight(const QFont &) const;
int maxLabelWidth(const QFont &) const; int maxLabelWidth(const QFont &) const;
QPoint labelPosition(double val) const; QPoint labelPosition(double val) const;
QRect labelRect(const QFont &, double val) const; QRect labelRect(const QFont &, double val) const;
QSize labelSize(const QFont &, double val) const; QSize labelSize(const QFont &, double val) const;
QRect boundingLabelRect(const QFont &, double val) const;
protected: protected:
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
QWMatrix labelMatrix(const QPoint &, const QSize &) const; QWMatrix labelMatrix(const QPoint &, const QSize &) const;
#else #else
QMatrix labelMatrix(const QPoint &, const QSize &) const; QMatrix labelMatrix(const QPoint &, const QSize &) const;
#endif #endif
virtual void drawTick(QPainter *p, double val, int len) const; virtual void drawTick(QPainter *p, double val, int len) const;
virtual void drawBackbone(QPainter *p) const; virtual void drawBackbone(QPainter *p) const;
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 qwt_scale_engine.h   qwt_scale_engine.h 
skipping to change at line 53 skipping to change at line 53
The layout of the scale can be varied with setAttribute(). The layout of the scale can be varied with setAttribute().
Qwt offers implementations for logarithmic (log10) Qwt offers implementations for logarithmic (log10)
and linear scales. Contributions for other types of scale engines and linear scales. Contributions for other types of scale engines
(date/time, log2 ... ) are welcome. (date/time, log2 ... ) are welcome.
*/ */
class QWT_EXPORT QwtScaleEngine class QWT_EXPORT QwtScaleEngine
{ {
public: public:
//! see QwtScaleEngine::setOption, testOption //! see QwtScaleEngine::setAttribute, testAttribute
enum Attribute enum Attribute
{ {
NoAttribute = 0, NoAttribute = 0,
IncludeReference = 1, IncludeReference = 1,
Symmetric = 2, Symmetric = 2,
Floating = 4, Floating = 4,
Inverted = 8 Inverted = 8
}; };
explicit QwtScaleEngine(); explicit QwtScaleEngine();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_symbol.h   qwt_symbol.h 
skipping to change at line 27 skipping to change at line 27
class QPainter; class QPainter;
class QRect; class QRect;
//! A class for drawing symbols //! A class for drawing symbols
class QWT_EXPORT QwtSymbol class QWT_EXPORT QwtSymbol
{ {
public: public:
/*! /*!
Style Style
\sa QwtSymbol::setStyle, QwtSymbol::style \sa setStyle(), style()
*/ */
enum Style enum Style
{ {
NoSymbol = -1, NoSymbol = -1,
Ellipse, Ellipse,
Rect, Rect,
Diamond, Diamond,
Triangle, Triangle,
DTriangle, DTriangle,
skipping to change at line 58 skipping to change at line 58
StyleCnt StyleCnt
}; };
public: public:
QwtSymbol(); QwtSymbol();
QwtSymbol(Style st, const QBrush &bd, const QPen &pn, const QSize &s); QwtSymbol(Style st, const QBrush &bd, const QPen &pn, const QSize &s);
virtual ~QwtSymbol(); virtual ~QwtSymbol();
bool operator!=(const QwtSymbol &) const; bool operator!=(const QwtSymbol &) const;
bool operator==(const QwtSymbol &) const; virtual bool operator==(const QwtSymbol &) const;
virtual QwtSymbol *clone() const;
void setSize(const QSize &s); void setSize(const QSize &s);
void setSize(int a, int b = -1); void setSize(int a, int b = -1);
void setBrush(const QBrush& b); void setBrush(const QBrush& b);
void setPen(const QPen &p); void setPen(const QPen &p);
void setStyle (Style s); void setStyle (Style s);
//! Return Brush //! Return Brush
const QBrush& brush() const { return d_brush; } const QBrush& brush() const { return d_brush; }
//! Return Pen //! Return Pen
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/