ngscopeclient · Mar 13, 2020 · Mar 13, 2020
Showing with 56 additions and 13 deletions.

+5 −1 glscopeclient/HistoryWindow.cpp

+15 −2 glscopeclient/OscilloscopeWindow.cpp

+27 −6 glscopeclient/ScopeApp.cpp

+8 −1 glscopeclient/ScopeApp.h

+1 −3 glscopeclient/main.cpp
diff --git a/glscopeclient/HistoryWindow.cpp b/glscopeclient/HistoryWindow.cpp
@@ -97,7 +97,11 @@ HistoryWindow::~HistoryWindow()
 	{
 		WaveformHistory hist = it[m_columns.m_history];
 		for(auto w : hist)
-			delete w.second;
+		{
+			//Do *not* delete the channel's current data!
+			if(w.second != w.first->GetData())
+				delete w.second;
+		}
 	}
 }
 

diff --git a/glscopeclient/OscilloscopeWindow.cpp b/glscopeclient/OscilloscopeWindow.cpp
@@ -383,9 +383,22 @@ void OscilloscopeWindow::CloseSession()
 	m_waveformGroups.clear();
 	m_waveformAreas.clear();
 
-	//TODO: delete stuff from our UI
+	//Delete stuff from our UI
 
-	//TODO: close stuff in the application, terminate threads, etc
+	//Purge our list of scopes (the app will delete them)
+	m_scopes.clear();
+
+	//Clear performance counters
+	m_tAcquire = 0;
+	m_tDecode = 0;
+	m_tView = 0;
+	m_tHistory = 0;
+	m_tPoll = 0;
+	m_tEvent = 0;
+	m_lastWaveformTimes.clear();
+
+	//Close stuff in the application, terminate threads, etc
+	g_app->ShutDownSession();
 }
 
 /**

diff --git a/glscopeclient/ScopeApp.cpp b/glscopeclient/ScopeApp.cpp
@@ -39,11 +39,7 @@ using namespace std;
 
 ScopeApp::~ScopeApp()
 {
-	for(auto t : m_threads)
-	{
-		t->join();
-		delete t;
-	}
+	ShutDownSession();
 }
 
 void ScopeApp::run()
@@ -65,12 +61,37 @@ void ScopeApp::run()
 			break;
 	}
 
-	g_terminating = true;
+	m_terminating = true;
 
 	delete m_window;
 	m_window = NULL;
 }
 
+/**
+	@brief Shuts down the current session and disconnects from all instruments but don't close the window
+ */
+void ScopeApp::ShutDownSession()
+{
+	//Set terminating flag so all current ScopeThread's terminate
+	m_terminating = true;
+
+	//Wait for all threads to shut down and remove them
+	for(auto t : m_threads)
+	{
+		t->join();
+		delete t;
+	}
+	m_threads.clear();
+
+	//Clean up scopes
+	for(auto scope : m_scopes)
+		delete scope;
+	m_scopes.clear();
+
+	//Back to normal mode
+	m_terminating = false;
+}
+
 /**
 	@brief Create windows for each instrument
  */

diff --git a/glscopeclient/ScopeApp.h b/glscopeclient/ScopeApp.h
@@ -43,6 +43,7 @@ class ScopeApp : public Gtk::Application
 public:
 	ScopeApp()
 	 : Gtk::Application()
+	 , m_terminating(false)
 	 , m_window(NULL)
 	{}
 
@@ -52,7 +53,14 @@ class ScopeApp : public Gtk::Application
 
 	virtual void run();
 
+	void ShutDownSession();
+
+	bool IsTerminating()
+	{ return m_terminating; }
+
 protected:
+	bool m_terminating;
+
 	OscilloscopeWindow* m_window;
 
 	virtual void on_activate();
@@ -63,6 +71,5 @@ class ScopeApp : public Gtk::Application
 void ScopeThread(Oscilloscope* scope);
 
 extern ScopeApp* g_app;
-extern bool g_terminating;
 
 #endif
diff --git a/glscopeclient/main.cpp b/glscopeclient/main.cpp
@@ -49,8 +49,6 @@ using namespace std;
 //for color selection
 int g_numDecodes = 0;
 
-bool g_terminating = false;
-
 ScopeApp* g_app = NULL;
 
 int main(int argc, char* argv[])
@@ -198,7 +196,7 @@ void ScopeThread(Oscilloscope* scope)
 	uint32_t delay_max = 500 * 1000;
 	uint32_t delay_min = 250;
 	double dt = 0;
-	while(!g_terminating)
+	while(!g_app->IsTerminating())
 	{
 		size_t npending = scope->GetPendingWaveformCount();