HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2136:44641cd4faa0

Fixes categoryaxis sizeHints

Michal Klocek -

r2136:44641cd4faa0

parent child

Context file:

r2136:44641cd4faa0

Collapse all files

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +1 -1

                         {
                             QRectF rect = fn.boundingRect(ticksList.at(i));
                             height+=rect.height();
-                            width=qMax(rect.width()+labelPadding() +1 ,width); //one pixel torelance
+                            width=qMax(rect.width()+labelPadding() + 1 ,width); //one pixel torelance
                         }
                         height=qMax(height,base.height());
                         width+=base.width();

src/axis/categoryaxis/chartcategoryaxisx.cpp +5 -4

                     return points;
                 const QRectF &gridRect = gridGeometry();
-                qreal range = m_axis->max() - m_axis->min();
+                qreal range  = max() - min();
                 if (range > 0) {
                     points.resize(tickCount);
                     qreal scale = gridRect.width() / range;
                     for (int i = 0; i < tickCount; ++i) {
                         if (i < tickCount - 1) {
-                            int x = (m_axis->startValue(m_axis->categoriesLabels().at(i)) - m_axis->min()) * scale + gridRect.left();
+                            int x = (m_axis->startValue(m_axis->categoriesLabels().at(i)) - min()) * scale + gridRect.left();
                             points[i] = x;
                         } else {
-                            int x = (m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - m_axis->min())  * scale + gridRect.left();
+                            int x = (m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - min())  * scale + gridRect.left();
                             points[i] = x;
                         }
                     }
             void ChartCategoryAxisX::updateGeometry()
             {
+                //TODO: this is not optimal when many categories :( , create only visible lables
                 setLabels(m_axis->categoriesLabels() << "");
                 HorizontalAxis::updateGeometry();
             }
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = ChartAxis::sizeHint(which, constraint);
-                QStringList ticksList ; //TODO:
+                QStringList ticksList = m_axis->categoriesLabels();
                 qreal width = 0;
                 qreal height = 0;

src/axis/categoryaxis/chartcategoryaxisy.cpp +8 -8

             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     return points;
                 const QRectF &gridRect = gridGeometry();
-                qreal range = m_axis->max() - m_axis->min();
+                qreal range = max() - min();
                 if (range > 0) {
                     points.resize(tickCount);
                     qreal scale = gridRect.height() / range;
                     for (int i = 0; i < tickCount; ++i) {
                         if (i < tickCount - 1) {
-                            int y = -(m_axis->startValue(m_axis->categoriesLabels().at(i)) - m_axis->min()) * scale + gridRect.bottom();
+                            int y = -(m_axis->startValue(m_axis->categoriesLabels().at(i)) - min()) * scale + gridRect.bottom();
                             points[i] = y;
                         } else {
-                            int y = -(m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - m_axis->min())  * scale + gridRect.bottom();
+                            int y = -(m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - min())  * scale + gridRect.bottom();
                             points[i] = y;
                         }
                     }
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = ChartAxis::sizeHint(which, constraint);
-                QStringList ticksList; //TODO::
+                QStringList ticksList = m_axis->categoriesLabels();
                 qreal width = 0;
                 qreal height = 0;
                 case Qt::MinimumSize:
                     width = fn.boundingRect("...").width() + labelPadding();
                     height = fn.height();
-                    width = qMax(width, base.width());
+                    width += base.width();
-                    height += base.height();
+                    height = qMax(height, base.height());;
                     sh = QSizeF(width, height);
                     break;
                 case Qt::PreferredSize: {
                     for (int i = 0; i < ticksList.size(); ++i) {
                         QRectF rect = fn.boundingRect(ticksList.at(i));
+                        width = qMax(rect.width() + labelPadding() + 1, width);
                         height += rect.height();
-                        width = qMax(rect.width() + labelPadding(), width);
                     }
                     height = qMax(height, base.height());
                     width += base.width();
                 default:
                     break;
                 }
                 return sh;
             }

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