diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-25 15:07:06 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-26 12:25:18 +0200 |
| commit | b36b9eb7c65e3a4f6972d2f2145722470d1ad29b (patch) | |
| tree | 1d2225a3a107d0a786482c57dab8c50177a16149 /tests/barstest/main.cpp | |
| parent | b16a964d0ed24b720e4e71da03cea87e35db7806 (diff) | |
Implement QLogValue3DAxisFormatter
Task-number: QTRD-2787
Change-Id: I6ecff5c3d2047a2c566051951bf237bf3e68ffab
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/barstest/main.cpp')
| -rw-r--r-- | tests/barstest/main.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index edf61e2e..f4cd02f7 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -33,6 +33,7 @@ #include <QPainter> #include <QColorDialog> #include <QLineEdit> +#include <QSpinBox> int main(int argc, char **argv) { @@ -292,6 +293,11 @@ int main(int argc, char **argv) shadowQuality->setCurrentIndex(5); QLineEdit *valueAxisFormatEdit = new QLineEdit(widget); + QLineEdit *logBaseEdit = new QLineEdit(widget); + QSpinBox *valueAxisSegmentsSpin = new QSpinBox(widget); + valueAxisSegmentsSpin->setMinimum(1); + valueAxisSegmentsSpin->setMaximum(100); + valueAxisSegmentsSpin->setValue(10); vLayout->addWidget(addDataButton, 0, Qt::AlignTop); vLayout->addWidget(addMultiDataButton, 0, Qt::AlignTop); @@ -320,7 +326,6 @@ int main(int argc, char **argv) vLayout->addWidget(ownThemeButton, 0, Qt::AlignTop); vLayout->addWidget(primarySeriesTestsButton, 0, Qt::AlignTop); vLayout->addWidget(toggleRotationButton, 0, Qt::AlignTop); - vLayout->addWidget(logAxisButton, 0, Qt::AlignTop); vLayout->addWidget(gradientBtoYPB, 1, Qt::AlignTop); vLayout2->addWidget(staticCheckBox, 0, Qt::AlignTop); @@ -349,7 +354,12 @@ int main(int argc, char **argv) vLayout2->addWidget(new QLabel(QStringLiteral("Adjust font size")), 0, Qt::AlignTop); vLayout2->addWidget(fontSizeSlider, 0, Qt::AlignTop); vLayout2->addWidget(new QLabel(QStringLiteral("Value axis format")), 0, Qt::AlignTop); - vLayout2->addWidget(valueAxisFormatEdit, 1, Qt::AlignTop); + vLayout2->addWidget(valueAxisFormatEdit, 0, Qt::AlignTop); + vLayout2->addWidget(new QLabel(QStringLiteral("Log axis base")), 0, Qt::AlignTop); + vLayout2->addWidget(logBaseEdit, 0, Qt::AlignTop); + vLayout2->addWidget(new QLabel(QStringLiteral("Value axis segments")), 0, Qt::AlignTop); + vLayout2->addWidget(valueAxisSegmentsSpin, 0, Qt::AlignTop); + vLayout->addWidget(logAxisButton, 1, Qt::AlignTop); // TODO: Add example for setMeshFileName widget->show(); @@ -387,6 +397,10 @@ int main(int argc, char **argv) &GraphModifier::changeFontSize); QObject::connect(valueAxisFormatEdit, &QLineEdit::textEdited, modifier, &GraphModifier::changeValueAxisFormat); + QObject::connect(logBaseEdit, &QLineEdit::textEdited, modifier, + &GraphModifier::changeLogBase); + QObject::connect(valueAxisSegmentsSpin, SIGNAL(valueChanged(int)), modifier, + SLOT(changeValueAxisSegments(int))); QObject::connect(multiScaleButton, &QPushButton::clicked, modifier, &GraphModifier::toggleMultiseriesScaling); |