qwt_color_map.h   qwt_color_map.h 
skipping to change at line 66 skipping to change at line 66
enum Format enum Format
{ {
RGB, RGB,
Indexed Indexed
}; };
QwtColorMap(Format = QwtColorMap::RGB ); QwtColorMap(Format = QwtColorMap::RGB );
virtual ~QwtColorMap(); virtual ~QwtColorMap();
inline Format format() const; Format format() const;
//! Clone the color map //! Clone the color map
virtual QwtColorMap *copy() const = 0; virtual QwtColorMap *copy() const = 0;
/*! /*!
Map a value of a given interval into a rgb value. Map a value of a given interval into a rgb value.
\param interval Range for the values \param interval Range for the values
\param value Value \param value Value
\return rgb value, corresponding to value \return rgb value, corresponding to value
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_double_interval.h   qwt_double_interval.h 
skipping to change at line 48 skipping to change at line 48
enum BorderMode enum BorderMode
{ {
IncludeBorders = 0, IncludeBorders = 0,
ExcludeMinimum = 1, ExcludeMinimum = 1,
ExcludeMaximum = 2, ExcludeMaximum = 2,
ExcludeBorders = ExcludeMinimum | ExcludeMaximum ExcludeBorders = ExcludeMinimum | ExcludeMaximum
}; };
inline QwtDoubleInterval(); QwtDoubleInterval();
inline QwtDoubleInterval(double minValue, double maxValue, QwtDoubleInterval(double minValue, double maxValue,
int borderFlags = IncludeBorders); int borderFlags = IncludeBorders);
inline void setInterval(double minValue, double maxValue, void setInterval(double minValue, double maxValue,
int borderFlags = IncludeBorders); int borderFlags = IncludeBorders);
QwtDoubleInterval normalized() const; QwtDoubleInterval normalized() const;
QwtDoubleInterval inverted() const; QwtDoubleInterval inverted() const;
QwtDoubleInterval limited(double minValue, double maxValue) const; QwtDoubleInterval limited(double minValue, double maxValue) const;
inline int operator==(const QwtDoubleInterval &) const; int operator==(const QwtDoubleInterval &) const;
inline int operator!=(const QwtDoubleInterval &) const; int operator!=(const QwtDoubleInterval &) const;
inline void setBorderFlags(int); void setBorderFlags(int);
inline int borderFlags() const; int borderFlags() const;
inline double minValue() const; double minValue() const;
inline double maxValue() const; double maxValue() const;
inline double width() const; double width() const;
inline void setMinValue(double); void setMinValue(double);
inline void setMaxValue(double); void setMaxValue(double);
bool contains(double value) const; bool contains(double value) const;
bool intersects(const QwtDoubleInterval &) const; bool intersects(const QwtDoubleInterval &) const;
QwtDoubleInterval intersect(const QwtDoubleInterval &) const; QwtDoubleInterval intersect(const QwtDoubleInterval &) const;
QwtDoubleInterval unite(const QwtDoubleInterval &) const; QwtDoubleInterval unite(const QwtDoubleInterval &) const;
inline QwtDoubleInterval operator|(const QwtDoubleInterval &) const; QwtDoubleInterval operator|(const QwtDoubleInterval &) const;
inline QwtDoubleInterval operator&(const QwtDoubleInterval &) const; QwtDoubleInterval operator&(const QwtDoubleInterval &) const;
QwtDoubleInterval &operator|=(const QwtDoubleInterval &); QwtDoubleInterval &operator|=(const QwtDoubleInterval &);
QwtDoubleInterval &operator&=(const QwtDoubleInterval &); QwtDoubleInterval &operator&=(const QwtDoubleInterval &);
QwtDoubleInterval extend(double value) const; QwtDoubleInterval extend(double value) const;
inline QwtDoubleInterval operator|(double) const; QwtDoubleInterval operator|(double) const;
QwtDoubleInterval &operator|=(double); QwtDoubleInterval &operator|=(double);
inline bool isValid() const; bool isValid() const;
inline bool isNull() const; bool isNull() const;
inline void invalidate(); void invalidate();
QwtDoubleInterval symmetrize(double value) const; QwtDoubleInterval symmetrize(double value) const;
private: private:
double d_minValue; double d_minValue;
double d_maxValue; double d_maxValue;
int d_borderFlags; int d_borderFlags;
}; };
/*! /*!
 End of changes. 10 change blocks. 
18 lines changed or deleted 18 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 0x050200 #define QWT_VERSION 0x050201
#define QWT_VERSION_STR "5.2.0" #define QWT_VERSION_STR "5.2.1"
#if defined(Q_WS_WIN) #if defined(Q_WS_WIN) || defined(Q_WS_S60)
#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
#if defined(QWT_MAKEDLL) // create a Qwt DLL library #if defined(QWT_MAKEDLL) // create a Qwt DLL library
#define QWT_EXPORT __declspec(dllexport) #define QWT_EXPORT __declspec(dllexport)
#define QWT_TEMPLATEDLL #define QWT_TEMPLATEDLL
#else // use a Qwt DLL library #else // use a Qwt DLL library
#define QWT_EXPORT __declspec(dllimport) #define QWT_EXPORT __declspec(dllimport)
#endif #endif
#endif // QWT_DLL #endif // QWT_DLL
#endif // Q_WS_WIN #endif // Q_WS_WIN || Q_WS_S60
#ifndef QWT_EXPORT #ifndef QWT_EXPORT
#define QWT_EXPORT #define QWT_EXPORT
#endif #endif
// #define QWT_NO_COMPAT 1 // disable withdrawn functionality // #define QWT_NO_COMPAT 1 // disable withdrawn functionality
#endif // QWT_GLOBAL_H #endif // QWT_GLOBAL_H
 End of changes. 3 change blocks. 
4 lines changed or deleted 4 lines changed or added


 qwt_plot_curve.h   qwt_plot_curve.h 
skipping to change at line 194 skipping to change at line 194
void setData(const QPolygonF &data); void setData(const QPolygonF &data);
#endif #endif
void setData(const QwtData &data); void setData(const QwtData &data);
int closestPoint(const QPoint &pos, double *dist = NULL) const; int closestPoint(const QPoint &pos, double *dist = NULL) const;
QwtData &data(); QwtData &data();
const QwtData &data() const; const QwtData &data() const;
int dataSize() const; int dataSize() const;
inline double x(int i) const; double x(int i) const;
inline double y(int i) const; double y(int i) const;
virtual QwtDoubleRect boundingRect() const; virtual QwtDoubleRect boundingRect() const;
//! boundingRect().left() double minXValue() const;
inline double minXValue() const { return boundingRect().left(); } double maxXValue() const;
//! boundingRect().right() double minYValue() const;
inline double maxXValue() const { return boundingRect().right(); } double maxYValue() const;
//! boundingRect().top()
inline double minYValue() const { return boundingRect().top(); }
//! boundingRect().bottom()
inline double maxYValue() const { return boundingRect().bottom(); }
void setCurveAttribute(CurveAttribute, bool on = true); void setCurveAttribute(CurveAttribute, bool on = true);
bool testCurveAttribute(CurveAttribute) const; bool testCurveAttribute(CurveAttribute) const;
void setPen(const QPen &); void setPen(const QPen &);
const QPen &pen() const; const QPen &pen() const;
void setBrush(const QBrush &); void setBrush(const QBrush &);
const QBrush &brush() const; const QBrush &brush() const;
skipping to change at line 309 skipping to change at line 305
/*! /*!
\param i index \param i index
\return y-value at position i \return y-value at position i
*/ */
inline double QwtPlotCurve::y(int i) const inline double QwtPlotCurve::y(int i) const
{ {
return d_xy->y(i); return d_xy->y(i);
} }
//! boundingRect().left()
inline double QwtPlotCurve::minXValue() const
{
return boundingRect().left();
}
//! boundingRect().right()
inline double QwtPlotCurve::maxXValue() const
{
return boundingRect().right();
}
//! boundingRect().top()
inline double QwtPlotCurve::minYValue() const
{
return boundingRect().top();
}
//! boundingRect().bottom()
inline double QwtPlotCurve::maxYValue() const
{
return boundingRect().bottom();
}
#endif #endif
 End of changes. 3 change blocks. 
10 lines changed or deleted 30 lines changed or added


 qwt_plot_rescaler.h   qwt_plot_rescaler.h 
skipping to change at line 16 skipping to change at line 16
* 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_RESCALER_H #ifndef QWT_PLOT_RESCALER_H
#define QWT_PLOT_RESCALER_H 1 #define QWT_PLOT_RESCALER_H 1
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_double_rect.h" #include "qwt_double_rect.h"
#include "qwt_double_interval.h" #include "qwt_double_interval.h"
#include "qwt_plot.h"
#include <qobject.h> #include <qobject.h>
class QwtPlotCanvas; class QwtPlotCanvas;
class QwtPlot;
class QResizeEvent; class QResizeEvent;
/*! /*!
\brief QwtPlotRescaler takes care of fixed aspect ratios for plot scale s \brief QwtPlotRescaler takes care of fixed aspect ratios for plot scale s
QwtPlotRescaler autoadjusts the axes of a QwtPlot according QwtPlotRescaler autoadjusts the axes of a QwtPlot according
to fixed aspect ratios. to fixed aspect ratios.
*/ */
class QWT_EXPORT QwtPlotRescaler: public QObject class QWT_EXPORT QwtPlotRescaler: public QObject
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_scale_div.h   qwt_scale_div.h 
skipping to change at line 58 skipping to change at line 58
explicit QwtScaleDiv(double lowerBound, double upperBound, explicit QwtScaleDiv(double lowerBound, double upperBound,
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 lowerBound, double upperBound); void setInterval(double lowerBound, double upperBound);
void setInterval(const QwtDoubleInterval &); void setInterval(const QwtDoubleInterval &);
QwtDoubleInterval interval() const; QwtDoubleInterval interval() const;
inline double lowerBound() const; double lowerBound() const;
inline double upperBound() const; double upperBound() const;
inline double range() const; double range() const;
bool contains(double v) const; bool contains(double v) const;
void setTicks(int type, const QwtValueList &); 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();
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 lines changed or added


 qwt_scale_map.h   qwt_scale_map.h 
skipping to change at line 38 skipping to change at line 38
}; };
QwtScaleTransformation(Type type); QwtScaleTransformation(Type type);
virtual ~QwtScaleTransformation(); virtual ~QwtScaleTransformation();
virtual double xForm(double x, double s1, double s2, virtual double xForm(double x, double s1, double s2,
double p1, double p2) const; double p1, double p2) const;
virtual double invXForm(double x, double s1, double s2, virtual double invXForm(double x, double s1, double s2,
double p1, double p2) const; double p1, double p2) const;
//! \return Transformation type Type type() const;
inline Type type() const { return d_type; }
virtual QwtScaleTransformation *copy() const; virtual QwtScaleTransformation *copy() const;
private: private:
QwtScaleTransformation(); QwtScaleTransformation();
QwtScaleTransformation &operator=( const QwtScaleTransformation); QwtScaleTransformation &operator=( const QwtScaleTransformation);
const Type d_type; const Type d_type;
}; };
//! \return Transformation type
inline QwtScaleTransformation::Type QwtScaleTransformation::type() const
{
return d_type;
}
/*! /*!
\brief A scale map \brief A scale map
QwtScaleMap offers transformations from a scale QwtScaleMap offers transformations from a scale
into a paint interval and vice versa. into a paint interval and vice versa.
*/ */
class QWT_EXPORT QwtScaleMap class QWT_EXPORT QwtScaleMap
{ {
public: public:
QwtScaleMap(); QwtScaleMap();
skipping to change at line 78 skipping to change at line 83
void setPaintInterval(int p1, int p2); void setPaintInterval(int p1, int p2);
void setPaintXInterval(double p1, double p2); void setPaintXInterval(double p1, double p2);
void setScaleInterval(double s1, double s2); void setScaleInterval(double s1, double s2);
int transform(double x) const; int transform(double x) const;
double invTransform(double i) const; double invTransform(double i) const;
double xTransform(double x) const; double xTransform(double x) const;
inline double p1() const; double p1() const;
inline double p2() const; double p2() const;
inline double s1() const; double s1() const;
inline double s2() const; double s2() const;
inline double pDist() const; double pDist() const;
inline double sDist() const; double sDist() const;
QT_STATIC_CONST double LogMin; QT_STATIC_CONST double LogMin;
QT_STATIC_CONST double LogMax; QT_STATIC_CONST double LogMax;
private: private:
void newFactor(); void newFactor();
double d_s1, d_s2; // scale interval boundaries double d_s1, d_s2; // scale interval boundaries
double d_p1, d_p2; // paint device interval boundaries double d_p1, d_p2; // paint device interval boundaries
 End of changes. 5 change blocks. 
8 lines changed or deleted 13 lines changed or added


 qwt_text.h   qwt_text.h 
skipping to change at line 148 skipping to change at line 148
QwtText &operator=(const QwtText &); QwtText &operator=(const QwtText &);
int operator==(const QwtText &) const; int operator==(const QwtText &) const;
int operator!=(const QwtText &) const; int operator!=(const QwtText &) const;
void setText(const QString &, void setText(const QString &,
QwtText::TextFormat textFormat = AutoText); QwtText::TextFormat textFormat = AutoText);
QString text() const; QString text() const;
//! \return text().isNull() bool isNull() const;
inline bool isNull() const { return text().isNull(); } bool isEmpty() const;
//! \return text().isEmpty()
inline bool isEmpty() const { return text().isEmpty(); }
void setFont(const QFont &); void setFont(const QFont &);
QFont font() const; QFont font() const;
QFont usedFont(const QFont &) const; QFont usedFont(const QFont &) const;
void setRenderFlags(int flags); void setRenderFlags(int flags);
int renderFlags() const; int renderFlags() const;
void setColor(const QColor &); void setColor(const QColor &);
skipping to change at line 198 skipping to change at line 195
static void setTextEngine(QwtText::TextFormat, QwtTextEngine *); static void setTextEngine(QwtText::TextFormat, QwtTextEngine *);
private: private:
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
class LayoutCache; class LayoutCache;
LayoutCache *d_layoutCache; LayoutCache *d_layoutCache;
}; };
//! \return text().isNull()
inline bool QwtText::isNull() const
{
return text().isNull();
}
//! \return text().isEmpty()
inline bool QwtText::isEmpty() const
{
return text().isEmpty();
}
#endif #endif
 End of changes. 2 change blocks. 
5 lines changed or deleted 14 lines changed or added


 qwt_valuelist.h   qwt_valuelist.h 
skipping to change at line 25 skipping to change at line 25
#include "qwt_global.h" #include "qwt_global.h"
/*! /*!
\def QwtValueList \def QwtValueList
*/ */
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#include <qvaluelist.h> #include <qvaluelist.h>
#if defined(QWT_TEMPLATEDLL)
// MOC_SKIP_BEGIN
template class QWT_EXPORT QValueList<double>;
// MOC_SKIP_END
#endif
typedef QValueList<double> QwtValueList; typedef QValueList<double> QwtValueList;
#else // QT_VERSION >= 0x040000 #else // QT_VERSION >= 0x040000
#include <qlist.h> #include <qlist.h>
#if defined(QWT_TEMPLATEDLL)
#if QT_VERSION < 0x040300
// Some compilers have problems,
// without a qHash(double) implementation
#include <qset.h>
#include <qvector.h>
inline uint qHash(double key) { return uint(key); }
#endif
// MOC_SKIP_BEGIN
template class QWT_EXPORT QList<double>;
// MOC_SKIP_END
#endif // QWT_TEMPLATEDLL
typedef QList<double> QwtValueList; typedef QList<double> QwtValueList;
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
22 lines changed or deleted 0 lines changed or added


 qwt_wheel.h   qwt_wheel.h 
skipping to change at line 65 skipping to change at line 65
void setWheelWidth( int w ); void setWheelWidth( int w );
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const; virtual QSize minimumSizeHint() const;
protected: protected:
virtual void resizeEvent(QResizeEvent *e); virtual void resizeEvent(QResizeEvent *e);
virtual void paintEvent(QPaintEvent *e); virtual void paintEvent(QPaintEvent *e);
void layoutWheel( bool update = true ); void layoutWheel( bool update = true );
void draw(QPainter *p, const QRect& update_rect); void draw(QPainter *, const QRect &);
void drawWheel(QPainter *p, const QRect &r); void drawWheel(QPainter *, const QRect &);
void drawWheelBackground(QPainter *p, const QRect &r); void drawWheelBackground(QPainter *, const QRect &);
void setColorArray(); void setColorArray();
virtual void valueChange(); virtual void valueChange();
virtual void paletteChange( const QPalette &); virtual void paletteChange( const QPalette &);
virtual double getValue(const QPoint &p); virtual double getValue(const QPoint &);
virtual void getScrollMode(const QPoint &p, virtual void getScrollMode(const QPoint &,
int &scrollMode, int &direction); int &scrollMode, int &direction);
private: private:
void initWheel(); void initWheel();
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 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/