HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r146:6c3759bde1fd

Moved pie stuff to own .pri file and rename stuff

Jani Honkonen -

r146:6c3759bde1fd

parent child

Context file:

r146:6c3759bde1fd

Collapse all files

src/piechart/piechart.pri created 644 +14 0

@@ -0,0 +1,14
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/qpieseries.cpp \
	6	$$PWD/pieslice.cpp \
	7	$$PWD/piepresenter.cpp
	8
	9	PRIVATE_HEADERS += \
	10	$$PWD/piepresenter.h \
	11	$$PWD/pieslice.h
	12
	13	PUBLIC_HEADERS += \
	14	$$PWD/qpieseries.h

src/chartdataset.cpp +1 -2

             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
-            #include "piechart/qpieseries.h"
+            #include "qpieseries.h"
-            #include "piechart/piepresentation.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/chartpresenter.cpp +6 -6

             #include "linechartitem_p.h"
             #include "percentbargroup.h"
             #include "linechartanimationitem_p.h"
-            #include "piepresentation.h"
+            #include "piepresenter.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     case QChartSeries::SeriesTypePie: {
                         QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
-                        PiePresentation* pieChart = new PiePresentation(m_chart, pieSeries);
+                        PiePresenter* pie = new PiePresenter(m_chart, pieSeries);
-                        pieSeries->m_piePresentation = pieChart; // TODO: remove this pointer passing use signals&slots
+                        pieSeries->m_piePresenter = pie; // TODO: remove this pointer passing use signals&slots
-                        QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), pieChart, SLOT(handleGeometryChanged(const QRectF&)));
+                        QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), pie, SLOT(handleGeometryChanged(const QRectF&)));
-                        QObject::connect(m_dataset, SIGNAL(domainChanged(const Domain&)), pieChart, SLOT(handleDomainChanged(const Domain&)));
+                        QObject::connect(m_dataset, SIGNAL(domainChanged(const Domain&)), pie, SLOT(handleDomainChanged(const Domain&)));
-                        m_chartItems.insert(series, pieChart);
+                        m_chartItems.insert(series, pie);
                         break;
                     }

src/piechart/piepresenter.cpp ~~src/piechart/piepresentation.cpp~~ renamed +10 -10

-            #include "piepresentation.h"
+            #include "piepresenter.h"
             #include "pieslice.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PiePresentation::PiePresentation(QGraphicsItem *parent, QPieSeries *series) :
+            PiePresenter::PiePresenter(QGraphicsItem *parent, QPieSeries *series) :
                 ChartItem(parent),
                 m_pieSeries(series)
             {
                 setAcceptHoverEvents(true);
             }
-            PiePresentation::~PiePresentation()
+            PiePresenter::~PiePresenter()
             {
                 while (m_slices.count())
                     delete m_slices.takeLast();
             }
-            void PiePresentation::seriesChanged()
+            void PiePresenter::seriesChanged()
             {
                 const qreal fullPie = 360;
                 qreal total = 0;
                 resize();
             }
-            void PiePresentation::setSize(const QSizeF &size)
+            void PiePresenter::setSize(const QSizeF &size)
             {
                 // TODO: allow user setting the size?
                 // TODO: allow user defining the margins?
                 resize();
             }
-            void PiePresentation::setPlotDomain(const PlotDomain& plotDomain)
+            void PiePresenter::setPlotDomain(const PlotDomain& plotDomain)
             {
                 // TODO
             }
-            void PiePresentation::resize()
+            void PiePresenter::resize()
             {
                 m_pieRect = m_rect;
                 qDebug() << "pie rect:" << m_pieRect;
             }
-            void PiePresentation::handleDomainChanged(const Domain& domain)
+            void PiePresenter::handleDomainChanged(const Domain& domain)
             {
                 // TODO
             }
-            void PiePresentation::handleGeometryChanged(const QRectF& rect)
+            void PiePresenter::handleGeometryChanged(const QRectF& rect)
             {
                 setSize(rect.size());
             }
-            #include "moc_piepresentation.cpp"
+            #include "moc_piepresenter.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piepresenter.h ~~src/piechart/piepresentation.h~~ renamed +6 -6

-            #ifndef PIEPRESENTATION_H
+            #ifndef PIEPRESENTER_H
-            #define PIEPRESENTATION_H
+            #define PIEPRESENTER_H
             #include "chartitem_p.h"
             #include "qpieseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieSlice;
-            class PiePresentation : public QObject, public ChartItem
+            class PiePresenter : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
                 // TODO: use a generic data class instead of x and y
-                PiePresentation(QGraphicsItem *parent, QPieSeries *series);
+                PiePresenter(QGraphicsItem *parent, QPieSeries *series);
-                ~PiePresentation();
+                ~PiePresenter();
             public: // from ChartItem
                 void setSize(const QSizeF &size);
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // PIEPRESENTATION_H
+            #endif // PIEPRESENTER_H

src/piechart/pieslice.cpp +4 -4

             #include "pieslice.h"
-            #include "piepresentation.h"
+            #include "piepresenter.h"
             #include <QPainter>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PieSlice::PieSlice(PiePresentation *piePresentation, int seriesIndex, qreal startAngle, qreal span)
+            PieSlice::PieSlice(PiePresenter *piePresentation, int seriesIndex, qreal startAngle, qreal span)
                 :QGraphicsItem(piePresentation),
                 m_seriesIndex(seriesIndex),
                 m_startAngle(startAngle),
             QPainterPath PieSlice::shape() const
             {
-                QRectF rect = (static_cast<PiePresentation*>(parentItem()))->pieRect();
+                QRectF rect = (static_cast<PiePresenter*>(parentItem()))->pieRect();
                 qreal angle = (-m_startAngle) + (90);
                 qreal span = -m_span;
                 //painter->setPen(m_theme.linePen);
                 // TODO:
-                QPieSlice data = (static_cast<PiePresentation*>(parentItem()))->m_pieSeries->slice(m_seriesIndex);
+                QPieSlice data = (static_cast<PiePresenter*>(parentItem()))->m_pieSeries->slice(m_seriesIndex);
                 painter->setBrush(data.m_color);

src/piechart/pieslice.h +2 -2

             #include <QColor>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class PiePresentation;
+            class PiePresenter;
             class PieSlice : public QGraphicsItem
             {
             public:
-                PieSlice(PiePresentation *piePresentation, int seriesIndex, qreal startAngle, qreal span);
+                PieSlice(PiePresenter *piePresentation, int seriesIndex, qreal startAngle, qreal span);
                 ~PieSlice();
             public: // from QGraphicsItem

src/piechart/qpieseries.cpp +19 -19

             #include "qpieseries.h"
-            #include "piepresentation.h"
+            #include "piepresenter.h"
             #include "pieslice.h"
             #include <QDebug>
             QPieSeries::QPieSeries(QObject *parent) :
                 QChartSeries(parent),
-                m_piePresentation(0),
+                m_piePresenter(0),
                 m_sizeFactor(1.0),
                 m_position(PiePositionMaximized)
             {
             void QPieSeries::set(QList<QPieSlice> slices)
             {
                 m_slices = slices;
-                if (m_piePresentation) {
+                if (m_piePresenter) {
-                    m_piePresentation->seriesChanged();
+                    m_piePresenter->seriesChanged();
-                    m_piePresentation->update();
+                    m_piePresenter->update();
                 }
             }
             void QPieSeries::add(QList<QPieSlice> slices)
             {
                 m_slices += slices;
-                if (m_piePresentation) {
+                if (m_piePresenter) {
-                    m_piePresentation->seriesChanged();
+                    m_piePresenter->seriesChanged();
-                    // TODO: m_piePresentation->seriesAppended()??
+                    // TODO: m_piePresenter->seriesAppended()??
-                    m_piePresentation->update();
+                    m_piePresenter->update();
                 }
             }
             {
                 if ((index >= 0) && (index < m_slices.count())) {
                     m_slices[index] = slice;
-                    if (m_piePresentation) {
+                    if (m_piePresenter) {
-                        m_piePresentation->seriesChanged();
+                        m_piePresenter->seriesChanged();
                         // TODO: for a nice animation we need something like
-                        // m_piePresentation->sliceChanged(index, oldslice, newslice)
+                        // m_piePresenter->sliceChanged(index, oldslice, newslice)
-                        m_piePresentation->update();
+                        m_piePresenter->update();
                     }
                     return true;
                 }
                 if (factor > 0.0)
                     m_sizeFactor = factor;
-                if (m_piePresentation) {
+                if (m_piePresenter) {
-                    m_piePresentation->resize();
+                    m_piePresenter->resize();
-                    m_piePresentation->update();
+                    m_piePresenter->update();
                     // TODO: do we have to update the parent item also?
                     //  - potential issue: what if this function is called from the parent context?
                 }
             void QPieSeries::setPosition(PiePosition position)
             {
                 m_position = position;
-                if (m_piePresentation) {
+                if (m_piePresenter) {
-                    m_piePresentation->resize();
+                    m_piePresenter->resize();
-                    m_piePresentation->update();
+                    m_piePresenter->update();
                     // TODO: do we have to update the parent item also?
                     //  - potential issue: what if this function is called from the parent context?
                 }

src/piechart/qpieseries.h +3 -3

             class QGraphicsObject;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class PiePresentation;
+            class PiePresenter;
             class PieSlice;
             class QPieSlice
                 // TODO: use PIML
                 friend class ChartPresenter;
                 friend class ChartDataSet;
-                friend class PiePresentation;
+                friend class PiePresenter;
-                PiePresentation *m_piePresentation;
+                PiePresenter *m_piePresenter;
                 QList<QPieSlice> m_slices;
                 qreal m_sizeFactor;
                 PiePosition m_position;

src/src.pro +3 -7

                 linechart/linechartanimationitem.cpp \
                 linechart/linechartitem.cpp \
                 linechart/qlinechartseries.cpp \
-                piechart/qpieseries.cpp \
-                piechart/pieslice.cpp \
-                piechart/piepresentation.cpp \
                 barchart/separator.cpp \
                 barchart/bargroupbase.cpp \
                 barchart/barchartseriesbase.cpp \
                 barchart/barlabel_p.h \
                 barchart/bar_p.h \
                 barchart/separator_p.h \
-                piechart/piepresentation.h \
-                piechart/pieslice.h \
                 plotdomain_p.h \
                 qscatterseries_p.h \
                 axisitem_p.h \
                 barchart/percentbargroup.h \
                 barchart/barchartseriesbase.h \
                 barchart/bargroupbase.h \
-                piechart/qpieseries.h \
                 qchartseries.h \
                 qscatterseries.h \
                 qchart.h \
                 qchartglobal.h \
                 qchartview.h \
                 qchartaxis.h
+            include(piechart/piechart.pri)
             THEMES += themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
             HEADERS += $$THEMES
             INCLUDEPATH += linechart \
                 barchart \
-                piechart \
                 themes \
                 .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib

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