HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r488:e14529020653

removed old barlabel implementation

sauimone -

r488:e14529020653

parent child

Context file:

r488:e14529020653

src/barchart/barchart.pri 0 -2

             SOURCES += \
                 $$PWD/bar.cpp \
                 $$PWD/barchartmodel.cpp \
-                $$PWD/barlabel.cpp \
                 $$PWD/barpresenter.cpp \
                 $$PWD/barpresenterbase.cpp \
                 $$PWD/percentbarpresenter.cpp \
             PRIVATE_HEADERS += \
                 $$PWD/bar_p.h \
                 $$PWD/barchartmodel_p.h \
-                $$PWD/barlabel_p.h \
                 $$PWD/barpresenter_p.h \
                 $$PWD/barpresenterbase_p.h \
                 $$PWD/percentbarpresenter_p.h \

src/barchart/barpresenter.cpp 0 -8

                 qreal xStepPerCategory = (tW/tC) + mBarWidth;
                 int itemIndex(0);
-                int labelIndex(0);
                 for (int category=0; category < categoryCount; category++) {
                     qreal xPos = xStepPerCategory * category;
                     qreal yPos = mHeight;
                         itemIndex++;
                         xPos += mBarWidth;
                     }
-                    // TODO: Layout for labels, remove magic number
-                    xPos = xStepPerCategory * category + mBarWidth/2;
-                    BarLabel* label = mLabels.at(labelIndex);
-                    label->setPos(xPos, mHeight - 20);
-                    labelIndex++;
                 }
                 // Position floating values

src/barchart/barpresenterbase.cpp 0 -12

                 }
                 mBars.clear();
-                mLabels.clear();
                 mSeparators.clear();
                 mFloatingValues.clear();
                     }
                 }
-                // Create labels
-                /*
-                int count = mSeries->categoryCount();
-                for (int i=0; i<count; i++) {
-                    BarLabel* label = new BarLabel(this);
-                    label->set(mSeries->categoryName(i));
-                    childItems().append(label);
-                    mLabels.append(label);
-                */
                 // Create separators
                 int count = mSeries->categoryCount() - 1;   // There is one less separator than columns
                 for (int i=0; i<count; i++) {

src/barchart/barpresenterbase_p.h 0 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Bar;
-            class BarLabel;
             class Separator;
             class BarValue;
             class QChartAxisCategories;
                 // Not owned.
                 QBarSeries* mSeries;
                 QList<Bar*> mBars;
-                QList<BarLabel*> mLabels;
                 QList<Separator*> mSeparators;
                 QList<BarValue*> mFloatingValues;
                 QChart* mChart;

src/barchart/percentbarpresenter.cpp 0 -6

                 qreal h = mHeight;
                 int itemIndex(0);
-                int labelIndex(0);
                 for (int category = 0; category < mSeries->categoryCount(); category++) {
                     qreal colSum = mSeries->categorySum(category);
                     qreal scale = (h / colSum);
                         itemIndex++;
                         yPos -= barHeight;
                     }
-                    // TODO: Layout for labels, remove magic number
-                    BarLabel* label = mLabels.at(labelIndex);
-                    label->setPos(xPos, mHeight + 20);
-                    labelIndex++;
                     xPos += xStep;
                 }

src/barchart/stackedbarpresenter.cpp 0 -6

                 qreal xPos = ((tW/tC) - mBarWidth / 2);
                 int itemIndex(0);
-                int labelIndex(0);
                 for (int category = 0; category < mSeries->categoryCount(); category++) {
                     qreal yPos = h;
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         itemIndex++;
                         yPos -= barHeight;
                     }
-                    // TODO: Layout for labels, remove magic number
-            //        BarLabel* label = mLabels.at(labelIndex);
-            //        label->setPos(xPos, mHeight + 20);
-                    labelIndex++;
                     xPos += xStep;
                 }

src/barchart/barlabel.cpp removed 0 -36

NO CONTENT: file was removed

src/barchart/barlabel_p.h removed 0 -34

NO CONTENT: file was removed

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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