TriggerPropertiesDialog: now provide control of trigger offset. See #12.

ngscopeclient · Sep 16, 2020 · 5488366 · 5488366
1 parent c3964ab
commit 5488366
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
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;