HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r357:82b904eaae07

review fix: Removed iterator from barseries. Remove const from brush and pen. Renamed setters for tooltip, floating values and separators

sauimone -

r357:82b904eaae07

parent child

Context file:

r357:82b904eaae07

Collapse all files

example/barchart/main.cpp +1 -1

                 //! [4]
                 // Enable some features
-                series->enableToolTip();
+                series->setToolTipEnabled();
                 series->enableFloatingValues();
                 //! [4]

example/percentbarchart/main.cpp +1 -1

                 //! [4]
                 // Enable features
-                series->enableToolTip();
+                series->setToolTipEnabled();
                 series->enableFloatingValues();
                 //! [4]

example/stackedbarchart/main.cpp +1 -1

                 //! [4]
                 // Enable features
-                series->enableToolTip();
+                series->setToolTipEnabled();
                 series->enableFloatingValues();
                 //! [4]

src/barchart/barchartmodel.cpp +4 -14

                 }
             }
-            QBarSet* BarChartModel::nextSet(bool getFirst)
+            QBarSet* BarChartModel::setAt(int index)
             {
-                if (getFirst) {
+                return mDataModel.at(index);
-                    mCurrentSet = 0;
-                if ((mDataModel.count() <= 0) || (mDataModel.count() <= mCurrentSet)) {
-                    return 0;
-                QBarSet* set = mDataModel.at(mCurrentSet);
-                mCurrentSet++;
-                return set;
             }
-            QBarSet* BarChartModel::setAt(int index)
+            QList<QBarSet*> BarChartModel::barSets()
             {
-                return mDataModel.at(index);
+                return mDataModel;
             }
             QList<QString> BarChartModel::legend()

src/barchart/barchartmodel_p.h +2 -1

                 QBarCategory& category();
                 void addBarSet(QBarSet *set);
                 void removeBarSet(QBarSet *set);
-                QBarSet* nextSet(bool getFirst);
                 QBarSet *setAt(int index);
+                QList<QBarSet*> barSets();
                 QList<QString> legend();
                 int countSets();            // Number of sets in model

src/barchart/barpresenter.cpp +1 -1

                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mSeries->setAt(set)->brush());
+                        bar->setBrush(mSeries->barsetAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;

src/barchart/barpresenterbase.cpp +2 -2

                 // Create new graphic items for bars
                 for (int c=0; c<mSeries->countCategories(); c++) {
                     for (int s=0; s<mSeries->countSets(); s++) {
-                        QBarSet *set = mSeries->setAt(s);
+                        QBarSet *set = mSeries->barsetAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
                 // Create floating values
                 for (int category=0; category<mSeries->countCategories(); category++) {
                     for (int s=0; s<mSeries->countSets(); s++) {
-                        QBarSet *set = mSeries->setAt(s);
+                        QBarSet *set = mSeries->barsetAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
                         mFloatingValues.append(value);

src/barchart/percentbarpresenter.cpp +1 -1

                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mSeries->setAt(set)->brush());
+                        bar->setBrush(mSeries->barsetAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;

src/barchart/qbarseries.cpp +8 -28

                 \mainclass
-                Example on how to create category:
-                \snippet ../example/barchart/main.cpp 1
-                Example on how to create sets of data:
-                \snippet ../example/barchart/main.cpp 2
-                Example on how to add sets to bar chart:
-                \snippet ../example/barchart/main.cpp 3
-                Example on how to enable tooltip and floating values:
-                \snippet ../example/barchart/main.cpp 4
-                Example on how to create view and apply theme:
-                \snippet ../example/barchart/main.cpp 5
                 \sa QBarCategory, QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             }
             /*!
-                Simple iterator for set. Returns pointer to next set in series.
+                Returns a list of sets in series. Keeps ownership of sets.
-                Returns first set, if parameter \a getFirst is true.
-                If series is empty, returns 0.
-                Returns 0 after last set.
              */
-            QBarSet* QBarSeries::nextSet(bool getFirst)
+            QList<QBarSet*> QBarSeries::barSets()
             {
-                return mModel->nextSet(getFirst);
+                return mModel->barSets();
             }
             /*!
-                Returns set indexed by \a index. Doesn't check for index bounds.
+                \internal \a index
-                Assumes that \a index is between 0 and number of sets. Use countSets() to get valid index bound.
-                \sa countSets()
             */
-            QBarSet* QBarSeries::setAt(int index)
+            QBarSet* QBarSeries::barsetAt(int index)
             {
                 return mModel->setAt(index);
             }
                 Floating values are bar values, that are displayed on top of each bar.
                 Calling without parameter \a enabled, enables the floating values
             */
-            void QBarSeries::enableFloatingValues(bool enabled)
+            void QBarSeries::setFloatingValuesEnabled(bool enabled)
             {
                 if (enabled) {
                     for (int i=0; i<mModel->countSets(); i++) {
                 Tooltip shows the name of set, when mouse is hovering on top of bar.
                 Calling without parameter \a enabled, enables the tooltip
             */
-            void QBarSeries::enableToolTip(bool enabled)
+            void QBarSeries::setToolTipEnabled(bool enabled)
             {
                 if (enabled) {
                     for (int i=0; i<mModel->countSets(); i++) {
                 Separators are visual elements that are drawn between categories.
                 Calling without parameter \a enabled, enables the separators
             */
-            void QBarSeries::enableSeparators(bool enabled)
+            void QBarSeries::setSeparatorsEnabled(bool enabled)
             {
                 emit separatorsEnabled(enabled);
             }

src/barchart/qbarseries.h +5 -5

                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 int countSets();
                 int countCategories();
-                QBarSet* nextSet(bool getFirst=false);      // Returns first set, if called with true
+                QList<QBarSet*> barSets();
-                QBarSet *setAt(int index);
                 QList<QString> legend();                    // Returns legend of series (ie. names of all sets in series)
                 // TODO: Functions below this are not part of api and will be moved
                 // to private implementation, when we start using it
                 // TODO: TO PIMPL --->
+                QBarSet *barsetAt(int index);
                 QString label(int category);
                 qreal min();
                 qreal max();
                 // <--- TO PIMPL
             public Q_SLOTS:
-                void enableFloatingValues(bool enabled=true);    // enables floating values on top of bars
+                void setFloatingValuesEnabled(bool enabled=true);    // enables floating values on top of bars
-                void enableToolTip(bool enabled=true);           // enables tooltips
+                void setToolTipEnabled(bool enabled=true);           // enables tooltips
-                void enableSeparators(bool enabled=true);        // enables separators between categories
+                void setSeparatorsEnabled(bool enabled=true);        // enables separators between categories
             protected:
                 BarChartModel* mModel;

src/barchart/qbarset.cpp +4 -4

             /*!
                 Sets pen for set. Bars of this set are drawn using \a pen
             */
-            void QBarSet::setPen(const QPen& pen)
+            void QBarSet::setPen(QPen pen)
             {
                 mPen = pen;
             }
             /*!
                 Returns pen of the set.
             */
-            const QPen& QBarSet::pen() const
+            QPen QBarSet::pen()
             {
                 return mPen;
             }
             /*!
                 Sets brush for the set. Bars of this set are drawn using \a brush
             */
-            void QBarSet::setBrush(const QBrush& brush)
+            void QBarSet::setBrush(QBrush brush)
             {
                 mBrush = brush;
             }
             /*!
                 Returns brush of the set.
             */
-            const QBrush& QBarSet::brush() const
+            QBrush QBarSet::brush()
             {
                 return mBrush;
             }

src/barchart/qbarset.h +4 -4

                 qreal valueAt(int index);                   // for modifying individual values
                 void setValue(int index, qreal value);      // setter for individual value
-                void setPen(const QPen& pen);
+                void setPen(QPen pen);
-                const QPen& pen() const;
+                QPen pen();
-                void setBrush(const QBrush& brush);
+                void setBrush(QBrush brush);
-                const QBrush& brush() const;
+                QBrush brush();
             Q_SIGNALS:
                 void clicked();                         // Clicked and hover signals exposed to user

src/barchart/stackedbarpresenter.cpp +1 -1

                         Bar* bar = mBars.at(itemIndex);
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mSeries->setAt(set)->brush());
+                        bar->setBrush(mSeries->barsetAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;

src/charttheme.cpp +6 -3

             void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int count)
             {
+                QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->countSets(); i++) {
-                    series->nextSet(0==i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
+                    sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
             void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count)
             {
+                QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->countSets(); i++) {
-                    series->nextSet(0==i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
+                    sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
             void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count)
             {
+                QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->countSets(); i++) {
-                    series->nextSet(0==i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
+                    sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }

test/chartwidgettest/mainwidget.cpp +1 -1

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

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