HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2322:2741539ef9e9

Fixed: chart not redrawing when logaxis's logBase value changed

Marek Rosa -

r2322:2741539ef9e9

parent child

Context file:

r2322:2741539ef9e9

src/axis/logvalueaxis/chartlogvalueaxisx.cpp +8 -4

                 : HorizontalAxis(axis, item),
                   m_axis(axis)
             {
+                QObject::connect(m_axis,SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
             }
             ChartLogValueAxisX::~ChartLogValueAxisX()
                 HorizontalAxis::updateGeometry();
             }
-            //void ChartLogValueAxisX::handleAxisUpdated()
+            void ChartLogValueAxisX::handleBaseChanged(qreal base)
-            //{
-            //    ChartAxis::handleAxisUpdated();
+                Q_UNUSED(base);
-            //}
+                if(presenter()) presenter()->layout()->invalidate();
+            }
             QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 return sh;
             }
+            #include "moc_chartlogvalueaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/logvalueaxis/chartlogvalueaxisx_p.h +5 0

             class ChartLogValueAxisX : public HorizontalAxis
             {
+                Q_OBJECT
             public:
                 ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem* item);
                 ~ChartLogValueAxisX();
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private Q_SLOTS:
+                void handleBaseChanged(qreal base);
             private:
                 QLogValueAxis *m_axis;
             };

src/axis/logvalueaxis/chartlogvalueaxisy.cpp +8 -4

                 : VerticalAxis(axis, item),
                   m_axis(axis)
             {
+                QObject::connect(m_axis, SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
             }
             ChartLogValueAxisY::~ChartLogValueAxisY()
                 VerticalAxis::updateGeometry();
             }
-            //void ChartLogValueAxisY::handleAxisUpdated()
+            void ChartLogValueAxisY::handleBaseChanged(qreal base)
-            //{
-            //    ChartAxis::handleAxisUpdated();
+                Q_UNUSED(base);
-            //}
+                if(presenter()) presenter()->layout()->invalidate();
+            }
             QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 return sh;
             }
+            #include "moc_chartlogvalueaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/logvalueaxis/chartlogvalueaxisy_p.h +5 0

             class ChartLogValueAxisY : public VerticalAxis
             {
+                Q_OBJECT
             public:
                 ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem* item);
                 ~ChartLogValueAxisY();
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private Q_SLOTS:
+                void handleBaseChanged(qreal base);
             private:
                 QLogValueAxis *m_axis;
             };

src/domain/logxlogydomain.cpp +2 0

                 m_logBaseY = baseY;
                 m_logMinY = log10(m_minY) / log10(m_logBaseY);
                 m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
+                emit updated();
             }
             void LogXLogYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
                 m_logBaseX = baseX;
                 m_logMinX = log10(m_minX) / log10(m_logBaseX);
                 m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
+                emit updated();
             }
             // operators

src/domain/logxydomain.cpp +1 0

                 m_logBaseX = baseX;
                 m_logMinX = log10(m_minX) / log10(m_logBaseX);
                 m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
+                emit updated();
             }
             // operators

src/domain/xlogydomain.cpp +1 0

                 m_logBaseY = baseY;
                 m_logMinY = log10(m_minY) / log10(m_logBaseY);
                 m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
+                emit updated();
             }
             // operators

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