HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r892:7f4e2249f988

Improving pie examples

Jani Honkonen -

r892:7f4e2249f988

parent child

Context file:

r892:7f4e2249f988

Collapse all files

demos/piechartcustomization/mainwidget.cpp +6 -4

                 m_endAngle->setValue(m_series->pieEndAngle());
                 m_endAngle->setSingleStep(1);
-                QPushButton *addSlice = new QPushButton("Add slice");
+                QPushButton *appendSlice = new QPushButton("Append slice");
                 QPushButton *insertSlice = new QPushButton("Insert slice");
                 QFormLayout* seriesSettingsLayout = new QFormLayout();
                 seriesSettingsLayout->addRow("Size factor", m_sizeFactor);
                 seriesSettingsLayout->addRow("Start angle", m_startAngle);
                 seriesSettingsLayout->addRow("End angle", m_endAngle);
-                seriesSettingsLayout->addRow(addSlice);
+                seriesSettingsLayout->addRow(appendSlice);
                 seriesSettingsLayout->addRow(insertSlice);
                 QGroupBox* seriesSettings = new QGroupBox("Series");
                 seriesSettings->setLayout(seriesSettingsLayout);
                 connect(m_sizeFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
                 connect(m_startAngle, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
                 connect(m_endAngle, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
-                connect(addSlice, SIGNAL(clicked()), this, SLOT(addSlice()));
+                connect(appendSlice, SIGNAL(clicked()), this, SLOT(appendSlice()));
                 connect(insertSlice, SIGNAL(clicked()), this, SLOT(insertSlice()));
                 // slice settings
                 m_font->setText(dialog.currentFont().toString());
             }
-            void MainWidget::addSlice()
+            void MainWidget::appendSlice()
             {
                 *m_series << new CustomSlice(10.0, "Slice " + QString::number(m_series->count()+1));
             }
                 if (!m_slice)
                     return;
+                m_sliceName->setText("<click a slice>");
                 m_series->remove(m_slice);
                 m_slice = 0;
             }

demos/piechartcustomization/mainwidget.h +1 -1

                 void updateSliceSettings();
                 void handleSliceClicked(QPieSlice* slice, Qt::MouseButtons buttons);
                 void showFontDialog();
-                void addSlice();
+                void appendSlice();
                 void insertSlice();
                 void removeSlice();

examples/piechart/main.cpp +6 -6

             //![1]
                 QPieSeries *series = new QPieSeries();
-                series->append(1, "Slice 1");
+                series->append(1, "Jane");
-                series->append(2, "Slice 2");
+                series->append(2, "Joe");
-                series->append(3, "Slice 3");
+                series->append(3, "Andy");
-                series->append(4, "Slice 4");
+                series->append(4, "Barbara");
-                series->append(5, "Slice 5");
+                series->append(5, "Axel");
             //![1]
             //![2]
-                QPieSlice *slice = series->slices().first();
+                QPieSlice *slice = series->slices().at(1);
                 slice->setExploded();
                 slice->setLabelVisible();
                 slice->setPen(QPen(Qt::darkGreen, 2));

examples/piechartdrilldown/drilldownslice.cpp +16 -3

                 m_prefix(prefix)
             {
                 setValue(value);
-                setLabelVisible(true);
                 updateLabel();
                 connect(this, SIGNAL(changed()), this, SLOT(updateLabel()));
+                connect(this, SIGNAL(hoverEnter()), this, SLOT(showHighlight()));
+                connect(this, SIGNAL(hoverLeave()), this, SLOT(hideHighlight()));
             }
             DrilldownSlice::~DrilldownSlice()
             void DrilldownSlice::updateLabel()
             {
                 QString label = m_prefix;
-                label += " ";
+                label += " $";
                 label += QString::number(this->value());
-                label += "e, ";
+                label += ", ";
                 label += QString::number(this->percentage()*100, 'f', 1);
                 label += "%";
                 setLabel(label);
             }
+            void DrilldownSlice::showHighlight()
+            {
+                setExploded();
+                setLabelVisible();
+            }
+            void DrilldownSlice::hideHighlight()
+            {
+                setExploded(false);
+                setLabelVisible(false);
+            }
             #include "moc_drilldownslice.cpp"

examples/piechartdrilldown/drilldownslice.h +2 0

             public Q_SLOTS:
                 void updateLabel();
+                void showHighlight();
+                void hideHighlight();
             private:
                 QSeries* m_drilldownSeries;

examples/piechartdrilldown/main.cpp +3 0

             #include <QMainWindow>
             #include <QTime>
             #include <QChartView>
+            #include <QLegend>
             #include <QPieSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 DrilldownChart* chart = new DrilldownChart();
                 chart->setTheme(QChart::ChartThemeLight);
                 chart->setAnimationOptions(QChart::AllAnimations);
+                chart->legend()->setVisible(true);
+                chart->legend()->setAlignmnent(QLegend::AlignmentRight);
                 QPieSeries* yearSeries = new QPieSeries(&window);
                 yearSeries->setName("Sales by year - All");

src/piechart/piechartitem.cpp +4 -1

                 // Note: the following does not affect as long as the item does not have anything to paint
                 setZValue(ChartPresenter::PieSeriesZValue);
-                setFlags(QGraphicsItem::ItemClipsChildrenToShape);
+            	// If enabled slice boundingrect() is called instead of shape().
+            	// And this causes severe issues with mouse click & hover decection.
+                //setFlags(QGraphicsItem::ItemClipsChildrenToShape);
             }
             PieChartItem::~PieChartItem()

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