| @@ -21,6 +21,7 | |||
|
|
21 | 21 | #include "declarativeareaseries.h" |
|
|
22 | 22 | #include "declarativechart.h" |
|
|
23 | 23 | #include "qchart.h" |
|
|
24 | #include "qxymodelmapper.h" | |
|
|
24 | 25 | |
|
|
25 | 26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
|
26 | 27 | |
| @@ -35,7 +36,10 bool DeclarativeAreaSeries::setDeclarativeUpperModel(DeclarativeXyModel *model) | |||
|
|
35 | 36 | bool value(false); |
|
|
36 | 37 | if (m) { |
|
|
37 | 38 | upperSeries()->setModel(m); |
|
|
38 | upperSeries()->setModelMapping(0, 1, Qt::Vertical); | |
|
|
39 | QXYModelMapper *mapper = new QXYModelMapper; | |
|
|
40 | mapper->setMapX(0); | |
|
|
41 | mapper->setMapY(1); | |
|
|
42 | upperSeries()->setModelMapper(mapper); | |
|
|
39 | 43 | } else { |
|
|
40 | 44 | qWarning("DeclarativeAreaSeries: Illegal model"); |
|
|
41 | 45 | } |
| @@ -53,7 +57,10 bool DeclarativeAreaSeries::setDeclarativeLowerModel(DeclarativeXyModel *model) | |||
|
|
53 | 57 | bool value(false); |
|
|
54 | 58 | if (m) { |
|
|
55 | 59 | lowerSeries()->setModel(m); |
|
|
56 | lowerSeries()->setModelMapping(0, 1, Qt::Vertical); | |
|
|
60 | QXYModelMapper *mapper = new QXYModelMapper; | |
|
|
61 | mapper->setMapX(0); | |
|
|
62 | mapper->setMapY(1); | |
|
|
63 | lowerSeries()->setModelMapper(mapper); | |
|
|
57 | 64 | } else { |
|
|
58 | 65 | qWarning("DeclarativeAreaSeries: Illegal model"); |
|
|
59 | 66 | } |
| @@ -59,8 +59,8 void DeclarativeBarSeries::classBegin() | |||
|
|
59 | 59 | |
|
|
60 | 60 | void DeclarativeBarSeries::componentComplete() |
|
|
61 | 61 | { |
|
|
62 | if (model()) | |
|
|
63 | setModelMapping(0, 1, 1, Qt::Vertical); | |
|
|
62 | // if (model()) | |
|
|
63 | // setModelMapping(0, 1, 1, Qt::Vertical); | |
|
|
64 | 64 | } |
|
|
65 | 65 | |
|
|
66 | 66 | bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model) |
| @@ -68,9 +68,9 bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model) | |||
|
|
68 | 68 | QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model); |
|
|
69 | 69 | bool value(false); |
|
|
70 | 70 | if (m) { |
|
|
71 |
|
|
|
|
71 | setModel(m); | |
|
|
72 | 72 | //setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical); |
|
|
73 | setModelMapping(0, 1, 1, Qt::Vertical); | |
|
|
73 | // setModelMapping(0, 1, 1, Qt::Vertical); | |
|
|
74 | 74 | } else { |
|
|
75 | 75 | qWarning("DeclarativeBarSeries: Illegal model"); |
|
|
76 | 76 | } |
| @@ -492,9 +492,9 void tst_QLineSeries::setModelMapping() | |||
|
|
492 | 492 | { |
|
|
493 | 493 | QSKIP("Model mapping has been rewriten, test case needs update", SkipAll); |
|
|
494 | 494 | |
|
|
495 | QFETCH(int, modelX); | |
|
|
496 | QFETCH(int, modelY); | |
|
|
497 | QFETCH(Qt::Orientation, orientation); | |
|
|
495 | // QFETCH(int, modelX); | |
|
|
496 | // QFETCH(int, modelY); | |
|
|
497 | // QFETCH(Qt::Orientation, orientation); | |
|
|
498 | 498 | |
|
|
499 | 499 | // QLineSeries series; |
|
|
500 | 500 | |
| @@ -538,12 +538,12 void tst_QLineSeries::setModelMappingRange() | |||
|
|
538 | 538 | { |
|
|
539 | 539 | QSKIP("Model mapping has been rewriten, test case needs update", SkipAll); |
|
|
540 | 540 | |
|
|
541 | QFETCH(int, first); | |
|
|
542 | QFETCH(int, count); | |
|
|
543 | QLineSeries series; | |
|
|
541 | // QFETCH(int, first); | |
|
|
542 | // QFETCH(int, count); | |
|
|
543 | // QLineSeries series; | |
|
|
544 | 544 | |
|
|
545 | QStandardItemModel *model = new QStandardItemModel(0, 2); | |
|
|
546 | series.setModel(model); | |
|
|
545 | // QStandardItemModel *model = new QStandardItemModel(0, 2); | |
|
|
546 | // series.setModel(model); | |
|
|
547 | 547 | // series.setModelMapping(0, 1); |
|
|
548 | 548 | // series.setModelMappingRange(first, count); |
|
|
549 | 549 | |
General Comments 0
You need to be logged in to leave comments.
Login now