Major revamp of triggering in ngscopeclient. Trigger groups now are f…

…unctional, but there's no UI to independently start/stop them. No setup wizard etc yet.

src/ngscopeclient/MainWindow.cpp

@@ -682,17 +682,17 @@ void MainWindow::ToolbarButtons()
 
 	//Trigger button group
 	if(ImGui::ImageButton("trigger-start", GetTexture("trigger-start"), buttonsize))
-		m_session.ArmTrigger(Session::TRIGGER_TYPE_NORMAL);
+		m_session.ArmTrigger(TriggerGroup::TRIGGER_TYPE_NORMAL);
 	Dialog::Tooltip("Arm the trigger in normal mode");
 
 	ImGui::SameLine(0.0, 0.0);
 	if(ImGui::ImageButton("trigger-single", GetTexture("trigger-single"), buttonsize))
-		m_session.ArmTrigger(Session::TRIGGER_TYPE_SINGLE);
+		m_session.ArmTrigger(TriggerGroup::TRIGGER_TYPE_SINGLE);
 	Dialog::Tooltip("Arm the trigger in one-shot mode");
 
 	ImGui::SameLine(0.0, 0.0);
 	if(ImGui::ImageButton("trigger-force", GetTexture("trigger-force"), buttonsize))
-		m_session.ArmTrigger(Session::TRIGGER_TYPE_FORCED);
+		m_session.ArmTrigger(TriggerGroup::TRIGGER_TYPE_FORCED);
 	Dialog::Tooltip("Acquire a waveform immediately, ignoring the trigger condition");
 
 	ImGui::SameLine(0.0, 0.0);

src/ngscopeclient/ManageInstrumentsDialog.cpp

@@ -145,7 +145,7 @@ void ManageInstrumentsDialog::TriggerGroupsTable()
 			ImGui::TextUnformatted(
 				"Drag to the root of a trigger group to add this instrument to the group.\n"
 				"Drag to an ungrouped instrument to create a new group under it.\n"
-				"Drag an instrment to the root of its current group to make it the primary.\n");
+				"Drag an instrument to the root of its current group to make it the primary.\n");
 			ImGui::PopTextWrapPos();
 			ImGui::EndTooltip();
 		}