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: 2c4b5d1d5580
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: e703604034e4
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 30, 2020

  1. Copy the full SHA
    e703604 View commit details
Showing with 7 additions and 1 deletion.
  1. +1 −1 lib
  2. +6 −0 src/glscopeclient/OscilloscopeWindow.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from ac9922 to 03f12c
6 changes: 6 additions & 0 deletions src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -356,6 +356,12 @@ void OscilloscopeWindow::CreateWidgets(bool nodigital)
if( (type == OscilloscopeChannel::CHANNEL_TYPE_ANALOG) ||
( (type == OscilloscopeChannel::CHANNEL_TYPE_DIGITAL) && !nodigital ) )
{
//Test if channel can be enabled. If it returns false, we're interleaving or something,
//which means it's unavailable.
chan->Enable();
if(!chan->IsEnabled())
continue;

auto w = new WaveformArea(chan, this);
w->m_group = group;
m_waveformAreas.emplace(w);