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: ab5aefd2b9ad
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: a0639ae41c37
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 26, 2020

  1. OscilloscopeWindow: ensure events are processed at least every 50ms i…

    …n polling loop if scope waveforms come in faster than the filter graph can handle. Fixes #290.
    azonenberg committed Nov 26, 2020
    Copy the full SHA
    a0639ae View commit details
Showing with 11 additions and 1 deletion.
  1. +1 −1 lib
  2. +10 −0 src/glscopeclient/OscilloscopeWindow.cpp
2 changes: 1 addition & 1 deletion lib
10 changes: 10 additions & 0 deletions src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -2342,6 +2342,8 @@ bool OscilloscopeWindow::PollScopes()

bool had_waveforms = false;

double tstart = GetTime();

bool pending = true;
while(pending)
{
@@ -2411,6 +2413,14 @@ bool OscilloscopeWindow::PollScopes()

//Update filters etc once every instrument has been updated
OnAllWaveformsUpdated();

//Pull as many waveforms as we can in 50 ms, then handle events
double dt = GetTime() - tstart;
if(dt > 0.05)
{
g_app->DispatchPendingEvents();
break;
}
}

return had_waveforms;