ngscopeclient · Sep 16, 2020 · Sep 16, 2020
Showing with 44 additions and 4 deletions.

+4 −0 src/glscopeclient/OscilloscopeWindow.cpp

+25 −3 src/glscopeclient/Timeline.cpp

+1 −1 src/glscopeclient/Timeline.h

+12 −0 src/glscopeclient/TriggerPropertiesDialog.cpp

+2 −0 src/glscopeclient/TriggerPropertiesDialog.h
diff --git a/src/glscopeclient/OscilloscopeWindow.cpp b/src/glscopeclient/OscilloscopeWindow.cpp
@@ -1555,6 +1555,10 @@ void OscilloscopeWindow::OnTriggerProperties(Oscilloscope* scope)
 	if(Gtk::RESPONSE_OK != dlg.run())
 		return;
 	dlg.ConfigureTrigger();
+
+	//Redraw the timeline in case we changed the trigger channel etc
+	for(auto g : m_waveformGroups)
+		g->m_timeline.queue_draw();
 }
 
 void OscilloscopeWindow::OnEyeColorChanged(EyeColor color, Gtk::RadioMenuItem* item)

diff --git a/src/glscopeclient/Timeline.cpp b/src/glscopeclient/Timeline.cpp
@@ -181,21 +181,25 @@ bool Timeline::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
 
 	//Figure out the units to use for the axis
 	auto children = m_group->m_waveformBox.get_children();
+	OscilloscopeChannel* chan = NULL;
 	if(!children.empty())
 	{
 		auto view = dynamic_cast<WaveformArea*>(children[0]);
 		if(view != NULL)
-			m_xAxisUnit = view->GetChannel().m_channel->GetXAxisUnits();
+		{
+			chan = view->GetChannel().m_channel;
+			m_xAxisUnit = chan->GetXAxisUnits();
+		}
 	}
 
 	//And actually draw the rest
-	Render(cr);
+	Render(cr, chan);
 
 	cr->restore();
 	return true;
 }
 
-void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr)
+void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr, OscilloscopeChannel* chan)
 {
 	size_t w = get_width();
 	size_t h = get_height();
@@ -343,6 +347,24 @@ void Timeline::Render(const Cairo::RefPtr<Cairo::Context>& cr)
 			true,
 			false);
 	}
+
+	//Draw trigger position for the first scope in the plot
+	//TODO: handle more than one scope
+	if(chan)
+	{
+		auto scope = chan->GetScope();
+		int64_t timestamp = scope->GetTriggerOffset();
+		double x = (timestamp - m_group->m_xAxisOffset) * m_group->m_pixelsPerXUnit;
+
+		Gdk::Color color(scope->GetTrigger()->GetInput(0).m_channel->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);
+		cr->line_to(x,		h);
+		cr->line_to(x+size, h-size);
+		cr->fill();
+	}
 }
 
 void Timeline::DrawCursor(

diff --git a/src/glscopeclient/Timeline.h b/src/glscopeclient/Timeline.h
@@ -58,7 +58,7 @@ class Timeline : public Gtk::Layout
 
 	virtual void on_realize();
 
-	void Render(const Cairo::RefPtr<Cairo::Context>& cr);
+	void Render(const Cairo::RefPtr<Cairo::Context>& cr, OscilloscopeChannel* chan);
 
 	virtual void DrawCursor(
 		const Cairo::RefPtr<Cairo::Context>& cr,

diff --git a/src/glscopeclient/TriggerPropertiesDialog.cpp b/src/glscopeclient/TriggerPropertiesDialog.cpp
@@ -80,6 +80,14 @@ TriggerPropertiesDialog::TriggerPropertiesDialog(
 			m_triggerTypeBox.signal_changed().connect(
 				sigc::mem_fun(*this, &TriggerPropertiesDialog::OnTriggerTypeChanged));
 
+	//Trigger horizontal offset
+	Unit ps(Unit::UNIT_PS);
+	m_grid.attach_next_to(m_triggerOffsetLabel, m_triggerTypeLabel, Gtk::POS_BOTTOM, 1, 1);
+		m_triggerOffsetLabel.set_text("Trigger Offset");
+		m_grid.attach_next_to(m_triggerOffsetEntry, m_triggerOffsetLabel, Gtk::POS_RIGHT, 1, 1);
+			auto offset = m_scope->GetTriggerOffset();
+			m_triggerOffsetEntry.set_text(ps.PrettyPrint(offset));
+
 	//Actual content
 	get_vbox()->pack_start(m_contentGrid, Gtk::PACK_SHRINK);
 	AddRows(trig);
@@ -120,6 +128,10 @@ void TriggerPropertiesDialog::ConfigureTrigger()
 
 	//and feed it to the scope
 	m_scope->SetTrigger(trig);
+
+	//Also, set the trigger offset
+	Unit ps(Unit::UNIT_PS);
+	m_scope->SetTriggerOffset(ps.ParseString(m_triggerOffsetEntry.get_text()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/glscopeclient/TriggerPropertiesDialog.h b/src/glscopeclient/TriggerPropertiesDialog.h
@@ -60,6 +60,8 @@ class TriggerPropertiesDialog	: public Gtk::Dialog
 			Gtk::Label m_scopeNameEntry;
 		Gtk::Label m_triggerTypeLabel;
 			Gtk::ComboBoxText m_triggerTypeBox;
+		Gtk::Label m_triggerOffsetLabel;
+			Gtk::Entry m_triggerOffsetEntry;
 	Gtk::Grid m_contentGrid;
 
 	Oscilloscope* m_scope;