##// END OF EJS Templates
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts Conflicts: example/example.pro

File last commit:

r195:3f425cc48265
r207:1bc0eafcd96e merge
Show More
qscatterseries.h
66 lines | 1.7 KiB | text/x-c | CLexer
Tero Ahola
Integrated scatter type series...
r42 #ifndef QSCATTERSERIES_H
#define QSCATTERSERIES_H
#include "qchartseries.h"
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48 #include <QRectF>
Tero Ahola
Draft implementation for setting color themes for a chart
r64 #include <QColor>
Tero Ahola
Integrated scatter type series...
r42
QTCOMMERCIALCHART_BEGIN_NAMESPACE
class QScatterSeriesPrivate;
class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
{
Q_OBJECT
Tero Ahola
Scatter series marker visuals
r195
public:
enum MarkerShape {
// TODO: to be defined by the graphics design
// TODO: marker shapes: "x", star, rectangle, tilted rect, triangle, circle, dot
MarkerShapeDefault = 0,
MarkerShapePoint,
MarkerShapeX,
MarkerShapeRectangle,
MarkerShapeTiltedRectangle,
MarkerShapeTriangle,
MarkerShapeCircle
};
Tero Ahola
Integrated scatter type series...
r42 public:
Tero Ahola
Refactored series creation with QChart
r61 QScatterSeries(QObject *parent = 0);
Tero Ahola
Integrated scatter type series...
r42 ~QScatterSeries();
public: // from QChartSeries
Tero Ahola
Integrated draft version of pie series
r51 QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
Tero Ahola
Integrated scatter type series...
r42
Tero Ahola
Integrated scatter again. Missing functionality....
r158 public:
Tero Ahola
added stream operator to scatter series
r180 // TODO: the name of the function? addPoint? addData? addValue?
void addData(QPointF value);
QScatterSeries& operator << (const QPointF &value);
Tero Ahola
Modifying QScatterSeries API
r179 void setData(QList<QPointF> data);
Tero Ahola
Integrated scatter again. Missing functionality....
r158 QList<QPointF> data();
Tero Ahola
Scatter series marker visuals
r195 //TODO: insertData?
Tero Ahola
Modifying QScatterSeries API
r179
void setMarkerPen(QPen pen);
QPen markerPen();
Tero Ahola
Scatter series marker visuals
r195 void setMarkerBrush(QBrush brush);
QBrush markerBrush();
void setMarkerShape(MarkerShape shape);
MarkerShape markerShape();
// TODO: marker size?
Tero Ahola
Modifying QScatterSeries API
r179
Tero Ahola
Integrated scatter again. Missing functionality....
r158 Q_SIGNALS:
Tero Ahola
Scatter series marker visuals
r195 // TODO: move to PIMPL for simplicity or does the user ever need these signals?
Tero Ahola
Modifying QScatterSeries API
r179 // TODO: more finegrained signaling for performance reasons
Tero Ahola
Scatter series marker visuals
r195 // (check QPieSeries implementation with change sets)
Tero Ahola
Integrated scatter again. Missing functionality....
r158 void changed();
Tero Ahola
Modifying QScatterSeries API
r179 //public Q_SLOTS:
Tero Ahola
Integrated scatter type series...
r42 private:
Q_DECLARE_PRIVATE(QScatterSeries)
Q_DISABLE_COPY(QScatterSeries)
QScatterSeriesPrivate *const d;
};
QTCOMMERCIALCHART_END_NAMESPACE
#endif // QSCATTERSERIES_H