HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1611:9f1825280c4a

Refactor categories implementation...

Michal Klocek -

r1611:9f1825280c4a

parent child

Context file:

r1611:9f1825280c4a

Collapse all files

src/axis/qabstractaxis_p.h +2 -2

             public:
                 virtual ChartAxis* createGraphics(ChartPresenter* presenter) = 0;
-                virtual void updateRange() = 0;
+                virtual void emitRange() = 0;
             protected:
                 virtual void setMin(const QVariant &min) = 0;
                 virtual void setMax(const QVariant &max) = 0;
-                virtual void setRange(const QVariant &min, const QVariant &max, bool force = false) = 0;
+                virtual void setRange(const QVariant &min, const QVariant &max) = 0;
                 virtual int ticksCount() const = 0;
             public:

src/axis/qcategoriesaxis.cpp +27 -26

             #include "chartcategoriesaxisx_p.h"
             #include "chartcategoriesaxisy_p.h"
             #include <qmath.h>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 Q_D(QCategoriesAxis);
                 if (d->m_categories.isEmpty()) {
-                    d->m_minCategory = categories.first();
+                	d->m_categories.append(categories);
-                    d->m_maxCategory = categories.last();
+                	setRange(categories.first(),categories.last());
+                }else{
+                	d->m_categories.append(categories);
                 }
-                d->m_categories.append(categories);
                 emit categoriesChanged();
             }
             {
             	Q_D(QCategoriesAxis);
             	if (d->m_categories.isEmpty()) {
-                    d->m_minCategory = category;
-                    d->m_maxCategory = category;
             		d->m_categories.append(category);
+            		setRange(category,category);
+            	}else{
+            		d->m_categories.append(category);
+            	}
             	emit categoriesChanged();
             }
                 Q_D(QCategoriesAxis);
                 if (d->m_categories.contains(category)) {
                     d->m_categories.removeAt(d->m_categories.indexOf(category));
-                    d->m_minCategory = d->m_categories.first();
+                    setRange(d->m_categories.first(),d->m_categories.last());
-                    d->m_maxCategory = d->m_categories.last();
                     emit categoriesChanged();
                 }
             }
             {
                 Q_D(QCategoriesAxis);
                 if (d->m_categories.isEmpty()) {
-                    d->m_minCategory = category;
-                    d->m_maxCategory = category;
                 	d->m_categories.insert(index,category);
+                	setRange(category,category);
+                }else{
+                }
                 emit categoriesChanged();
             }
             {
                 Q_D(QCategoriesAxis);
                 d->m_categories.clear();
-                d->m_minCategory.clear();
+                setRange(QString::null,QString::null);
-                d->m_maxCategory.clear();
                 emit categoriesChanged();
             }
             void QCategoriesAxis::setCategories(const QStringList &categories)
             {
                 Q_D(QCategoriesAxis);
+                if(d->m_categories!=categories){
                 d->m_categories = categories;
-                d->m_minCategory = categories.first();
+                setRange(categories.first(),categories.last());
-                d->m_maxCategory = categories.last();
                 emit categoriesChanged();
                 }
+            }
             QStringList QCategoriesAxis::categories()
             {
                     return;
                 }
-                d->m_minCategory = minCategory;
-                d->m_maxCategory = maxCategory;
                 bool changed = false;
                 if (!qFuzzyIsNull(d->m_min - (minIndex))) {
+                	d->m_minCategory = minCategory;
                     d->m_min = minIndex;
                     changed = true;
                 }
                 if (!qFuzzyIsNull(d->m_max - (maxIndex))) {
                     d->m_max = maxIndex;
+                    d->m_maxCategory = maxCategory;
                     changed = true;
                 }
                 if ((changed)) {
-                    if(!signalsBlocked()){
+                    d->emitRange();
-                        emit d->changed(d->m_min -0.5, d->m_max +0.5, qCeil(d->m_max + 0.5) -qCeil(d->m_min - 0.5) +1, false);
                     emit categoriesChanged();
                 }
             }
                 setRange(m_minCategory,max);
             }
-            void QCategoriesAxisPrivate::setRange(const QVariant &min, const QVariant &max, bool force)
+            void QCategoriesAxisPrivate::setRange(const QVariant &min, const QVariant &max)
             {
-                Q_UNUSED(force);    // TODO: use this?
                 Q_Q(QCategoriesAxis);
                 QString value1 = min.toString();
                 QString value2 = max.toString();
                 }
             }
-            void QCategoriesAxisPrivate::updateRange()
+            void QCategoriesAxisPrivate::emitRange()
             {
-                setRange(m_min,m_max,true);
+            	Q_Q( QCategoriesAxis);
+            	if(!q->signalsBlocked()) {
+            		emit changed(m_min -0.5, m_max +0.5, qCeil(m_max + 0.5) -qCeil(m_min - 0.5) +1, false);
+            	}
             }

src/axis/qcategoriesaxis.h +5 0

             {
                 Q_OBJECT
                 Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)
+                Q_PROPERTY(QString min READ min WRITE setMin NOTIFY minChanged)
+                Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged)
             public:
                 explicit QCategoriesAxis(QObject *parent = 0);
             Q_SIGNALS:
                 void categoriesChanged();
+            	void minChanged(const QString &min);
+            	void maxChanged(const QString &max);
+            	void rangeChanged(const QString &min, const QString &max);
             private:
                 Q_DECLARE_PRIVATE(QCategoriesAxis)

src/axis/qcategoriesaxis_p.h +2 -2

             public:
                 ChartAxis* createGraphics(ChartPresenter* presenter);
-                void updateRange();
+                void emitRange();
             private:
                 //range handling
                 void setMin(const QVariant &min);
                 void setMax(const QVariant &max);
-                void setRange(const QVariant &min, const QVariant &max, bool force = false);
+                void setRange(const QVariant &min, const QVariant &max);
                 int ticksCount() const;
             Q_SIGNALS:

src/axis/qvaluesaxis.cpp +7 -7

                 }
                 if (changed) {
+                	d->emitRange();
                     emit rangeChanged(d->m_min,d->m_max);
-                    if(!signalsBlocked()){
-                        emit d->changed(d->m_min, d->m_max, d->m_ticksCount, d->m_niceNumbers);
                 }
             }
                 if(ok) q->setMax(value);
             }
-            void QValuesAxisPrivate::setRange(const QVariant &min, const QVariant &max, bool force)
+            void QValuesAxisPrivate::setRange(const QVariant &min, const QVariant &max)
             {
-                Q_UNUSED(force);    // TODO: use this
                 Q_Q(QValuesAxis);
                 bool ok1;
                 bool ok2;
             }
-            void QValuesAxisPrivate::updateRange()
+            void QValuesAxisPrivate::emitRange()
             {
-                setRange(m_min,m_max,true);
+            	Q_Q(QValuesAxis);
+            	if(!q->signalsBlocked()) {
+            		emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
+            	}
             }
             #include "moc_qvaluesaxis.cpp"

src/axis/qvaluesaxis_p.h +2 -2

             public:
                 ChartAxis* createGraphics(ChartPresenter* presenter);
-                void updateRange();
+                void emitRange();
             protected:
                 void setMin(const QVariant &min);
                 void setMax(const QVariant &max);
-                void setRange(const QVariant &min, const QVariant &max, bool force = false);
+                void setRange(const QVariant &min, const QVariant &max);
                 int ticksCount() const;
             private:

src/chartdataset.cpp +2 -3

                 }
                 m_seriesAxisXMap.insert(series,axis);
+                axis->d_ptr->emitRange();
-                // Force range update
-                axis->d_ptr->updateRange();
             }
             void ChartDataSet::setAxisY(QAbstractSeries *series, QAbstractAxis *axis)
                 }
                 m_seriesAxisYMap.insert(series,axis);
+                axis->d_ptr->emitRange();
             }
             Domain* ChartDataSet::domain(QAbstractSeries *series) const

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages