ngscopeclient · Mar 16, 2020 · Mar 16, 2020
Showing with 15 additions and 2 deletions.

+5 −0 glscopeclient/OscilloscopeWindow.cpp

+7 −2 glscopeclient/ScopeApp.cpp

+2 −0 glscopeclient/ScopeApp.h

+1 −0 glscopeclient/WaveformArea_events.cpp
diff --git a/glscopeclient/OscilloscopeWindow.cpp b/glscopeclient/OscilloscopeWindow.cpp
@@ -512,6 +512,11 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
 		}
 	}
 
+	//Make sure all resize etc events have been handled before replaying history.
+	//Otherwise eye patterns don't refresh right.
+	show_all();
+	g_app->DispatchPendingEvents();
+
 	//TODO: make this work properly if we have decodes spanning multiple scopes
 	for(auto it : m_historyWindows)
 		it.second->ReplayHistory();

diff --git a/glscopeclient/ScopeApp.cpp b/glscopeclient/ScopeApp.cpp
@@ -66,8 +66,7 @@ void ScopeApp::run(string fileToLoad)
 		m_window->PollScopes();
 
 		//Dispatch events if we have any
-		while(Gtk::Main::events_pending())
-			Gtk::Main::iteration();
+		DispatchPendingEvents();
 
 		//Stop if the main window got closed
 		if(!m_window->is_visible())
@@ -80,6 +79,12 @@ void ScopeApp::run(string fileToLoad)
 	m_window = NULL;
 }
 
+void ScopeApp::DispatchPendingEvents()
+{
+	while(Gtk::Main::events_pending())
+		Gtk::Main::iteration();
+}
+
 /**
 	@brief Shuts down the current session and disconnects from all instruments but don't close the window
  */

diff --git a/glscopeclient/ScopeApp.h b/glscopeclient/ScopeApp.h
@@ -53,6 +53,8 @@ class ScopeApp : public Gtk::Application
 
 	virtual void run(std::string fileToLoad);
 
+	void DispatchPendingEvents();
+
 	void ShutDownSession();
 
 	bool IsTerminating()

diff --git a/glscopeclient/WaveformArea_events.cpp b/glscopeclient/WaveformArea_events.cpp
@@ -98,6 +98,7 @@ void WaveformArea::on_resize(int width, int height)
 		auto eye = dynamic_cast<EyeDecoder2*>(m_channel);
 		eye->SetWidth(m_width/4);
 		eye->SetHeight(m_height);
+		eye->Refresh();
 	}
 	else if(IsWaterfall())
 	{