qwt_polar_curve.h   qwt_polar_curve.h 
skipping to change at line 60 skipping to change at line 60
UserCurve = 100 UserCurve = 100
}; };
/*! /*!
\brief Attributes how to represent the curve on the legend \brief Attributes how to represent the curve on the legend
If none of the flags is activated QwtPlotCurve tries to find If none of the flags is activated QwtPlotCurve tries to find
a color representing the curve and paints a rectangle with it. a color representing the curve and paints a rectangle with it.
In the default setting all attributes are off. In the default setting all attributes are off.
\sa setLegendAttribute(), testLegendAttribute(), \sa setLegendAttribute(), testLegendAttribute()
drawLegendIdentifier()
*/ */
enum LegendAttribute enum LegendAttribute
{ {
/*! /*!
If the curveStyle() is not NoCurve a line is painted with the If the curveStyle() is not NoCurve a line is painted with the
curvePen(). curvePen().
*/ */
LegendShowLine = 0x01, LegendShowLine = 0x01,
skipping to change at line 102 skipping to change at line 101
size_t dataSize() const; size_t dataSize() const;
QwtPointPolar sample( int i ) const; QwtPointPolar sample( int i ) const;
void setPen( const QPen & ); void setPen( const QPen & );
const QPen &pen() const; const QPen &pen() const;
void setStyle( CurveStyle style ); void setStyle( CurveStyle style );
CurveStyle style() const; CurveStyle style() const;
void setSymbol( const QwtSymbol * ); void setSymbol( QwtSymbol * );
const QwtSymbol *symbol() const; const QwtSymbol *symbol() const;
void setCurveFitter( QwtCurveFitter * ); void setCurveFitter( QwtCurveFitter * );
QwtCurveFitter *curveFitter() const; QwtCurveFitter *curveFitter() const;
virtual void draw( QPainter *p, virtual void draw( QPainter *p,
const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap,
const QPointF &pole, double radius, const QPointF &pole, double radius,
const QRectF &canvasRect ) const; const QRectF &canvasRect ) const;
virtual void draw( QPainter *p, virtual void draw( QPainter *p,
const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap,
const QPointF &pole, int from, int to ) const; const QPointF &pole, int from, int to ) const;
virtual void updateLegend( QwtLegend * ) const;
virtual QwtInterval boundingInterval( int scaleId ) const; virtual QwtInterval boundingInterval( int scaleId ) const;
virtual void drawLegendIdentifier( QPainter *, const QRectF & ) const; virtual QwtGraphic legendIcon( int index, const QSizeF & ) const;
protected: protected:
void init(); void init();
virtual void drawCurve( QPainter *, int style, virtual void drawCurve( QPainter *, int style,
const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap,
const QPointF &pole, int from, int to ) const; const QPointF &pole, int from, int to ) const;
virtual void drawSymbols( QPainter *, const QwtSymbol &, virtual void drawSymbols( QPainter *, const QwtSymbol &,
 End of changes. 4 change blocks. 
5 lines changed or deleted 3 lines changed or added


 qwt_polar_global.h   qwt_polar_global.h 
skipping to change at line 16 skipping to change at line 16
* 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_POLAR_GLOBAL_H #ifndef QWT_POLAR_GLOBAL_H
#define QWT_POLAR_GLOBAL_H #define QWT_POLAR_GLOBAL_H
#include <qglobal.h> #include <qglobal.h>
// QWT_POLAR_VERSION is (major << 16) + (minor << 8) + patch. // QWT_POLAR_VERSION is (major << 16) + (minor << 8) + patch.
#define QWT_POLAR_VERSION 0x010000 #define QWT_POLAR_VERSION 0x010100
#define QWT_POLAR_VERSION_STR "1.0.0" #define QWT_POLAR_VERSION_STR "1.1.0"
#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_POLAR_DLL #ifdef QWT_POLAR_DLL
#if defined(QWT_POLAR_MAKEDLL) // create a Qwt DLL library #if defined(QWT_POLAR_MAKEDLL) // create DLL library
#define QWT_POLAR_EXPORT __declspec(dllexport) #define QWT_POLAR_EXPORT __declspec(dllexport)
#define QWT_POLAR_TEMPLATEDLL #define QWT_POLAR_TEMPLATEDLL
#else // use a Qwt DLL library #else // use DLL library
#define QWT_POLAR_EXPORT __declspec(dllimport) #define QWT_POLAR_EXPORT __declspec(dllimport)
#endif #endif
#endif // QWT_POLAR_MAKEDLL #endif // QWT_POLAR_DLL
#endif // Q_WS_WIN
#ifndef QWT_POLAR_EXPORT #ifndef QWT_POLAR_EXPORT
#define QWT_POLAR_EXPORT #define QWT_POLAR_EXPORT
#endif #endif
#endif // QWT_POLAR_GLOBAL_H #endif // QWT_POLAR_GLOBAL_H
 End of changes. 4 change blocks. 
9 lines changed or deleted 5 lines changed or added


 qwt_polar_item.h   qwt_polar_item.h 
skipping to change at line 14 skipping to change at line 14
* *
* 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_POLAR_ITEM_H #ifndef QWT_POLAR_ITEM_H
#define QWT_POLAR_ITEM_H #define QWT_POLAR_ITEM_H
#include "qwt_polar_global.h" #include "qwt_polar_global.h"
#include <qwt_text.h> #include <qwt_text.h>
#include <qwt_legend_itemmanager.h> #include <qwt_legend_data.h>
#include <qwt_graphic.h>
#include <qwt_interval.h> #include <qwt_interval.h>
class QString; class QString;
class QRect; class QRect;
class QPointF; class QPointF;
class QPainter; class QPainter;
class QwtPolarPlot; class QwtPolarPlot;
class QwtScaleMap; class QwtScaleMap;
class QwtScaleDiv; class QwtScaleDiv;
skipping to change at line 36 skipping to change at line 37
\brief Base class for items on a polar plot \brief Base class for items on a polar plot
A QwtPolarItem is "something that can be painted on the canvas". A QwtPolarItem is "something that can be painted on the canvas".
It is connected to the QwtPolar framework by a couple of virtual It is connected to the QwtPolar framework by a couple of virtual
methods, that are individually implemented in derived item classes. methods, that are individually implemented in derived item classes.
QwtPolar offers an implementation of the most common types of items, QwtPolar offers an implementation of the most common types of items,
but deriving from QwtPolarItem makes it easy to implement additional but deriving from QwtPolarItem makes it easy to implement additional
types of items. types of items.
*/ */
class QWT_POLAR_EXPORT QwtPolarItem: public QwtLegendItemManager class QWT_POLAR_EXPORT QwtPolarItem
{ {
public: public:
/*! /*!
\brief Runtime type information \brief Runtime type information
RttiValues is used to cast plot items, without RttiValues is used to cast plot items, without
having to enable runtime type information of the compiler. having to enable runtime type information of the compiler.
*/ */
enum RttiValues enum RttiValues
{ {
skipping to change at line 105 skipping to change at line 106
RenderAntialiased = 0x01 RenderAntialiased = 0x01
}; };
//! Item attributes //! Item attributes
typedef QFlags<RenderHint> RenderHints; typedef QFlags<RenderHint> RenderHints;
explicit QwtPolarItem( const QwtText &title = QwtText() ); explicit QwtPolarItem( const QwtText &title = QwtText() );
virtual ~QwtPolarItem(); virtual ~QwtPolarItem();
void attach( QwtPolarPlot *plot ); void attach( QwtPolarPlot *plot );
void detach();
/*!
\brief This method detaches a QwtPolarItem from any QwtPolarPlot it
has been associated with.
detach() is equivalent to calling attach( NULL )
\sa attach( QwtPolarPlot* plot )
*/
void detach() { attach( NULL ); }
QwtPolarPlot *plot() const; QwtPolarPlot *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;
void setItemAttribute( ItemAttribute, bool on = true ); void setItemAttribute( ItemAttribute, bool on = true );
bool testItemAttribute( ItemAttribute ) const; bool testItemAttribute( ItemAttribute ) const;
void setRenderHint( RenderHint, bool on = true ); void setRenderHint( RenderHint, bool on = true );
bool testRenderHint( RenderHint ) const; bool testRenderHint( RenderHint ) const;
void setRenderThreadCount( uint numThreads );
uint renderThreadCount() const;
double z() const; double z() const;
void setZ( double z ); void setZ( double z );
void show(); void show();
void hide(); void hide();
virtual void setVisible( bool ); virtual void setVisible( bool );
bool isVisible () const; bool isVisible () const;
virtual void itemChanged(); virtual void itemChanged();
virtual void legendChanged();
/*! /*!
\brief Draw the item \brief Draw the item
\param painter Painter \param painter Painter
\param azimuthMap Maps azimuth values to values related to 0.0, M_2PI \param azimuthMap Maps azimuth values to values related to 0.0, M_2PI
\param radialMap Maps radius values into painter coordinates. \param radialMap Maps radius values into painter coordinates.
\param pole Position of the pole in painter coordinates \param pole Position of the pole in painter coordinates
\param radius Radius of the complete plot area in painter coordinates \param radius Radius of the complete plot area in painter coordinates
\param canvasRect Contents rect of the canvas in painter coordinates \param canvasRect Contents rect of the canvas in painter coordinates
*/ */
virtual void draw( QPainter *painter, virtual void draw( QPainter *painter,
const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap,
const QPointF &pole, double radius, const QPointF &pole, double radius,
const QRectF &canvasRect ) const = 0; const QRectF &canvasRect ) const = 0;
virtual QwtInterval boundingInterval( int scaleId ) const; virtual QwtInterval boundingInterval( int scaleId ) const;
virtual QWidget *legendItem() const;
virtual void updateLegend( QwtLegend * ) const;
virtual void updateScaleDiv( const QwtScaleDiv &, virtual void updateScaleDiv( const QwtScaleDiv &,
const QwtScaleDiv &, const QwtInterval & ); const QwtScaleDiv &, const QwtInterval & );
virtual int marginHint() const; virtual int marginHint() const;
void setLegendIconSize( const QSize & );
QSize legendIconSize() const;
virtual QList<QwtLegendData> legendData() const;
virtual QwtGraphic legendIcon( int index, const QSizeF & ) const;
private: private:
// Disabled copy constructor and operator= // Disabled copy constructor and operator=
QwtPolarItem( const QwtPolarItem & ); QwtPolarItem( const QwtPolarItem & );
QwtPolarItem &operator=( const QwtPolarItem & ); QwtPolarItem &operator=( const QwtPolarItem & );
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPolarItem::ItemAttributes ) Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPolarItem::ItemAttributes )
Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPolarItem::RenderHints ) Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPolarItem::RenderHints )
Q_DECLARE_METATYPE( QwtPolarItem * )
#endif #endif
 End of changes. 8 change blocks. 
14 lines changed or deleted 16 lines changed or added


 qwt_polar_itemdict.h   qwt_polar_itemdict.h 
skipping to change at line 46 skipping to change at line 46
~QwtPolarItemDict(); ~QwtPolarItemDict();
void setAutoDelete( bool ); void setAutoDelete( bool );
bool autoDelete() const; bool autoDelete() const;
const QwtPolarItemList& itemList() const; const QwtPolarItemList& itemList() const;
void detachItems( int rtti = QwtPolarItem::Rtti_PolarItem, void detachItems( int rtti = QwtPolarItem::Rtti_PolarItem,
bool autoDelete = true ); bool autoDelete = true );
private: protected:
friend class QwtPolarItem; void insertItem( QwtPolarItem * );
void removeItem( QwtPolarItem * );
void attachItem( QwtPolarItem *, bool );
private:
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 qwt_polar_plot.h   qwt_polar_plot.h 
skipping to change at line 26 skipping to change at line 26
#include <qwt_scale_map.h> #include <qwt_scale_map.h>
#include <qwt_point_polar.h> #include <qwt_point_polar.h>
#include <qframe.h> #include <qframe.h>
class QwtRoundScaleDraw; class QwtRoundScaleDraw;
class QwtScaleEngine; class QwtScaleEngine;
class QwtScaleDiv; class QwtScaleDiv;
class QwtTextLabel; class QwtTextLabel;
class QwtPolarCanvas; class QwtPolarCanvas;
class QwtPolarLayout; class QwtPolarLayout;
class QwtAbstractLegend;
/*! /*!
\brief A plotting widget, displaying a polar coordinate system \brief A plotting widget, displaying a polar coordinate system
An unlimited number of plot items can be displayed on An unlimited number of plot items can be displayed on
its canvas. Plot items might be curves (QwtPolarCurve), markers its canvas. Plot items might be curves (QwtPolarCurve), markers
(QwtPolarMarker), the grid (QwtPolarGrid), or anything else derived (QwtPolarMarker), the grid (QwtPolarGrid), or anything else derived
from QwtPolarItem. from QwtPolarItem.
The coordinate system is defined by a radial and a azimuth scale. The coordinate system is defined by a radial and a azimuth scale.
skipping to change at line 142 skipping to change at line 143
QwtPolarCanvas *canvas(); QwtPolarCanvas *canvas();
const QwtPolarCanvas *canvas() const; const QwtPolarCanvas *canvas() const;
void setPlotBackground ( const QBrush &c ); void setPlotBackground ( const QBrush &c );
const QBrush& plotBackground() const; const QBrush& plotBackground() const;
virtual void drawCanvas( QPainter *, const QRectF & ) const; virtual void drawCanvas( QPainter *, const QRectF & ) const;
// Legend // Legend
void insertLegend( QwtLegend *, void insertLegend( QwtAbstractLegend *,
LegendPosition = RightLegend, double ratio = -1.0 ); LegendPosition = RightLegend, double ratio = -1.0 );
QwtLegend *legend(); QwtAbstractLegend *legend();
const QwtLegend *legend() const; const QwtAbstractLegend *legend() const;
void updateLegend();
void updateLegend( const QwtPolarItem * );
// Layout // Layout
QwtPolarLayout *plotLayout(); QwtPolarLayout *plotLayout();
const QwtPolarLayout *plotLayout() const; const QwtPolarLayout *plotLayout() const;
QwtInterval visibleInterval() const; QwtInterval visibleInterval() const;
QRectF plotRect() const; QRectF plotRect() const;
QRectF plotRect( const QRectF & ) const; QRectF plotRect( const QRectF & ) const;
int plotMarginHint() const; int plotMarginHint() const;
virtual QVariant itemToInfo( QwtPolarItem * ) const;
virtual QwtPolarItem *infoToItem( const QVariant & ) const;
Q_SIGNALS: Q_SIGNALS:
/*! /*!
A signal which is emitted when the user has clicked on A signal indicating, that an item has been attached/detached
a legend item, which is in QwtLegend::ClickableItem mode.
\param plotItem Corresponding plot item of the
selected legend item
\note clicks are disabled as default \param plotItem Plot item
\sa QwtLegend::setItemMode, QwtLegend::itemMode \param on Attached/Detached
*/ */
void legendClicked( QwtPolarItem *plotItem ); void itemAttached( QwtPolarItem *plotItem, bool on );
/*! /*!
A signal which is emitted when the user has clicked on A signal with the attributes how to update
a legend item, which is in QwtLegend::CheckableItem mode the legend entries for a plot item.
\param plotItem Corresponding plot item of the \param itemInfo Info about a plot, build from itemToInfo()
selected legend item
\param on True when the legen item is checked
\note clicks are disabled as default \sa itemToInfo(), infoToItem(), QwtAbstractLegend::updateLegend()
\sa QwtLegend::setItemMode, QwtLegend::itemMode
*/ */
void legendChecked( QwtPolarItem *plotItem, bool on ); void legendDataChanged( const QVariant &itemInfo,
const QList<QwtLegendData> &data );
/*! /*!
A signal that is emitted, whenever the layout of the plot A signal that is emitted, whenever the layout of the plot
has been recalculated. has been recalculated.
*/ */
void layoutChanged(); void layoutChanged();
public Q_SLOTS: public Q_SLOTS:
virtual void replot(); virtual void replot();
void autoRefresh(); void autoRefresh();
void setAzimuthOrigin( double ); void setAzimuthOrigin( double );
protected Q_SLOTS:
virtual void legendItemClicked();
virtual void legendItemChecked( bool );
protected: protected:
virtual bool event( QEvent * ); virtual bool event( QEvent * );
virtual void resizeEvent( QResizeEvent * ); virtual void resizeEvent( QResizeEvent * );
virtual void updateLayout(); virtual void updateLayout();
virtual void drawItems( QPainter *painter, virtual void drawItems( QPainter *painter,
const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap,
const QPointF &pole, double radius, const QPointF &pole, double radius,
const QRectF &canvasRect ) const; const QRectF &canvasRect ) const;
private: private:
friend class QwtPolarItem;
void attachItem( QwtPolarItem *, bool );
void initPlot( const QwtText & ); void initPlot( const QwtText & );
class ScaleData; class ScaleData;
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 13 change blocks. 
23 lines changed or deleted 23 lines changed or added


 qwt_polar_renderer.h   qwt_polar_renderer.h 
skipping to change at line 14 skipping to change at line 14
* *
* 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_POLAR_RENDERER_H #ifndef QWT_POLAR_RENDERER_H
#define QWT_POLAR_RENDERER_H 1 #define QWT_POLAR_RENDERER_H 1
#include "qwt_polar_global.h" #include "qwt_polar_global.h"
#include <qobject.h> #include <qobject.h>
#include <qsize.h>
class QwtPolarPlot; class QwtPolarPlot;
class QSizeF;
class QRectF; class QRectF;
class QPainter; class QPainter;
class QPrinter; class QPrinter;
class QPaintDevice; class QPaintDevice;
#ifndef QWT_NO_POLAR_SVG #ifndef QWT_NO_POLAR_SVG
#ifdef QT_SVG_LIB #ifdef QT_SVG_LIB
class QSvgGenerator; class QSvgGenerator;
#endif #endif
#endif #endif
skipping to change at line 54 skipping to change at line 54
const QSizeF &sizeMM, int resolution = 85 ); const QSizeF &sizeMM, int resolution = 85 );
#ifndef QWT_NO_POLAR_SVG #ifndef QWT_NO_POLAR_SVG
#ifdef QT_SVG_LIB #ifdef QT_SVG_LIB
#if QT_VERSION >= 0x040500 #if QT_VERSION >= 0x040500
void renderTo( QwtPolarPlot *, QSvgGenerator & ) const; void renderTo( QwtPolarPlot *, QSvgGenerator & ) const;
#endif #endif
#endif #endif
#endif #endif
void renderTo( QwtPolarPlot *, QPrinter & ) const; void renderTo( QwtPolarPlot *, QPrinter & ) const;
void renderTo( QwtPolarPlot *, QPaintDevice &p ) const; void renderTo( QwtPolarPlot *, QPaintDevice & ) const;
virtual void render( QwtPolarPlot *, virtual void render( QwtPolarPlot *,
QPainter *, const QRectF &rect ) const; QPainter *, const QRectF &rect ) const;
protected: bool exportTo( QwtPolarPlot *, const QString &documentName,
const QSizeF &sizeMM = QSizeF( 200, 200 ), int resolution = 85 );
virtual void renderTitle( QPainter *, const QRectF & ) const; virtual void renderTitle( QPainter *, const QRectF & ) const;
virtual void renderLegend( QPainter *, const QRectF & ) const;
virtual void renderLegendItem( QPainter *, virtual void renderLegend(
const QWidget *, const QRectF & ) const; const QwtPolarPlot *, QPainter *, const QRectF & ) const;
private: private:
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 6 change blocks. 
6 lines changed or deleted 7 lines changed or added


 qwt_polar_spectrogram.h   qwt_polar_spectrogram.h 
skipping to change at line 62 skipping to change at line 62
void setData( QwtRasterData *data ); void setData( QwtRasterData *data );
const QwtRasterData *data() const; const QwtRasterData *data() const;
void setColorMap( QwtColorMap * ); void setColorMap( QwtColorMap * );
const QwtColorMap *colorMap() const; const QwtColorMap *colorMap() const;
void setPaintAttribute( PaintAttribute, bool on = true ); void setPaintAttribute( PaintAttribute, bool on = true );
bool testPaintAttribute( PaintAttribute ) const; bool testPaintAttribute( PaintAttribute ) const;
void setRenderThreadCount( uint numThreads );
uint renderThreadCount() const;
virtual int rtti() const; virtual int rtti() const;
virtual void draw( QPainter *painter, virtual void draw( QPainter *painter,
const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap, const QwtScaleMap &azimuthMap, const QwtScaleMap &radialMap,
const QPointF &pole, double radius, const QPointF &pole, double radius,
const QRectF &canvasRect ) const; const QRectF &canvasRect ) const;
virtual QwtInterval boundingInterval( int scaleId ) const; virtual QwtInterval boundingInterval( int scaleId ) const;
protected: protected:
 End of changes. 1 change blocks. 
3 lines changed or deleted 0 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/