HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1425:a0d2e2cf1ab3

barmargin replaced with barwidth

sauimone -

r1425:a0d2e2cf1ab3

parent child

Context file:

r1425:a0d2e2cf1ab3

Collapse all files

examples/barchart/main.cpp +1 -1

             //![2]
                 QBarSeries* series = new QBarSeries();
-                series->setBarMargin(0.8);
+                series->setBarWidth(0.2);
                 series->append(set0);
                 series->append(set1);
                 series->append(set2);

src/barchart/barchartitem.cpp +1 -1

                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
-                qreal barWidth = scaleX - scaleX * m_series->d_func()->barMargin();
+                qreal barWidth = scaleX * m_series->d_func()->barWidth();
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {

src/barchart/groupedbarchartitem.cpp +1 -1

                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
-                qreal barWidth = scaleX / setCount - (scaleX / setCount) * m_series->d_func()->barMargin();
+                qreal barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {

src/barchart/percentbarchartitem.cpp +1 -1

                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
-                qreal barWidth = scaleX - scaleX * m_series->d_func()->barMargin();
+                qreal barWidth = scaleX * m_series->d_func()->barWidth();
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {

src/barchart/qbarseries.cpp +27 -22

             */
             /*!
-                \property QBarSeries::barMargin
+                \property QBarSeries::barWidth
-                \brief Defines the margin around bars.
+                \brief Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
+                is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
+                is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
+                Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar. This is
+                because with grouped series it is more logical to set width of whole group and let the chart calculate correct
+                width for bar.
+                \sa QGroupedBarSeries
             */
             /*!
             }
             /*!
-                Sets the margin of the bars of the series. The unit of \a margin is the unit of x-axis. Setting the margin to 0.0
+                Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
-                means there is no margin around the bars, making a single bar or bargroup to take one x-axis unit on the screen.
+                is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
-                Setting margin to maximum value of 1.0 makes the bar width to exactly 1 pixel on the screen. Bars cannot be zero
+                is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
-                width, otherwise they would not be visible at all. If you want to hide bars, use visible property of the series
+                Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar. This is
-                instead.
+                because with grouped series it is more logical to set widht of whole group and let the chart calculate correct
+                width for bar.
+                \sa QGroupedBarSeries
             */
-            void QBarSeries::setBarMargin(qreal margin)
+            void QBarSeries::setBarWidth(qreal width)
             {
                 Q_D(QBarSeries);
-                d->setBarMargin(margin);
+                d->setBarWidth(width);
             }
             /*!
-                Returns the margin around bars
+                Returns the width of bars.
             */
-            qreal QBarSeries::barMargin() const
+            qreal QBarSeries::barWidth() const
             {
                 Q_D(const QBarSeries);
-                return d->barMargin();
+                return d->barWidth();
             }
             /*!
             QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
-                m_barMargin(0.5),  // Default value is 50% of category width
+                m_barWidth(0.5),  // Default value is 50% of category width
                 m_labelsVisible(false),
                 m_visible(true)
             {
                 return categories;
             }
-            void QBarSeriesPrivate::setBarMargin(qreal margin)
+            void QBarSeriesPrivate::setBarWidth(qreal width)
             {
-                if (margin > 1.0) {
+                if (width < 0.0) {
-                    margin = 1.0;
+                    width = 0.0;
-                } else if (margin < 0.0) {
-                    margin = 0.0;
                 }
+                m_barWidth = width;
-                m_barMargin = margin;
                 emit updatedBars();
             }
-            qreal QBarSeriesPrivate::barMargin() const
+            qreal QBarSeriesPrivate::barWidth() const
             {
-                return m_barMargin;
+                return m_barWidth;
             }
             QBarSet* QBarSeriesPrivate::barsetAt(int index)

src/barchart/qbarseries.h +3 -3

             class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
-                Q_PROPERTY(qreal barMargin READ barMargin WRITE setBarMargin)
+                Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
                 Q_PROPERTY(int count READ barsetCount)
                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible)
                 QAbstractSeries::SeriesType type() const;
-                void setBarMargin(qreal margin);
+                void setBarWidth(qreal width);
-                qreal barMargin() const;
+                qreal barWidth() const;
                 bool append(QBarSet *set);
                 bool remove(QBarSet *set);

src/barchart/qbarseries_p.h +3 -3

                 int categoryCount() const;
                 QStringList categories() const;
-                void setBarMargin(qreal margin);
+                void setBarWidth(qreal width);
-                qreal barMargin() const;
+                qreal barWidth() const;
                 void setVisible(bool visible);
                 void setLabelsVisible(bool visible);
             protected:
                 QList<QBarSet *> m_barSets;
                 QStringList m_categories;
-                qreal m_barMargin;
+                qreal m_barWidth;
                 bool m_labelsVisible;
                 bool m_visible;

src/barchart/stackedbarchartitem.cpp +1 -1

                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
-                qreal barWidth = scaleX - scaleX * m_series->d_func()->barMargin();
+                qreal barWidth = scaleX * m_series->d_func()->barWidth();
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {

tests/auto/qbarseries/tst_qbarseries.cpp +11 -18

             //====================================================================================
             // barset 1, bar 0
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(95,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(102,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             //====================================================================================
             // barset 1, bar 1
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(164,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             //====================================================================================
             // barset 1, bar 2
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(234,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(271,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             //====================================================================================
             // barset 2, bar 0
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(127,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             //====================================================================================
             // barset 2, bar 1
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(185,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(212,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             //====================================================================================
             // barset 2, bar 2
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(254,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(296,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             void tst_QBarSeries::mousehovered()
             {
                 QBarSeries* series = new QBarSeries();
-                QStringList categories;
-                categories << "test1" << "test2" << "test3";
-            //    series->setCategories(categories);
                 QBarSet* set1 = new QBarSet(QString("set 1"));
-                *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10);
+                *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
             //=======================================================================
             // move mouse on top of set1
-                QTest::mouseMove(view.viewport(), QPoint(95,142));
+                QTest::mouseMove(view.viewport(), QPoint(102,142));
                 QVERIFY(seriesSpy.count() == 1);
             //=======================================================================
             // move mouse from top of set1 to top of set2
-                QTest::mouseMove(view.viewport(), QPoint(116,142));
+                QTest::mouseMove(view.viewport(), QPoint(127,142));
                 QVERIFY(seriesSpy.count() == 2);
             //=======================================================================
             // move mouse from top of set2 to background
-                QTest::mouseMove(view.viewport(), QPoint(116,0));
+                QTest::mouseMove(view.viewport(), QPoint(127,0));
                 QVERIFY(seriesSpy.count() == 1);
                 // should leave set2
             void tst_QBarSeries::clearWithAnimations()
             {
-                QSKIP("Known issue with the animation handling", SkipAll);
                 QBarSeries* series = new QBarSeries();
-                QStringList categories;
-                categories << "test1" << "test2" << "test3";
-            //    series->setCategories(categories);
                 QBarSet* set1 = new QBarSet(QString("set 1"));
-                *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10);
+                *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));

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