ngscopeclient · Mar 15, 2020
Showing with 30 additions and 3 deletions.

+15 −0 glscopeclient/HistoryWindow.cpp

+2 −0 glscopeclient/HistoryWindow.h

+12 −2 glscopeclient/OscilloscopeWindow.cpp

+1 −1 glscopeclient/OscilloscopeWindow.h
diff --git a/glscopeclient/HistoryWindow.cpp b/glscopeclient/HistoryWindow.cpp
@@ -397,3 +397,18 @@ void HistoryWindow::SerializeWaveforms(string dir, IDTable& table)
 	}
 	fclose(fp);
 }
+
+void HistoryWindow::ReplayHistory()
+{
+	//TODO: is there a way to binary search a tree view?
+	//Or get *stable* iterators that aren't invalidated by adding/removing items?
+	auto children = m_model->children();
+	for(auto it : children)
+	{
+		//Select will update all the protocol decoders etc
+		m_tree.get_selection()->select(it);
+
+		//Update analyzers
+		m_parent->OnHistoryUpdated(true);
+	}
+}
diff --git a/glscopeclient/HistoryWindow.h b/glscopeclient/HistoryWindow.h
@@ -59,6 +59,8 @@ class HistoryWindow : public Gtk::Window
 	HistoryWindow(OscilloscopeWindow* parent, Oscilloscope* scope);
 	~HistoryWindow();
 
+	void ReplayHistory();
+
 	void OnWaveformDataReady();
 	void JumpToHistory(TimePoint timestamp);
 

diff --git a/glscopeclient/OscilloscopeWindow.cpp b/glscopeclient/OscilloscopeWindow.cpp
@@ -505,11 +505,17 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
 
 				auto analyzer = new ProtocolAnalyzerWindow(title, this, pdecode, area);
 				m_analyzers.emplace(analyzer);
+
+				//Done
 				analyzer->show();
 			}
 		}
 	}
 
+	//TODO: make this work properly if we have decodes spanning multiple scopes
+	for(auto it : m_historyWindows)
+		it.second->ReplayHistory();
+
 	//Start threads to poll scopes etc
 	g_app->StartScopeThreads();
 }
@@ -1709,7 +1715,7 @@ void OscilloscopeWindow::ArmTrigger(bool oneshot)
 /**
 	@brief Called when the history view selects an old waveform
  */
-void OscilloscopeWindow::OnHistoryUpdated()
+void OscilloscopeWindow::OnHistoryUpdated(bool refreshAnalyzers)
 {
 	//Stop triggering if we select a saved waveform
 	OnStop();
@@ -1731,7 +1737,11 @@ void OscilloscopeWindow::OnHistoryUpdated()
 		w->OnWaveformDataReady();
 	}
 
-	//Don't update the protocol analyzers, they should already have this waveform saved
+	if(refreshAnalyzers)
+	{
+		for(auto a : m_analyzers)
+			a->OnWaveformDataReady();
+	}
 }
 
 void OscilloscopeWindow::RemoveHistory(TimePoint timestamp)

diff --git a/glscopeclient/OscilloscopeWindow.h b/glscopeclient/OscilloscopeWindow.h
@@ -88,7 +88,7 @@ class OscilloscopeWindow	: public Gtk::Window
 	void HideHistory()
 	{ m_btnHistory.set_active(0); }
 
-	void OnHistoryUpdated();
+	void OnHistoryUpdated(bool refreshAnalyzers = false);
 	void RemoveHistory(TimePoint timestamp);
 
 	void JumpToHistory(TimePoint timestamp);