HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r682:137b7097b510

build error fix after merge

sauimone -

r682:137b7097b510

parent child

Context file:

r682:137b7097b510

Collapse all files

src/barchart/barchartitem.cpp +16 -13

                  int categoryCount = mSeries->categoryCount();
                  int setCount = mSeries->barsetCount();
-                 qreal tW = mWidth;
-                 qreal tH = mHeight;
+             //    qreal tW = mWidth;
+             //    qreal tH = mHeight;
+                 qreal width = geometry().width();
+                 qreal height = geometry().height();
                  qreal tM = mSeries->max();
                  // Domain:
                      tM = mDomainMaxY;
                  }
-                 qreal scale = (tH/tM);
+                 qreal scale = (height/tM);
                  qreal tC = categoryCount + 1;
-                 qreal categoryWidth = tW/tC;
-                 mBarWidth = categoryWidth / (setCount+1);
+                 qreal categoryWidth = width/tC;
+                 qreal barWidth = categoryWidth / (setCount+1);
                  int itemIndex(0);
                  for (int category=0; category < categoryCount; category++) {
-                     qreal xPos = categoryWidth * category + categoryWidth /2 + mBarWidth/2;
-                     qreal yPos = mHeight;
+                     qreal xPos = categoryWidth * category + categoryWidth /2 + barWidth/2;
+                     qreal yPos = height;
                      for (int set = 0; set < setCount; set++) {
                          qreal barHeight = mSeries->valueAt(set,category) * scale;
                          Bar* bar = mBars.at(itemIndex);
-                         QRectF rect(xPos,yPos-barHeight,mBarWidth,barHeight);
+                         QRectF rect(xPos,yPos-barHeight,barWidth,barHeight);
                          //layout.insert(bar,rect);
                          layout.append(rect);
                          // TODO: width settable per bar?
                          bar->setBrush(mSeries->barsetAt(set)->brush());
              //            bar->setPos(xPos, yPos-barHeight);
                          itemIndex++;
-                         xPos += mBarWidth;
+                         xPos += barWidth;
                      }
                  }
                  // Position floating values
                  itemIndex = 0;
                  for (int category=0; category < mSeries->categoryCount(); category++) {
-                     qreal xPos = categoryWidth * category + categoryWidth/2 + mBarWidth;
-                     qreal yPos = mHeight;
+                     qreal xPos = categoryWidth * category + categoryWidth/2 + barWidth;
+                     qreal yPos = height;
                      for (int set=0; set < mSeries->barsetCount(); set++) {
                          qreal barHeight = mSeries->valueAt(set,category) * scale;
                          BarValue* value = mFloatingValues.at(itemIndex);
                          }
                          itemIndex++;
-                         xPos += mBarWidth;
+                         xPos += barWidth;
                      }
                  }
              void BarChartItem::handleGeometryChanged(const QRectF& rect)
              {
                  m_rect=rect;
-                 layoutChanged();
+                 handleLayoutChanged();
                  mLayoutSet = true;
                  setPos(rect.topLeft());
              }

src/chart_p.h +1 0

              #include "qchartglobal.h"
              #include <QObject>
+             #include <QRect>
              QTCOMMERCIALCHART_BEGIN_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