##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixed: chart not redrawing when logaxis's logBase value changed
Marek Rosa -
r2322:2741539ef9e9
parent child
Show More
Side by Side Unified
Context file:
r2322:2741539ef9e9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -32,6 +32,7 ChartLogValueAxisX::ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem* item)
32 32 : HorizontalAxis(axis, item),
33 33 m_axis(axis)
34 34 {
35 QObject::connect(m_axis,SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
35 36 }
36 37
37 38 ChartLogValueAxisX::~ChartLogValueAxisX()
@@ -67,10 +68,11 void ChartLogValueAxisX::updateGeometry()
67 68 HorizontalAxis::updateGeometry();
68 69 }
69 70
70 //void ChartLogValueAxisX::handleAxisUpdated()
71 //{
72 // ChartAxis::handleAxisUpdated();
73 //}
71 void ChartLogValueAxisX::handleBaseChanged(qreal base)
72 {
73 Q_UNUSED(base);
74 if(presenter()) presenter()->layout()->invalidate();
75 }
74 76
75 77 QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
76 78 {
@@ -120,4 +122,6 QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint
120 122 return sh;
121 123 }
122 124
125 #include "moc_chartlogvalueaxisx_p.cpp"
126
123 127 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -39,6 +39,8 class ChartPresenter;
39 39
40 40 class ChartLogValueAxisX : public HorizontalAxis
41 41 {
42 Q_OBJECT
43
42 44 public:
43 45 ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem* item);
44 46 ~ChartLogValueAxisX();
@@ -50,6 +52,9 protected:
50 52 QVector<qreal> calculateLayout() const;
51 53 void updateGeometry();
52 54
55 private Q_SLOTS:
56 void handleBaseChanged(qreal base);
57
53 58 private:
54 59 QLogValueAxis *m_axis;
55 60 };
Show file before | Show file after | Hide comments
@@ -32,6 +32,7 ChartLogValueAxisY::ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem* item)
32 32 : VerticalAxis(axis, item),
33 33 m_axis(axis)
34 34 {
35 QObject::connect(m_axis, SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
35 36 }
36 37
37 38 ChartLogValueAxisY::~ChartLogValueAxisY()
@@ -67,10 +68,11 void ChartLogValueAxisY::updateGeometry()
67 68 VerticalAxis::updateGeometry();
68 69 }
69 70
70 //void ChartLogValueAxisY::handleAxisUpdated()
71 //{
72 // ChartAxis::handleAxisUpdated();
73 //}
71 void ChartLogValueAxisY::handleBaseChanged(qreal base)
72 {
73 Q_UNUSED(base);
74 if(presenter()) presenter()->layout()->invalidate();
75 }
74 76
75 77 QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
76 78 {
@@ -117,4 +119,6 QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint
117 119 return sh;
118 120 }
119 121
122 #include "moc_chartlogvalueaxisy_p.cpp"
123
120 124 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -39,6 +39,8 class ChartPresenter;
39 39
40 40 class ChartLogValueAxisY : public VerticalAxis
41 41 {
42 Q_OBJECT
43
42 44 public:
43 45 ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem* item);
44 46 ~ChartLogValueAxisY();
@@ -50,6 +52,9 protected:
50 52 QVector<qreal> calculateLayout() const;
51 53 void updateGeometry();
52 54
55 private Q_SLOTS:
56 void handleBaseChanged(qreal base);
57
53 58 private:
54 59 QLogValueAxis *m_axis;
55 60 };
Show file before | Show file after | Hide comments
@@ -192,6 +192,7 void LogXLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)
192 192 m_logBaseY = baseY;
193 193 m_logMinY = log10(m_minY) / log10(m_logBaseY);
194 194 m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
195 emit updated();
195 196 }
196 197
197 198 void LogXLogYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
@@ -199,6 +200,7 void LogXLogYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
199 200 m_logBaseX = baseX;
200 201 m_logMinX = log10(m_minX) / log10(m_logBaseX);
201 202 m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
203 emit updated();
202 204 }
203 205
204 206 // operators
Show file before | Show file after | Hide comments
@@ -184,6 +184,7 void LogXYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
184 184 m_logBaseX = baseX;
185 185 m_logMinX = log10(m_minX) / log10(m_logBaseX);
186 186 m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
187 emit updated();
187 188 }
188 189
189 190 // operators
Show file before | Show file after | Hide comments
@@ -182,6 +182,7 void XLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)
182 182 m_logBaseY = baseY;
183 183 m_logMinY = log10(m_minY) / log10(m_logBaseY);
184 184 m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
185 emit updated();
185 186 }
186 187
187 188 // operators
General Comments 0
You need to be logged in to leave comments. Login now