HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r683:ef336a9288eb

Fixes after merge

Michal Klocek -

r683:ef336a9288eb

parent child

Context file:

r683:ef336a9288eb

Collapse all files

src/animations/baranimation.cpp 0 -7

              {
              }
-             void BarAnimation::updateValues(const QVector<QRectF>& layout)
+             {
-                 // TODO?:
-             //    qDebug() << "BarAnimation::updateValues" << layout.count();
+             }
              QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
              {
                  QVector<QRectF> startVector = qVariantValue<QVector<QRectF> > (from);

src/animations/baranimation_p.h 0 -2

                  BarAnimation(BarChartItem *item);
                  ~BarAnimation();
-                 void updateValues(const QVector<QRectF>& layout);
              public: // from QVariantAnimation
                  virtual QVariant interpolated (const QVariant & from, const QVariant & to, qreal progress ) const;
                  virtual void updateCurrentValue (const QVariant & value );

src/barchart/barchartitem.cpp +9 -12

                  QVector<QRectF> layout;
                  // Use temporary qreals for accurancy (we might get some compiler warnings... :)
-                 int categoryCount = mSeries->categoryCount();
-                 int setCount = mSeries->barsetCount();
+                 qreal categoryCount = mSeries->categoryCount();
+                 qreal setCount = mSeries->barsetCount();
-             //    qreal tW = mWidth;
-             //    qreal tH = mHeight;
                  qreal width = geometry().width();
                  qreal height = geometry().height();
-                 qreal tM = mSeries->max();
+                 qreal max = mSeries->max();
                  // Domain:
-                 if (mDomainMaxY > tM) {
-                     tM = mDomainMaxY;
+                 if (mDomainMaxY > max) {
+                     max = mDomainMaxY;
                  }
-                 qreal scale = (height/tM);
-                 qreal tC = categoryCount + 1;
-                 qreal categoryWidth = width/tC;
+                 qreal scale = (height/max);
+                 qreal categoryWidth = width/categoryCount;
                  qreal barWidth = categoryWidth / (setCount+1);
                  int itemIndex(0);
                  for (int category=0; category < categoryCount; category++) {
-                     qreal xPos = categoryWidth * category + categoryWidth /2 + barWidth/2;
+                     qreal xPos = categoryWidth * category + barWidth/2;
                      qreal yPos = height;
                      for (int set = 0; set < setCount; set++) {
                          qreal barHeight = mSeries->valueAt(set,category) * scale;
                  // Position floating values
                  itemIndex = 0;
                  for (int category=0; category < mSeries->categoryCount(); category++) {
-                     qreal xPos = categoryWidth * category + categoryWidth/2 + barWidth;
+                     qreal xPos = categoryWidth * category  + barWidth;
                      qreal yPos = height;
                      for (int set=0; set < mSeries->barsetCount(); set++) {
                          qreal barHeight = mSeries->valueAt(set,category) * scale;

src/domain_p.h +2 -2

                  void rangeYChanged(qreal min, qreal max, int tickYCount);
              public slots:
-                 void handleAxisXChanged(qreal min,qreal max,int tickXCount,QChartAxis::LabelsSelection mode);
-                 void handleAxisYChanged(qreal min,qreal max,int tickYCount,QChartAxis::LabelsSelection mode);
+                 void handleAxisXChanged(qreal min,qreal max,int tickXCount = 5,QChartAxis::LabelsSelection mode = QChartAxis::NativeLabelsSelection);
+                 void handleAxisYChanged(qreal min,qreal max,int tickYCount = 5,QChartAxis::LabelsSelection mode = QChartAxis::NativeLabelsSelection);
              private:
                  void niceNumbers(qreal &min, qreal &max, int &ticksCount);

test/auto/domain/tst_domain.cpp +3 -2

              #include <QtTest/QtTest>
              #include <private/domain_p.h>
+             #include <qchartaxis.h>
              QTCOMMERCIALCHART_USE_NAMESPACE
                  QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
                  QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
-                 domain.handleAxisRangeXChanged(min, max);
+                 domain.handleAxisXChanged(min, max);
                  QList<QVariant> arg0 = spy0.first();
                  QVERIFY(arg0.at(0).toReal() == min);
                  QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
                  QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
-                 domain.handleAxisRangeYChanged(min, max);
+                 domain.handleAxisYChanged(min, max,5);
                  QList<QVariant> arg0 = spy0.first();
                  QVERIFY(arg0.at(2).toReal() == min);

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