HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r113:184733143a25

theme interface to barcharts. some minor fixes

sauimone -

r113:184733143a25

parent child

Context file:

r113:184733143a25

Collapse all files

src/barchart/bar.cpp +10 -2

                 mPlotDomain = data;
             }
-            void Bar::resize( int w, int h )
+            void Bar::resize( qreal w, qreal h )
             {
             //    qDebug() << "bar::resize" << w << h;
                 mWidth = w;
                 // TODO: accept brush instead of color
                 QBrush brush(mColor);
                 painter->setBrush(brush);
-                painter->drawRect(mXpos-mWidth, mYpos-mHeight ,mWidth ,mHeight); // Evil inverse rect, because we want bars to grow from bottom to top :)
+                // This compensates for rounding errors. drawRect takes ints and cumulative error of pos + size may be over 1.
+                int x0 = mXpos;
+                int x1 = (mXpos + mWidth);
+                int w = x1-x0;
+                int y0 = mYpos;
+                int y1 = (mYpos + mHeight);
+                int h = y1-y0;
+                painter->drawRect(x0, y0 ,w ,h);
             }
             QRectF Bar::boundingRect() const

src/barchart/bar.h +4 -4

             public:
                 Bar(QGraphicsItem *parent=0);
-            public: // from ChartItemControl
+            public: // from ChartItem
                 void setSize(const QSize &size);
                 void setPlotDomain(const PlotDomain& data);
                 // Layout Stuff
-                void resize( int w, int h );       // Size of bar. in screen coordinates.
+                void resize( qreal w, qreal h );   // Size of bar.
                 void setColor( QColor col );       // Color of bar
                 void setPos(qreal x, qreal y);
             private:
-                int mHeight;
+                qreal mHeight;
-                int mWidth;
+                qreal mWidth;
                 qreal mXpos;
                 qreal mYpos;
                 QColor mColor;

src/barchart/bargroup.cpp +2 -1

                 int itemIndex(0);
                 for (int column=0; column < columnCount; column++) {
                     qreal xPos = xStepPerSeries * column + ((tW + mBarDefaultWidth*rowCount)/(columnCount*2));
+                    qreal yPos = mHeight;
                     for (int row = 0; row < rowCount; row++) {
                         qreal barHeight = mSeries.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
-                        bar->setPos(xPos, mHeight); // item*posStep+startPos + series * mBarDefaultWidth, mHeight);
+                        bar->setPos(xPos, yPos-barHeight); // item*posStep+startPos + series * mBarDefaultWidth, mHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }

src/barchart/percentbargroup.cpp +1 -1

                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
-                        bar->setPos(xPos, yPos);
+                        bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }

src/barchart/stackedbargroup.cpp +10 -2

               ,mLayoutSet(false)
               ,mLayoutDirty(true)
               ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
+              ,mTheme(0)
             {
                 dataChanged();
             }
                 // TODO:
             }
+            void StackedBarGroup::themeChanged(ChartTheme *theme)
+            {
+                mTheme = theme;
+            }
             void StackedBarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
                 qreal tW = mWidth;
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
-                qreal xPos = ((tW/tC) + mBarDefaultWidth / 2);
+                qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 for (int column = 0; column < mSeries.countColumns(); column++) {
                     qreal yPos = h;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
+                        // TODO: how to get color for series(x) from theme?
+            //            mTheme->themeForSeries();
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
-                        bar->setPos(xPos, yPos);
+                        bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }

src/barchart/stackedbargroup.h +7 -1

             #ifndef STACKEDBARGROUP_H
             #define STACKEDBARGROUP_H
+            #include "charttheme_p.h"
             #include "chartitem_p.h"
             #include "bar.h"
             #include "stackedbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: derive this from ChartObjectInterface, when setSize is back in ChartItem
-            class StackedBarGroup : public ChartItem
+            class StackedBarGroup : public ChartItem, public ChartThemeObserver
             {
             public:
                 StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent = 0);
                 void setSize(const QSize &size);
                 void setPlotDomain(const PlotDomain& data);
+                // From ChartThemeObserver
+                void themeChanged(ChartTheme *theme);
             public: // Layout "api"
                 void setPos(qreal x, qreal y);
                 void setBarWidth( int w );          // Default width for each bar
                 QList<QColor> mColors;  // List of colors for series for now
+                ChartTheme* mTheme;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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