HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r296:8254aab7233d

enablers for tooltip and floating values, bug fixing, updated examples. tidying up the code

sauimone -

r296:8254aab7233d

parent child

Context file:

r296:8254aab7233d

Collapse all files

example/barchart/barchart.pro +2 -4

             TARGET = barchart
             SOURCES += main.cpp \
-                chartwidget.cpp \
+                chartwidget.cpp
-                custombarset.cpp
             HEADERS += \
-                chartwidget.h \
+                chartwidget.h
-                custombarset.h

example/barchart/main.cpp +8 -7

             #include <qbarset.h>
             #include <qbarcategory.h>
-            #include "custombarset.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
                 QBarChartSeries* series= new QBarChartSeries(category);
                 // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
-                CustomBarSet *set0 = new CustomBarSet("Bub");
+                QBarSet *set0 = new QBarSet("Bub");
-                CustomBarSet *set1 = new CustomBarSet("Bob");
+                QBarSet *set1 = new QBarSet("Bob");
-                CustomBarSet *set2 = new CustomBarSet("Guybrush");
+                QBarSet *set2 = new QBarSet("Guybrush");
-                CustomBarSet *set3 = new CustomBarSet("Larry");
+                QBarSet *set3 = new QBarSet("Larry");
-                CustomBarSet *set4 = new CustomBarSet("Zak");
+                QBarSet *set4 = new QBarSet("Zak");
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
                 series->addBarSet(set3);
                 series->addBarSet(set4);
+                series->enableToolTip(true);
+                series->enableFloatingValues(true);
                 QChartView* chartView =  new QChartView(&window);
                 chartView->addSeries(series);
                 chartView->setChartTitle("simple stacked barchart");

example/percentbarchart/main.cpp +9 -8

             #include <qpercentbarchartseries.h>
             #include <qbarcategory.h>
             #include <qchartview.h>
+            #include <qbarset.h>
-            #include "custombarset.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QPercentBarChartSeries* series = new QPercentBarChartSeries(category);
-                // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
+                QBarSet *set0 = new QBarSet("Bub");
-                CustomBarSet *set0 = new CustomBarSet("Bub");
+                QBarSet *set1 = new QBarSet("Bob");
-                CustomBarSet *set1 = new CustomBarSet("Bob");
+                QBarSet *set2 = new QBarSet("Guybrush");
-                CustomBarSet *set2 = new CustomBarSet("Guybrush");
+                QBarSet *set3 = new QBarSet("Larry");
-                CustomBarSet *set3 = new CustomBarSet("Larry");
+                QBarSet *set4 = new QBarSet("Zak");
-                CustomBarSet *set4 = new CustomBarSet("Zak");
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
                 series->addBarSet(set3);
                 series->addBarSet(set4);
+                series->enableToolTip(true);
+                series->enableFloatingValues(true);
                 QChartView* chartView =  new QChartView(&window);
                 chartView->addSeries(series);
                 chartView->setChartTitle("simple percent barchart");

example/percentbarchart/percentbarchart.pro +2 -4

             TARGET = percentbarchart
             SOURCES += main.cpp \
-                chartwidget.cpp \
+                chartwidget.cpp
-                custombarset.cpp
             HEADERS += \
-                chartwidget.h \
+                chartwidget.h
-                custombarset.h

example/stackedbarchart/main.cpp +8 -8

             #include <qbarset.h>
             #include <qbarcategory.h>
-            #include "custombarset.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
                 QStackedBarChartSeries* series = new QStackedBarChartSeries(category);
-                // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
+                QBarSet *set0 = new QBarSet("Bub");
-                CustomBarSet *set0 = new CustomBarSet("Bub");
+                QBarSet *set1 = new QBarSet("Bob");
-                CustomBarSet *set1 = new CustomBarSet("Bob");
+                QBarSet *set2 = new QBarSet("Guybrush");
-                CustomBarSet *set2 = new CustomBarSet("Guybrush");
+                QBarSet *set3 = new QBarSet("Larry");
-                CustomBarSet *set3 = new CustomBarSet("Larry");
+                QBarSet *set4 = new QBarSet("Zak");
-                CustomBarSet *set4 = new CustomBarSet("Zak");
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
                 series->addBarSet(set3);
                 series->addBarSet(set4);
+                series->enableToolTip(true);
+                series->enableFloatingValues(true);
                 QChartView* chartView =  new QChartView(&window);
                 chartView->addSeries(series);
                 chartView->setChartTitle("simple stacked barchart");

example/stackedbarchart/stackedbarchart.pro +2 -4

             }
             TARGET = stackedbarchart
             SOURCES += main.cpp \
-                chartwidget.cpp \
+                chartwidget.cpp
-                custombarset.cpp
             HEADERS += \
-                chartwidget.h \
+                chartwidget.h
-                custombarset.h

src/barchart/barpresenterbase.cpp +9 -22

                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
+                ,mSeparatorsEnabled(false)
                 ,mSeries(series)
             {
-                connect(series,SIGNAL(floatingValuesEnabled(bool)),this,SLOT(enableFloatingValues(bool)));
-                connect(series,SIGNAL(toolTipEnabled(bool)),this,SLOT(enableToolTip(bool)));
-                connect(series,SIGNAL(separatorsEnabled(bool)),this,SLOT(enableSeparators(bool)));
                 connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
+                connect(series,SIGNAL(separatorsEnabled(bool)),this,SLOT(enableSeparators(bool)));
                 dataChanged();
             }
             BarPresenterBase::~BarPresenterBase()
             {
-                disconnect(this,SLOT(enableFloatingValues(bool)));
-                disconnect(this,SLOT(enableToolTip(bool)));
-                disconnect(this,SLOT(enableSeparators(bool)));
                 disconnect(this,SLOT(showToolTip(QPoint,QString)));
                 delete mSeries;
             }
                         childItems().append(bar);
                         mBars.append(bar);
                         connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
-                        // TODO: should the event be passed to set or not?
                         connect(bar,SIGNAL(hoverEntered(QPoint)),set,SLOT(barHoverEntered(QPoint)));
                         connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaved()));
                     }
                 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);
                     childItems().append(sep);
                     mSeparators.append(sep);
                 }
                 setPos(rect.topLeft());
             }
-            void BarPresenterBase::enableFloatingValues(bool enabled)
+            void BarPresenterBase::showToolTip(QPoint pos, QString tip)
-                mFloatingValuesEnabled = enabled;
-            void BarPresenterBase::enableToolTip(bool enabled)
             {
-                mToolTipEnabled = enabled;
+                // TODO: cool tooltip instead of default
+                QToolTip::showText(pos,tip);
             }
             void BarPresenterBase::enableSeparators(bool enabled)
             {
-                mSeparatorsEnabled = enabled;
+                for (int i=0; i<mSeparators.count(); i++) {
+                    mSeparators.at(i)->setVisible(enabled);
-            void BarPresenterBase::showToolTip(QPoint pos, QString tip)
-                if (mToolTipEnabled) {
-                    // TODO: cool tooltip instead of default
-                    QToolTip::showText(pos,tip);
                 }
+                mSeparatorsEnabled = enabled;
             }
             #include "moc_barpresenterbase.cpp"

src/barchart/barpresenterbase.h +1 -5

                 void handleGeometryChanged(const QRectF& size);
                 // Internal slots
-                void enableFloatingValues(bool enabled=true);   // enables floating values on top of bars
-                void enableToolTip(bool enabled=true);          // enables tooltips
-                void enableSeparators(bool enabled=true);       // enables separators between categories
                 void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)
+                void enableSeparators(bool enabled);
             protected:
                 bool mLayoutSet;    // True, if component has been laid out.
                 bool mLayoutDirty;
-                bool mFloatingValuesEnabled;
-                bool mToolTipEnabled;
                 bool mSeparatorsEnabled;
                 // Owned

src/barchart/qbarchartseries.cpp +22 -10

             void QBarChartSeries::addBarSet(QBarSet *set)
             {
-                connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
-                connect(this,SIGNAL(separatorsEnabled(bool)),set,SLOT(enableSeparators(bool)));
-                connect(this,SIGNAL(toolTipEnabled(bool)),set,SLOT(enableToolTip(bool)));
-                connect(set,SIGNAL(showToolTip(QPoint,QString)),this,SIGNAL(showToolTip(QPoint,QString)));
                 mModel->addBarSet(set);
             }
             void QBarChartSeries::removeBarSet(QBarSet *set)
             {
-                disconnect(set,SLOT(enableFloatingValues(bool)));
-                disconnect(set,SLOT(enableSeparators(bool)));
-                disconnect(set,SLOT(enableToolTip(bool)));
                 mModel->removeBarSet(set);
             }
             void QBarChartSeries::enableFloatingValues(bool enabled)
             {
-                emit floatingValuesEnabled(enabled);
+                if (enabled) {
+                    for (int i=0; i<mModel->countSets(); i++) {
+                        QBarSet *set = mModel->setAt(i);
+                        connect(set,SIGNAL(clicked()),set,SIGNAL(toggleFloatingValues()));
+                    }
+                } else {
+                    for (int i=0; i<mModel->countSets(); i++) {
+                        QBarSet *set = mModel->setAt(i);
+                        disconnect(set,SIGNAL(clicked()),set,SIGNAL(toggleFloatingValues()));
+                    }
+                }
             }
             void QBarChartSeries::enableToolTip(bool enabled)
             {
-                emit toolTipEnabled(enabled);
+                if (enabled) {
+                    for (int i=0; i<mModel->countSets(); i++) {
+                        QBarSet *set = mModel->setAt(i);
+                        connect(set,SIGNAL(showToolTip(QPoint,QString)),this,SIGNAL(showToolTip(QPoint,QString)));
+                    }
+                } else {
+                    for (int i=0; i<mModel->countSets(); i++) {
+                        QBarSet *set = mModel->setAt(i);
+                        disconnect(set,SIGNAL(showToolTip(QPoint,QString)),this,SIGNAL(showToolTip(QPoint,QString)));
+                    }
+                }
             }
             void QBarChartSeries::enableSeparators(bool enabled)
                 return *mModel;
             }
             #include "moc_qbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarchartseries.h +11 -11

                 void addBarSet(QBarSet *set);               // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 int countSets();
-                QBarSet* nextSet(bool getFirst=false);     // Returns first set, if called with true
+                QBarSet* nextSet(bool getFirst=false);      // Returns first set, if called with true
                 QBarSet *setAt(int index);
                 QList<QString> legend();                    // Returns legend of series (ie. names of all sets in series)
                 QString label(int category);
-            public Q_SLOTS:
-                // Disabled by default. Call these to change behavior.
-                void enableFloatingValues(bool enabled=true);    // enables floating values on top of bars
-                void enableToolTip(bool enabled=true);           // enables tooltips
-                void enableSeparators(bool enabled=true);        // enables separators between categories
             public:
                 // TODO: Functions below this are not part of api and will be moved
-                // to private implementation, when we start using it (not part of api)
+                // to private implementation, when we start using it
+                // TODO: TO PIMPL --->
                 int countCategories();
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal percentageAt(int set, int category);
                 qreal categorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
+                // <--- TO PIMPL
             signals:
                 void changed(int index);
                 // TODO: internal signals, these to private implementation.
+                // TODO: TO PIMPL --->
                 void floatingValuesEnabled(bool enabled);
                 void toolTipEnabled(bool enabled);
                 void separatorsEnabled(bool enabled);
                 void showToolTip(QPoint pos, QString tip);
+                // <--- TO PIMPL
+            public Q_SLOTS:
+                void enableFloatingValues(bool enabled=true);    // enables floating values on top of bars
+                void enableToolTip(bool enabled=true);           // enables tooltips
+                void enableSeparators(bool enabled=true);        // enables separators between categories
             protected:
                 BarChartModel* mModel;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.cpp +1 -24

             QBarSet::QBarSet(QString name, QObject *parent)
                 : QObject(parent)
                 ,mName(name)
-                ,mToolTipEnabled(true)       // TODO: these 2 as false by default, when implementation is ready
-                ,mFloatingValuesEnabled(true)
             {
             }
                 return mBrush;
             }
-            void QBarSet::enableFloatingValues(bool enabled)
-                qDebug() << "QBarSet::enableFloatingValues";
-                mFloatingValuesEnabled = enabled;
-            void QBarSet::enableToolTip(bool enabled)
-                qDebug() << "QBarSet::enableToolTip";
-                mToolTipEnabled = enabled;
-            void QBarSet::enableSeparators(bool enabled)
-                qDebug() << "QBarSet::enableSeparators";
-                mSeparatorsEnabled = enabled;
             void QBarSet::barClicked()
             {
             //    qDebug() << "QBarset::barClicked" << this;
             void QBarSet::barHoverEntered(QPoint pos)
             {
-                if (mToolTipEnabled) {
+                emit showToolTip(pos, mName);
-                    emit showToolTip(pos, mName);
-                // Emit signal to user of charts
                 emit hoverEnter(pos);
             }

src/barchart/qbarset.h +10 -13

                 const QBrush& brush() const;
             Q_SIGNALS:
-                void clicked();                 // Clicked and hover signals exposed to user
+                void clicked();                         // Clicked and hover signals exposed to user
                 void hoverEnter(QPoint pos);
                 void hoverLeave();
-                void toggleFloatingValues();                // Private signal, TODO: move to private impl
-                void showToolTip(QPoint pos, QString tip);  // Private signal, TODO: move to private impl
-            public Q_SLOTS:
+                // TODO: Expose this to user or not?
-                void enableFloatingValues(bool enabled);    // enables floating values on top of bars
+                // TODO: TO PIMPL --->
-                void enableToolTip(bool enabled);           // enables tooltips
+                void toggleFloatingValues();
-                void enableSeparators(bool enabled);        // enables separators between categories
+                void showToolTip(QPoint pos, QString tip);  // Private signal
+                // <--- TO PIMPL
-                // TODO: these slots belong to private implementation.
+            public Q_SLOTS:
-                // These are for single bars to notify set about internal events
+                // These are for internal communication
+                // TODO: TO PIMPL --->
                 void barClicked();
                 void barHoverEntered(QPoint pos);
                 void barHoverLeaved();
+                // <--- TO PIMPL
             private:
                 QPen mPen;
                 QBrush mBrush;
-                // TODO: to pimpl
-                bool mFloatingValuesEnabled;
-                bool mToolTipEnabled;
-                bool mSeparatorsEnabled;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/separator.cpp +5 -4

             void Separator::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                // TODO: real pen
+                if (isVisible()) {
-                QPen pen(mColor);
+                    QPen pen(mColor);
-                painter->setPen(pen);
+                    painter->setPen(pen);
-                painter->drawLine(mXpos,mYpos,mXpos,mHeight);
+                    painter->drawLine(mXpos,mYpos,mXpos,mHeight);
+                }
             }
             QRectF Separator::boundingRect() const

test/chartwidgettest/mainwidget.cpp +3 0

                         }
                         series->addBarSet(set);
                     }
+                    series->enableFloatingValues();
+                    series->enableToolTip();
+                    series->enableSeparators(false);
                     m_chartWidget->addSeries(series);
                     setCurrentSeries(series);
                 }

example/barchart/custombarset.cpp removed 0 -8

NO CONTENT: file was removed

example/barchart/custombarset.h removed 0 -20

NO CONTENT: file was removed

example/percentbarchart/custombarset.cpp removed 0 -8

NO CONTENT: file was removed

example/percentbarchart/custombarset.h removed 0 -20

NO CONTENT: file was removed

example/stackedbarchart/custombarset.cpp removed 0 -8

NO CONTENT: file was removed

example/stackedbarchart/custombarset.h removed 0 -20

NO CONTENT: file was removed

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