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

Commits on Mar 9, 2020

  1. Digital overlays now are packed properly

    @azonenberg
    azonenberg committed Mar 9, 2020
    Copy the full SHA
    43c6005 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 glscopeclient/OscilloscopeWindow.cpp
  2. +1 −1 glscopeclient/WaveformArea_cairo.cpp
3 changes: 2 additions & 1 deletion glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -961,7 +961,8 @@ WaveformArea* OscilloscopeWindow::DoAddChannel(OscilloscopeChannel* chan, Wavefo
w->m_group = ngroup;
m_waveformAreas.emplace(w);

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

//Move the new trace after the reference trace, if one was provided
if(ref != NULL)
2 changes: 1 addition & 1 deletion glscopeclient/WaveformArea_cairo.cpp
View file
Original file line number Diff line number Diff line change
@@ -249,7 +249,7 @@ void WaveformArea::RenderDecodeOverlays(Cairo::RefPtr< Cairo::Context > cr)
int spacing = 30;
int midline = spacing / 2;

//Render digital bus waveforms here (TODO: GL stuff)
//Render digital bus waveforms in the main channel here (TODO: GL stuff)
auto bus = dynamic_cast<DigitalBusCapture*>(m_channel->GetData());
if(bus != NULL)
{