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

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

Common naming convention for barcharts
sauimone -
r231:da9e6c0e9029
parent child
Show More
Show file before | Show file after | Hide comments
@@ -44,7 +44,6 signals:
44 public Q_SLOTS:
44 public Q_SLOTS:
45
45
46 private:
46 private:
47
48 BarChartModel* mModel;
47 BarChartModel* mModel;
49 };
48 };
50
49
Show file before | Show file after | Hide comments
@@ -45,7 +45,6 public Q_SLOTS:
45
45
46
46
47 private:
47 private:
48
49 BarChartModel* mModel;
48 BarChartModel* mModel;
50
49
51 };
50 };
Show file before | Show file after | Hide comments
@@ -44,7 +44,6 signals:
44 public Q_SLOTS:
44 public Q_SLOTS:
45
45
46 private:
46 private:
47
48 BarChartModel* mModel;
47 BarChartModel* mModel;
49 };
48 };
50
49
Show file before | Show file after | Hide comments
@@ -71,7 +71,10 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
71 break;
71 break;
72 }
72 }
73 case QChartSeries::SeriesTypeBar: {
73 case QChartSeries::SeriesTypeBar: {
74 <<<<<<< HEAD
74 qDebug() << "QChartSeries::SeriesTypeBar";
75 qDebug() << "QChartSeries::SeriesTypeBar";
76 =======
77 >>>>>>> Common naming convention for barcharts
75 QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
78 QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
76 qreal x = barSeries->countCategories();
79 qreal x = barSeries->countCategories();
77 qreal y = barSeries->max();
80 qreal y = barSeries->max();
Show file before | Show file after | Hide comments
@@ -52,6 +52,12 PUBLIC_HEADERS += linechart/qlinechartseries.h \
52 barchart/qbarchartseries.h \
52 barchart/qbarchartseries.h \
53 barchart/qstackedbarchartseries.h \
53 barchart/qstackedbarchartseries.h \
54 barchart/qpercentbarchartseries.h \
54 barchart/qpercentbarchartseries.h \
55 barchart/barpresenter.h \
56 barchart/qstackedbarchartseries.h \
57 barchart/stackedbarpresenter.h \
58 barchart/qpercentbarchartseries.h \
59 barchart/percentbarpresenter.h \
60 barchart/barpresenterbase.h \
55 barchart/qbarset.h \
61 barchart/qbarset.h \
56 barchart/qbarcategory.h \
62 barchart/qbarcategory.h \
57 qchartseries.h \
63 qchartseries.h \
General Comments 0
You need to be logged in to leave comments. Login now