HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r232:ca5ae6ab9869

Compilation fix

Michal Klocek -

r232:ca5ae6ab9869

parent child

Context file:

r232:ca5ae6ab9869

Collapse all files

example/gdpbarchart/widget.cpp +4 -4

             Widget::Widget(QWidget *parent)
                 : QWidget(parent)
+            {
                 setGeometry(100, 100, 800, 600);
                 // right panel layout
                 }
                 // hide axis X labels
-                QChartAxis newAxis = chartArea->defaultAxisX();
+                QChartAxis* axis = chartArea->axisX();
-                newAxis.setLabelsVisible(false);
+                axis->setLabelsVisible(false);
             //    newAxis.setLabelsOrientation(QChartAxis::LabelsOrientationSlide);
-                chartArea->setDefaultAxisX(newAxis);
             }
             Widget::~Widget()

example/percentbarchart/chartwidget.h 0 -5

                 Q_OBJECT
             public:
                 explicit ChartWidget(QWidget *parent = 0);
-            signals:
-            public slots:
             };
             #endif // CHARTWIDGET_H

qmlplugin/declarativeseries.cpp +5 -2

             #include "declarativechart.h"
             #include <qscatterseries.h>
             #include <qlinechartseries.h>
+            #include <qpieseries.h>
             #include <cmath>
             #include <QDebug>
                     case SeriesTypeBar:
                         // fallthrough; bar and scatter use the same test data
                     case SeriesTypeScatter: {
-                        m_series = chart->createSeries((QChartSeries::QChartSeriesType) m_seriesType);
+                        m_series = new QScatterSeries();
+                        chart->addSeries(m_series);
                         QScatterSeries *scatter = qobject_cast<QScatterSeries *>(m_series);
                         Q_ASSERT(scatter);
                         for (qreal i = 0; i < 100; i += 0.1)
                     case SeriesTypePercentBar:
                         break;
                     case SeriesTypePie: {
-                        m_series = chart->createSeries((QChartSeries::QChartSeriesType) m_seriesType);
+                        m_series = new QPieSeries();
+                        chart->addSeries(m_series);
                         QList<qreal> data;
                         data << 1.0;
                         data << 12.0;

src/chartdataset.cpp 0 -3

                         break;
                     }
                     case QChartSeries::SeriesTypeBar: {
-            <<<<<<< HEAD
                     qDebug() << "QChartSeries::SeriesTypeBar";
-            =======
-            >>>>>>> Common naming convention for barcharts
                         QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
                         qreal x = barSeries->countCategories();
                         qreal y = barSeries->max();

src/charttheme.cpp 0 -1

             #include "stackedbarpresenter.h"
             #include "linechartitem_p.h"
             #include "percentbarpresenter.h"
-            #include "percentbargroup.h"
             #include "scatterpresenter_p.h"
             #include "piepresenter.h"

test/chartwidgettest/mainwidget.cpp +5 -4

                         (*scatter) << QPointF(x.at(i), y.at(i));
                     m_chartWidget->addSeries(scatter);
                 } else if (series == "Pie") {
-                    newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypePie);
+                    newSeries = new QPieSeries();
+                    m_chartWidget->addSeries(newSeries);
                     Q_ASSERT(newSeries->setData(y));
                 } else if (series == "Line") {
                     // TODO: adding data to an existing line series does not give any visuals for some reason
                     QBarCategory *category = new QBarCategory;
                     *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                    BarChartSeries* series0 = new BarChartSeries(category, this);
+                    QBarChartSeries* series0 = new QBarChartSeries(category, this);
                     series0->addBarSet(set0);
                     series0->addBarSet(set1);
                     QBarCategory *category = new QBarCategory;
                     *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                    StackedBarChartSeries* series0 = new StackedBarChartSeries(category, this);
+                    QStackedBarChartSeries* series0 = new QStackedBarChartSeries(category, this);
                     series0->addBarSet(set0);
                     series0->addBarSet(set1);
                     QBarCategory *category = new QBarCategory;
                     *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                    PercentBarChartSeries* series0 = new PercentBarChartSeries(category, this);
+                    QPercentBarChartSeries* series0 = new QPercentBarChartSeries(category, this);
                     series0->addBarSet(set0);
                     series0->addBarSet(set1);

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