From e54c97fc02b8f45e691768a40bcfa85124bcfd5f 2012-04-04 06:40:52 From: Marek Rosa Date: 2012-04-04 06:40:52 Subject: [PATCH] Fixed: qareaseries - commented out code (model stuff.. this will be implemented, right?). Also some commented out code removed from SplineSeries --- diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index 575ecff..9894b24 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -146,25 +146,6 @@ void QAreaSeries::setPointsVisible(bool visible) } } -//bool QAreaSeries::setModel(QAbstractItemModel* model) -//{ -// m_upperSeries->setModel(model); -// if (m_lowerSeries) -// m_lowerSeries->setModel(model); -// return true; -//} - -//void QAreaSeries::setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation) -//{ -// m_upperSeries->setModelMapping(modelX, modelY, orientation); -//} - -//void QAreaSeries::setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation) -//{ -// if (m_lowerSeries) -// m_lowerSeries->setModelMapping(modelX, modelY, orientation); -//} - #include "moc_qareaseries.cpp" QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h index 08d6f66..9144a56 100644 --- a/src/areachart/qareaseries.h +++ b/src/areachart/qareaseries.h @@ -51,10 +51,6 @@ public: // from QChartSeries void setPointsVisible(bool visible); bool pointsVisible() const { return m_pointsVisible; } -// bool setModel(QAbstractItemModel* model); -// void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); -// void setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); - Q_SIGNALS: void updated(); void clicked(const QPointF &point); diff --git a/src/splinechart/qsplineseries.h b/src/splinechart/qsplineseries.h index baeecdf..7ddd0e7 100644 --- a/src/splinechart/qsplineseries.h +++ b/src/splinechart/qsplineseries.h @@ -37,19 +37,12 @@ public: QSplineSeries(QObject *parent = 0); QSeriesType type() const {return QSeries::SeriesTypeSpline;} -// int count() const { return m_x.size(); } QPointF controlPoint(int index) const {return m_controlPoints[index];} bool setModel(QAbstractItemModel *model); void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); void setModelMappingShift(int first, int count); - // TODO: allow the user to set custom control points -// void setCustomControlPoints(QList controlPoints); -// bool calculateControlPointsAutomatically(); -// void setCalculateControlPointsAutomatically(); - - private: void calculateControlPoints(); QList getFirstControlPoints(QList rhs); diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h index 5814c69..c114242 100644 --- a/src/xychart/qxyseries.h +++ b/src/xychart/qxyseries.h @@ -63,7 +63,7 @@ public: QAbstractItemModel* model() const { return m_model; } virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); - virtual void setModelMappingShift(int first, int count = 0); + virtual void setModelMappingRange(int first, int count = 0); int mapFirst() const { return m_mapFirst; } private Q_SLOTS: