HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r505:ffc461f7ce12

barchart separators fixed, layout fixed

sauimone -

r505:ffc461f7ce12

parent child

Context file:

r505:ffc461f7ce12

Collapse all files

examples/barchart/main.cpp +2 -3

                 //! [4]
                 // Enable tooltip
                 series->setToolTipEnabled();
+                series->setSeparatorsVisible(true);
                 // Connect clicked signal of set to toggle floating values of set.
-                // Note that we leave QBarset "Zak" unconnected here, so clicking on it doesn't toggle values.
                 QObject::connect(set0,SIGNAL(clicked(QString)),set0,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set1,SIGNAL(clicked(QString)),set1,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set2,SIGNAL(clicked(QString)),set2,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set3,SIGNAL(clicked(QString)),set3,SIGNAL(toggleFloatingValues()));
+                QObject::connect(set4,SIGNAL(clicked(QString)),set4,SIGNAL(toggleFloatingValues()));
                 //! [4]
                 //! [5]
                 //! [5]
                 //! [6]
-                chartView->axisX()->setAxisVisible(false);
                 chartView->axisX()->setGridVisible(false);
-                chartView->axisX()->setLabelsVisible(false);
                 //! [6]
                 window.setCentralWidget(chartView);

examples/stackedbarchart/main.cpp +1 -3

                 series->setToolTipEnabled();
                 // Connect clicked signal of set to toggle floating values of set.
-                // Note that we leave QBarset "Zak" unconnected here, so clicking on it doesn't toggle values.
                 QObject::connect(set0,SIGNAL(clicked(QString)),set0,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set1,SIGNAL(clicked(QString)),set1,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set2,SIGNAL(clicked(QString)),set2,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set3,SIGNAL(clicked(QString)),set3,SIGNAL(toggleFloatingValues()));
+                QObject::connect(set4,SIGNAL(clicked(QString)),set4,SIGNAL(toggleFloatingValues()));
                 //! [4]
                 //! [5]
                 //! [5]
                 //! [6]
-                chartView->axisX()->setAxisVisible(false);
                 chartView->axisX()->setGridVisible(false);
-                chartView->axisX()->setLabelsVisible(false);
                 //! [6]
                 window.setCentralWidget(chartView);

src/barchart/barpresenter.cpp +14 -4

             #include "barpresenter_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
+            #include "separator_p.h"
             #include "qbarset.h"
             #include <QDebug>
                 qreal tM = mSeries->max();
                 qreal scale = (tH/tM);
                 qreal tC = categoryCount + 1;
-                mBarWidth = tW / ((categoryCount * setCount) + tC);
+                qreal categoryWidth = tW/tC;
-                qreal xStepPerCategory = (tW/tC) + mBarWidth;
+                mBarWidth = categoryWidth / (setCount+1);
                 int itemIndex(0);
                 for (int category=0; category < categoryCount; category++) {
-                    qreal xPos = xStepPerCategory * category;
+                    qreal xPos = categoryWidth * category + categoryWidth /2;
                     qreal yPos = mHeight;
                     for (int set = 0; set < setCount; set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                     }
                 }
+                // Position separators
+                qreal xPos = categoryWidth + categoryWidth/2 - mBarWidth /2;
+                for (int s=0; s < mSeparators.count(); s++) {
+                    Separator* sep = mSeparators.at(s);
+                    sep->setPos(xPos,0);
+                    sep->setSize(QSizeF(1,mHeight));
+                    xPos += categoryWidth;
+                }
                 // Position floating values
                 itemIndex = 0;
                 for (int category=0; category < mSeries->categoryCount(); category++) {
-                    qreal xPos = xStepPerCategory * category + mBarWidth/2;
+                    qreal xPos = categoryWidth * category + categoryWidth/2 + mBarWidth/2;
                     qreal yPos = mHeight;
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;

src/barchart/barpresenterbase.cpp +4 -3

             BarPresenterBase::BarPresenterBase(QBarSeries *series, QChart *parent)
                 : ChartItem(parent)
                 ,mLayoutSet(false)
-                ,mSeparatorsEnabled(false)
                 ,mSeries(series)
                 ,mChart(parent)
             {
                 connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
+                connect(series,SIGNAL(enableSeparators(bool)),this,SLOT(enableSeparators(bool)));
+                enableSeparators(series->separatorsVisible());
                 initAxisLabels();
                 dataChanged();
             }
             BarPresenterBase::~BarPresenterBase()
             {
                 disconnect(this,SLOT(showToolTip(QPoint,QString)));
+                disconnect(this,SLOT(enableSeparators(bool)));
             }
             void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
                 for (int i=0; i<count; i++) {
                     Separator* sep = new Separator(this);
                     sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
-                    sep->setVisible(mSeparatorsEnabled);
+                    sep->setVisible(mSeries->separatorsVisible());
                     childItems().append(sep);
                     mSeparators.append(sep);
                 }
                 for (int i=0; i<mSeparators.count(); i++) {
                     mSeparators.at(i)->setVisible(enabled);
                 }
-                mSeparatorsEnabled = enabled;
             }
             #include "moc_barpresenterbase_p.cpp"

src/barchart/barpresenterbase_p.h 0 -1

                 qreal mBarWidth;
                 bool mLayoutSet;    // True, if component has been laid out.
-                bool mSeparatorsEnabled;
                 // Not owned.
                 QBarSeries* mSeries;

src/barchart/qbarseries.cpp +8 -3

                 Separators are visual elements that are drawn between categories.
                 Calling without parameter \a enabled, enables the separators
             */
-            void QBarSeries::setSeparatorsEnabled(bool enabled)
+            void QBarSeries::setSeparatorsVisible(bool visible)
             {
-                // TODO: toggle
+                mSeparatorsVisible = visible;
-            //    emit separatorsEnabled(enabled);
+                emit enableSeparators(visible);
             }
                 return *mModel;
             }
+            bool QBarSeries::separatorsVisible()
+            {
+                return mSeparatorsVisible;
+            }
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +4 -1

                 qreal categorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
+                bool separatorsVisible();
                 // <--- TO PIMPL
             signals:
                 // TODO: internal signals, these to private implementation.
                 // TODO: TO PIMPL --->
+                void enableSeparators(bool enable);
                 void showToolTip(QPoint pos, QString tip);
                 // <--- TO PIMPL
             public Q_SLOTS:
                 void setToolTipEnabled(bool enabled=true);           // enables tooltips
-                void setSeparatorsEnabled(bool enabled=true);        // enables separators between categories
+                void setSeparatorsVisible(bool visible=true);        // enables separators between categories
                 // TODO: TO PIMPL --->
                 void barsetClicked(QString category);
             protected:
                 BarChartModel* mModel;
+                bool mSeparatorsVisible;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

test/chartwidgettest/mainwidget.cpp +1 -1

                     // TODO: new implementation of setFloatingValuesEnabled with signals
                     //series->setFloatingValuesEnabled(true);
                     series->setToolTipEnabled(true);
-                    series->setSeparatorsEnabled(false);
+                    series->setSeparatorsVisible(false);
                     m_chartView->addSeries(series);
                     setCurrentSeries(series);
                 } else if (seriesName == "Spline") {

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