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: e55cd2bab463
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: 58fe5325c5d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 2, 2020

  1. Copy the full SHA
    aca7166 View commit details

Commits on Jun 3, 2020

  1. Merge pull request #109 from miek/load_all_the_waveforms

    OscilloscopeWindow: set max waveform count before loading waveforms
    azonenberg authored Jun 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    58fe532 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 glscopeclient/OscilloscopeWindow.cpp
1 change: 1 addition & 0 deletions glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -633,6 +633,7 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
int scope_id = table[scope];

auto wavenode = node["waveforms"];
window->SetMaxWaveforms(wavenode.size());
for(auto it : wavenode)
{
//Top level metadata