Property to control box width

Also fix bounding rect to get rid of some pen width related
drawing artifacts.

Change-Id: Ib498545cecd497d845031a3ccba572a9cba8e91d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

2 files changed, 22 insertions, 0 deletions

diff --git a/tests/boxplottester/mainwidget.cpp b/tests/boxplottester/mainwidget.cpp
index 62a5521f..02bbaafa 100644
--- a/tests/boxplottester/mainwidget.cpp
+++ b/tests/boxplottester/mainwidget.cpp
@@ -111,6 +111,16 @@ MainWidget::MainWidget(QWidget *parent) :
     connect(m_penTool, SIGNAL(changed()), this, SLOT(changePen()));
     grid->addWidget(setWhiskersButton, m_rowPos++, 1);
 
+    // Box width setting
+    m_boxWidthSB = new QDoubleSpinBox();
+    m_boxWidthSB->setMinimum(-1.0);
+    m_boxWidthSB->setMaximum(2.0);
+    m_boxWidthSB->setSingleStep(0.1);
+    m_boxWidthSB->setValue(0.5);
+    grid->addWidget(new QLabel("Box width:"), m_rowPos, 0);
+    grid->addWidget(m_boxWidthSB, m_rowPos++, 1);
+    connect(m_boxWidthSB, SIGNAL(valueChanged(double)), this, SLOT(setBoxWidth(double)));
+
     initThemeCombo(grid);
     initCheckboxes(grid);
 
@@ -249,6 +259,7 @@ void MainWidget::addSeries()
     connect(set2, SIGNAL(hovered(bool)), this, SLOT(singleBoxHovered(bool)));
 
     m_series[m_seriesCount]->setBoxOutlineVisible(m_boxOutlined->checkState());
+    m_series[m_seriesCount]->setBoxWidth(m_boxWidthSB->value());
 
     m_chart->addSeries(m_series[m_seriesCount]);
 
@@ -459,3 +470,11 @@ void MainWidget::changePen()
     for (int i = 0; i <  m_seriesCount; i++)
         m_series[i]->setPen(m_penTool->pen());
 }
+
+void MainWidget::setBoxWidth(double width)
+{
+    qDebug() << "setBoxWidth to " << width;
+
+    for (int i = 0; i <  m_seriesCount; i++)
+        m_series[i]->setBoxWidth(qreal(width));
+}
diff --git a/tests/boxplottester/mainwidget.h b/tests/boxplottester/mainwidget.h
index d2825ded..cc329b0c 100644
--- a/tests/boxplottester/mainwidget.h
+++ b/tests/boxplottester/mainwidget.h
@@ -31,6 +31,7 @@
 #include <QBarCategoryAxis>
 #include <QBoxSet>
 #include <QCheckBox>
+#include <QDoubleSpinBox>
 
 class QGridLayout;
 
@@ -70,6 +71,7 @@ private slots:
     void changePen();
     void antialiasingToggled(bool);
     void boxOutlineToggled(bool);
+    void setBoxWidth(double width);
 
 private:
     QChart *m_chart;
@@ -82,6 +84,7 @@ private:
     int m_seriesCount;
     QBoxPlotSeries *m_series[10];
     QCheckBox *m_boxOutlined;
+    QDoubleSpinBox *m_boxWidthSB;
 };
 
 #endif // MAINWIDGET_H