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: 1c8a5fb5bb71
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: e55cd2bab463
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 2, 2020

  1. Copy the full SHA
    e55cd2b View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 glscopeclient/OscilloscopeWindow.cpp
9 changes: 4 additions & 5 deletions glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -1902,11 +1902,6 @@ void OscilloscopeWindow::OnWaveformDataReady(Oscilloscope* scope)

void OscilloscopeWindow::RefreshAllDecoders()
{
//Update the measurements
//TODO: remove this when we finish unification of measurements and decodes
for(auto g : m_waveformGroups)
g->RefreshMeasurements();

double start = GetTime();

auto decodes = ProtocolDecoder::EnumDecodes();
@@ -1964,6 +1959,10 @@ void OscilloscopeWindow::RefreshAllDecoders()
block[i]->RefreshIfDirty();
}

//Update statistic displays after the filter graph update is complete
for(auto g : m_waveformGroups)
g->RefreshMeasurements();

m_tDecode += GetTime() - start;
}