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

Commits on Sep 24, 2020

  1. Copy the full SHA
    28ba5ef View commit details
Showing with 7 additions and 3 deletions.
  1. +1 −1 lib
  2. +6 −2 src/glscopeclient/Timeline.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 4e7d62 to 7219fe
8 changes: 6 additions & 2 deletions src/glscopeclient/Timeline.cpp
Original file line number Diff line number Diff line change
@@ -361,8 +361,12 @@ void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr, OscilloscopeChann
auto trig = scope->GetTrigger();
if(trig)
{
Gdk::Color color(trig->GetInput(0).m_channel->m_displaycolor);
cr->set_source_rgba(color.get_red_p(), color.get_green_p(), color.get_blue_p(), 1.0);
auto chan = trig->GetInput(0).m_channel;
if(chan)
{
Gdk::Color color(chan->m_displaycolor);
cr->set_source_rgba(color.get_red_p(), color.get_green_p(), color.get_blue_p(), 1.0);
}

int size = 5;
cr->move_to(x-size, h-size);