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: 6206c28f0f8d
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: 4c05c1461c4f
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Sep 25, 2020

  1. Copy the full SHA
    4c05c14 View commit details
Showing with 4 additions and 6 deletions.
  1. +1 −1 lib
  2. +0 −2 src/glscopeclient/HaltConditionsDialog.cpp
  3. +3 −3 src/glscopeclient/Timeline.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 32d962 to 5da1ab
2 changes: 0 additions & 2 deletions src/glscopeclient/HaltConditionsDialog.cpp
Original file line number Diff line number Diff line change
@@ -46,8 +46,6 @@ HaltConditionsDialog::HaltConditionsDialog(
: Gtk::Dialog("Halt Conditions", *parent)
, m_parent(parent)
{
char buf[128];

get_vbox()->pack_start(m_grid, Gtk::PACK_EXPAND_WIDGET);
m_grid.attach(m_haltEnabledButton, 0, 0, 1, 1);
m_haltEnabledButton.set_label("Halt Enabled");
6 changes: 3 additions & 3 deletions src/glscopeclient/Timeline.cpp
Original file line number Diff line number Diff line change
@@ -361,10 +361,10 @@ void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr, OscilloscopeChann
auto trig = scope->GetTrigger();
if(trig)
{
auto chan = trig->GetInput(0).m_channel;
if(chan)
auto c = trig->GetInput(0).m_channel;
if(c)
{
Gdk::Color color(chan->m_displaycolor);
Gdk::Color color(c->m_displaycolor);
cr->set_source_rgba(color.get_red_p(), color.get_green_p(), color.get_blue_p(), 1.0);
}