Rich UI support for StreamBrowserDialog on oscilloscopes

src/ngscopeclient/InstrumentThread.cpp

@@ -65,6 +65,8 @@ void InstrumentThread(InstrumentThreadArgs args)
 	auto bertstate = args.bertstate;
 	auto psustate = args.psustate;
 
+	bool triggerUpToDate = false;
+
 	while(!*args.shuttingDown)
 	{
 		//Flush any pending commands
@@ -86,15 +88,26 @@ void InstrumentThread(InstrumentThreadArgs args)
 			{
 				//LogTrace("Scope isn't armed, sleeping\n");
 				this_thread::sleep_for(chrono::milliseconds(5));
+				if(!triggerUpToDate)
+				{	// Check for trigger state change
+					auto stat = scope->PollTrigger();
+					session->GetInstrumentConnectionState(inst)->m_lastTriggerState = stat;
+					if(stat == Oscilloscope::TRIGGER_MODE_STOP || stat == Oscilloscope::TRIGGER_MODE_RUN || stat == Oscilloscope::TRIGGER_MODE_TRIGGERED)
+					{	// Final state
+						triggerUpToDate = true;
+					}
+				}
 			}
 
 			//Grab data if it's ready
 			//TODO: how is this going to play with reading realtime BER from BERT+scope deviecs?
 			else
 			{
 				auto stat = scope->PollTrigger();
+				session->GetInstrumentConnectionState(inst)->m_lastTriggerState = stat;
 				if(stat == Oscilloscope::TRIGGER_MODE_TRIGGERED)
 					scope->AcquireData();
+				triggerUpToDate = false;
 			}
 		}
 

src/ngscopeclient/MainWindow.cpp

@@ -1277,7 +1277,7 @@ void MainWindow::DockingArea()
 				rightPanelID = topNode->ChildNodes[1]->ID;
 			}
 			else
-				ImGui::DockBuilderSplitNode(topNode->ID, ImGuiDir_Left, 0.1, &leftPanelID, &rightPanelID);
+				ImGui::DockBuilderSplitNode(topNode->ID, ImGuiDir_Left, 0.2, &leftPanelID, &rightPanelID);
 
 			ImGui::DockBuilderDockWindow(m_streamBrowser->GetTitleAndID().c_str(), leftPanelID);
 			ImGui::DockBuilderDockWindow(m_initialWorkspaceDockRequest->GetTitleAndID().c_str(), rightPanelID);

src/ngscopeclient/Session.h

@@ -58,6 +58,7 @@ class InstrumentConnectionState
 		m_shuttingDown = false;
 		args.shuttingDown = &m_shuttingDown;
 		m_thread = std::make_unique<std::thread>(InstrumentThread, args);
+		m_lastTriggerState = Oscilloscope::TRIGGER_MODE_WAIT;
 	}
 
 	~InstrumentConnectionState()
@@ -79,6 +80,9 @@ class InstrumentConnectionState
 
 	///@brief Thread for polling the instrument
 	std::unique_ptr<std::thread> m_thread;
+
+	///@brief Cached trigger state, to reflect in the UI
+	Oscilloscope::TriggerMode m_lastTriggerState;
 };
 
 /**
@@ -132,6 +136,7 @@ class Session
 
 	void AddInstrument(std::shared_ptr<Instrument> inst, bool createDialogs = true);
 	void RemoveInstrument(std::shared_ptr<Instrument> inst);
+	std::shared_ptr<InstrumentConnectionState> GetInstrumentConnectionState(std::shared_ptr<Instrument> inst) { return m_instrumentStates[inst]; }
 
 	bool IsMultiScope()
 	{ return m_multiScope; }