WaveformRendererPreroll: Improve variable naming

1 files changed, 13 insertions, 10 deletions

diff --git a/src/waveform/renderers/waveformrendererpreroll.cpp b/src/waveform/renderers/waveformrendererpreroll.cpp
index 0717958cfe..6590e7151b 100644
--- a/src/waveform/renderers/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/waveformrendererpreroll.cpp
@@ -53,8 +53,6 @@ void WaveformRendererPreroll::draw(QPainter* painter, QPaintEvent* event) {
         //          << "totalVSamples" << totalVSamples
         //          << "WaveformRendererPreroll::playMarkerPosition=" << playMarkerPositionFrac;
 
-        const double polyLength = 40.0 / vSamplesPerPixel;
-        const double polyVSampleSize = (polyLength + 1) * vSamplesPerPixel;
         const float halfBreadth = m_waveformRenderer->getBreadth() / 2.0f;
         const float halfPolyBreadth = m_waveformRenderer->getBreadth() / 5.0f;
 
@@ -66,6 +64,10 @@ void WaveformRendererPreroll::draw(QPainter* painter, QPaintEvent* event) {
         painter->setWorldMatrixEnabled(false);
         painter->setPen(QPen(QBrush(m_color), std::max(1.0, scaleFactor())));
 
+        const double polyPixelWidth = 40.0 / vSamplesPerPixel;
+        const double polyPixelOffset = polyPixelWidth + 1;
+        const double polyVSampleOffset = polyPixelOffset * vSamplesPerPixel;
+
         // Rotate if drawing vertical waveforms
         if (m_waveformRenderer->getOrientation() == Qt::Vertical) {
             painter->setTransform(QTransform(0, 1, 1, 0, 0, 0));
@@ -79,13 +81,14 @@ void WaveformRendererPreroll::draw(QPainter* painter, QPaintEvent* event) {
 
             QPolygonF polygon;
             polygon << QPointF(0, halfBreadth)
-                    << QPointF(-polyLength, halfBreadth - halfPolyBreadth)
-                    << QPointF(-polyLength, halfBreadth + halfPolyBreadth);
+                    << QPointF(-polyPixelWidth, halfBreadth - halfPolyBreadth)
+                    << QPointF(-polyPixelWidth, halfBreadth + halfPolyBreadth);
             polygon.translate(triangleTipVSamplePosition / vSamplesPerPixel, 0);
 
-            for (; triangleTipVSamplePosition > 0; triangleTipVSamplePosition -= polyVSampleSize) {
+            for (; triangleTipVSamplePosition > 0;
+                    triangleTipVSamplePosition -= polyVSampleOffset) {
                 painter->drawPolygon(polygon);
-                polygon.translate(-(polyLength + 1), 0);
+                polygon.translate(-polyPixelOffset, 0);
             }
         }
 
@@ -98,14 +101,14 @@ void WaveformRendererPreroll::draw(QPainter* painter, QPaintEvent* event) {
 
             QPolygonF polygon;
             polygon << QPointF(0, halfBreadth)
-                    << QPointF(polyLength, halfBreadth - halfPolyBreadth)
-                    << QPointF(polyLength, halfBreadth + halfPolyBreadth);
+                    << QPointF(polyPixelWidth, halfBreadth - halfPolyBreadth)
+                    << QPointF(polyPixelWidth, halfBreadth + halfPolyBreadth);
             polygon.translate(triangleTipVSamplePosition / vSamplesPerPixel, 0);
 
             for (; triangleTipVSamplePosition < numberOfVSamples;
-                    triangleTipVSamplePosition += polyVSampleSize) {
+                    triangleTipVSamplePosition += polyVSampleOffset) {
                 painter->drawPolygon(polygon);
-                polygon.translate(polyLength + 1, 0);
+                polygon.translate(polyPixelOffset, 0);
             }
         }
     }