HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r280:9b4c1980ee18

barcharts: added legend to model. added signals for hover events (for tooltip). updated examples

sauimone -

r280:9b4c1980ee18

parent child

Context file:

r280:9b4c1980ee18

Expand all files

example/barchart/custombarset.cpp +2 -2

             #include "custombarset.h"
-            CustomBarSet::CustomBarSet(QObject *parent) :
+            CustomBarSet::CustomBarSet(QString name, QObject *parent) :
-                QBarSet(parent)
+                QBarSet(name, parent)
             {
                 // Using signal to signal connection here.
                 connect(this,SIGNAL(clicked()),this,SIGNAL(toggleFloatingValues()));

example/barchart/custombarset.h +1 -1

             {
                 Q_OBJECT
             public:
-                explicit CustomBarSet(QObject *parent = 0);
+                explicit CustomBarSet(QString name, QObject *parent = 0);
             signals:

example/barchart/main.cpp +5 -5

                 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;
+                CustomBarSet *set0 = new CustomBarSet("Bub");
-                CustomBarSet *set1 = new CustomBarSet;
+                CustomBarSet *set1 = new CustomBarSet("Bob");
-                CustomBarSet *set2 = new CustomBarSet;
+                CustomBarSet *set2 = new CustomBarSet("Guybrush");
-                CustomBarSet *set3 = new CustomBarSet;
+                CustomBarSet *set3 = new CustomBarSet("Larry");
-                CustomBarSet *set4 = new CustomBarSet;
+                CustomBarSet *set4 = new CustomBarSet("Zak");
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;

example/percentbarchart/custombarset.cpp +2 -2

             #include "custombarset.h"
-            CustomBarSet::CustomBarSet(QObject *parent) :
+            CustomBarSet::CustomBarSet(QString name, QObject *parent) :
-                QBarSet(parent)
+                QBarSet(name, parent)
             {
                 // Using signal to signal connection here.
                 connect(this,SIGNAL(clicked()),this,SIGNAL(toggleFloatingValues()));

example/percentbarchart/custombarset.h +1 -1

             {
                 Q_OBJECT
             public:
-                explicit CustomBarSet(QObject *parent = 0);
+                explicit CustomBarSet(QString name, QObject *parent = 0);
             signals:

example/percentbarchart/main.cpp +5 -6

             #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
-                CustomBarSet *set0 = new CustomBarSet;
+                CustomBarSet *set0 = new CustomBarSet("Bub");
-                CustomBarSet *set1 = new CustomBarSet;
+                CustomBarSet *set1 = new CustomBarSet("Bob");
-                CustomBarSet *set2 = new CustomBarSet;
+                CustomBarSet *set2 = new CustomBarSet("Guybrush");
-                CustomBarSet *set3 = new CustomBarSet;
+                CustomBarSet *set3 = new CustomBarSet("Larry");
-                CustomBarSet *set4 = new CustomBarSet;
+                CustomBarSet *set4 = new CustomBarSet("Zak");
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;

example/stackedbarchart/custombarset.cpp +2 -2

             #include "custombarset.h"
-            CustomBarSet::CustomBarSet(QObject *parent) :
+            CustomBarSet::CustomBarSet(QString name, QObject *parent) :
-                QBarSet(parent)
+                QBarSet(name, parent)
             {
                 // Using signal to signal connection here.
                 connect(this,SIGNAL(clicked()),this,SIGNAL(toggleFloatingValues()));

example/stackedbarchart/custombarset.h +1 -1

             {
                 Q_OBJECT
             public:
-                explicit CustomBarSet(QObject *parent = 0);
+                explicit CustomBarSet(QString name, QObject *parent = 0);
             signals:

example/stackedbarchart/main.cpp +5 -5

                 QStackedBarChartSeries* series = new QStackedBarChartSeries(category);
                 // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
-                CustomBarSet *set0 = new CustomBarSet;
+                CustomBarSet *set0 = new CustomBarSet("Bub");
-                CustomBarSet *set1 = new CustomBarSet;
+                CustomBarSet *set1 = new CustomBarSet("Bob");
-                CustomBarSet *set2 = new CustomBarSet;
+                CustomBarSet *set2 = new CustomBarSet("Guybrush");
-                CustomBarSet *set3 = new CustomBarSet;
+                CustomBarSet *set3 = new CustomBarSet("Larry");
-                CustomBarSet *set4 = new CustomBarSet;
+                CustomBarSet *set4 = new CustomBarSet("Zak");
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;

src/barchart/bar.cpp +5 -9

                 : QGraphicsObject(parent)
             {
                 setAcceptedMouseButtons(Qt::LeftButton);
+                setAcceptHoverEvents(true);
             }
             void Bar::setSize(const QSizeF& size)
                 mHeight = h;
             }
-            void Bar::setColor( QColor col )
-                mColor = col;
             void Bar::setPos(qreal x, qreal y)
             {
                 mXpos = x;
                 emit clicked();
             }
-            void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
+            void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
             {
-                emit hoverEntered();
+                emit hoverEntered(event);
             }
-            void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
+            void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
             {
-                emit hoverLeaved();
+                emit hoverLeaved(event);
             }
             #include "moc_bar_p.cpp"

src/barchart/bar_p.h +4 -5

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            // Single bar item of chart
+            // Single visual bar item of chart
             class Bar : public QGraphicsObject
             {
                 Q_OBJECT
                 void setSize(const QSizeF &size);
                 // Layout Stuff
-                void resize(qreal w, qreal h);   // Size of bar.
+                void resize(qreal w, qreal h);
                 void setPos(qreal x, qreal y);
                 void setPen(QPen pen);
                 void setBrush(QBrush brush);
-                void setColor( QColor col);     // deprecated
             public:
                 // From QGraphicsItem
             Q_SIGNALS:
                 void clicked();
-                void hoverEntered();
+                void hoverEntered(QGraphicsSceneHoverEvent *event);
-                void hoverLeaved();
+                void hoverLeaved(QGraphicsSceneHoverEvent *event);
             private:

src/barchart/barchartmodel.cpp +10 0

@@ -56,6 +56,16 QBarSet* BarChartModel::setAt(int index)
56	return mDataModel.at(index);	56	return mDataModel.at(index);
57	}	57	}
58		58
		59	QList<QString> BarChartModel::legend()
		60	{
		61	QList<QString> legend;
		62
		63	for (int i=0; i<mDataModel.count(); i++) {
		64	legend.append(mDataModel.at(i)->name());
		65	}
		66	return legend;
		67	}
		68
59	int BarChartModel::countSets()	69	int BarChartModel::countSets()
60	{	70	{
61	return mDataModel.count();	71	return mDataModel.count();

src/barchart/barchartmodel_p.h +1 0

                 void removeBarSet(QBarSet *set);
                 QBarSet* nextSet(bool getFirst);
                 QBarSet *setAt(int index);
+                QList<QString> legend();
                 int countSets();            // Number of sets in model
                 int countCategories();      // Number of categories

src/barchart/barpresenterbase.cpp +14 -2

                         childItems().append(bar);
                         mBars.append(bar);
                         connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
-                        connect(bar,SIGNAL(hoverEntered()),set,SLOT(barHoverEntered()));
+                        // TODO: should the event be passed to set or not?
-                        connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaved()));
+                        //connect(bar,SIGNAL(hoverEntered(QGraphicsSceneHoverEvent* event)),set,SLOT(barHoverEntered(QGraphicsSceneHoverEvent* event)));
+                        //connect(bar,SIGNAL(hoverLeaved(QGraphicsSceneHoverEvent* event)),set,SLOT(barHoverLeaved(QGraphicsSceneHoverEvent *event)));
                     }
                 }
                 setPos(rect.topLeft());
             }
+            void BarPresenterBase::barHoverEntered(QGraphicsSceneHoverEvent *event)
+            {
+                //TODO: show tooltip (name of series, where bar belongs...)
+            }
+            void BarPresenterBase::barHoverLeaved(QGraphicsSceneHoverEvent *event)
+            {
+                //TODO: hide tooltip (name of series, where bar belongs...)
+            }
             #include "moc_barpresenterbase.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barpresenterbase.h +3 0

                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& size);
+                void barHoverEntered(QGraphicsSceneHoverEvent *event);  // Internal.
+                void barHoverLeaved(QGraphicsSceneHoverEvent *event);
             protected:
                 // TODO: consider these.

src/barchart/barvalue.cpp +2 0

                 mYpos = y;
             }
+            /*
             bool BarValue::belongsToSet(QBarSet *set)
             {
                 return (&mBarSet == set);
             }
+            */
             void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {

src/barchart/barvalue_p.h +2 -1

                 void resize(qreal w, qreal h);
                 void setPos(qreal x, qreal y);
-                bool belongsToSet(QBarSet *set);
+                // Propably not needed.
+            //    bool belongsToSet(QBarSet *set);
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);

src/barchart/percentbarpresenter.cpp +4 -1

                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
+                        value->resize(100,50);
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
                         if (mModel.valueAt(set,category) != 0) {
-                            QString vString(QString::number(mModel.percentageAt(set,category) * 100));
+                            int p = mModel.percentageAt(set,category) * 100;
+                            QString vString(QString::number(p));
+                            vString.truncate(3);
                             vString.append("%");
                             value->setValueString(vString);
                         } else {

src/barchart/qbarchartseries.cpp +19 0

             void QBarChartSeries::addBarSet(QBarSet *set)
             {
+            //    connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
+            //    connect(this,SIGNAL(hoverNamesEnabled(bool)),set,SLOT(enableHoverNames(bool)));
                 mModel->addBarSet(set);
             }
             void QBarChartSeries::removeBarSet(QBarSet *set)
             {
+            //    disconnect(set,SLOT(enableFloatingValues(bool)));
+            //    disconnect(set,SLOT(enableHoverNames(bool)));
                 mModel->removeBarSet(set);
             }
                 return mModel->nextSet(getFirst);
             }
+            QList<QString> QBarChartSeries::legend()
+            {
+                return mModel->legend();
+            }
+            void QBarChartSeries::enableFloatingValues(bool enabled)
+            {
+                emit floatingValuesEnabled(enabled);
+            }
+            void QBarChartSeries::enableHoverNames(bool enabled)
+            {
+                emit hoverNamesEnabled(enabled);
+            }
             int QBarChartSeries::countCategories()
             {
                 return mModel->countCategories();

src/barchart/qbarchartseries.h +15 -5

             class BarChartModel;
             // Container for series
+            // TODO: derive Stacked and percent bar charts from this?
             class QTCOMMERCIALCHART_EXPORT QBarChartSeries : public QChartSeries
             {
                 Q_OBJECT
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
-                void addBarSet(QBarSet *set);       // Takes ownership of set
+                void addBarSet(QBarSet *set);               // Takes ownership of set
-                void removeBarSet(QBarSet *set);    // Removes set, releases ownership.
+                void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool getFirst=false);     // Returns first set, if called with true
-                //TODO:
+                QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
-                //QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
+                // Disabled by default. Call these to change behavior.
+                void enableFloatingValues(bool enabled=true);
+                void enableHoverNames(bool enabled=true);
                 // 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)
             signals:
                 void changed(int index);
-            public Q_SLOTS:
+                // TODO: these to private implementation.
+                void floatingValuesEnabled(bool enabled);
+                void hoverNamesEnabled(bool enabled);
+            //public Q_SLOTS:
             private:
                 BarChartModel* mModel;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.cpp +19 -6

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QBarSet::QBarSet(QObject *parent)
+            QBarSet::QBarSet(QString name, QObject *parent)
                 : QObject(parent)
+                ,mName(name)
+                ,mHoverNamesEnabled(true)       // TODO: these 2 as false by default, when implementation is ready
+                ,mFloatingValuesEnabled(true)
             {
-                mFloatingValuesVisible = false;
             }
             void QBarSet::setName(QString name)
                 return mBrush;
             }
-            bool QBarSet::isFloatingValuesVisible()
+            void QBarSet::enableFloatingValues(bool enabled)
             {
-                return mFloatingValuesVisible;
+                qDebug() << "QBarSet::enableFloatingValues" << enabled;
+                mFloatingValuesEnabled = enabled;
+            }
+            void QBarSet::enableHoverNames(bool enabled)
+            {
+                qDebug() << "QBarSet::enableHoverNames" << enabled;
+                mHoverNamesEnabled = enabled;
             }
             void QBarSet::barClicked()
             void QBarSet::barHoverEntered()
             {
                 qDebug() << "QBarset::barHoverEntered" << this;
-                emit hoverEnter();
+                if (mHoverNamesEnabled) {
+                    emit hoverEnter();
+                }
             }
             void QBarSet::barHoverLeaved()
             {
                 qDebug() << "QBarset::barHoverLeaved" << this;
-                emit hoverLeave();
+                if (mHoverNamesEnabled) {
+                    emit hoverLeave();
+                }
             }
             #include "moc_qbarset.cpp"

src/barchart/qbarset.h +12 -7

             {
                 Q_OBJECT
             public:
-                QBarSet(QObject *parent = 0);
+                QBarSet(QString name, QObject *parent = 0);
                 void setName(QString name);
                 QString name();
                 int count();                                // count of values in set
                 qreal valueAt(int index);                   // for modifying individual values
-                void setValue(int index, qreal value);      //
+                void setValue(int index, qreal value);      // setter for individual value
                 void setPen(const QPen& pen);
                 const QPen& pen() const;
                 void setBrush(const QBrush& brush);
                 const QBrush& brush() const;
-                bool isFloatingValuesVisible();
             Q_SIGNALS:
-                void clicked();
+                void clicked();                 // Clicked and hover signals exposed to user
                 void hoverEnter();
                 void hoverLeave();
-                void toggleFloatingValues();
+                void toggleFloatingValues();    // Private signal, TODO: move to private impl
             public Q_SLOTS:
+                void enableFloatingValues(bool enabled);    // enables floating values on top of bars
+                void enableHoverNames(bool enabled);        // enableHoverEvents would be better name?
+                // TODO: these slots belong to private implementation.
+                // These are for single bars to notify set about internal events
                 void barClicked();
                 void barHoverEntered();
                 void barHoverLeaved();
                 QPen mPen;
                 QBrush mBrush;
-                bool mFloatingValuesVisible;
+                // TODO: to pimpl
+                bool mFloatingValuesEnabled;
+                bool mHoverNamesEnabled;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarchartseries.cpp +9 0

             void QPercentBarChartSeries::addBarSet(QBarSet *set)
             {
+                connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
+                connect(this,SIGNAL(hoverNamesEnabled(bool)),set,SLOT(enableHoverNames(bool)));
                 mModel->addBarSet(set);
             }
             void QPercentBarChartSeries::removeBarSet(QBarSet *set)
             {
+                disconnect(set,SLOT(enableFloatingValues(bool)));
+                disconnect(set,SLOT(enableHoverNames(bool)));
                 mModel->removeBarSet(set);
             }
                 return mModel->nextSet(getFirst);
             }
+            QList<QString> QPercentBarChartSeries::legend()
+            {
+                return mModel->legend();
+            }
             int QPercentBarChartSeries::countCategories()
             {
                 return mModel->countCategories();

src/barchart/qpercentbarchartseries.h +6 -3

                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
                 void addBarSet(QBarSet *set);       // Takes ownership
-                void removeBarSet(QBarSet *set);    // Also deletes the set, if set is owned.
+                void removeBarSet(QBarSet *set);    // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool first=false);     // Returns first set, if called with true
-                //TODO:
+                QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
-                //QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
+                // Disabled by default. Call these to change behavior.
+                void enableFloatingValues(bool enabled=true);
+                void enableHoverNames(bool enabled=true);
                 // 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)

src/barchart/qstackedbarchartseries.cpp +9 0

             void QStackedBarChartSeries::addBarSet(QBarSet *set)
             {
+                connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
+                connect(this,SIGNAL(hoverNamesEnabled(bool)),set,SLOT(enableHoverNames(bool)));
                 mModel->addBarSet(set);
             }
             void QStackedBarChartSeries::removeBarSet(QBarSet *set)
             {
+                disconnect(set,SLOT(enableFloatingValues(bool)));
+                disconnect(set,SLOT(enableHoverNames(bool)));
                 mModel->removeBarSet(set);
             }
                 return mModel->nextSet(getFirst);
             }
+            QList<QString> QStackedBarChartSeries::legend()
+            {
+                return mModel->legend();
+            }
             int QStackedBarChartSeries::countCategories()
             {
                 return mModel->countCategories();

src/barchart/qstackedbarchartseries.h +6 -2

                 // Set handling
                 void addBarSet(QBarSet *set);       // Takes ownership
-                void removeBarSet(QBarSet *set);    // Also deletes the set, if set is owned.
+                void removeBarSet(QBarSet *set);    // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool first=false);     // Returns first set, if called with true
-                //QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
+                QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
+                // Disabled by default. Call these to change behavior.
+                void enableFloatingValues(bool enabled=true);
+                void enableHoverNames(bool enabled=true);
                 // 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)

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