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

Commits on May 13, 2020

  1. Hide inactive measurement/stats views when loading a save file. Fixes #… 

    …94.
    @azonenberg
    azonenberg committed May 13, 2020
    Copy the full SHA
    bf6cdaf View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 glscopeclient/OscilloscopeWindow.cpp
6 changes: 3 additions & 3 deletions glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -319,7 +319,7 @@ void OscilloscopeWindow::CreateWidgets()
}

//See which channels are currently on
//DEBUG: enable all analog channels to save time when setting up the client
//DEBUG: enable all channels to save time when setting up the client
//if(chan->IsEnabled())
if( (type == OscilloscopeChannel::CHANNEL_TYPE_ANALOG) ||
(type == OscilloscopeChannel::CHANNEL_TYPE_DIGITAL) )
@@ -485,7 +485,6 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
LoadDecodes(node["decodes"], table);
LoadUIConfiguration(node["ui_config"], table);
}
show_all();

//Create history windows for all of our scopes
for(auto scope : m_scopes)
@@ -540,6 +539,7 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
//Make sure all resize etc events have been handled before replaying history.
//Otherwise eye patterns don't refresh right.
show_all();
GarbageCollectGroups();
g_app->DispatchPendingEvents();

//TODO: make this work properly if we have decodes spanning multiple scopes
@@ -858,7 +858,7 @@ void OscilloscopeWindow::LoadUIConfiguration(const YAML::Node& node, IDTable& ta
auto gn = it.second;
WaveformGroup* group = new WaveformGroup(this);
table.emplace(gn["id"].as<int>(), &group->m_frame);
group->m_measurementFrame.set_label(gn["name"].as<string>());
group->m_frame.set_label(gn["name"].as<string>());
group->m_pixelsPerXUnit = gn["pixelsPerXUnit"].as<float>();
group->m_xAxisOffset = gn["xAxisOffset"].as<long>();
m_waveformGroups.emplace(group);