HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2293:f2379b79baf8

Log domains update when axis base changes. LogAxis fix for labelFormat

Marek Rosa -

r2293:f2379b79baf8

parent child

Context file:

r2293:f2379b79baf8

src/axis/chartaxis.cpp +12 -1

@@ -466,7 +466,18 QStringList ChartAxis::createLogValueLabels(qreal min, qreal max, qreal base, in
466	QByteArray array = format.toLatin1();	466	QByteArray array = format.toLatin1();
467	for (int i = firstTick; i < ticks + firstTick; i++) {	467	for (int i = firstTick; i < ticks + firstTick; i++) {
468	qreal value = qPow(base, i);	468	qreal value = qPow(base, i);
469	labels << QString().sprintf(array, value);	469	if (format.contains("d")
		470	\|\| format.contains("i")
		471	\|\| format.contains("c"))
		472	labels << QString().sprintf(array, (qint64)value);
		473	else if (format.contains("u")
		474	\|\| format.contains("o")
		475	\|\| format.contains("x", Qt::CaseInsensitive))
		476	labels << QString().sprintf(array, (quint64)value);
		477	else if (format.contains("f", Qt::CaseInsensitive)
		478	\|\| format.contains("e", Qt::CaseInsensitive)
		479	\|\| format.contains("g", Qt::CaseInsensitive))
		480	labels << QString().sprintf(array, value);
470	}	481	}
471	}	482	}
472		483

src/domain/logxlogydomain.cpp +4 0

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

src/domain/logxydomain.cpp +2 0

             void LogXYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
             {
                 m_logBaseX = baseX;
+                m_logMinX = log10(m_minX) / log10(m_logBaseX);
+                m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
             }
             // operators

src/domain/xlogydomain.cpp +2 0

             void XLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)
             {
                 m_logBaseY = baseY;
+                m_logMinY = log10(m_minY) / log10(m_logBaseY);
+                m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
             }
             // 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