HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r153:04be7b528347

src/chartpresenter.cpp +14 -4

             m_marginSize(0),
             m_rect(QRectF(QPoint(0,0),m_chart->size()))
             {
-                setTheme(QChart::ChartThemeDefault);
+                setChartTheme(QChart::ChartThemeDefault);
                 createConnections();
                 createDeafultAxis();
             }
                 m_dataset->clearDomains();
             }
-            void ChartPresenter::setTheme(QChart::ChartThemeId theme)
+            void ChartPresenter::setChartTheme(QChart::ChartTheme theme)
             {
                 delete m_chartTheme;
                 }
-            QChart::ChartThemeId ChartPresenter::theme()
+            QChart::ChartTheme ChartPresenter::chartTheme()
             {
-                return (QChart::ChartThemeId) 0;
+                return m_chartTheme->id();
+            }
+            void ChartPresenter::setAxisX(QChartAxis* axis)
+            {
+            }
+            void ChartPresenter::addAxisY(QChartAxis* axis)
+            {
             }
             /*

src/chartpresenter_p.h +4 -9

             public:
                 ChartPresenter(QChart* chart,ChartDataSet *dataset);
                 virtual ~ChartPresenter();
-            /*
-                void setAxisX(const QChartAxis& axis);
-                void setAxisY(const QChartAxis& axis);
-                void setAxisY(const QList<QChartAxis>& axis);
-            */
                 void setMargin(int margin);
                 int margin() const;
                 void zoomOut();
                 void zoomReset();
-                void setTheme(QChart::ChartThemeId theme);
+                void setChartTheme(QChart::ChartTheme theme);
-                QChart::ChartThemeId theme();
+                QChart::ChartTheme chartTheme();
+                void setAxisX(QChartAxis* axis);
+                void addAxisY(QChartAxis* axis);
             private:
                 void createConnections();
                 void createDeafultAxis();

src/charttheme.cpp +3 -2

                     m_gradientEndColor = QColor(QRgb(0xffafafaf));
             */
-            ChartTheme::ChartTheme()
+            ChartTheme::ChartTheme(QChart::ChartTheme id)
             {
+                m_id = id;
                 m_seriesColor.append(QRgb(0xff000000));
                 m_seriesColor.append(QRgb(0xff707070));
                 m_gradientStartColor = QColor(QRgb(0xffffffff));
             }
-            ChartTheme* ChartTheme::createTheme(QChart::ChartThemeId theme)
+            ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
             {
                 switch(theme) {
                     case QChart::ChartThemeDefault:

src/charttheme_p.h +4 -2

             class ChartTheme
             {
             protected:
-                explicit ChartTheme();
+                explicit ChartTheme(QChart::ChartTheme id =  QChart::ChartThemeDefault);
             public:
-                static ChartTheme* createTheme(QChart::ChartThemeId theme);
+                static ChartTheme* createTheme(QChart::ChartTheme theme);
+                QChart::ChartTheme id() const {return m_id;}
                 void decorate(QChart* chart);
                 void decorate(ChartItem* item, QChartSeries* series,int count);
                 void decorate(LineChartItem* item, QLineChartSeries*, int count);
                 void decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count);
             protected:
+                QChart::ChartTheme m_id;
                 QColor m_gradientStartColor;
                 QColor m_gradientEndColor;
                 QList<QColor> m_seriesColor;

src/qchart.cpp +8 -18

                 m_presenter->setMargin(margin);
             }
-            void QChart::setTheme(QChart::ChartThemeId theme)
+            void QChart::setChartTheme(QChart::ChartTheme theme)
             {
-                m_presenter->setTheme(theme);
+                m_presenter->setChartTheme(theme);
             }
-            QChart::ChartThemeId QChart::theme()
+            QChart::ChartTheme QChart::chartTheme() const
             {
-                return m_presenter->theme();
+                return m_presenter->chartTheme();
             }
             void QChart::zoomInToRect(const QRectF& rectangle)
                 m_presenter->zoomReset();
             }
-            void QChart::setAxisX(const QChartAxis& axis)
+            void QChart::setAxisX(QChartAxis* axis)
             {
+                m_presenter->setAxisX(axis);
             }
-            void QChart::setAxisY(const QChartAxis& axis)
+            void QChart::addAxisY(QChartAxis* axis)
-            void QChart::setAxisY(const QList<QChartAxis>& axis)
             {
-                //TODO not implemented
+                m_presenter->addAxisY(axis);
-            void QChart::setAxis(AxisItem *item, const QChartAxis& axis)
             }
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)

src/qchart.h +5 -7

             {
                 Q_OBJECT
             public:
-                enum ChartThemeId {
+                enum ChartTheme {
-                    ChartThemeInvalid = -1,
                     /*! The default theme follows the GUI style of the Operating System */
                     ChartThemeDefault,
                     ChartThemeVanilla,
                 void setMargin(int margin);
                 int margin() const;
-                void setTheme(QChart::ChartThemeId theme);
+                void setChartTheme(QChart::ChartTheme theme);
-                QChart::ChartThemeId theme();
+                QChart::ChartTheme chartTheme() const;
                 void setTitle(const QString& title,const QFont& font = QFont());
                 void setChartBackgroundBrush(const QBrush& brush);
                 void zoomOut();
                 void zoomReset();
-                void setAxisX(const QChartAxis& axis);
+                void setAxisX(QChartAxis* axis);
-                void setAxisY(const QChartAxis& axis);
+                void addAxisY(QChartAxis* axis);
-                void setAxisY(const QList<QChartAxis>& axis);
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);

src/qchartview.cpp +6 -2

                 }
             }
-            void QChartView::setTheme(QChart::ChartThemeId theme)
+            void QChartView::setChartTheme(QChart::ChartTheme theme)
             {
-                m_chart->setTheme(theme);
+                m_chart->setChartTheme(theme);
             }
+            QChart::ChartTheme QChartView::chartTheme() const
+            {
+                return m_chart->chartTheme();
+            }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +2 -1

                 void setRubberBandPolicy(const RubberBandPolicy );
                 RubberBandPolicy rubberBandPolicy() const;
-                void setTheme(QChart::ChartThemeId theme);
+                void setChartTheme(QChart::ChartTheme theme);
+                QChart::ChartTheme chartTheme() const;
             protected:
                 void mousePressEvent(QMouseEvent *event);

src/themes/chartthemegrayscale_p.h +1 -1

             class ChartThemeGrayscale: public ChartTheme
             {
             public:
-                ChartThemeGrayscale()
+                ChartThemeGrayscale():ChartTheme(QChart::ChartThemeGrayscale)
                 {
                     m_seriesColor.append(QRgb(0xFF869299));
                     m_seriesColor.append(QRgb(0xFFA5BDCC));

src/themes/chartthemeicy_p.h +1 -1

             class ChartThemeIcy: public ChartTheme
             {
             public:
-                ChartThemeIcy()
+                ChartThemeIcy():ChartTheme(QChart::ChartThemeIcy)
                 {
                     m_seriesColor.append(QRgb(0xFF0D2673));
                     m_seriesColor.append(QRgb(0xFF2685BF));

src/themes/chartthemescientific_p.h +1 -1

             class ChartThemeScientific: public ChartTheme
             {
             public:
-                ChartThemeScientific()
+                ChartThemeScientific():ChartTheme(QChart::ChartThemeScientific)
                 {
                     m_seriesColor.append(QRgb(0xFF000000));
                     m_seriesColor.append(QRgb(0xFFFFAD00));

src/themes/chartthemevanilla_p.h +1 -1

             class ChartThemeVanilla: public ChartTheme
             {
             public:
-                ChartThemeVanilla()
+                ChartThemeVanilla():ChartTheme(QChart::ChartThemeVanilla)
                 {
                     m_seriesColor.append(QColor(217, 197, 116));
                     m_seriesColor.append(QColor(214, 168, 150));

	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