Q3DScatter: Axis label drawing added

Now draws x, y and z labels. Categoryaxes still used for testing, should
be converted to valueaxes.

Change-Id: I2c7bc5402315dec9e09eacd8b65fcdbbf536bc64
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 18 insertions, 99 deletions

diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index df4fad41..9e6e63bb 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -75,10 +75,6 @@ int main(int argc, char **argv)
     hLayout->addWidget(container, 1);
     hLayout->addLayout(vLayout);
 
-//    QPushButton *dataButton = new QPushButton(widget);
-//    dataButton->setText(QStringLiteral("Add a row of random data"));
-//    dataButton->setEnabled(false);
-
     QPushButton *themeButton = new QPushButton(widget);
     themeButton->setText(QStringLiteral("Change theme"));
 
@@ -91,48 +87,14 @@ int main(int argc, char **argv)
     QPushButton *cameraButton = new QPushButton(widget);
     cameraButton->setText(QStringLiteral("Change camera preset"));
 
-//    QPushButton *selectionButton = new QPushButton(widget);
-//    selectionButton->setText(QStringLiteral("Change selection mode"));
+    QCheckBox *backgroundCheckBox = new QCheckBox(widget);
+    backgroundCheckBox->setText(QStringLiteral("Show background"));
+    backgroundCheckBox->setChecked(true);
 
     QCheckBox *gridCheckBox = new QCheckBox(widget);
     gridCheckBox->setText(QStringLiteral("Show grid"));
     gridCheckBox->setChecked(true);
 
-//    QCheckBox *rotationCheckBox = new QCheckBox(widget);
-//    rotationCheckBox->setText("Rotate with slider");
-
-//    QSlider *rotationSliderX = new QSlider(Qt::Horizontal, widget);
-//    rotationSliderX->setTickInterval(1);
-//    rotationSliderX->setMinimum(-180);
-//    rotationSliderX->setValue(0);
-//    rotationSliderX->setMaximum(180);
-//    rotationSliderX->setEnabled(false);
-//    QSlider *rotationSliderY = new QSlider(Qt::Horizontal, widget);
-//    rotationSliderY->setTickInterval(1);
-//    rotationSliderY->setMinimum(0);
-//    rotationSliderY->setValue(0);
-//    rotationSliderY->setMaximum(90);
-//    rotationSliderY->setEnabled(false);
-
-//    QSlider *sizeSliderX = new QSlider(Qt::Horizontal, widget);
-//    sizeSliderX->setTickInterval(1);
-//    sizeSliderX->setMinimum(1);
-//    sizeSliderX->setValue(100);
-//    sizeSliderX->setMaximum(100);
-//    QSlider *sizeSliderZ = new QSlider(Qt::Horizontal, widget);
-//    sizeSliderZ->setTickInterval(1);
-//    sizeSliderZ->setMinimum(1);
-//    sizeSliderZ->setValue(100);
-//    sizeSliderZ->setMaximum(100);
-
-//    QComboBox *valueDimension = new QComboBox(widget);
-//    valueDimension->addItem(QStringLiteral("Height"));
-//    valueDimension->addItem(QStringLiteral("Width"));
-//    valueDimension->addItem(QStringLiteral("Depth"));
-//    valueDimension->addItem(QStringLiteral("Radius"));
-//    valueDimension->addItem(QStringLiteral("All"));
-//    valueDimension->setCurrentIndex(4);
-
     QComboBox *shadowQuality = new QComboBox(widget);
     shadowQuality->addItem(QStringLiteral("None"));
     shadowQuality->addItem(QStringLiteral("Low"));
@@ -148,20 +110,11 @@ int main(int argc, char **argv)
     fontSizeSlider->setValue(30);
     fontSizeSlider->setMaximum(200);
 
-//    vLayout->addWidget(rotationCheckBox, 0, Qt::AlignTop);
-//    vLayout->addWidget(rotationSliderX, 0, Qt::AlignTop);
-//    vLayout->addWidget(rotationSliderY, 0, Qt::AlignTop);
-//    vLayout->addWidget(new QLabel(QStringLiteral("Adjust relative bar size")));
-//    vLayout->addWidget(sizeSliderX, 0, Qt::AlignTop);
-//    vLayout->addWidget(sizeSliderZ, 0, Qt::AlignTop);
-//    vLayout->addWidget(dataButton, 0, Qt::AlignTop);
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
     vLayout->addWidget(cameraButton, 0, Qt::AlignTop);
-//    vLayout->addWidget(new QLabel(QStringLiteral("Apply value to:")));
-//    vLayout->addWidget(valueDimension, 0, Qt::AlignTop);
-//    vLayout->addWidget(selectionButton, 0, Qt::AlignTop);
+    vLayout->addWidget(backgroundCheckBox);
     vLayout->addWidget(gridCheckBox);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
     vLayout->addWidget(shadowQuality);
@@ -169,18 +122,11 @@ int main(int argc, char **argv)
     vLayout->addWidget(fontList);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust font size")));
     vLayout->addWidget(fontSizeSlider, 1, Qt::AlignTop);
-    // TODO: Add example for setMeshFileName
 
     widget->show();
 
     ScatterDataModifier *modifier = new ScatterDataModifier(chart);
 
-//    QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &MapsModifier::rotateX);
-//    QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &MapsModifier::rotateY);
-
-//    QObject::connect(sizeSliderX, &QSlider::valueChanged, modifier, &MapsModifier::setSpecsX);
-//    QObject::connect(sizeSliderZ, &QSlider::valueChanged, modifier, &MapsModifier::setSpecsZ);
-
     QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier,
                      &ScatterDataModifier::changeFontSize);
 
@@ -192,12 +138,6 @@ int main(int argc, char **argv)
                      &ScatterDataModifier::changeTheme);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeTransparency);
-//    QObject::connect(dataButton, &QPushButton::clicked, modifier, &MapsModifier::addBars);
-//    QObject::connect(selectionButton, &QPushButton::clicked, modifier,
-//                     &MapsModifier::changeSelectionMode);
-
-//    QObject::connect(valueDimension, SIGNAL(currentIndexChanged(int)), modifier,
-//                     SLOT(changeValueDimension(int)));
 
     QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeShadowQuality(int)));
@@ -209,18 +149,11 @@ int main(int argc, char **argv)
     QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
                      &ScatterDataModifier::changeFont);
 
+    QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier,
+                     &ScatterDataModifier::setBackgroundEnabled);
     QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier,
                      &ScatterDataModifier::setGridEnabled);
 
-//    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderX,
-//                     &QSlider::setEnabled);
-//    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderX,
-//                     &QSlider::setValue);
-//    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderY,
-//                     &QSlider::setEnabled);
-//    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderY,
-//                     &QSlider::setValue);
-
     modifier->start();
 
     return app.exec();
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index 9281127b..9c3c3247 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -71,12 +71,15 @@ void ScatterDataModifier::start()
 void ScatterDataModifier::addData()
 {
     QStringList rowLabels;
-    rowLabels << "something 1" << "something 2" << "something 3" << "something 4" << "something 5";
+    rowLabels << "something 1" << "something 2" << "something 3" << "something 4" << "something 5"
+                 << "something 6" << "something 7" << "something 8" << "something 9"
+                 << "something 10" << "something 11";
     QStringList columnLabels;
-    columnLabels << "other 1" << "other 2" << "other 3" << "other 4" << "other 5";
+    columnLabels << "other 1" << "other 2" << "other 3" << "other 4" << "other 5" << "other 6"
+                 << "other 7" << "other 8" << "other 9" << "other 10" << "other 11";
 
     // Set tick count and step
-    //m_chart->setTickCount(10, 0.1f);
+    m_chart->setTickCount(10, 0.1f, -1.0f);
 
     // Add labels
     m_chart->rowAxis()->setTitle("Somethings");
@@ -153,16 +156,10 @@ void ScatterDataModifier::changeTransparency()
         transparency = TransparencyFromTheme;
 }
 
-//void ScatterDataModifier::changeValueDimension(int dimension)
-//{
-//    m_chart->setBarSpecs(m_barSpecs, (Q3DMaps::AdjustmentDirection)dimension);
-//}
-
 void ScatterDataModifier::changeFont(const QFont &font)
 {
     QFont newFont = font;
     newFont.setPointSizeF(m_fontSize);
-    //qDebug() << newFont << newFont.style();
     m_chart->setFont(newFont);
 }
 
@@ -209,19 +206,12 @@ void ScatterDataModifier::changeShadowQuality(int quality)
     emit shadowQualityChanged(quality);
 }
 
+void ScatterDataModifier::setBackgroundEnabled(int enabled)
+{
+    m_chart->setBackgroundVisible((bool)enabled);
+}
+
 void ScatterDataModifier::setGridEnabled(int enabled)
 {
     m_chart->setGridVisible((bool)enabled);
 }
-
-//void ScatterDataModifier::rotateX(int rotation)
-//{
-//    m_xRotation = rotation;
-//    m_chart->setCameraPosition(m_xRotation, m_yRotation);
-//}
-
-//void ScatterDataModifier::rotateY(int rotation)
-//{
-//    m_yRotation = rotation;
-//    m_chart->setCameraPosition(m_xRotation, m_yRotation);
-//}
diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h
index ef9b6b33..cf8e5b1b 100644
--- a/examples/scatterchart/scatterchart.h
+++ b/examples/scatterchart/scatterchart.h
@@ -45,7 +45,6 @@
 
 #include <QFont>
 #include <QDebug>
-//#include <QVector3D>
 
 using namespace QtDataVis3D;
 
@@ -60,12 +59,10 @@ public:
     void changeStyle();
     void changePresetCamera();
     void changeTheme();
-//    void changeSelectionMode();
     void changeTransparency();
     void changeFont(const QFont &font);
     void changeFontSize(int fontsize);
-//    void rotateX(int rotation);
-//    void rotateY(int rotation);
+    void setBackgroundEnabled(int enabled);
     void setGridEnabled(int enabled);
     void start();
 
@@ -78,7 +75,6 @@ signals:
 
 private:
     Q3DScatter *m_chart;
-    //QRect m_areaRect;
     int m_fontSize;
 };