HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r604:e52d5440d618

Added insert pie slice function to QPieSeries

Marek Rosa -

r604:e52d5440d618

parent child

Context file:

r604:e52d5440d618

Collapse all files

examples/tablemodelchart/customtablemodel.cpp +2 -2

                  beginInsertRows(QModelIndex(), row /*dataTable.count()*/, row + count - 1);
                  for (int i = row; i < row + count; i++)
                  {
-                     m_points.insert(row, QPointF());
-                     m_labels.insert(row,(""));
+                     m_points.insert(row, QPointF(10,20));
+                     m_labels.insert(row,("a"));
                  }
                  endInsertRows();
                  return true;

src/piechart/qpieseries.cpp +40 -7

                  return slice;
              }
+             void QPieSeries::insert(int i, QPieSlice* slice)
+             {
+                 Q_ASSERT(i <= m_slices.count());
+                 slice->setParent(this);
+                 m_slices.insert(i, slice);
+                 updateDerivativeData();
+                 connect(slice, SIGNAL(changed()), this, SLOT(sliceChanged()));
+                 connect(slice, SIGNAL(clicked()), this, SLOT(sliceClicked()));
+                 connect(slice, SIGNAL(hoverEnter()), this, SLOT(sliceHoverEnter()));
+                 connect(slice, SIGNAL(hoverLeave()), this, SLOT(sliceHoverLeave()));
+                 emit changed();
+             }
              /*!
                  Removes a single \a slice from the series and deletes the slice.
              void QPieSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
              {
                  if (m_mapOrientation == Qt::Vertical)
+                 {
                      //        slices().at(topLeft.row())->setValue(m_model->data(m_model->index(topLeft.row(), topLeft.column()), Qt::DisplayRole).toDouble());
                      if (topLeft.column() == m_mapValues)
                          slices().at(topLeft.row())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
                      else if (topLeft.column() == m_mapLabels)
                          slices().at(topLeft.row())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
-                     else
-                         //        slices().at(topLeft.column())->setValue(m_model->data(m_model->index(topLeft.row(), topLeft.column()), Qt::DisplayRole).toDouble());
-                         if (topLeft.column() == m_mapValues)
-                             slices().at(topLeft.column())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
-                         else if (topLeft.column() == m_mapLabels)
-                             slices().at(topLeft.column())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
+                 }
+                 else
+                 {
+                     //        slices().at(topLeft.column())->setValue(m_model->data(m_model->index(topLeft.row(), topLeft.column()), Qt::DisplayRole).toDouble());
+                     if (topLeft.column() == m_mapValues)
+                         slices().at(topLeft.column())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                     else if (topLeft.column() == m_mapLabels)
+                         slices().at(topLeft.column())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
+                 }
              }
              void QPieSeries::modelDataAdded(QModelIndex parent, int start, int end)
              {
-                 //
+                 QPieSlice* newSlice = new QPieSlice;
+                 newSlice->setLabelVisible(true);
+                 if (m_mapOrientation == Qt::Vertical)
+                 {
+                     newSlice->setValue(m_model->data(m_model->index(start, m_mapValues), Qt::DisplayRole).toDouble());
+                     newSlice->setLabel(m_model->data(m_model->index(start, m_mapLabels), Qt::DisplayRole).toString());
+                 }
+                 else
+                 {
+                     newSlice->setValue(m_model->data(m_model->index(m_mapValues, start), Qt::DisplayRole).toDouble());
+                     newSlice->setLabel(m_model->data(m_model->index(m_mapLabels, start), Qt::DisplayRole).toString());
+                 }
+                 insert(start, newSlice);
              }
              void QPieSeries::modelDataRemoved(QModelIndex parent, int start, int end)

src/piechart/qpieseries.h +1 0

                  // slice setters
                  void add(QPieSlice* slice);
                  void add(QList<QPieSlice*> slices);
+                 void insert(int i, QPieSlice* slice);
                  void replace(QList<QPieSlice*> slices);
                  void remove(QPieSlice* slice);
                  void clear();

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