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

Commits on Oct 6, 2020

  1. Updated submodules

    @azonenberg
    azonenberg committed Oct 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4af8be6 View commit details

  2. WaveformArea: disable stats checkbox for digital channels. Fixes #208.

    @azonenberg
    azonenberg committed Oct 6, 2020
    Copy the full SHA
    eb412fe View commit details
Showing with 12 additions and 3 deletions.
  1. +1 −1 lib
  2. +11 −2 src/glscopeclient/WaveformArea_events.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 2 files
+1 −1 log
+1 −1 scopeprotocols/IBM8b10bDecoder.cpp
13 changes: 11 additions & 2 deletions src/glscopeclient/WaveformArea_events.cpp
View file
Original file line number Diff line number Diff line change
@@ -1400,8 +1400,17 @@ void WaveformArea::UpdateContextMenu()
break;
}

//Set stats checkbox
m_statisticsItem.set_active(m_group->IsShowingStats(m_selectedChannel.m_channel));
//Hide stats for non-analog channels
if(m_selectedChannel.m_channel->GetType() != OscilloscopeChannel::CHANNEL_TYPE_ANALOG)
{
m_statisticsItem.set_sensitive(false);
m_statisticsItem.set_active(false);
}
else
{
m_statisticsItem.set_sensitive(true);
m_statisticsItem.set_active(m_group->IsShowingStats(m_selectedChannel.m_channel));
}

m_updatingContextMenu = false;
}