impulse chart 1 sample offset fixed

psmokotnin · Feb 14, 2023 · e176888 · e176888
1 parent f49d17c
commit e176888
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/chart/metal/impulseseriesnode.mm b/src/chart/metal/impulseseriesnode.mm
@@ -57,8 +57,8 @@
     float *vertex_ptr = vertexBuffer(maxBufferSize);
 
     float dcOffset =  (m_source->impulseValue(0) + m_source->impulseValue(m_source->impulseSize() - 1)) / 2;
-    float value = 0, lastValue = 0;
-    for (unsigned int i = 0, j = 0; i < m_source->impulseSize() - 1; ++i) {
+    float value = 0, lastValue = 0, lastTime = 0;
+    for (unsigned int i = 0, j = 0; i < m_source->impulseSize(); ++i) {
         switch (m_mode) {
         case ImpulsePlot::Linear:
             value = m_source->impulseValue(i) - dcOffset;
@@ -67,12 +67,14 @@
             value = 10 * std::log10f(std::powf(m_source->impulseValue(i) - dcOffset, 2));
             break;
         }
-
-        addLineSegment(vertex_ptr, j, verticiesCount,
-                       m_source->impulseTime(i),      lastValue,
-                       m_source->impulseTime(i + 1),  value,
-                       1, 1);
+        if (i > 0) {
+            addLineSegment(vertex_ptr, j, verticiesCount,
+                           lastTime,                  lastValue,
+                           m_source->impulseTime(i),  value,
+                           1, 1);
+        }
         lastValue = value;
+        lastTime = m_source->impulseTime(i);
     }
 
     encodeLine(m_pipeline, verticiesCount);

diff --git a/src/chart/opengl/impulseseriesrenderer.cpp b/src/chart/opengl/impulseseriesrenderer.cpp
@@ -61,8 +61,8 @@ void ImpulseSeriesRenderer::renderSeries()
     }
 
     float dc =  (m_source->impulseValue(0) + m_source->impulseValue(m_source->impulseSize() - 1)) / 2;
-    float value = 0, lastValue = 0;
-    for (unsigned int i = 0, j = 0; i < m_source->impulseSize() - 1; ++i) {
+    float value = 0, lastValue = 0, lastTime = 0;
+    for (unsigned int i = 0, j = 0; i < m_source->impulseSize(); ++i) {
 
         switch (m_mode) {
         case ImpulsePlot::Linear:
@@ -79,11 +79,14 @@ void ImpulseSeriesRenderer::renderSeries()
             verticiesCount += 1;
             j += 2;
         } else {
-            addLineSegment(j, verticiesCount,
-                           m_source->impulseTime(i),     lastValue,
-                           m_source->impulseTime(i + 1), value,
-                           1, 1);
+            if (i > 0) {
+                addLineSegment(j, verticiesCount,
+                               lastTime,                 lastValue,
+                               m_source->impulseTime(i), value,
+                               1, 1);
+            }
             lastValue = value;
+            lastTime = m_source->impulseTime(i);
         }
     }