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: ae8540c3154f
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: 9aa8d079d605
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 23, 2020

  1. Copy the full SHA
    ffcd329 View commit details
  2. Updated to latest scopehal

    azonenberg committed Nov 23, 2020
    Copy the full SHA
    9aa8d07 View commit details
Showing with 4 additions and 1 deletion.
  1. +1 −1 lib
  2. +3 −0 src/glscopeclient/OscilloscopeWindow.cpp
3 changes: 3 additions & 0 deletions src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -757,6 +757,9 @@ void OscilloscopeWindow::DoImportCSV(const string& filename)
tmp += line[i];
}

//Discard name of timestamp column
channel_names.erase(channel_names.begin());

continue;
}