HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r60:0be2c26f8dc1

Added size factor property to pie

Tero Ahola -

r60:0be2c26f8dc1

parent child

Context file:

r60:0be2c26f8dc1

Collapse all files

charts.pro +2 -2

             !include(common.pri) {
-             error('missing common.pri')
+                error('missing common.pri')
             }
             TEMPLATE = subdirs
-            SUBDIRS +=  src example test
+            SUBDIRS += src example test
             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
             unix:QMAKE_DISTCLEAN += -r build bin

integrated.pri +10 -10

                 #this is ugly hack to work around missing rpath, it simply copies lib
                 win32:{
                     copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
-                    copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
+                    copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
                     copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
                     PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                     QMAKE_EXTRA_TARGETS +=copylib
                 }
                 } else {
-                LIBS += -lQtCommercialChart
+                    LIBS += -lQtCommercialChart
-                #this is ugly hack to work around missing rpath, it simply copies lib
+                    #this is ugly hack to work around missing rpath, it simply copies lib
-                win32:{
+                    win32: {
-                    copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
+                        copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
-                    copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
+                        copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
-                    copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
+                        copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
-                    PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
+                        PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
-                    QMAKE_EXTRA_TARGETS +=copylib
+                        QMAKE_EXTRA_TARGETS +=copylib
                     }
                 }
-            }else{
+            } else {
                 CONFIG+=qtcommercialchart
             }

src/pieslice.cpp +4 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PieSlice::PieSlice(const QColor& color, qreal startAngle, qreal span)
+            PieSlice::PieSlice(const QColor& color, qreal startAngle, qreal span, QRectF rect)
                 : m_color(color),
                 m_startAngle(startAngle),
-                m_span(span)
+                m_span(span),
+                m_rect(rect)
             {
                 setAcceptHoverEvents(true);
             }
             QRectF PieSlice::boundingRect() const
             {
-                return parentItem()->boundingRect();
+                return m_rect;
             }
             QPainterPath PieSlice::shape() const

src/pieslice.h +3 -2

             class PieSlice : public QGraphicsItem
             {
             public:
-                PieSlice(const QColor& color, qreal startAngle, qreal span);
+                PieSlice(const QColor& color, qreal startAngle, qreal span, QRectF rect);
                 ~PieSlice();
             public: // from QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 void hoverEnterEvent(QGraphicsSceneHoverEvent * event);
-            private:
+            public:
                 QColor m_color;
                 qreal m_startAngle;
                 qreal m_span;
+                QRectF m_rect;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qpieseries.cpp +43 -6

             QPieSeries::QPieSeries(QList<qreal> x, QGraphicsObject *parent) :
                 QChartSeries(parent),
-                m_x(x)
+                m_x(x),
+                m_sizeFactor(1.0)
             {
                 // Create slices
                 qreal fullPie = 360;
                 QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent);
                 Q_ASSERT(parentItem);
+                m_chartSize = parentItem->boundingRect();
                 qreal angle = 0;
                 // TODO: no need to create new slices in case size changed; we should re-use the existing ones
                 foreach (qreal value, m_x) {
                     qreal span = value / total * fullPie;
-                    PieSlice *slice = new PieSlice(randomColor(), angle, span);
+                    PieSlice *slice = new PieSlice(randomColor(), angle, span, parentItem->boundingRect());
                     slice->setParentItem(parentItem);
                     m_slices.append(slice);
                     angle += span;
                 }
+                resizeSlices(m_chartSize);
             }
             QPieSeries::~QPieSeries()
             {
+                while (m_slices.count())
+                    delete m_slices.takeLast();
             }
-            void QPieSeries::chartSizeChanged(QRectF /*rect*/)
+            void QPieSeries::chartSizeChanged(QRectF chartRect)
             {
+                // TODO: allow user setting the size?
+                // TODO: allow user defining the margins?
+                m_chartSize = chartRect;
+                resizeSlices(m_chartSize);
+            }
+            void QPieSeries::resizeSlices(QRectF rect)
+            {
+                QRectF tempRect = rect;
+                if (tempRect.width() < tempRect.height()) {
+                    tempRect.setWidth(tempRect.width() * m_sizeFactor);
+                    tempRect.setHeight(tempRect.width());
+                    tempRect.moveCenter(rect.center());
+                } else {
+                    tempRect.setHeight(tempRect.height() * m_sizeFactor);
+                    tempRect.setWidth(tempRect.height());
+                    tempRect.moveCenter(rect.center());
+                }
+                foreach (PieSlice *slice, m_slices)
+                    slice->m_rect = tempRect;
+            }
+            void QPieSeries::setSizeFactor(qreal factor)
+            {
+                if (factor > 0.0)
+                    m_sizeFactor = factor;
+                resizeSlices(m_chartSize);
+                // Initiate update via the parent graphics item
+                // TODO: potential issue: what if this function is called from the parent context?
+                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent());
+                Q_ASSERT(parentItem);
+                parentItem->update();
             }
             QColor QPieSeries::randomColor()
                 return c;
             }
-            void QPieSeries::setData(QList<int> data)
             #include "moc_qpieseries.cpp"

src/qpieseries.h +6 -2

             class QTCOMMERCIALCHART_EXPORT QPieSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 // TODO: use a generic data class instead of x and y
                 QPieSeries(QList<qreal> x, QGraphicsObject *parent = 0);
                 ~QPieSeries();
                 QColor randomColor();
-                void setData(QList<int> data);
+                void setSizeFactor(qreal sizeFactor);
+                qreal sizeFactor() { return m_sizeFactor; }
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypePie; }
                 void chartSizeChanged(QRectF rect);
             private:
+                void resizeSlices(QRectF rect);
                 //Q_DECLARE_PRIVATE(QPieSeries)
                 Q_DISABLE_COPY(QPieSeries)
                 // TODO: move the followin to internal impl
                 QList<qreal> m_x;
                 QList<PieSlice*> m_slices;
-                QSizeF m_size;
+                QRectF m_chartSize;
+                qreal m_sizeFactor;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

test/chartwidgettest/chartwidgettest.pro +6 -8

-            include( ../../common.pri )
+            !include( ../../common.pri ) {
-            include( ../../integrated.pri )
+                error( "Couldn't find the common.pri file!" )
+            }
+            !include( ../../integrated.pri ) {
+                error( "Couldn't find the integrated.pri file !")
+            }
             TARGET = chartwidgettest
             TEMPLATE = app
                 QT += widgets
             }
             OBJECTS_DIR = tmp
             MOC_DIR = tmp
             SOURCES += main.cpp \
                 mainwidget.cpp \
-            #    qscatterseries.cpp \
-            #    qseriespointgraphicsitem.cpp \
                 dataseriedialog.cpp
             HEADERS += \
                 mainwidget.h \
-            #    qscatterseries.h \
-            #    qseriespointgraphicsitem.h \
                 dataseriedialog.h

test/chartwidgettest/mainwidget.cpp +55 -25

             #include "mainwidget.h"
             #include "dataseriedialog.h"
+            #include "qchartseries.h"
+            #include "qpieseries.h"
             #include <qxychartseries.h>
             #include <QPushButton>
             #include <QComboBox>
                 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
                 QGridLayout *grid = new QGridLayout();
-                QHBoxLayout *hbox = new QHBoxLayout();
+                QGridLayout *mainLayout = new QGridLayout();
                 //grid->addWidget(new QLabel("Add series:"), 0, 0);
                 grid->addWidget(addSeriesButton, 0, 1);
                 grid->addWidget(new QLabel("Background:"), 2, 0);
                 grid->addWidget(new QLabel(""), 8, 0);
                 grid->setRowStretch(8, 1);
-                hbox->addLayout(grid);
+                mainLayout->addLayout(grid, 0, 0);
+                // Scatter specific settings
+                m_scatterLayout = new QGridLayout();
+                m_scatterLayout->addWidget(new QLabel("scatter"), 0, 0);
+                m_scatterLayout->setEnabled(false);
+                // Pie specific settings
+                m_pieLayout = new QGridLayout();
+                m_pieLayout->addWidget(new QLabel("Pie size factor"), 0, 0);
+                QDoubleSpinBox *pieSizeSpin = new QDoubleSpinBox();
+                pieSizeSpin->setMinimum(LONG_MIN);
+                pieSizeSpin->setMaximum(LONG_MAX);
+                pieSizeSpin->setValue(1.0);
+                pieSizeSpin->setSingleStep(0.1);
+                connect(pieSizeSpin, SIGNAL(valueChanged(double)), this, SLOT(setPieSizeFactor(double)));
+                m_pieLayout->setEnabled(false);
+                m_pieLayout->addWidget(pieSizeSpin, 0, 1);
+                mainLayout->addLayout(m_scatterLayout, 1, 0);
+                mainLayout->addLayout(m_pieLayout, 2, 0);
                 m_chartWidget = new QChartWidget(this);
                 //m_chartWidget->setColor(Qt::red);
-                hbox->addWidget(m_chartWidget);
+                mainLayout->addWidget(m_chartWidget, 0, 1, 3, 1);
             //    hbox->setStretch(1, 1);
-                setLayout(hbox);
+                setLayout(mainLayout);
                 m_autoScaleCheck->setChecked(true);
-                chartTypeChanged(4);
                 testDataChanged(0);
             }
             void MainWidget::addSeries()
             {
-                DataSerieDialog dialog(m_defaultSeries, this);
+                DataSerieDialog dialog(m_defaultSeriesName, this);
                 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
                 dialog.exec();
             }
             void MainWidget::addSeries(QString series, QString data)
             {
                 qDebug() << "addSeries: " << series << " data: " << data;
-                m_defaultSeries = series;
+                m_defaultSeriesName = series;
+                QChartSeries *newSeries = QXYChartSeries::create();
-                QXYChartSeries* series0 = QXYChartSeries::create();
                 // TODO: a dedicated data class for storing x and y values
                 QList<qreal> x;
                         y.append(i);
                     }
                     for (int i = 0; i < 20; i++)
-                        series0->add(i, i);
+                        ((QXYChartSeries *)newSeries)->add(i, i);
                 } else if (data == "linear, 1M") {
                     for (int i = 0; i < 10000; i++) {
                         x.append(i);
                         y.append(20);
                     }
                     for (int i = 0; i < 1000000; i++)
-                        series0->add(i, 10);
+                        ((QXYChartSeries *)newSeries)->add(i, 10);
                 } else if (data == "SIN") {
                     for (int i = 0; i < 100; i++) {
                         x.append(i);
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
                     }
                     for (int i = 0; i < 100; i++)
-                        series0->add(i, abs(sin(3.14159265358979 / 50 * i) * 100));
+                        ((QXYChartSeries *)newSeries)->add(i, abs(sin(3.14159265358979 / 50 * i) * 100));
                 } else if (data == "SIN + random") {
                     for (qreal i = 0; i < 100; i += 0.1) {
                         x.append(i + (rand() % 5));
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                     }
                     for (qreal i = 0; i < 100; i += 0.1)
-                        series0->add(i + (rand() % 5), abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
+                        ((QXYChartSeries *)newSeries)->add(i + (rand() % 5), abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                 } else {
                     // TODO: check if data has a valid file name
                 }
                 // TODO: color of the series
                 if (series == "Scatter") {
-                    /*QChartSeries* scatterSeries = */
+                    newSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
-                    m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
                 } else if (series == "Pie") {
-                    m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypePie);
+                    newSeries = m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypePie);
                 } else if (series == "Line") {
-                    m_chartWidget->addSeries(series0);
+                    m_chartWidget->addSeries(newSeries);
                 } else {
                     // TODO
                 }
+                setCurrentSeries(newSeries);
             }
-            void MainWidget::chartTypeChanged(int itemIndex)
+            void MainWidget::setCurrentSeries(QChartSeries *series)
             {
-                // TODO: change chart type
+                m_currentSeries = series;
-                switch (itemIndex) {
+                switch (m_currentSeries->type()) {
-                case 4:
+                case QChartSeries::SeriesTypeLine:
-                    //m_chartWidget->setType(4);
                     break;
-                default: {
+                case QChartSeries::SeriesTypeScatter:
-                    //m_chartWidget->setType(0);
+                    break;
+                case QChartSeries::SeriesTypePie:
+                    break;
+                default:
+                    Q_ASSERT(false);
                     break;
                 }
             }
             {
                 qDebug() << "yMaxChanged: " << value;
             }
+            void MainWidget::setPieSizeFactor(double size)
+            {
+                QPieSeries *pie = qobject_cast<QPieSeries *>(m_currentSeries);
+                Q_ASSERT(pie);
+                pie->setSizeFactor(qreal(size));
+            }

test/chartwidgettest/mainwidget.h +7 -2

             class QSpinBox;
             class QCheckBox;
+            class QGridLayout;
             QTCOMMERCIALCHART_USE_NAMESPACE
             signals:
             private slots:
-                void chartTypeChanged(int itemIndex);
                 void addSeries();
                 void addSeries(QString series, QString data);
                 void testDataChanged(int itemIndex);
                 void xMaxChanged(int value);
                 void yMinChanged(int value);
                 void yMaxChanged(int value);
+                void setCurrentSeries(QChartSeries *series);
+                void setPieSizeFactor(double margin);
             private:
                 QChartWidget *m_chartWidget;
                 QSpinBox *m_xMaxSpin;
                 QSpinBox *m_yMinSpin;
                 QSpinBox *m_yMaxSpin;
-                QString m_defaultSeries;
+                QString m_defaultSeriesName;
+                QChartSeries *m_currentSeries;
+                QGridLayout *m_scatterLayout;
+                QGridLayout *m_pieLayout;
             };
             #endif // MAINWIDGET_H

src/pie/main.cpp removed 0 -168

NO CONTENT: file was removed

src/pie/pie.pro removed 0 -15

NO CONTENT: file was removed

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