HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r703:44befe5b9760

Adds BarCategories typedef

Michal Klocek -

r703:44befe5b9760

parent child

Context file:

r703:44befe5b9760

src/axis/qchartaxiscategories.cpp +2 -2

                 // TODO Auto-generated destructor stub
             }
-            void QChartAxisCategories::insert(QBarCategory& category)
+            void QChartAxisCategories::insert(const QBarCategories& categories)
             {
                 int i=1;
-                foreach(QString string , category){
+                foreach(QString string , categories){
                     m_map.insert(i,string);
                     i++;
                 }

src/axis/qchartaxiscategories.h +1 -1

             public:
                 ~QChartAxisCategories();
-                void insert(QBarCategory& category);
+                void insert(const QBarCategories& category);
                 void insert(qreal value,QString label);
                 void remove(qreal value);
                 QString label(qreal value) const;

src/barchart/qbarseries.cpp +11 -1

                 Constructs empty QBarSeries. Parameter \a categories defines the categories for chart.
                 QBarSeries is QObject which is a child of a \a parent.
             */
-            QBarSeries::QBarSeries(QStringList categories, QObject *parent)
+            QBarSeries::QBarSeries(QBarCategories categories, QObject *parent)
                 : QSeries(parent)
                 ,mModel(new BarChartModel(categories, this))
             {
                 emit updatedBars();
             }
+            QBarCategories QBarSeries::categories() const
+            {
+                QBarCategories categories;
+                int count = mModel->categoryCount();
+                for (int i=1; i<=count; i++) {
+                      categories.insert(i, mModel->categoryName(i-1));
+                }
+                return categories;
+            }
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +3 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            typedef QStringList QBarCategory;
+            typedef QStringList QBarCategories;
             class QBarSet;
             class BarChartModel;
                 int barsetCount();
                 int categoryCount();
                 QList<QBarSet*> barSets();
+                QBarCategories categories() const;
                 bool setModel(QAbstractItemModel* model);
                 QAbstractItemModel* modelExt() {return m_model;}

src/chartdataset.cpp +1 -4

             void ChartDataSet::setupCategories(QBarSeries* series)
             {
-               int count = series->categoryCount();
                QChartAxisCategories* categories = axisX()->categories();
                categories->clear();
-               for (int i=1; i<=count; i++) {
+               categories->insert(series->categories());
-                   categories->insert(i,series->categoryName(i-1));
             }
             void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)

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