HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r119:9025093c4c9d

prototyping separators with stacked bars

sauimone -

r119:9025093c4c9d

parent child

Context file:

r119:9025093c4c9d

Collapse all files

src/barchart/stackedbargroup.cpp +35 -6

              #include "bar_p.h"
              #include "barlabel_p.h"
              #include <QDebug>
+             #include <QPainter>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                ,mLayoutDirty(true)
                ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                ,mTheme(0)
+               ,mSeparatorsVisible(true)
              {
                  dataChanged();
              }
+             void StackedBarGroup::setSeparatorsVisible(bool visible)
+             {
+                 mSeparatorsVisible = visible;
+             }
              void StackedBarGroup::setSize(const QSizeF& size)
              {
-             //    qDebug() << "StackedBarGroup::setSize";
                  mWidth = size.width();
                  mHeight = size.height();
                  layoutChanged();
                      foreach(QGraphicsItem* i, childItems()) {
                          i->paint(painter,option,widget);
                      }
-                     mLayoutDirty = false;
-                 //TODO: draw labels.
+                     if (mSeparatorsVisible) {
+                         //TODO: own class for separators (graphicsitem), because they may have style etc later.
+                         // this is just to see that the positions are calculated correctly.
+                         QPen pen(QColor(0,0,255,255));
+                         painter->setPen(pen);
+                         for (int i=0; i<mSeparatorPositions.count(); i++ ) {
+                             qreal xp = mSeparatorPositions.at(i);
+                             painter->drawLine(xp,0,xp,mHeight);
+                         }
+                     }
+             //        mLayoutDirty = false;
                  }
              }
              void StackedBarGroup::dataChanged()
              {
-                 qDebug() << "QBarChart::dataChanged mSeries";
+                 qDebug() << "QBarChart::dataChanged";
                  // Find out maximum and minimum of all series
                  mMax = mSeries.max();
                      childItems().append(label);
                  }
+                 mSeparatorPositions.clear();
                  // TODO: if (autolayout) { layoutChanged() } or something
                  mLayoutDirty = true;
              }
                      return;
                  }
+                 if (mSeries.countColumns() == 0) {
+                     // Nothing to do
+                     return;
+                 }
                  // TODO: better way to auto-layout
                  // Use reals for accurancy (we might get some compiler warnings... :)
+                 // TODO: use temp variable for column count...
                  qreal maxSum = mSeries.maxColumnSum();
                  qreal h = mHeight;
                  qreal scale = (h / maxSum);
-                 int count = mSeries.countColumns();
                  int itemIndex(0);
                  qreal tW = mWidth;
-                 qreal tC = count+1;
+                 qreal tC = mSeries.countColumns() + 1;
                  qreal xStep = (tW/tC);
                  qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                  int labelIndex = mSeries.countColumns() * mSeries.countRows();
                      xPos += xStep;
                  }
+                 // Position separators
+                 mSeparatorPositions.clear();
+                 xPos = xStep + xStep/2;     // Initial position is between first and second group. ie one and half steps from left.
+                 for (int s=0; s < mSeries.countColumns() - 1; s++) {
+                     mSeparatorPositions.append(xPos);
+                     xPos += xStep;
+                 }
                  mLayoutDirty = true;
              }

src/barchart/stackedbargroup.h +5 -1

              public:
                  StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent = 0);
+                 // Bar chart spesific
+                 void setSeparatorsVisible(bool visible = true);
              public: // From ChartItem
                  void setSize(const QSizeF &size);
                  void setPlotDomain(const PlotDomain& data);
                  QList<QColor> mColors;  // List of colors for series for now
                  ChartTheme* mTheme;
-             //    QList<BarLabel*> mLabels;
+                 bool mSeparatorsVisible;
+                 QList<qreal> mSeparatorPositions;
              };

src/qchart.cpp +3 0

                      domain.m_minY = qMin(domain.m_minY,y);
                      domain.m_maxX = qMax(domain.m_maxX,x);
                      domain.m_maxY = qMax(domain.m_maxY,y);
+                     m_axisXItem->setVisible(false);
                      break;
                      }
                  case QChartSeries::SeriesTypeStackedBar: {
                      domain.m_minY = qMin(domain.m_minY,y);
                      domain.m_maxX = qMax(domain.m_maxX,x);
                      domain.m_maxY = qMax(domain.m_maxY,y);
+                     m_axisXItem->setVisible(false);
                      break;
                      }
                  case QChartSeries::SeriesTypePercentBar: {
                      domain.m_minY = 0;
                      domain.m_maxX = qMax(domain.m_maxX,x);
                      domain.m_maxY = 100;
+                     m_axisXItem->setVisible(false);
                      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