ngscopeclient · Apr 24, 2021 · Apr 24, 2021 · Apr 24, 2021
Showing with 8 additions and 6 deletions.

+1 −1 doc

+1 −1 lib

+2 −2 src/glscopeclient/WaveformArea_cairo.cpp

+4 −2 src/glscopeclient/WaveformArea_rendering.cpp
diff --git a/doc b/doc
diff --git a/lib b/lib
diff --git a/src/glscopeclient/WaveformArea_cairo.cpp b/src/glscopeclient/WaveformArea_cairo.cpp
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * glscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2020 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2021 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -733,7 +733,7 @@ float WaveformArea::GetValueAtTime(int64_t time_fs)
 	size_t index = BinarySearchForGequal(
 		(int64_t*)&waveform->m_offsets[0],
 		waveform->m_offsets.size(),
-		(int64_t)round(ticks));
+		(int64_t)ceil(ticks));
 
 	//Stop if start of waveform (no lerping possible)
 	if(index == 0)

diff --git a/src/glscopeclient/WaveformArea_rendering.cpp b/src/glscopeclient/WaveformArea_rendering.cpp
@@ -204,12 +204,14 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata, bool update_wavefo
 	alpha_scaled = min(1.0f, alpha_scaled) * 2;
 
 	//Config stuff
-	wdata->m_mappedConfigBuffer64[0] = -group->m_xAxisOffset / pdat->m_timescale;			//innerXoff
+	int64_t innerxoff = group->m_xAxisOffset / pdat->m_timescale;
+	int64_t fractional_offset = group->m_xAxisOffset % pdat->m_timescale;
+	wdata->m_mappedConfigBuffer64[0] = -innerxoff;											//innerXoff
 	wdata->m_mappedConfigBuffer[2] = height;												//windowHeight
 	wdata->m_mappedConfigBuffer[3] = wdata->m_area->m_plotRight;							//windowWidth
 	wdata->m_mappedConfigBuffer[4] = wdata->m_count;										//depth
 	wdata->m_mappedFloatConfigBuffer[5] = alpha_scaled;										//alpha
-	wdata->m_mappedFloatConfigBuffer[6] = pdat->m_triggerPhase * group->m_pixelsPerXUnit;	//xoff
+	wdata->m_mappedFloatConfigBuffer[6] = (pdat->m_triggerPhase - fractional_offset) * group->m_pixelsPerXUnit;	//xoff
 	wdata->m_mappedFloatConfigBuffer[7] = pdat->m_timescale * group->m_pixelsPerXUnit;		//xscale
 	wdata->m_mappedFloatConfigBuffer[8] = ybase;											//ybase
 	wdata->m_mappedFloatConfigBuffer[9] = yscale;											//yscale
+ −		images/filters/swd.png
+93 −2		section-decodes.tex
+17 −5		section-gettingstarted.tex
+45 −3		scopehal/AgilentOscilloscope.cpp
+9 −0		scopehal/AgilentOscilloscope.h