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: 4552291ef12e
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: 3ebb00f3368c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 12, 2020

  1. Fixed non-digital decodes not being packed into the waveform box

    @azonenberg
    azonenberg committed Mar 12, 2020
    Copy the full SHA
    3ebb00f View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 glscopeclient/OscilloscopeWindow.cpp
2 changes: 2 additions & 0 deletions glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -1004,6 +1004,8 @@ WaveformArea* OscilloscopeWindow::DoAddChannel(OscilloscopeChannel* chan, Wavefo

if(chan->GetType() == OscilloscopeChannel::CHANNEL_TYPE_DIGITAL)
ngroup->m_waveformBox.pack_start(*w, Gtk::PACK_SHRINK);
else
ngroup->m_waveformBox.pack_start(*w);

//Move the new trace after the reference trace, if one was provided
if(ref != NULL)