HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1643:d11966383060

Fixes missing update barcategory...

Michal Klocek -

r1643:d11966383060

parent child

Context file:

r1643:d11966383060

Collapse all files

demos/qmlweather/qml/qmlweather/main.qml +34 -22

                     legend.alignment: Qt.AlignTop
                 //![2]
+                    BarCategoriesAxis {
+                            id: myBarCategoryAxis
+                            categories: ["Mo", "Tu", "We", "Th", "Fr"]
+                    }
                     BarSeries {
-                        axisX: CategoriesAxis {
+                        id: myBarSeries
-                            id: categoriesAxis
-                            categories: ["Mo", "Tu", "We", "Th", "Fr", "Sa" ]
                         BarSet {
                             id: rainfallSet
                             label: "Rainfall"
                         }
                     }
+                    ValuesAxis{
+                        id: myValuesAxisY
+                        min: 0
+                        max: 10
+                    }
-                    ScatterSeries {
+                    LineSeries {
                         id: maxTempSeries
                         name: "Max. temperature"
                     }
-                    ScatterSeries {
+                    LineSeries {
                         id: minTempSeries
                         name: "Min. temperature"
                     }
                 //![2]
+                    Component.onCompleted: {
+                          setAxisX(myBarCategoryAxis,myBarSeries)
+                          setAxisX(myBarCategoryAxis,maxTempSeries)
+                          setAxisX(myBarCategoryAxis,minTempSeries)
+                          setAxisY(myValuesAxisY,maxTempSeries)
+                          setAxisY(myValuesAxisY,minTempSeries)
+                          setAxisY(myValuesAxisY,myBarSeries)
+                    }
                 }
                 // A timer to refresh the forecast every 5 minutes
                 function parseWeatherData(weatherData) {
                     // Clear previous values
-                    chartView.axisX.min = 0;
-                    chartView.axisX.max = 5;
-                    chartView.axisY.min = 0;
-                    chartView.axisY.max = 5;
                     maxTempSeries.clear();
                     minTempSeries.clear();
                     weatherImageModel.clear();
                         maxTempSeries.append(i, weatherObj.tempMaxC);
                         minTempSeries.append(i, weatherObj.tempMinC);
                         rainfallSet.append(i, weatherObj.precipMM);
                         weatherImageModel.append({"imageSource":weatherObj.weatherIconUrl[0].value});
                         //![5]
                         // Update scale of the chart
-                        chartView.axisX.min = 0;
+                        chartView.axisY().max = Math.max(chartView.axisY().max,weatherObj.tempMaxC)
-                        chartView.axisX.max = i;
+                        chartView.axisY().max = Math.max(chartView.axisY().max,weatherObj.tempMinC)
-                        while (chartView.axisY.min >= Number(weatherObj.tempMinC))
+                        chartView.axisX().min = 0;
-                            chartView.axisY.min = chartView.axisY.min - 10;
+                        chartView.axisX().max = i+1;
-                        while (chartView.axisY.max <= Number(weatherObj.tempMaxC))
-                            chartView.axisY.max = chartView.axisY.max + 10;
                         // Set the x-axis labels to the dates of the forecast
-                        var xLabels = categoriesAxis.categories;
+                        var xLabels = myBarCategoryAxis.categories;
-                        xLabels[Number(i) * 2] = i;
+                        xLabels[Number(i)] = weatherObj.date.substring(5, 10);
-                        xLabels[(Number(i) * 2) + 1] = weatherObj.date.substring(5, 10);
+                        myBarCategoryAxis.categories = xLabels;
-                        categoriesAxis.categories = xLabels;
+                        myBarCategoryAxis.visible = true;
                     }
                 }
             }

plugins/declarative/declarativechart.h +3 -4

                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
                 Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY)
                 Q_PROPERTY(QLegend *legend READ legend)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 qreal leftMargin();
                 qreal rightMargin();
-                QAbstractAxis *axisX(QAbstractSeries *series = 0);
-                QAbstractAxis *axisY(QAbstractSeries *series = 0);
             public:
                 Q_INVOKABLE QAbstractSeries *series(int index);
                 Q_INVOKABLE void setAxisX(QAbstractAxis* axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void setAxisY(QAbstractAxis* axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void createDefaultAxes();
+                Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
+                Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
                 Q_INVOKABLE void zoom(qreal factor);
                 Q_INVOKABLE void scrollLeft(qreal pixels);

src/axis/chartaxis_p.h +1 -1

                 void createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const;
             public Q_SLOTS:
-                void handleAxisUpdated();
+                virtual void handleAxisUpdated();
                 void handleAxisCategoriesUpdated();
                 void handleRangeChanged(qreal min , qreal max,int tickCount);
                 void handleGeometryChanged(const QRectF &size);

src/axis/chartcategoriesaxisx.cpp +10 0

@@ -106,4 +106,14 void ChartCategoriesAxisX::updateGeometry()
106	}	106	}
107	}	107	}
108		108
		109	void ChartCategoriesAxisX::handleAxisUpdated()
		110	{
		111	if(m_categoriesAxis->categories()!=m_categories)
		112	{
		113	m_categories=m_categoriesAxis->categories();
		114	if(ChartAxis::layout().count()==m_categories.size()+1) updateGeometry();
		115	}
		116	ChartAxis::handleAxisUpdated();
		117	}
		118
109	QTCOMMERCIALCHART_END_NAMESPACE	119	QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartcategoriesaxisx_p.h +3 0

             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            Q_SLOTS
+                void handleAxisUpdated();
             private:
+                QStringList m_categories;
                 QBarCategoriesAxis *m_categoriesAxis;
             };

src/axis/chartcategoriesaxisy.cpp +12 0

@@ -105,4 +105,16 void ChartCategoriesAxisY::updateGeometry()
105	}	105	}
106	}	106	}
107		107
		108
		109	void ChartCategoriesAxisY::handleAxisUpdated()
		110	{
		111
		112	if(m_categoriesAxis->categories()!=m_categories)
		113	{
		114	m_categories=m_categoriesAxis->categories();
		115	if(ChartAxis::layout().count()==m_categories.size()+1) updateGeometry();
		116	}
		117	ChartAxis::handleAxisUpdated();
		118	}
		119
108	QTCOMMERCIALCHART_END_NAMESPACE	120	QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartcategoriesaxisy_p.h +3 -1

             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            Q_SLOTS
+                    void handleAxisUpdated();
             private:
+                QStringList m_categories;
                 QBarCategoriesAxis *m_categoriesAxis;
             };

src/axis/qbarcategoriesaxis.cpp +8 -4

                 }else{
                 	d->m_categories.append(categories);
                 }
+                emit d->updated();
                 emit categoriesChanged();
             }
             	}else{
             		d->m_categories.append(category);
             	}
+            	emit d->updated();
             	emit categoriesChanged();
             }
                 if (d->m_categories.contains(category)) {
                     d->m_categories.removeAt(d->m_categories.indexOf(category));
                     setRange(d->m_categories.first(),d->m_categories.last());
+                    emit d->updated();
                     emit categoriesChanged();
                 }
             }
                 }else{
                     d->m_categories.insert(index,category);
                 }
+                emit d->updated();
                 emit categoriesChanged();
             }
                 Q_D(QBarCategoriesAxis);
                 d->m_categories.clear();
                 setRange(QString::null,QString::null);
+                emit d->updated();
                 emit categoriesChanged();
             }
                 if(d->m_categories!=categories){
                 d->m_categories = categories;
                 setRange(categories.first(),categories.last());
+                emit d->updated();
                 emit categoriesChanged();
                 }
             }
                 }
                 bool changed = false;
-                if (!qFuzzyIsNull(d->m_min - (minIndex))) {
+                if (!qFuzzyIsNull(d->m_min - (minIndex))||d->m_minCategory!=minCategory) {
                 	d->m_minCategory = minCategory;
                     d->m_min = minIndex;
                     emit minChanged(minCategory);
                     changed = true;
                 }
-                if (!qFuzzyIsNull(d->m_max - (maxIndex))) {
+                if (!qFuzzyIsNull(d->m_max - (maxIndex))||d->m_maxCategory!=maxCategory ) {
                     d->m_max = maxIndex;
                     d->m_maxCategory = maxCategory;
                     emit maxChanged(maxCategory);
                 if (changed) {
                     d->emitRange();
-                    emit categoriesChanged();
                 }
             }

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