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: 1824351d5521
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: 17aff5220114
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 24, 2020

  1. OscilloscopeWindow: recreate a waveform group before adding a channel… 

    … if we don't have any groups. Fixes #68.
    @azonenberg
    azonenberg committed May 24, 2020
    Copy the full SHA
    17aff52 View commit details
Showing with 12 additions and 1 deletion.
  1. +12 −1 glscopeclient/OscilloscopeWindow.cpp
13 changes: 12 additions & 1 deletion glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -1704,7 +1704,18 @@ void OscilloscopeWindow::OnQuit()

void OscilloscopeWindow::OnAddChannel(OscilloscopeChannel* chan)
{
//Add to a random group for now
//If all waveform groups were closed, recreate one
if(m_waveformGroups.empty())
{
auto split = *m_splitters.begin();
auto group = new WaveformGroup(this);
m_waveformGroups.emplace(group);
split->pack1(group->m_frame);
split->show_all();
group->m_measurementView.hide();
}

//Add to a the first group for now
DoAddChannel(chan, *m_waveformGroups.begin());
}