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

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

Check if min and max are same on findMinMaxForSeries
Mika Salmela -
r2414:660546542fa7
parent child
Show More
Side by Side Unified
Context file:
r2414:660546542fa7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -31,21 +31,34 int main(int argc, char *argv[])
31
31
32 //![1]
32 //![1]
33 QLineSeries *series = new QLineSeries();
33 QLineSeries *series = new QLineSeries();
34 QLineSeries *series2 = new QLineSeries();
34 //![1]
35 //![1]
35
36
36 //![2]
37 //![2]
37 series->append(0, 6);
38 *series << QPointF(0.06197, 0.16)
38 series->append(2, 4);
39 << QPointF(0.18694, 0.16)
39 series->append(3, 8);
40 << QPointF(0.3119, 0.16)
40 series->append(7, 4);
41 << QPointF(0.43687, 0.16)
41 series->append(10, 5);
42 << QPointF(0.56183, 0.16)
42 *series << QPointF(11, 1) << QPointF(13, 3) << QPointF(17, 6) << QPointF(18, 3) << QPointF(20, 2);
43 << QPointF(0.68678, 0.16)
44 << QPointF(0.81173, 0.16)
45 << QPointF(0.93667, 0.16);
46
47 *series2 << QPointF(0.06197, 0.16)
48 << QPointF(0.18694, 0.16)
49 << QPointF(0.3119, 0.16)
50 << QPointF(0.43687, 0.16)
51 << QPointF(0.56183, 0.16)
52 << QPointF(0.68678, 0.16)
53 << QPointF(0.81173, 0.16)
54 << QPointF(0.93667, 0.16);
43 //![2]
55 //![2]
44
56
45 //![3]
57 //![3]
46 QChart *chart = new QChart();
58 QChart *chart = new QChart();
47 chart->legend()->hide();
59 chart->legend()->hide();
48 chart->addSeries(series);
60 chart->addSeries(series);
61 chart->addSeries(series2);
49 chart->createDefaultAxes();
62 chart->createDefaultAxes();
50 chart->setTitle("Simple line chart example");
63 chart->setTitle("Simple line chart example");
51 //![3]
64 //![3]
Show file before | Show file after | Hide comments
@@ -336,6 +336,10 void ChartDataSet::findMinMaxForSeries(QList<QAbstractSeries *> series,Qt::Orien
336 min = qMin((orientation == Qt::Vertical) ? domain->minY() : domain->minX(), min);
336 min = qMin((orientation == Qt::Vertical) ? domain->minY() : domain->minX(), min);
337 max = qMax((orientation == Qt::Vertical) ? domain->maxY() : domain->maxX(), max);
337 max = qMax((orientation == Qt::Vertical) ? domain->maxY() : domain->maxX(), max);
338 }
338 }
339 if (min == max) {
340 min -= 0.5;
341 max += 0.5;
342 }
339 }
343 }
340
344
341 void ChartDataSet::deleteAllSeries()
345 void ChartDataSet::deleteAllSeries()
Show file before | Show file after | Hide comments
@@ -820,6 +820,8 void tst_QChart::createDefaultAxesForLineSeries_data()
820 << (qreal)1.1 << (qreal)2.0 << (qreal)2.9 << (qreal)1.0 << (qreal)2.0 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0;
820 << (qreal)1.1 << (qreal)2.0 << (qreal)2.9 << (qreal)1.0 << (qreal)2.0 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0;
821 QTest::newRow("series1hasMin_series2hasMax") << (qreal)1.0 << (qreal)2.0 << (qreal)2.9 << (qreal)1.1 << (qreal)1.7 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0
821 QTest::newRow("series1hasMin_series2hasMax") << (qreal)1.0 << (qreal)2.0 << (qreal)2.9 << (qreal)1.1 << (qreal)1.7 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0
822 << (qreal)1.0 << (qreal)2.0 << (qreal)2.9 << (qreal)1.1 << (qreal)1.7 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0;
822 << (qreal)1.0 << (qreal)2.0 << (qreal)2.9 << (qreal)1.1 << (qreal)1.7 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0;
823 QTest::newRow("bothSeriesHaveSameMinAndMax") << (qreal)1.0 << (qreal)2.0 << (qreal)2.9 << (qreal)1.1 << (qreal)1.7 << (qreal)3.0 << (qreal)1.0 << (qreal)3.0
824 << (qreal)1.1 << (qreal)1.1 << (qreal)1.1 << (qreal)1.1 << (qreal)1.1 << (qreal)1.1 << (qreal)0.6 << (qreal)1.6;
823 }
825 }
824
826
825 void tst_QChart::createDefaultAxesForLineSeries()
827 void tst_QChart::createDefaultAxesForLineSeries()
General Comments 0
You need to be logged in to leave comments. Login now