HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r662:c9f8f8ef7809

Adding data to BarSet through model added

Marek Rosa -

r662:c9f8f8ef7809

parent child

Context file:

r662:c9f8f8ef7809

Collapse all files

src/barchart/barchartmodel.cpp +10 0

@@ -29,6 +29,16 void BarChartModel::removeBarSet(QBarSet *set)
29	}	29	}
30	}	30	}
31		31
		32	void BarChartModel::insertBarSet(int i, QBarSet *set)
		33	{
		34	mDataModel.insert(i, set);
		35	}
		36
		37	void BarChartModel::insertCategory(int i, QString category)
		38	{
		39	mCategory.insert(i, category);
		40	}
		41
32	QBarSet* BarChartModel::setAt(int index)	42	QBarSet* BarChartModel::setAt(int index)
33	{	43	{
34	return mDataModel.at(index);	44	return mDataModel.at(index);

src/barchart/barchartmodel_p.h +2 0

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

src/barchart/barpresenter.cpp +1 0

                 BarPresenterBase(series, parent)
             {
                 connect(series, SIGNAL(updatedBars()), this, SLOT(layoutChanged()));
+                connect(series, SIGNAL(restructuredBar(int)), this, SLOT(handleModelChanged(int)));
             }
             void BarPresenter::layoutChanged()

src/barchart/qbarseries.cpp +37 -10

                 mModel->removeBarSet(set);
             }
+            void QBarSeries::insertBarSet(int i, QBarSet *set)
+            {
+                mModel->insertBarSet(i, set);
+                //    emit barsetChanged();
+            }
+            void QBarSeries::insertCategory(int i, QString category)
+            {
+                mModel->insertCategory(i, category);
+            }
             /*!
                 Returns number of sets in series.
             */
             int QBarSeries::barsetCount()
             {
-            //    if(m_model)
+                //    if(m_model)
-            //        return m_mapBarTop - m_mapBarBottom;
+                //        return m_mapBarTop - m_mapBarBottom;
-            //    else
+                //    else
-                    return mModel->barsetCount();
+                return mModel->barsetCount();
             }
             /*!
                 {
                     if (topLeft.column() >= m_mapBarBottom && topLeft.column() <= m_mapBarTop)
                         barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
-            //        else if (topLeft.column() == m_mapCategories)
+                    //        else if (topLeft.column() == m_mapCategories)
-            //            slices().at(topLeft.row())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
+                    //            slices().at(topLeft.row())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
                 }
                 else
                 {
                     if (topLeft.row() >= m_mapBarBottom && topLeft.row() <= m_mapBarTop)
                         barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
-            //        else if (topLeft.row() == m_mapCategories)
+                    //        else if (topLeft.row() == m_mapCategories)
-            //            slices().at(topLeft.column())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
+                    //            slices().at(topLeft.column())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
                 }
             }
-            void QBarSeries::modelDataAdded(QModelIndex /*parent*/, int /*start*/, int /*end*/)
+            void QBarSeries::modelDataAdded(QModelIndex /*parent*/, int start, int /*end*/)
             {
-                //
+                if (m_mapOrientation == Qt::Vertical)
+                {
+                    insertCategory(start, QString("Row: %1").arg(start + 1));
+                    for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
+                    {
+                        barsetAt(i)->insertValue(start, m_model->data(m_model->index(start, i), Qt::DisplayRole).toDouble());
+                    }
+                }
+                else
+                {
+                    insertCategory(start, QString("Column: %1").arg(start + 1));
+                    for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
+                    {
+                        barsetAt(i)->insertValue(start, m_model->data(m_model->index(i, start), Qt::DisplayRole).toDouble());
+                    }
+                }
+                emit restructuredBar(1);
             }
             void QBarSeries::modelDataRemoved(QModelIndex /*parent*/, int /*start*/, int /*end*/)

src/barchart/qbarseries.h +3 0

                 void addBarSet(QBarSet *set);               // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
+                void insertBarSet(int i, QBarSet *set);
+                void insertCategory(int i, QString category);
                 int barsetCount();
                 int categoryCount();
                 QList<QBarSet*> barSets();
                 //
                 void updatedBars();
+                void restructuredBar(int);
                 // TODO: internal signals, these to private implementation.
                 // TODO: TO PIMPL --->

src/barchart/qbarset.cpp +5 0

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

src/barchart/qbarset.h +1 0

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

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