HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2336:03ff7a7fe0a8

Change sizeHint of vertical axis, caculate width based on each label

Michal Klocek -

r2336:03ff7a7fe0a8

parent child

Context file:

r2336:03ff7a7fe0a8

src/axis/datetimeaxis/chartdatetimeaxisx.cpp 0 -1

                     return sh;
                 }
                 switch (which) {
                 case Qt::MinimumSize:{
                     int count = qMax(ticksList.last().count(),ticksList.first().count());

src/axis/datetimeaxis/chartdatetimeaxisy.cpp +9 -2

                 qreal width = 0;
                 qreal height = 0;
                 if(ticksList.empty()){
                     return sh;
                 }
+                int labelWidth = 0;
+                foreach(const QString& s, ticksList)
+                {
+                    labelWidth=qMax(fn.width(s),labelWidth);
+                }
                 switch (which) {
                     case Qt::MinimumSize: {
                         width = fn.boundingRect("...").width() + labelPadding();
                         break;
                     }
                     case Qt::PreferredSize: {
-                        int count = qMax(ticksList.first().count() , ticksList.last().count());
+                        width = labelWidth + labelPadding() + 2; //two pixels of tolerance
-                        width = count*fn.averageCharWidth() + labelPadding() + 2; //two pixels of tolerance
                         width += base.width();
                         height = fn.height() * ticksList.count();
                         height = qMax(height,base.height());

src/axis/valueaxis/chartvalueaxisy.cpp +5 -4

                 qreal width = 0;
                 qreal height = 0;
-                int count = 1;
+                int labelWidth = 0;
-                if(!ticksList.empty()){
+                foreach(const QString& s, ticksList)
-                    count = qMax(ticksList.last().count(),ticksList.first().count());
+                    labelWidth=qMax(fn.width(s),labelWidth);
                 }
                 switch (which) {
                 }
                 case Qt::PreferredSize:
                 {
-                    width = count*fn.averageCharWidth() + labelPadding() + 2; //two pixels of tolerance
+                    width = labelWidth + labelPadding() + 2; //two pixels of tolerance
                     width += base.width();
                     height = fn.height() * ticksList.count();
                     height = qMax(height,base.height());

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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