Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e010a1ae023
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 718c524b6629
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Sep 10, 2020

  1. Copy the full SHA
    718c524 View commit details
Showing with 7 additions and 7 deletions.
  1. +1 −1 lib
  2. +2 −2 src/glscopeclient/WaveformArea_cairo.cpp
  3. +4 −4 src/glscopeclient/shaders/waveform-compute-digital.glsl
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 995c6e to dae836
4 changes: 2 additions & 2 deletions src/glscopeclient/WaveformArea_cairo.cpp
Original file line number Diff line number Diff line change
@@ -455,9 +455,9 @@ void WaveformArea::RenderDecodeOverlays(Cairo::RefPtr< Cairo::Context > cr)
double last_end = textright;
for(size_t i=0; i<olen; i++)
{
if(data->m_offsets[i] < start_samples)
if(data->m_offsets[i] + data->m_durations[i] < start_samples)
continue;
if(data->m_offsets[i] + data->m_durations[i] > end_samples)
if(data->m_offsets[i] > end_samples)
continue;

double start = (data->m_offsets[i] * data->m_timescale) + data->m_triggerPhase;
8 changes: 4 additions & 4 deletions src/glscopeclient/shaders/waveform-compute-digital.glsl
Original file line number Diff line number Diff line change
@@ -110,8 +110,8 @@ void main()
float starty;
float endy;

//If we are very near the left edge, draw vertical line
if(abs(left.x - gl_GlobalInvocationID.x) <= 1)
//If we are very near the right edge, draw vertical line
if(abs(right.x - gl_GlobalInvocationID.x) <= 1)
{
starty = left.y;
endy = right.y;
@@ -120,8 +120,8 @@ void main()
//otherwise draw a single pixel
else
{
starty = right.y;
endy = right.y;
starty = left.y;
endy = left.y;
}

//Clip to window size