@@ -17,7 +17,7 class ChartView: public QChartView | |||||
17 | { |
|
17 | { | |
18 | Q_OBJECT |
|
18 | Q_OBJECT | |
19 | public: |
|
19 | public: | |
20 | ChartView(QWidget* parent=0); |
|
20 | ChartView(QWidget* parent = 0); | |
21 | virtual ~ChartView(); |
|
21 | virtual ~ChartView(); | |
22 |
|
22 | |||
23 | public slots: |
|
23 | public slots: |
@@ -11,7 +11,7 class ChartView: public QChartView | |||||
11 | { |
|
11 | { | |
12 | Q_OBJECT |
|
12 | Q_OBJECT | |
13 | public: |
|
13 | public: | |
14 | ChartView(QWidget* parent=0); |
|
14 | ChartView(QWidget* parent = 0); | |
15 | virtual ~ChartView(); |
|
15 | virtual ~ChartView(); | |
16 |
|
16 | |||
17 | public slots: |
|
17 | public slots: |
@@ -22,8 +22,8 public: | |||||
22 | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); |
|
22 | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); | |
23 | QPainterPath shape() const; |
|
23 | QPainterPath shape() const; | |
24 |
|
24 | |||
25 |
LineChartItem* upperLineItem() const { return m_upper |
|
25 | LineChartItem* upperLineItem() const { return m_upper; } | |
26 |
LineChartItem* lowerLineItem() const { return m_lower |
|
26 | LineChartItem* lowerLineItem() const { return m_lower; } | |
27 |
|
27 | |||
28 | void updatePath(); |
|
28 | void updatePath(); | |
29 |
|
29 | |||
@@ -55,13 +55,10 private: | |||||
55 | class AreaBoundItem : public LineChartItem |
|
55 | class AreaBoundItem : public LineChartItem | |
56 | { |
|
56 | { | |
57 | public: |
|
57 | public: | |
58 | AreaBoundItem(AreaChartItem *item,QLineSeries *lineSeries):LineChartItem(lineSeries,0), |
|
58 | AreaBoundItem(AreaChartItem *item,QLineSeries *lineSeries) : LineChartItem(lineSeries, 0), m_item(item) {} | |
59 | m_item(item){ |
|
59 | ~AreaBoundItem(){} | |
60 | }; |
|
|||
61 |
|
60 | |||
62 | ~AreaBoundItem(){}; |
|
61 | void setLayout(QVector<QPointF> &points) { | |
63 |
|
||||
64 | void setLayout(QVector<QPointF> &points){ |
|
|||
65 | LineChartItem::setLayout(points); |
|
62 | LineChartItem::setLayout(points); | |
66 | m_item->updatePath(); |
|
63 | m_item->updatePath(); | |
67 | } |
|
64 | } |
@@ -13,14 +13,14 class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QSeries | |||||
13 | { |
|
13 | { | |
14 | Q_OBJECT |
|
14 | Q_OBJECT | |
15 | public: |
|
15 | public: | |
16 | QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries=0); |
|
16 | QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = 0); | |
17 | virtual ~QAreaSeries(); |
|
17 | virtual ~QAreaSeries(); | |
18 |
|
18 | |||
19 | public: // from QChartSeries |
|
19 | public: // from QChartSeries | |
20 | virtual QSeriesType type() const { return QSeries::SeriesTypeArea;} |
|
20 | virtual QSeriesType type() const { return QSeries::SeriesTypeArea; } | |
21 |
|
21 | |||
22 | QLineSeries* upperSeries() const { return m_upperSeries;} |
|
22 | QLineSeries* upperSeries() const { return m_upperSeries; } | |
23 | QLineSeries* lowerSeries() const { return m_lowerSeries;} |
|
23 | QLineSeries* lowerSeries() const { return m_lowerSeries; } | |
24 |
|
24 | |||
25 | void setPen(const QPen &pen); |
|
25 | void setPen(const QPen &pen); | |
26 | QPen pen() const { return m_pen;} |
|
26 | QPen pen() const { return m_pen;} | |
@@ -29,7 +29,7 public: // from QChartSeries | |||||
29 | QBrush brush() const { return m_brush;} |
|
29 | QBrush brush() const { return m_brush;} | |
30 |
|
30 | |||
31 | void setPointsVisible(bool visible); |
|
31 | void setPointsVisible(bool visible); | |
32 | bool pointsVisible() const {return m_pointsVisible;} |
|
32 | bool pointsVisible() const { return m_pointsVisible; } | |
33 |
|
33 | |||
34 | // bool setModel(QAbstractItemModel* model); |
|
34 | // bool setModel(QAbstractItemModel* model); | |
35 | // void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); |
|
35 | // void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); |
@@ -18,7 +18,7 public: | |||||
18 | Axis(QChartAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS); |
|
18 | Axis(QChartAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS); | |
19 | ~Axis(); |
|
19 | ~Axis(); | |
20 |
|
20 | |||
21 |
AxisType axisType() const {return m_type;} |
|
21 | AxisType axisType() const { return m_type; } | |
22 |
|
22 | |||
23 | void setAxisOpacity(qreal opacity); |
|
23 | void setAxisOpacity(qreal opacity); | |
24 | qreal axisOpacity() const; |
|
24 | qreal axisOpacity() const; | |
@@ -46,7 +46,7 public: | |||||
46 | void setLabelsFont(const QFont &font); |
|
46 | void setLabelsFont(const QFont &font); | |
47 |
|
47 | |||
48 | inline QRectF geometry() const { return m_rect; } |
|
48 | inline QRectF geometry() const { return m_rect; } | |
49 |
inline QVector<qreal> layout() { return m_layoutVector;} |
|
49 | inline QVector<qreal> layout() { return m_layoutVector; } | |
50 |
|
50 | |||
51 | public slots: |
|
51 | public slots: | |
52 | void handleAxisUpdated(); |
|
52 | void handleAxisUpdated(); | |
@@ -91,7 +91,7 class AxisItem: public QGraphicsLineItem | |||||
91 | { |
|
91 | { | |
92 | public: |
|
92 | public: | |
93 |
|
93 | |||
94 |
AxisItem(Axis *axis, QGraphicsItem *parent=0) : QGraphicsLineItem(parent), m_axis(axis) {} |
|
94 | AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {} | |
95 |
|
95 | |||
96 | protected: |
|
96 | protected: | |
97 | void mousePressEvent(QGraphicsSceneMouseEvent *event) |
|
97 | void mousePressEvent(QGraphicsSceneMouseEvent *event) |
@@ -17,44 +17,44 public: | |||||
17 | ~QChartAxis(); |
|
17 | ~QChartAxis(); | |
18 |
|
18 | |||
19 | //axis handling |
|
19 | //axis handling | |
20 |
bool isAxisVisible() const { return m_axisVisible;} |
|
20 | bool isAxisVisible() const { return m_axisVisible; } | |
21 | void setAxisVisible(bool visible); |
|
21 | void setAxisVisible(bool visible); | |
22 | void setAxisPen(const QPen &pen); |
|
22 | void setAxisPen(const QPen &pen); | |
23 |
QPen axisPen() const { return m_axisPen;} |
|
23 | QPen axisPen() const { return m_axisPen; } | |
24 |
|
24 | |||
25 | //grid handling |
|
25 | //grid handling | |
26 |
bool isGridLineVisible() const { return m_gridLineVisible;} |
|
26 | bool isGridLineVisible() const { return m_gridLineVisible; } | |
27 | void setGridLineVisible(bool visible); |
|
27 | void setGridLineVisible(bool visible); | |
28 | void setGridLinePen(const QPen &pen); |
|
28 | void setGridLinePen(const QPen &pen); | |
29 | QPen gridLinePen() const {return m_gridLinePen;} |
|
29 | QPen gridLinePen() const { return m_gridLinePen; } | |
30 |
|
30 | |||
31 | //labels handling |
|
31 | //labels handling | |
32 |
bool labelsVisible() const { return m_labelsVisible;} |
|
32 | bool labelsVisible() const { return m_labelsVisible; } | |
33 | void setLabelsVisible(bool visible); |
|
33 | void setLabelsVisible(bool visible); | |
34 | void setLabelsPen(const QPen &pen); |
|
34 | void setLabelsPen(const QPen &pen); | |
35 | QPen labelsPen() const { return m_labelsPen;} |
|
35 | QPen labelsPen() const { return m_labelsPen;} | |
36 | void setLabelsBrush(const QBrush &brush); |
|
36 | void setLabelsBrush(const QBrush &brush); | |
37 | QBrush labelsBrush() const { return m_labelsBrush;} |
|
37 | QBrush labelsBrush() const { return m_labelsBrush; } | |
38 | void setLabelsFont(const QFont &font); |
|
38 | void setLabelsFont(const QFont &font); | |
39 | QFont labelsFont() const { return m_labelsFont;} |
|
39 | QFont labelsFont() const { return m_labelsFont; } | |
40 | void setLabelsAngle(int angle); |
|
40 | void setLabelsAngle(int angle); | |
41 |
int labelsAngle() const { return m_labelsAngle;} |
|
41 | int labelsAngle() const { return m_labelsAngle; } | |
42 |
|
42 | |||
43 | //shades handling |
|
43 | //shades handling | |
44 |
bool shadesVisible() const { return m_shadesVisible;} |
|
44 | bool shadesVisible() const { return m_shadesVisible; } | |
45 | void setShadesVisible(bool visible); |
|
45 | void setShadesVisible(bool visible); | |
46 | void setShadesPen(const QPen &pen); |
|
46 | void setShadesPen(const QPen &pen); | |
47 | QPen shadesPen() const { return m_shadesPen;} |
|
47 | QPen shadesPen() const { return m_shadesPen; } | |
48 | void setShadesBrush(const QBrush &brush); |
|
48 | void setShadesBrush(const QBrush &brush); | |
49 | QBrush shadesBrush() const { return m_shadesBrush;} |
|
49 | QBrush shadesBrush() const { return m_shadesBrush; } | |
50 | void setShadesOpacity(qreal opacity); |
|
50 | void setShadesOpacity(qreal opacity); | |
51 | qreal shadesOpacity() const { return m_shadesOpacity;} |
|
51 | qreal shadesOpacity() const { return m_shadesOpacity; } | |
52 |
|
52 | |||
53 | //range handling |
|
53 | //range handling | |
54 | void setMin(qreal min); |
|
54 | void setMin(qreal min); | |
55 |
qreal min() const { return m_min;} |
|
55 | qreal min() const { return m_min; } | |
56 | void setMax(qreal max); |
|
56 | void setMax(qreal max); | |
57 |
qreal max() const { return m_max;} |
|
57 | qreal max() const { return m_max; } | |
58 | void setRange(qreal min, qreal max); |
|
58 | void setRange(qreal min, qreal max); | |
59 |
|
59 | |||
60 | //ticks handling |
|
60 | //ticks handling |
@@ -8,7 +8,7 Chart::Chart(ChartPresenter *presenter):QObject(presenter), | |||||
8 | m_animator(0), |
|
8 | m_animator(0), | |
9 | m_presenter(presenter) |
|
9 | m_presenter(presenter) | |
10 | { |
|
10 | { | |
11 |
} |
|
11 | } | |
12 |
|
12 | |||
13 | void Chart::setAnimator(ChartAnimator* animator) |
|
13 | void Chart::setAnimator(ChartAnimator* animator) | |
14 | { |
|
14 | { |
@@ -32,7 +32,7 public: | |||||
32 | Domain* domain(QChartAxis* axis) const; |
|
32 | Domain* domain(QChartAxis* axis) const; | |
33 | QChartAxis* axis(QSeries* series) const; |
|
33 | QChartAxis* axis(QSeries* series) const; | |
34 |
|
34 | |||
35 |
QChartAxis* axisX() const { return m_axisX;} |
|
35 | QChartAxis* axisX() const { return m_axisX; } | |
36 | QChartAxis* axisY(QSeries* series = 0) const; |
|
36 | QChartAxis* axisY(QSeries* series = 0) const; | |
37 |
|
37 | |||
38 | signals: |
|
38 | signals: |
@@ -9,9 +9,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||||
9 |
|
9 | |||
10 | class ChartItem : public QGraphicsItem, public Chart |
|
10 | class ChartItem : public QGraphicsItem, public Chart | |
11 | { |
|
11 | { | |
12 | enum ChartItemTypes{ AXIS_ITEM = UserType+1, XYLINE_ITEM}; |
|
12 | enum ChartItemTypes{ AXIS_ITEM = UserType + 1, XYLINE_ITEM }; | |
13 | public: |
|
13 | public: | |
14 |
ChartItem(ChartPresenter *presenter):QGraphicsItem(presenter?presenter->rootItem():0),Chart(presenter){} |
|
14 | ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), Chart(presenter) {} | |
15 | }; |
|
15 | }; | |
16 |
|
16 | |||
17 | QTCOMMERCIALCHART_END_NAMESPACE |
|
17 | QTCOMMERCIALCHART_END_NAMESPACE |
@@ -23,10 +23,10 public: | |||||
23 | void setMinY(qreal min); |
|
23 | void setMinY(qreal min); | |
24 | void setMaxY(qreal max); |
|
24 | void setMaxY(qreal max); | |
25 |
|
25 | |||
26 |
qreal minX() const {return m_minX;} |
|
26 | qreal minX() const { return m_minX; } | |
27 |
qreal maxX() const {return m_maxX;} |
|
27 | qreal maxX() const { return m_maxX; } | |
28 |
qreal minY() const {return m_minY;} |
|
28 | qreal minY() const { return m_minY; } | |
29 |
qreal maxY() const {return m_maxY;} |
|
29 | qreal maxY() const { return m_maxY; } | |
30 |
|
30 | |||
31 | qreal spanX() const; |
|
31 | qreal spanX() const; | |
32 | qreal spanY() const; |
|
32 | qreal spanY() const; |
@@ -107,7 +107,7 protected: | |||||
107 | protected: |
|
107 | protected: | |
108 | QScopedPointer<QChartPrivate> d_ptr; |
|
108 | QScopedPointer<QChartPrivate> d_ptr; | |
109 | friend class QChartView; |
|
109 | friend class QChartView; | |
110 |
Q_DISABLE_COPY(QChart) |
|
110 | Q_DISABLE_COPY(QChart) | |
111 | }; |
|
111 | }; | |
112 |
|
112 | |||
113 | QTCOMMERCIALCHART_END_NAMESPACE |
|
113 | QTCOMMERCIALCHART_END_NAMESPACE |
General Comments 0
You need to be logged in to leave comments.
Login now