HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2482:63ca3532f831

Added remove single box...

Mika Salmela -

r2482:63ca3532f831

parent child

Context file:

r2482:63ca3532f831

Collapse all files

src/boxplotchart/boxplotchartitem.cpp +19 -2

                 m_animation(0),
                 m_animate(0)
             {
+                connect(series, SIGNAL(barsetsRemoved(QList<QBarSet*>)), this, SLOT(handleBarsetRemove(QList<QBarSet*>)));
                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
                 connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleUpdatedBars()));
             void BoxPlotChartItem::handleDataStructureChanged()
             {
-                //qDebug() << "BoxPlotChartItem::handleDataStructureChanged()";
+                qDebug() << "BoxPlotChartItem::handleDataStructureChanged()";
                 int setCount = m_series->count();
                 for (int s = 0; s < setCount; s++) {
             void BoxPlotChartItem::handleUpdatedBars()
             {
-                //qDebug() << "BoxPlotChartItem::handleUpdatedBars()";
+                qDebug() << "BoxPlotChartItem::handleUpdatedBars()";
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     item->setBrush(m_series->brush());
                 }
             }
+            void BoxPlotChartItem::handleBarsetRemove(QList<QBarSet*> barSets)
+            {
+                //qDebug() << "BoxPlotChartItem::handleBarsetRemove";
+                foreach (QBarSet *set, barSets) {
+                    BoxWhiskers *boxItem = m_boxTable.value(set);
+                    m_boxTable.remove(set);
+                    delete boxItem;
+                }
+                // We trust that series emits the restructuredBars, which handles restructuring
+            }
             void BoxPlotChartItem::handleDomainUpdated()
             {
                 //qDebug() << "BoxPlotChartItem::handleDomainUpdated() domain()->size() = " << domain()->size();
             void BoxPlotChartItem::handleLayoutChanged()
             {
+                qDebug() << "BoxPlotChartItem::handleLayoutChanged";
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     if (m_animation)
                         m_animation->setAnimationStart(item);

src/boxplotchart/boxplotchartitem_p.h +2 0

             #include "qboxplotseries.h"
             #include "chartitem_p.h"
             #include "boxplotanimation_p.h"
+            #include "qbarset.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 void handleDomainUpdated();
                 void handleLayoutChanged();
                 void handleUpdatedBars();
+                void handleBarsetRemove(QList<QBarSet*> barSets);
             private:
                 virtual QVector<QRectF> calculateLayout();

src/boxplotchart/boxwhiskers.cpp +1 0

                 QGraphicsObject(parent),
                 m_domain(domain)
             {
+                //qDebug() << "BoxWhiskers::BoxWhiskers()";
             }
             BoxWhiskers::~BoxWhiskers()

tests/boxplottester/mainwidget.cpp +26 -6

                 connect(removeSeriesButton, SIGNAL(clicked()), this, SLOT(removeSeries()));
                 grid->addWidget(removeSeriesButton, rowPos++, 1);
                 // Create add a single box button
                 QPushButton *addBoxButton = new QPushButton("Add a box");
                 connect(addBoxButton, SIGNAL(clicked()), this, SLOT(addBox()));
                 grid->addWidget(addBoxButton, rowPos++, 1);
+                // Create add a single box button
+                QPushButton *removeBoxButton = new QPushButton("Remove a box");
+                connect(removeBoxButton, SIGNAL(clicked()), this, SLOT(removeBox()));
+                grid->addWidget(removeBoxButton, rowPos++, 1);
                 initThemeCombo(grid);
                 initCheckboxes(grid);
                     nSeries--;
                     m_chart->removeSeries(m_series[nSeries]);
                     delete m_series[nSeries];
+                } else {
+                    qDebug() << "Create a series first";
                 }
             }
             {
                 qDebug() << "BoxPlotTester::MainWidget::addBox()";
-                QBarSet *newSet = new QBarSet("New");
+                if (nSeries > 0) {
-                *newSet << 5 << 6 << 6.8 << 7 << 8;
+                    QBarSet *newSet = new QBarSet("New");
+                    *newSet << 5 << 6 << 6.8 << 7 << 8;
-                m_series[0]->append(newSet);
+                    m_series[0]->append(newSet);
-                m_axis->append(addCategories[nNewBoxes]);
+                    m_axis->append(addCategories[nNewBoxes]);
-                nNewBoxes++;
+                    nNewBoxes++;
+                }
+            }
+            void MainWidget::removeBox()
+            {
+                qDebug() << "MainWidget::removeBox";
+                if (nSeries > 0) {
+                    QList<QBarSet *> sets = m_series[0]->barSets();
+                    m_series[0]->remove(sets.at(m_series[0]->count() - 3));
+                } else {
+                    qDebug() << "Create a series first";
+                }
             }
             void MainWidget::animationToggled(bool enabled)

tests/boxplottester/mainwidget.h +1 0

                 void addSeries();
                 void removeSeries();
                 void addBox();
+                void removeBox();
                 void animationToggled(bool enabled);
                 void legendToggled(bool enabled);
                 void titleToggled(bool enabled);

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