##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixed: qareaseries - commented out code (model stuff.. this will be implemented, right?). Also some commented out code removed from SplineSeries
Marek Rosa -
r863:e54c97fc02b8
parent child
Show More
Show file before | Show file after | Hide comments
@@ -146,25 +146,6 void QAreaSeries::setPointsVisible(bool visible)
146 }
146 }
147 }
147 }
148
148
149 //bool QAreaSeries::setModel(QAbstractItemModel* model)
150 //{
151 // m_upperSeries->setModel(model);
152 // if (m_lowerSeries)
153 // m_lowerSeries->setModel(model);
154 // return true;
155 //}
156
157 //void QAreaSeries::setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation)
158 //{
159 // m_upperSeries->setModelMapping(modelX, modelY, orientation);
160 //}
161
162 //void QAreaSeries::setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation)
163 //{
164 // if (m_lowerSeries)
165 // m_lowerSeries->setModelMapping(modelX, modelY, orientation);
166 //}
167
168 #include "moc_qareaseries.cpp"
149 #include "moc_qareaseries.cpp"
169
150
170 QTCOMMERCIALCHART_END_NAMESPACE
151 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -51,10 +51,6 public: // from QChartSeries
51 void setPointsVisible(bool visible);
51 void setPointsVisible(bool visible);
52 bool pointsVisible() const { return m_pointsVisible; }
52 bool pointsVisible() const { return m_pointsVisible; }
53
53
54 // bool setModel(QAbstractItemModel* model);
55 // void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
56 // void setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
57
58 Q_SIGNALS:
54 Q_SIGNALS:
59 void updated();
55 void updated();
60 void clicked(const QPointF &point);
56 void clicked(const QPointF &point);
Show file before | Show file after | Hide comments
@@ -37,19 +37,12 public:
37 QSplineSeries(QObject *parent = 0);
37 QSplineSeries(QObject *parent = 0);
38 QSeriesType type() const {return QSeries::SeriesTypeSpline;}
38 QSeriesType type() const {return QSeries::SeriesTypeSpline;}
39
39
40 // int count() const { return m_x.size(); }
41 QPointF controlPoint(int index) const {return m_controlPoints[index];}
40 QPointF controlPoint(int index) const {return m_controlPoints[index];}
42 bool setModel(QAbstractItemModel *model);
41 bool setModel(QAbstractItemModel *model);
43
42
44 void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
43 void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
45 void setModelMappingShift(int first, int count);
44 void setModelMappingShift(int first, int count);
46
45
47 // TODO: allow the user to set custom control points
48 // void setCustomControlPoints(QList<QPointsF> controlPoints);
49 // bool calculateControlPointsAutomatically();
50 // void setCalculateControlPointsAutomatically();
51
52
53 private:
46 private:
54 void calculateControlPoints();
47 void calculateControlPoints();
55 QList<qreal> getFirstControlPoints(QList<qreal> rhs);
48 QList<qreal> getFirstControlPoints(QList<qreal> rhs);
Show file before | Show file after | Hide comments
@@ -63,7 +63,7 public:
63 QAbstractItemModel* model() const { return m_model; }
63 QAbstractItemModel* model() const { return m_model; }
64
64
65 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
65 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
66 virtual void setModelMappingShift(int first, int count = 0);
66 virtual void setModelMappingRange(int first, int count = 0);
67 int mapFirst() const { return m_mapFirst; }
67 int mapFirst() const { return m_mapFirst; }
68
68
69 private Q_SLOTS:
69 private Q_SLOTS:
General Comments 0
You need to be logged in to leave comments. Login now