ngscopeclient · Sep 19, 2020
Showing with 45 additions and 2 deletions.

+37 −0 src/glscopeclient/OscilloscopeWindow.cpp

+4 −0 src/glscopeclient/OscilloscopeWindow.h

+3 −0 src/glscopeclient/ProtocolAnalyzerWindow.h

+1 −2 src/glscopeclient/WaveformArea_events.cpp
diff --git a/src/glscopeclient/OscilloscopeWindow.cpp b/src/glscopeclient/OscilloscopeWindow.cpp
@@ -249,6 +249,10 @@ void OscilloscopeWindow::CreateWidgets(bool nodigital)
 			m_menu.append(m_windowMenuItem);
 				m_windowMenuItem.set_label("Window");
 				m_windowMenuItem.set_submenu(m_windowMenu);
+					m_windowMenu.append(m_windowAnalyzerMenuItem);
+						m_windowAnalyzerMenuItem.set_label("Analyzer");
+						m_windowAnalyzerMenuItem.set_submenu(m_windowAnalyzerMenu);
+
 		m_vbox.pack_start(m_toolbox, Gtk::PACK_SHRINK);
 			m_vbox.get_style_context()->add_class("toolbar");
 			m_toolbox.pack_start(m_toolbar, Gtk::PACK_EXPAND_WIDGET);
@@ -602,6 +606,7 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
 
 	//Reconfigure menus
 	RefreshChannelsMenu();
+	RefreshAnalyzerMenu();
 
 	//Make sure all resize etc events have been handled before replaying history.
 	//Otherwise eye patterns don't refresh right.
@@ -2484,6 +2489,9 @@ void OscilloscopeWindow::OnHaltConditions()
 	m_haltConditionsDialog.RefreshChannels();
 }
 
+/**
+	@brief Update the channels menu when we connect to a new instrument
+ */
 void OscilloscopeWindow::RefreshChannelsMenu()
 {
 	//Remove the old items
@@ -2513,3 +2521,32 @@ void OscilloscopeWindow::RefreshChannelsMenu()
 
 	m_channelsMenu.show_all();
 }
+
+/**
+	@brief Update the protocol analyzer menu when we create or destroy an analyzer
+ */
+void OscilloscopeWindow::RefreshAnalyzerMenu()
+{
+	LogDebug("RefreshAnalyzerMenu\n");
+
+	//Remove the old items
+	auto children = m_windowAnalyzerMenu.get_children();
+	for(auto c : children)
+		m_windowAnalyzerMenu.remove(*c);
+
+	//Add new ones
+	for(auto a : m_analyzers)
+	{
+		auto item = Gtk::manage(new Gtk::MenuItem(a->GetDecoder()->m_displayname, false));
+		item->signal_activate().connect(
+			sigc::bind<ProtocolAnalyzerWindow*>(sigc::mem_fun(*this, &OscilloscopeWindow::OnShowAnalyzer), a ));
+		m_windowAnalyzerMenu.append(*item);
+	}
+
+	m_windowAnalyzerMenu.show_all();
+}
+
+void OscilloscopeWindow::OnShowAnalyzer(ProtocolAnalyzerWindow* window)
+{
+	window->show();
+}
diff --git a/src/glscopeclient/OscilloscopeWindow.h b/src/glscopeclient/OscilloscopeWindow.h
@@ -169,6 +169,8 @@ class OscilloscopeWindow	: public Gtk::Window
 							Gtk::RadioMenuItem m_eyeColorViridisItem;
 			Gtk::MenuItem m_windowMenuItem;
 				Gtk::Menu m_windowMenu;
+					Gtk::MenuItem m_windowAnalyzerMenuItem;
+						Gtk::Menu m_windowAnalyzerMenu;
 		Gtk::HBox m_toolbox;
 			Gtk::Toolbar m_toolbar;
 				Gtk::ToolButton m_btnStart;
@@ -238,9 +240,11 @@ class OscilloscopeWindow	: public Gtk::Window
 	void OnTimebaseSettings();
 	void OnScopeSync();
 	void OnHaltConditions();
+	void OnShowAnalyzer(ProtocolAnalyzerWindow* window);
 
 	//Reconfigure menus
 	void RefreshChannelsMenu();
+	void RefreshAnalyzerMenu();
 
 	//Protocol decoding etc
 	void RefreshAllFilters();

diff --git a/src/glscopeclient/ProtocolAnalyzerWindow.h b/src/glscopeclient/ProtocolAnalyzerWindow.h
@@ -128,6 +128,9 @@ class ProtocolAnalyzerWindow : public Gtk::Dialog
 	void OnWaveformDataReady();
 	void RemoveHistory(TimePoint timestamp);
 
+	PacketDecoder* GetDecoder()
+	{ return m_decoder; }
+
 protected:
 	OscilloscopeWindow* m_parent;
 	PacketDecoder* m_decoder;

diff --git a/src/glscopeclient/WaveformArea_events.cpp b/src/glscopeclient/WaveformArea_events.cpp
@@ -972,8 +972,6 @@ void WaveformArea::OnDecodeSetupComplete()
 	}
 
 	//If the decoder is a packet-oriented protocol, pop up a protocol analyzer
-	//TODO: UI for re-opening the analyzer if we close it?
-	//TODO: allow protocol decoder dialogs to reconfigure decoder in the future
 	auto pdecode = dynamic_cast<PacketDecoder*>(m_pendingDecode);
 	if(pdecode != NULL)
 	{
@@ -982,6 +980,7 @@ void WaveformArea::OnDecodeSetupComplete()
 
 		auto analyzer = new ProtocolAnalyzerWindow(title, m_parent, pdecode, this);
 		m_parent->m_analyzers.emplace(analyzer);
+		m_parent->RefreshAnalyzerMenu();
 
 		analyzer->OnWaveformDataReady();
 		analyzer->show();