diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-09 10:49:49 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-12-10 09:01:45 +0200 |
commit | 3573055abe42ff283d011d8550bc8495156338a1 (patch) | |
tree | bb45d4f7e32a0c63329d9f52639081162b34e17e /tests/barstest | |
parent | 22557b312570cbefde584466a28f2b9bfcc570ba (diff) |
Move series specific visual elements to series, part 4
Colors to series
- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
series have items in that grid
Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/barstest')
-rw-r--r-- | tests/barstest/chart.cpp | 42 | ||||
-rw-r--r-- | tests/barstest/main.cpp | 1 |
2 files changed, 42 insertions, 1 deletions
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 19410306..97685074 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -119,6 +119,48 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog) m_genericData->setItemLabelFormat(QStringLiteral("3: @valueTitle for (@rowIdx, @colIdx): @valueLabel")); m_genericData->dataProxy()->setColumnLabels(genericColumnLabels); + m_temperatureData->setBaseColor(Qt::red); + m_temperatureData->setSingleHighlightColor(Qt::cyan); + m_temperatureData->setMultiHighlightColor(Qt::magenta); + m_temperatureData2->setBaseColor(Qt::yellow); + m_genericData->setBaseColor(Qt::blue); + + QLinearGradient barGradient1(0, 0, 1, 100); + barGradient1.setColorAt(1.0, Qt::red); + barGradient1.setColorAt(0.75001, Qt::red); + barGradient1.setColorAt(0.75, Qt::magenta); + barGradient1.setColorAt(0.50001, Qt::magenta); + barGradient1.setColorAt(0.50, Qt::blue); + barGradient1.setColorAt(0.25001, Qt::blue); + barGradient1.setColorAt(0.25, Qt::black); + barGradient1.setColorAt(0.0, Qt::black); + + QLinearGradient barGradient2(0, 0, 1, 100); + barGradient2.setColorAt(1.0, Qt::red); + barGradient2.setColorAt(0.75, Qt::magenta); + barGradient2.setColorAt(0.50, Qt::blue); + barGradient2.setColorAt(0.25, Qt::black); + barGradient2.setColorAt(0.0, Qt::black); + + QLinearGradient singleHighlightGradient(0, 0, 1, 100); + singleHighlightGradient.setColorAt(1.0, Qt::white); + singleHighlightGradient.setColorAt(0.75, Qt::lightGray); + singleHighlightGradient.setColorAt(0.50, Qt::gray); + singleHighlightGradient.setColorAt(0.25, Qt::darkGray); + singleHighlightGradient.setColorAt(0.0, Qt::black); + + QLinearGradient multiHighlightGradient(0, 0, 1, 100); + multiHighlightGradient.setColorAt(1.0, Qt::lightGray); + multiHighlightGradient.setColorAt(0.75, Qt::gray); + multiHighlightGradient.setColorAt(0.50, Qt::darkGray); + multiHighlightGradient.setColorAt(0.25, Qt::black); + multiHighlightGradient.setColorAt(0.0, Qt::black); + + m_temperatureData->setBaseGradient(barGradient1); + m_temperatureData2->setBaseGradient(barGradient2); + m_temperatureData->setSingleHighlightGradient(singleHighlightGradient); + m_temperatureData->setMultiHighlightGradient(multiHighlightGradient); + m_graph->theme()->setFont(QFont("Times Roman", 20)); // Release and store the default input handler. diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index 5bfa26a3..d5e62b86 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -283,7 +283,6 @@ int main(int argc, char **argv) vLayout->addWidget(flipViewsButton, 0, Qt::AlignTop); vLayout->addWidget(changeColorStyleButton, 0, Qt::AlignTop); vLayout->addWidget(ownThemeButton, 0, Qt::AlignTop); - vLayout->addWidget(colorDialog, 0, Qt::AlignTop); vLayout->addWidget(gradientBtoYPB, 1, Qt::AlignTop); vLayout2->addWidget(staticCheckBox, 0, Qt::AlignTop); |