HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2584:1dbaa17880af

Property to control box width...

Mika Salmela -

r2584:1dbaa17880af

parent child

Context file:

r2584:1dbaa17880af

Collapse all files

plugins/declarative/declarativeboxplotseries.cpp +10 0

                 This property configures the visibility of the middle box outline.
             */
             /*!
+                \qmlproperty qreal BoxPlotSeries::boxWidth
+                This property configures the width of the box-and-whiskers item. The value signifies the relative
+                width of the box-and-whiskers item inside its own slot. The value can between 0.0 and 1.0. Negative values
+                are clamped to 0.0 and values over 1.0 are clamped to 1.0.
+            */
+            /*!
                 \qmlproperty Pen BoxPlotSeries::pen
                 This property configures the pen of the box-and-whiskers items.
             */
                 Signal is emitted when the middle box outline visibility is changed.
              */
             /*!
+                \qmlsignal BoxPlotSeries::onBoxWidthChanged()
+                Signal is emitted when the width of the box-and-whiskers item is changed.
+             */
+            /*!
                 \qmlsignal BoxPlotSeries::onPenChanged()
                 Signal is emitted when the pen for box-and-whiskers items has changed.
             */

src/boxplotchart/boxplotchartitem.cpp +4 0

                         box->setBrush(m_series->brush());
                         box->setPen(m_series->pen());
                         box->setBoxOutlined(m_series->boxOutlineVisible());
+                        box->setBoxWidth(m_series->boxWidth());
                     }
                     updateBoxGeometry(box, s);
                     item->setBrush(m_series->brush());
                     item->setPen(m_series->pen());
                     item->setBoxOutlined(m_series->boxOutlineVisible());
+                    item->setBoxWidth(m_series->boxWidth());
                 }
                 // Override with QBoxSet specific settings
                 foreach (QBoxSet *set, m_boxTable.keys()) {
                     if (m_animation)
                         m_animation->setAnimationStart(item);
+                    item->setBoxWidth(m_series->boxWidth());
                     bool dirty = updateBoxGeometry(item, item->m_data.m_index);
                     if (dirty && m_animation)
                         presenter()->startAnimation(m_animation->boxChangeAnimation(item));

src/boxplotchart/boxwhiskers.cpp +8 -3

                 update();
             }
+            void BoxWhiskers::setBoxWidth(const qreal width)
+            {
+                m_boxWidth = width;
+            }
             void BoxWhiskers::setLayout(const BoxWhiskersData &data)
             {
                 m_data = data;
                 m_boundingRect = m_boxPath.boundingRect();
                 qreal columnWidth = 1.0 / m_data.m_seriesCount;
-                qreal left = 0.25 * columnWidth + columnWidth * m_data.m_seriesIndex + m_data.m_index - 0.5;
+                qreal left = ((1.0 - m_boxWidth) / 2.0) * columnWidth + columnWidth * m_data.m_seriesIndex + m_data.m_index - 0.5;
-                qreal barWidth = columnWidth / 2.0;
+                qreal barWidth = m_boxWidth * columnWidth;
                 QPointF geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_upperExtreme), m_validData);
                 if (!m_validData)
                 m_boxPath = path;
                 m_boundingRect = m_boxPath.boundingRect();
-                qreal extra = (m_pen.widthF() / 2.0);
+                qreal extra = m_pen.widthF();
                 m_boundingRect.adjust(-extra, -extra, extra, extra);
             }

src/boxplotchart/boxwhiskers_p.h +2 0

                 void setPen(const QPen &pen);
                 void setLayout(const BoxWhiskersData &data);
                 void setBoxOutlined(const bool outlined) { m_boxOutlined = outlined; }
+                void setBoxWidth(const qreal width);
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
                 void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
                 QPen m_medianPen;
                 QPen m_outlinePen;
                 bool m_boxOutlined;
+                qreal m_boxWidth;
                 BoxWhiskersData m_data;
                 QSizeF m_domainSize;
                 QRectF m_middleBox;

src/boxplotchart/qboxplotseries.cpp +34 -3

                 \brief This property configures the visibility of the middle box outline.
             */
             /*!
+                \property QBoxPlotSeries::boxWidth
+                \brief This property configures the width of the box-and-whiskers item. The value signifies the relative
+                width of the box-and-whiskers item inside its own slot. The value can between 0.0 and 1.0. Negative values
+                are clamped to 0.0 and values over 1.0 are clamped to 1.0.
+            */
+            /*!
                 \property QBoxPlotSeries::pen
                 \brief This property configures the pen of the box-and-whiskers items.
             */
                 Signal is emitted when the middle box outline visibility is changed.
             */
             /*!
+                \fn void QBoxPlotSeries::boxWidthChanged()
+                Signal is emitted when the width of the box-and-whiskers item is changed.
+            */
+            /*!
                 \fn void QBoxPlotSeries::penChanged()
                 This signal is emitted when the pen of the box-and-whiskers has changed.
                 \sa brush
                 This signal is emitted when the brush of the box-and-whiskers has changed.
                 \sa brush
             */
             /*!
                 \fn virtual SeriesType QBoxPlotSeries::type() const
                 \brief Returns type of series.
                 return d->m_boxOutlineVisible;
             }
+            void QBoxPlotSeries::setBoxWidth(qreal width)
+            {
+                Q_D(QBoxPlotSeries);
+                if (width != d->m_boxWidth) {
+                    if (width < 0.0)
+                        width = 0.0;
+                    if (width > 1.0)
+                        width = 1.0;
+                    d->m_boxWidth = width;
+                    emit d->updatedLayout();
+                    emit boxWidthChanged();
+                }
+            }
+            qreal QBoxPlotSeries::boxWidth()
+            {
+                Q_D(QBoxPlotSeries);
+                return d->m_boxWidth;
+            }
             void QBoxPlotSeries::setBrush(const QBrush &brush)
             {
                 Q_D(QBoxPlotSeries);
                 : QAbstractSeriesPrivate(q),
                   m_pen(QChartPrivate::defaultPen()),
                   m_brush(QChartPrivate::defaultBrush()),
-                  m_boxOutlineVisible(true)
+                  m_boxOutlineVisible(true),
+                  m_boxWidth(0.5)
             {
             }

src/boxplotchart/qboxplotseries.h +4 0

             {
                 Q_OBJECT
                 Q_PROPERTY(bool boxOutlineVisible READ boxOutlineVisible WRITE setBoxOutlineVisible NOTIFY boxOutlineVisibilityChanged)
+                Q_PROPERTY(qreal boxWidth READ boxWidth WRITE setBoxWidth NOTIFY boxWidthChanged)
                 Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
                 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
             public:
                 void setBoxOutlineVisible(bool visible);
                 bool boxOutlineVisible();
+                void setBoxWidth(qreal width);
+                qreal boxWidth();
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setPen(const QPen &pen);
                 void penChanged();
                 void brushChanged();
                 void boxOutlineVisibilityChanged();
+                void boxWidthChanged();
                 void boxsetsAdded(QList<QBoxSet *> sets);
                 void boxsetsRemoved(QList<QBoxSet *> sets);

src/boxplotchart/qboxplotseries_p.h +1 0

                 bool m_boxOutlineVisible;
                 int m_index;
                 BoxPlotAnimation *m_animation;
+                qreal m_boxWidth;
             private:
                 Q_DECLARE_PUBLIC(QBoxPlotSeries)

tests/boxplottester/mainwidget.cpp +19 0

                 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);
                 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]);
                 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));
+            }

tests/boxplottester/mainwidget.h +3 0

             #include <QBarCategoryAxis>
             #include <QBoxSet>
             #include <QCheckBox>
+            #include <QDoubleSpinBox>
             class QGridLayout;
                 void changePen();
                 void antialiasingToggled(bool);
                 void boxOutlineToggled(bool);
+                void setBoxWidth(double width);
             private:
                 QChart *m_chart;
                 int m_seriesCount;
                 QBoxPlotSeries *m_series[10];
                 QCheckBox *m_boxOutlined;
+                QDoubleSpinBox *m_boxWidthSB;
             };
             #endif // MAINWIDGET_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages