HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r655:7ed6749a4b0d

Barchart updates on BarSet->SetValue now

Marek Rosa -

r655:7ed6749a4b0d

parent child

Context file:

r655:7ed6749a4b0d

examples/tablemodelchart/tablewidget.cpp +3 -3

                     // pie 1
                     QPieSeries* pieSeries = new QPieSeries;
                     pieSeries->setModel(m_model);
-                    pieSeries->setModelMapping(0,0, Qt::Horizontal);
+                    pieSeries->setModelMapping(0,0, Qt::Vertical);
                     pieSeries->setLabelsVisible(true);
                     pieSeries->setPieSize(0.4);
                     pieSeries->setPiePosition(0.2, 0.35);
                     // pie 2
                     pieSeries = new QPieSeries;
                     pieSeries->setModel(m_model);
-                    pieSeries->setModelMapping(1,1, Qt::Horizontal);
+                    pieSeries->setModelMapping(1,1, Qt::Vertical);
                     pieSeries->setLabelsVisible(true);
                     pieSeries->setPieSize(0.4);
                     pieSeries->setPiePosition(0.8, 0.35);
                     // pie 3
                     pieSeries = new QPieSeries;
                     pieSeries->setModel(m_model);
-                    pieSeries->setModelMapping(2,2, Qt::Horizontal);
+                    pieSeries->setModelMapping(2,2, Qt::Vertical);
                     pieSeries->setLabelsVisible(true);
                     pieSeries->setPieSize(0.4);
                     pieSeries->setPiePosition(0.5, 0.65);

src/barchart/barpresenter.cpp +2 0

             BarPresenter::BarPresenter(QBarSeries *series, QChart *parent) :
                 BarPresenterBase(series, parent)
             {
+                connect(series, SIGNAL(updatedBars()), this, SLOT(layoutChanged()));
             }
             void BarPresenter::layoutChanged()
                         xPos += mBarWidth;
                     }
                 }
+                update();
             }
             #include "moc_barpresenter_p.cpp"

src/barchart/barpresenterbase_p.h +1 0

                 // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
+            private slots:
                 virtual void layoutChanged() = 0;   // layout has changed -> need to recalculate bar sizes
             protected:

src/barchart/qbarseries.cpp +2 -2

                 mModel->addBarSet(set);
                 connect(set,SIGNAL(clicked(QString)),this,SLOT(barsetClicked(QString)));
                 connect(set,SIGNAL(rightClicked(QString)),this,SLOT(barsetRightClicked(QString)));
-                connect(set, SIGNAL(changed()), this, SLOT(barsetChanged()));
+                connect(set, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
             }
             /*!
             void QBarSeries::barsetChanged()
             {
-            //    mModel->
+                emit updatedBars();
             }
             #include "moc_qbarseries.cpp"

src/barchart/qbarseries.h +4 -1

                 void clicked(QBarSet* barset, QString category);        // Up to user of api, what to do with these signals
                 void rightClicked(QBarSet* barset, QString category);
+                //
+                void updatedBars();
                 // TODO: internal signals, these to private implementation.
                 // TODO: TO PIMPL --->
                 void showToolTip(QPoint pos, QString tip);
             protected:
                 BarChartModel* mModel;
-                QAbstractItemModel* m_model;
+            //    QAbstractItemModel* m_model;
                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;

src/barchart/qbarset.cpp +4 -3

             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 mValues.append(value);
+                emit structureChanged();
                 return *this;
             }
             void QBarSet::setValue(int index, qreal value)
             {
                 mValues.replace(index,value);
-                emit changed();
+                emit valueChanged();
             }
             /*!
             void QBarSet::setPen(const QPen pen)
             {
                 mPen = pen;
-                emit changed();
+                emit valueChanged();
             }
             /*!
             void QBarSet::setBrush(const QBrush brush)
             {
                 mBrush = brush;
-                emit changed();
+                emit valueChanged();
             }
             /*!

src/barchart/qbarset.h +2 -1

                 // TODO: Expose this to user or not?
                 // TODO: TO PIMPL --->
-                void changed();
+                void structureChanged();
+                void valueChanged();
                 void hoverEnter(QPoint pos);
                 void hoverLeave();
                 void showToolTip(QPoint pos, QString tip);  // Private signal

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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