HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r106:bc1381ca9ce2

adopted theme interface to barcharts

sauimone -

r106:bc1381ca9ce2

parent child

Context file:

r106:bc1381ca9ce2

Collapse all files

src/barchart/bargroup.cpp +2 -1

             void BarGroup::setTheme(ChartTheme *theme)
             {
-                // TODO
+                qDebug() << "BarGroup::setTheme";
+                // TODO:
             }
             void BarGroup::setBarWidth( int w )

src/barchart/percentbargroup.cpp +6 0

                 // TODO:
             }
+            void PercentBarGroup::setTheme(ChartTheme *theme)
+            {
+                qDebug() << "PercentBarGroup::setTheme";
+                // TODO:
+            }
             void PercentBarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;

src/barchart/stackedbargroup.cpp +6 0

                 // TODO:
             }
+            void StackedBarGroup::setTheme(ChartTheme *theme)
+            {
+                qDebug() << "StackedBarGroup::setTheme";
+                // TODO:
+            }
             void StackedBarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;

src/barchart/stackedbargroup.h +1 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            // TODO: derive this from ChartObjectInterface, when setSize is back in ChartItem
             class StackedBarGroup : public ChartItem
             {
             public:

src/chartitem_p.h +2 -1

             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            // TODO: setSize and set plotDomain back here. Derive this only from QGraphicsItem
+            // class ChartItem : public QGraphicsItem
             class ChartItem : public QGraphicsItem, public ChartObjectInterface
             {
                 enum ChartItemTypes{ AXIS_ITEM = UserType+1, XYLINE_ITEM};

src/chartobjectinterface_p.h +1 0

             class ChartObjectInterface
             {
             public:
+            // TODO: move setSize and setPlotDomain back to ChartItem. This interface should be only about handling themes.
                 virtual void setSize(const QSize &size) = 0;
                 virtual void setTheme(ChartTheme *theme) = 0;
                 virtual void setPlotDomain(const PlotDomain& data) = 0;

src/qchart.cpp +6 -4

                     m_chartObjectInterfaces << barGroup;
                     childItems().append(barGroup);
+            /*
                     m_plotDataIndex = 0 ;
                     m_plotDomainList.resize(1);
                     PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     foreach(ChartItem* i ,m_chartItems)
                         i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
+            */
                     break;
                     }
                 case QChartSeries::SeriesTypeStackedBar: {
                     m_chartObjectInterfaces << stackedBarGroup;
                     childItems().append(stackedBarGroup);
+            /*
                     m_plotDataIndex = 0 ;
                     m_plotDomainList.resize(1);
                     PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     foreach(ChartItem* i ,m_chartItems)
                         i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
+            */
                     break;
                     }
                 case QChartSeries::SeriesTypePercentBar: {
                     m_chartObjectInterfaces << percentBarGroup;
                     childItems().append(percentBarGroup);
+            /*
                     m_plotDataIndex = 0 ;
                     m_plotDomainList.resize(1);
                     PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     foreach(ChartItem* i ,m_chartItems)
                         i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
+            */
                     break;
                     }
                 case QChartSeries::SeriesTypeScatter: {

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