HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1423:4a12a8646078

scaledomain fix for barchart

sauimone -

r1423:4a12a8646078

parent child

Context file:

r1423:4a12a8646078

Collapse all files

src/barchart/qbarseries.cpp +43 -4

                  return max;
              }
+             qreal QBarSeriesPrivate::minX()
+             {
+                 if (m_barSets.count() <= 0) {
+                     return 0;
+                 }
+                 qreal min = INT_MAX;
+                 for (int i = 0; i < m_barSets.count(); i++) {
+                     int categoryCount = m_barSets.at(i)->count();
+                     for (int j = 0; j < categoryCount; j++) {
+                         qreal temp = m_barSets.at(i)->at(j).x();
+                         if (temp < min)
+                             min = temp;
+                     }
+                 }
+                 return min;
+             }
+             qreal QBarSeriesPrivate::maxX()
+             {
+                 if (m_barSets.count() <= 0) {
+                     return 0;
+                 }
+                 qreal max = INT_MIN;
+                 for (int i = 0; i < m_barSets.count(); i++) {
+                     int categoryCount = m_barSets.at(i)->count();
+                     for (int j = 0; j < categoryCount; j++) {
+                         qreal temp = m_barSets.at(i)->at(j).x();
+                         if (temp > max)
+                             max = temp;
+                     }
+                 }
+                 return max;
+             }
              void QBarSeriesPrivate::scaleDomain(Domain& domain)
              {
                  qreal minX(domain.minX());
                  int tickXCount(domain.tickXCount());
                  int tickYCount(domain.tickYCount());
-                 qreal x = categoryCount();
+                 qreal seriesMinX = this->minX();
+                 qreal seriesMaxX = this->maxX();
                  qreal y = max();
-                 minX = qMin(minX, x) - 0.5;
+                 minX = qMin(minX, seriesMinX - 0.5);
                  minY = qMin(minY, y);
-                 maxX = qMax(maxX, x) + 0.5;
+                 maxX = qMax(maxX, seriesMaxX + 0.5);
                  maxY = qMax(maxY, y);
-                 tickXCount = x+1;
+                 tickXCount = categoryCount()+1;
                  domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
              }

src/barchart/qbarseries_p.h +2 0

                  qreal categorySum(int category);
                  qreal absoluteCategorySum(int category);
                  qreal maxCategorySum();
+                 qreal minX();
+                 qreal maxX();
              Q_SIGNALS:
                  void clicked(QBarSet *barset, int index);

src/barchart/qgroupedbarseries.cpp +2 -2

                  qreal x = categoryCount();
                  qreal y = max();
-                 minX = qMin(minX, x) - 0.5;
+                 minX = qMin(minX, -0.5);
                  minY = qMin(minY, y);
-                 maxX = qMax(maxX, x) - 0.5;
+                 maxX = qMax(maxX, x - 0.5);
                  maxY = qMax(maxY, y);
                  tickXCount = x+1;

src/barchart/qpercentbarseries.cpp +2 -2

                  int tickYCount(domain.tickYCount());
                  qreal x = categoryCount();
-                 minX = qMin(minX, x) - 0.5;
-                 maxX = qMax(maxX, x) - 0.5;
+                 minX = qMin(minX, -0.5);
+                 maxX = qMax(maxX, x - 0.5);
                  minY = 0;
                  maxY = 100;
                  tickXCount = x+1;

src/barchart/qstackedbarseries.cpp +2 -2

                  qreal x = categoryCount();
                  qreal y = maxCategorySum();
-                 minX = qMin(minX, x) - 0.5;
+                 minX = qMin(minX, -0.5);
                  minY = qMin(minY, y);
-                 maxX = qMax(maxX, x) - 0.5;
+                 maxX = qMax(maxX, x - 0.5);
                  maxY = qMax(maxY, y);
                  tickXCount = x+1;

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