HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2306:496027721d42

Fixes layout rounding issue

Michal Klocek -

r2306:496027721d42

parent child

Context file:

r2306:496027721d42

Collapse all files

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +8 -12

             #include "chartbarcategoryaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoryaxis_p.h"
+            #include "chartlayout_p.h"
             #include <QFontMetrics>
             #include <QDebug>
             #include <qmath.h>
                 : HorizontalAxis(axis, item, true),
                   m_categoriesAxis(axis)
             {
+                QObject::connect(m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
+                handleCategoriesChanged();
             }
             ChartBarCategoryAxisX::~ChartBarCategoryAxisX()
                 HorizontalAxis::updateGeometry();
             }
-            void ChartBarCategoryAxisX::handleAxisUpdated()
+            void ChartBarCategoryAxisX::handleCategoriesChanged()
             {
-            	//TODO:
+                if(presenter()) presenter()->layout()->invalidate();
-            	/*
-                if (m_categoriesAxis->categories() != m_categories) {
-                    m_categories = m_categoriesAxis->categories();
-                    if (ChartAxis::layout().count() == m_categoriesAxis->d_ptr->count() + 2)
-                        updateGeometry();
-                */
-                //TODO: ChartAxis::handleAxisUpdated();
             }
             QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
-                QStringList ticksList = createCategoryLabels(ChartAxis::layout());
+                QStringList ticksList = m_categoriesAxis->categories();
                 qreal width=0;
                 qreal height=0;
                   return sh;
             }
+            #include "moc_chartbarcategoryaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +2 -2

             class ChartBarCategoryAxisX : public HorizontalAxis
             {
+                Q_OBJECT
             public:
                 ChartBarCategoryAxisX(QBarCategoryAxis *axis, QGraphicsItem* item = 0);
                 ~ChartBarCategoryAxisX();
             private:
                 QStringList createCategoryLabels(const QVector<qreal>& layout) const;
             public Q_SLOTS:
-                void handleAxisUpdated();
+                void handleCategoriesChanged();
             private:
-                QStringList m_categories;
                 QBarCategoryAxis *m_categoriesAxis;
             };

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +9 -11

             #include "chartbarcategoryaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoryaxis_p.h"
+            #include "chartlayout_p.h"
             #include <qmath.h>
             #include <QFontMetrics>
             #include <QDebug>
                 : VerticalAxis(axis, item, true),
                   m_categoriesAxis(axis)
             {
+                QObject::connect( m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
+                handleCategoriesChanged();
             }
             ChartBarCategoryAxisY::~ChartBarCategoryAxisY()
                 VerticalAxis::updateGeometry();
             }
-            void ChartBarCategoryAxisY::handleAxisUpdated()
+            void ChartBarCategoryAxisY::handleCategoriesChanged()
             {
-            	//TODO:
+                QGraphicsLayoutItem::updateGeometry();
-            	/*
+                if(presenter()) presenter()->layout()->invalidate();
-                if (m_categoriesAxis->categories() != m_categories) {
-                    m_categories = m_categoriesAxis->categories();
-                    if (ChartAxis::layout().count() == m_categoriesAxis->d_ptr->count() + 2)
-                        updateGeometry();
-                }*/
-                //TODO :: ChartAxis::handleAxisUpdated();
             }
             QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
-                QStringList ticksList = createCategoryLabels(ChartAxis::layout());
+                QStringList ticksList = m_categoriesAxis->categories();
                 qreal width=0;
                 qreal height=0;
                   return sh;
             }
+            #include "moc_chartbarcategoryaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +2 -2

             class ChartBarCategoryAxisY : public VerticalAxis
             {
+                Q_OBJECT
             public:
                 ChartBarCategoryAxisY(QBarCategoryAxis *axis, QGraphicsItem* item = 0);
                 ~ChartBarCategoryAxisY();
             private:
                 QStringList createCategoryLabels(const QVector<qreal>& layout) const;
             public Q_SLOTS:
-                void handleAxisUpdated();
+                void handleCategoriesChanged();
             private:
-                QStringList m_categories;
                 QBarCategoryAxis *m_categoriesAxis;
             };

src/axis/horizontalaxis.cpp +1 -1

             {
                 Q_UNUSED(constraint);
                 QFontMetrics fn(titleFont());
-                QSizeF sh;
+                QSizeF sh(0,0);
                 if (titleText().isNull() || !titleItem()->isVisible())
                     return sh;

src/axis/valueaxis/chartvalueaxisx.cpp 0 -2

             {
             	Q_UNUSED(tick);
                 if(presenter()) presenter()->layout()->invalidate();
-                //QVector<qreal> layout = calculateLayout();
-                //updateLayout(layout);
             }
             QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const

src/axis/valueaxis/chartvalueaxisy.cpp 0 -2

             {
             	Q_UNUSED(tick);
             	if(presenter()) presenter()->layout()->invalidate();
-            	//QVector<qreal> layout = calculateLayout();
-            	//updateLayout(layout);
             }
             QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const

src/axis/verticalaxis.cpp +1 -1

                 Q_UNUSED(constraint);
                 QFontMetrics fn(titleFont());
-                QSizeF sh;
+                QSizeF sh(0,0);
                 if (titleText().isNull() || !titleItem()->isVisible())
                     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