diff --git a/gui/src/Visualization/AxisRenderingUtils.cpp b/gui/src/Visualization/AxisRenderingUtils.cpp index e4a25a8..869fbbc 100644 --- a/gui/src/Visualization/AxisRenderingUtils.cpp +++ b/gui/src/Visualization/AxisRenderingUtils.cpp @@ -17,7 +17,7 @@ const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss"); /// Generates the appropriate ticker for an axis, depending on whether the axis displays time or /// non-time data -QSharedPointer axisTicker(bool isTimeAxis) +QSharedPointer axisTicker(bool isTimeAxis, QCPAxis::ScaleType scaleType) { if (isTimeAxis) { auto dateTicker = QSharedPointer::create(); @@ -26,6 +26,9 @@ QSharedPointer axisTicker(bool isTimeAxis) return dateTicker; } + else if (scaleType == QCPAxis::stLogarithmic) { + return QSharedPointer::create(); + } else { // default ticker return QSharedPointer::create(); @@ -46,9 +49,14 @@ void setAxisProperties(QCPAxis &axis, const Unit &unit, // scale type axis.setScaleType(scaleType); + if (scaleType == QCPAxis::stLogarithmic) { + // Scientific notation + axis.setNumberPrecision(0); + axis.setNumberFormat("eb"); + } // ticker (depending on the type of unit) - axis.setTicker(axisTicker(unit.m_TimeUnit)); + axis.setTicker(axisTicker(unit.m_TimeUnit, scaleType)); } /** @@ -99,7 +107,7 @@ struct AxisSetterinsertRow(0); @@ -114,8 +122,7 @@ struct AxisSetter