HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1236:a37d91e87542

QPieModelMapper: added support for labelChanged and valueChanged signals from the slice

Marek Rosa -

r1236:a37d91e87542

parent child

Context file:

r1236:a37d91e87542

Collapse all files

src/piechart/qpiemodelmapper.cpp +55 -8

                 if (firstIndex == -1)
                     return;
+                if (m_count != -1)
+                    m_count += slices.count();
+                for (int i = firstIndex; i < firstIndex + slices.count(); i++) {
+                    m_slices.insert(i, slices.at(i - firstIndex));
+                    connect(slices.at(i - firstIndex), SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
+                    connect(slices.at(i - firstIndex), SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
+                }
                 blockModelSignals();
                 if (m_orientation == Qt::Vertical)
                     m_model->insertRows(firstIndex + m_first, slices.count());
                 if (slices.count() == 0)
                     return;
-                int firstIndex = m_series->slices().indexOf(slices.at(0));
+                int firstIndex = m_slices.indexOf(slices.at(0));
                 if (firstIndex == -1)
                     return;
+                if (m_count != -1)
+                    m_count -= slices.count();
+                for (int i = firstIndex + slices.count() - 1; i >= firstIndex; i--)
+                    m_slices.removeAt(i);
                 blockModelSignals();
                 if (m_orientation == Qt::Vertical)
                     m_model->removeRows(firstIndex + m_first, slices.count());
                 blockModelSignals(false);
             }
-            void QPieModelMapperPrivate::sliceChanged()
+            void QPieModelMapperPrivate::sliceLabelChanged()
             {
+                if (m_seriesSignalsBlock)
+                    return;
                 blockModelSignals();
+                QPieSlice *slice = qobject_cast<QPieSlice *>(QObject::sender());
+                m_model->setData(labelModelIndex(m_series->slices().indexOf(slice)), slice->label());
+                blockModelSignals(false);
+            }
+            void QPieModelMapperPrivate::sliceValueChanged()
+            {
+                if (m_seriesSignalsBlock)
+                    return;
+                blockModelSignals();
+                QPieSlice *slice = qobject_cast<QPieSlice *>(QObject::sender());
+                m_model->setData(valueModelIndex(m_series->slices().indexOf(slice)), slice->value());
                 blockModelSignals(false);
             }
                         slice->setValue(m_model->data(valueModelIndex(i - m_first), Qt::DisplayRole).toDouble());
                         slice->setLabel(m_model->data(labelModelIndex(i - m_first), Qt::DisplayRole).toString());
                         slice->setLabelVisible();
+                        connect(slice, SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
+                        connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                         m_series->insert(i - m_first, slice);
+                        m_slices.insert(i - m_first, slice);
                     }
                     // remove excess of slices (abouve m_count)
                     if (m_count != -1 && m_series->slices().size() > m_count)
-                        for (int i = m_series->slices().size() - 1; i >= m_count; i--)
+                        for (int i = m_series->slices().size() - 1; i >= m_count; i--) {
                             m_series->remove(m_series->slices().at(i));
+                            m_slices.removeAt(i);
+                        }
                 }
             }
                     int toRemove = qMin(m_series->slices().size(), removedCount);     // first find how many items can actually be removed
                     int first = qMax(start, m_first);    // get the index of the first item that will be removed.
                     int last = qMin(first + toRemove - 1, m_series->slices().size() + m_first - 1);    // get the index of the last item that will be removed.
-                    for (int i = last; i >= first; i--)
+                    for (int i = last; i >= first; i--) {
                         m_series->remove(m_series->slices().at(i - m_first));
+                        m_slices.removeAt(i - m_first);
+                    }
                     if (m_count != -1) {
                         int itemsAvailable;     // check how many are available to be added
                                 }
                                 slice->setLabelVisible();
                                 m_series->insert(i, slice);
+                                m_slices.insert(i, slice);
                             }
                     }
                 }
                 if (m_model == 0 || m_series == 0)
                     return;
-                // clear current content
-                m_series->clear();
                 // check if mappings are set
                 if (m_valuesIndex == -1 || m_labelsIndex == -1)
                     return;
                 blockSeriesSignals();
+                // clear current content
+                m_series->clear();
+                m_slices.clear();
                 // create the initial slices set
                 int slicePos = 0;
                 QModelIndex valueIndex = valueModelIndex(slicePos);
                 QModelIndex labelIndex = labelModelIndex(slicePos);
                 while (valueIndex.isValid() && labelIndex.isValid()) {
-                    m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
+                    QPieSlice *slice = new QPieSlice;
+                    slice->setLabel(m_model->data(labelIndex, Qt::DisplayRole).toString());
+                    slice->setValue(m_model->data(valueIndex, Qt::DisplayRole).toDouble());
+                    connect(slice, SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
+                    connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
+                    m_series->append(slice);
+                    m_slices.append(slice);
+            //        m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
                     slicePos++;
                     valueIndex = valueModelIndex(slicePos);
                     labelIndex = labelModelIndex(slicePos);

src/piechart/qpiemodelmapper.h +1 -1

                 void reset();
-            private:
+            protected:
                 QPieModelMapperPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QPieModelMapper)
             };

src/piechart/qpiemodelmapper_p.h +3 -1

                 // for the series
                 void slicesAdded(QList<QPieSlice*> slices);
                 void slicesRemoved(QList<QPieSlice*> slices);
-                void sliceChanged();
+                void sliceLabelChanged();
+                void sliceValueChanged();
                 void initializePieFromModel();
                 bool m_seriesSignalsBlock;
                 bool m_modelSignalsBlock;
                 QPieSeries *m_series;
+                QList<QPieSlice*> m_slices;
                 QAbstractItemModel *m_model;
                 int m_first;
                 int m_count;

tests/tablemodelchart/tablewidget.cpp +23 -3

                 QPushButton* specialPieButton2 = new QPushButton("Remove slices from series");
                 connect(specialPieButton2, SIGNAL(clicked()), this, SLOT(testPie2()));
+                QPushButton* specialPieButton3 = new QPushButton("Remove slices from series");
+                connect(specialPieButton3, SIGNAL(clicked()), this, SLOT(testPie3()));
                 //    QLabel *spinBoxLabel = new QLabel("Rows affected:");
                 //    buttonsLayout->addWidget(removeColumnButton);
                 buttonsLayout->addWidget(specialPieButton);
                 buttonsLayout->addWidget(specialPieButton2);
+                buttonsLayout->addWidget(specialPieButton3);
                 buttonsLayout->addStretch();
                 // chart type radio buttons
                         m_pieMapper = new QPieModelMapper;
                         m_pieMapper->setValuesIndex(1);
-                        m_pieMapper->setLabelsIndex(1);
+                        m_pieMapper->setLabelsIndex(7);
                         m_pieMapper->setSeries(m_pieSeries);
                         m_pieMapper->setModel(m_model);
                         m_pieMapper->setFirst(2);
-                        //            m_pieMapper->setCount(5);
+                                    m_pieMapper->setCount(5);
                         //                    pieSeries->setModelMapper(mapper);
                         m_pieSeries->setLabelsVisible(true);
                         m_chart->addSeries(m_pieSeries);
                         seriesColorHex = "#" + QString::number(m_pieSeries->slices().at(m_pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
-                        m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 50));
+                        m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 5));
                         //                            pieSeries->slices().at(0)->setValue(400);
                 }
             }
+            void TableWidget::testPie3()
+            {
+                QPieSlice *slice;
+                if (m_pieSeries->count() > 0) {
+                    slice = m_pieSeries->slices().last();
+                    slice->setLabel("Dalej");
+                    slice->setValue(222);
+                }
+                if (m_pieSeries->count() > 0) {
+                    slice = m_pieSeries->slices().first();
+                    slice->setLabel("Prawie");
+                    slice->setValue(111);
+                }
+            }
             TableWidget::~TableWidget()
             {

tests/tablemodelchart/tablewidget.h +1 0

                 void updateChartType(bool toggle);
                 void testPie();
                 void testPie2();
+                void testPie3();
                 private:
                 QChartView* m_chartView;

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