HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r663:9af75e8e0281

Removing data from BarSeries through model added

Marek Rosa -

r663:9af75e8e0281

parent child

Context file:

r663:9af75e8e0281

src/barchart/barchartmodel.cpp +5 0

                 mCategory.insert(i, category);
             }
+            void BarChartModel::removeCategory(int i)
+            {
+                mCategory.removeAt(i);
+            }
             QBarSet* BarChartModel::setAt(int index)
             {
                 return mDataModel.at(index);

src/barchart/barchartmodel_p.h +1 0

                 void removeBarSet(QBarSet *set);
                 void insertBarSet(int i, QBarSet *set);
                 void insertCategory(int i, QString category);
+                void removeCategory(int i);
                 QBarSet *setAt(int index);
                 QList<QBarSet*> barSets();

src/barchart/qbarseries.cpp +12 -2

                 mModel->insertCategory(i, category);
             }
+            void QBarSeries::removeCategory(int i)
+            {
+                mModel->removeCategory(i);
+            }
             /*!
                 Returns number of sets in series.
             */
                 emit restructuredBar(1);
             }
-            void QBarSeries::modelDataRemoved(QModelIndex /*parent*/, int /*start*/, int /*end*/)
+            void QBarSeries::modelDataRemoved(QModelIndex /*parent*/, int start, int /*end*/)
             {
-                //
+                removeCategory(start);
+                for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
+                {
+                    barsetAt(i)->removeValue(start);
+                }
+                emit restructuredBar(1);
             }
             void QBarSeries::barsetChanged()

src/barchart/qbarseries.h +1 0

                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 void insertBarSet(int i, QBarSet *set);
                 void insertCategory(int i, QString category);
+                void removeCategory(int i);
                 int barsetCount();
                 int categoryCount();
                 QList<QBarSet*> barSets();

src/barchart/qbarset.cpp +5 0

                 mValues.insert(i, value);
             }
+            void QBarSet::removeValue(int i)
+            {
+                mValues.removeAt(i);
+            }
             /*!
                 Returns count of values in set.
             */

src/barchart/qbarset.h +1 0

                 QString name();
                 QBarSet& operator << (const qreal &value);  // appends new value to set
                 void insertValue(int i, qreal value);
+                void removeValue(int i);
                 // TODO: remove indices eventually. Use as internal?
                 int count();                                // count of values in set

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