HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r366:8a2edd028805

review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()

sauimone -

r366:8a2edd028805

parent child

Context file:

r366:8a2edd028805

Collapse all files

src/barchart/barpresenter.cpp +5 -5

             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mSeries->countSets() <= 0) {
+                if (mSeries->barsetCount() <= 0) {
                     qDebug() << "No sets in model!";
                     return;
                 }
                 // TODO: better way to auto-layout?
                 // Use reals for accurancy (we might get some compiler warnings... :)
-                int categoryCount = mSeries->countCategories();
+                int categoryCount = mSeries->categoryCount();
-                int setCount = mSeries->countSets();
+                int setCount = mSeries->barsetCount();
                 qreal tW = mWidth;
                 qreal tH = mHeight;
                 // Position floating values
                 itemIndex = 0;
-                for (int category=0; category < mSeries->countCategories(); category++) {
+                for (int category=0; category < mSeries->categoryCount(); category++) {
                     qreal xPos = xStepPerSet * category + ((tW + mBarDefaultWidth*setCount)/(categoryCount*2));
                     qreal yPos = mHeight;
-                    for (int set=0; set < mSeries->countSets(); set++) {
+                    for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);

src/barchart/barpresenterbase.cpp +6 -6

                 mFloatingValues.clear();
                 // Create new graphic items for bars
-                for (int c=0; c<mSeries->countCategories(); c++) {
+                for (int c=0; c<mSeries->categoryCount(); c++) {
-                    for (int s=0; s<mSeries->countSets(); s++) {
+                    for (int s=0; s<mSeries->barsetCount(); s++) {
                         QBarSet *set = mSeries->barsetAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                 }
                 // Create labels
-                int count = mSeries->countCategories();
+                int count = mSeries->categoryCount();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     label->set(mSeries->label(i));
                 }
                 // Create separators
-                count = mSeries->countCategories() - 1;   // There is one less separator than columns
+                count = mSeries->categoryCount() - 1;   // There is one less separator than columns
                 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
                 }
                 // Create floating values
-                for (int category=0; category<mSeries->countCategories(); category++) {
+                for (int category=0; category<mSeries->categoryCount(); category++) {
-                    for (int s=0; s<mSeries->countSets(); s++) {
+                    for (int s=0; s<mSeries->barsetCount(); s++) {
                         QBarSet *set = mSeries->barsetAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);

src/barchart/percentbarpresenter.cpp +7 -7

             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mSeries->countSets() <= 0) {
+                if (mSeries->barsetCount() <= 0) {
                     qDebug() << "No sets in model!";
                     // Nothing to do.
                     return;
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
-                int count = mSeries->countCategories();
+                int count = mSeries->categoryCount();
                 int itemIndex(0);
                 int labelIndex(0);
                 qreal tW = mWidth;
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 qreal h = mHeight;
-                for (int category = 0; category < mSeries->countCategories(); category++) {
+                for (int category = 0; category < mSeries->categoryCount(); category++) {
                     qreal colSum = mSeries->categorySum(category);
                     qreal scale = (h / colSum);
                     qreal yPos = h;
-                    for (int set=0; set < mSeries->countSets(); set++) {
+                    for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                 // Position separators
                 xPos = xStep + xStep/2;
-                for (int s=0; s < mSeries->countCategories() - 1; s++) {
+                for (int s=0; s < mSeries->categoryCount() - 1; s++) {
                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                 // Position floating values
                 itemIndex = 0;
                 xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                for (int category=0; category < mSeries->countCategories(); category++) {
+                for (int category=0; category < mSeries->categoryCount(); category++) {
                     qreal yPos = h;
                     qreal colSum = mSeries->categorySum(category);
                     qreal scale = (h / colSum);
-                    for (int set=0; set < mSeries->countSets(); set++) {
+                    for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);

src/barchart/qbarseries.cpp +2 -2

             /*!
                 Returns number of sets in series.
             */
-            int QBarSeries::countSets()
+            int QBarSeries::barsetCount()
             {
                 return mModel->countSets();
             }
             /*!
                 Returns number of categories in series
             */
-            int QBarSeries::countCategories()
+            int QBarSeries::categoryCount()
             {
                 return mModel->countCategories();
             }

src/barchart/qbarseries.h +2 -2

                 void addBarSet(QBarSet *set);               // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
-                int countSets();
+                int barsetCount();
-                int countCategories();
+                int categoryCount();
                 QList<QBarSet*> barSets();
                 QList<QString> legend();                    // Returns legend of series (ie. names of all sets in series)

src/barchart/stackedbarpresenter.cpp +8 -8

             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mSeries->countSets() <= 0) {
+                if (mSeries->barsetCount() <= 0) {
                     qDebug() << "No sets in model!";
                     // Nothing to do.
                     return;
                 }
-                if (mSeries->countCategories() == 0) {
+                if (mSeries->categoryCount() == 0) {
                     qDebug() << "No categories in model!";
                     // Nothing to do
                     return;
                 int itemIndex(0);
                 int labelIndex(0);
                 qreal tW = mWidth;
-                qreal tC = mSeries->countCategories() + 1;
+                qreal tC = mSeries->categoryCount() + 1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                for (int category = 0; category < mSeries->countCategories(); category++) {
+                for (int category = 0; category < mSeries->categoryCount(); category++) {
                     qreal yPos = h;
-                    for (int set=0; set < mSeries->countSets(); set++) {
+                    for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                 // Position separators
                 xPos = xStep + xStep/2;
-                for (int s=0; s < mSeries->countCategories() - 1; s++) {
+                for (int s=0; s < mSeries->categoryCount() - 1; s++) {
                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                 // Position floating values
                 itemIndex = 0;
                 xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                for (int category=0; category < mSeries->countCategories(); category++) {
+                for (int category=0; category < mSeries->categoryCount(); category++) {
                     qreal yPos = h;
-                    for (int set=0; set < mSeries->countSets(); set++) {
+                    for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);

src/chartdataset.cpp +3 -3

                     case QSeries::SeriesTypeBar: {
                     qDebug() << "QChartSeries::SeriesTypeBar";
                         QBarSeries* barSeries = static_cast<QBarSeries*>(series);
-                        qreal x = barSeries->countCategories();
+                        qreal x = barSeries->categoryCount();
                         qreal y = barSeries->max();
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = qMin(domain.m_minY,y);
                     qDebug() << "QChartSeries::SeriesTypeStackedBar";
                         QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
-                        qreal x = stackedBarSeries->countCategories();
+                        qreal x = stackedBarSeries->categoryCount();
                         qreal y = stackedBarSeries->maxCategorySum();
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = qMin(domain.m_minY,y);
                     qDebug() << "QChartSeries::SeriesTypePercentBar";
                         QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
-                        qreal x = percentBarSeries->countCategories();
+                        qreal x = percentBarSeries->categoryCount();
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = 0;
                         domain.m_maxX = qMax(domain.m_maxX,x);

src/charttheme.cpp +3 -3

             void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int count)
             {
                 QList<QBarSet*> sets = series->barSets();
-                for (int i=0; i<series->countSets(); i++) {
+                for (int i=0; i<series->barsetCount(); i++) {
                     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++) {
+                for (int i=0; i<series->barsetCount(); i++) {
                     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++) {
+                for (int i=0; i<series->barsetCount(); i++) {
                     sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }

test/chartwidgettest/mainwidget.cpp +1 -1

                         series->addBarSet(set);
                     }
                     series->setFloatingValuesEnabled(true);
-                    series->setToolTipEnabled();
+                    series->setToolTipEnabled(true);
                     series->setSeparatorsEnabled(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