Fixed WaveFormView not correctly updating chunks when zooming or scrolling + inversed wave signal

Author: BenPyton

UI/WaveFormChunk.cpp

@@ -49,20 +49,20 @@ void WaveFormChunk::updateWave(Signal* signal)
         //qDebug() << "There is a signal";
         m_nbTotalSample = signal->sampleCount();
 
-        int mid = qRound(height() / 2.);
+        int mid = qFloor((height()-1) * 0.5);
 
         if(m_nbIndex < width()) // less index than pixel -> draw lines between each index
         {
             QPainterPath path;
 
             qreal nbPixelPerIndex = qreal(width()) / m_nbIndex;
 
-            qint32 value = signal->getSample(m_startIndex);
+            qint32 value = -signal->getSample(m_startIndex);
             path.moveTo(0, qRound(value / qreal(INT32_MAX) * mid + mid));
 
             for(int i = 1; i < m_nbIndex + 1; i++)
             {
-                qint32 value = signal->getSample(m_startIndex + i);
+                value = -signal->getSample(m_startIndex + i);
                 path.lineTo(i * nbPixelPerIndex, qRound(value / qreal(INT32_MAX) * mid + mid));
             }
 
@@ -82,7 +82,7 @@ void WaveFormChunk::updateWave(Signal* signal)
 
                 for(int k = 0; k < nbIndexInThisPixel + 1; k++)
                 {
-                    qint32 y = signal->getSample(m_startIndex + prevIndex + k);
+                    qint32 y = -signal->getSample(m_startIndex + prevIndex + k);
                     if(y < min) min = y;
                     if(y > max) max = y;
                 }

UI/WaveFormView.cpp

@@ -120,7 +120,6 @@ void WaveFormView::paintEvent(QPaintEvent *_event)
 
 void WaveFormView::wheelEvent(QWheelEvent *_event)
 {
-
     // zoom
     int angle = _event->angleDelta().y();
     qreal factor = 1.0 + (angle > 0.0 ? 0.1 : -0.1);
@@ -148,17 +147,16 @@ void WaveFormView::setSampleOffset(int _startIndex)
 
     m_sampleOffset = qMax(0, _startIndex);
 
-    int chunkStartIndex = m_chunkList.first()->startIndex();
-
-    if(m_sampleOffset - chunkStartIndex >= 2 * m_samplePerChunk)
+    while(m_sampleOffset - m_chunkList.first()->startIndex() >= 2 * m_samplePerChunk)
     {
         WaveFormChunk* chunk = m_chunkList.first();
         m_chunkList.pop_front();
         chunk->setIndexRange(m_chunkList.last()->startIndex() + m_samplePerChunk, m_samplePerChunk);
         chunk->updateWave(m_signal);
         m_chunkList.push_back(chunk);
     }
-    else if(m_sampleOffset - chunkStartIndex < 0)
+
+    while(m_sampleOffset - m_chunkList.first()->startIndex() < 0)
     {
         WaveFormChunk* chunk = m_chunkList.last();
         m_chunkList.pop_back();
@@ -204,6 +202,6 @@ void WaveFormView::updateZoom(int _localOffset)
         m_sampleOffset = 0;
     }
 
-    m_sampleOffset = qMax(0, qRound(_localOffset + (m_sampleOffset - _localOffset) * qreal(m_nbSampleViewed) / oldSampleViewed));
+    setSampleOffset(qRound(_localOffset + (m_sampleOffset - _localOffset) * qreal(m_nbSampleViewed) / oldSampleViewed));
     emit zoomChanged();
 }