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

Commits on Oct 31, 2020

  1. Fixed bug causing CSV imports to not show up in history

    @azonenberg
    azonenberg committed Oct 31, 2020
    Copy the full SHA
    ab607c4 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/glscopeclient/OscilloscopeWindow.cpp
2 changes: 1 addition & 1 deletion src/glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -740,7 +740,6 @@ void OscilloscopeWindow::DoImportCSV(const string& filename)
}
}

hist->OnWaveformDataReady();
fclose(fp);

//Calculate gain/offset for each channel
@@ -778,6 +777,7 @@ void OscilloscopeWindow::DoImportCSV(const string& filename)
OnLoadComplete();

//Process the new data
m_historyWindows[m_scopes[0]]->OnWaveformDataReady();
OnAllWaveformsUpdated();
}