ngscopeclient · Mar 15, 2020 · Mar 15, 2020
Showing with 23 additions and 10 deletions.

+8 −4 glscopeclient/HistoryWindow.cpp

+2 −0 glscopeclient/HistoryWindow.h

+13 −4 glscopeclient/OscilloscopeWindow.cpp

+0 −2 glscopeclient/WaveformArea.cpp
diff --git a/glscopeclient/HistoryWindow.cpp b/glscopeclient/HistoryWindow.cpp
@@ -75,7 +75,7 @@ HistoryWindow::HistoryWindow(OscilloscopeWindow* parent, Oscilloscope* scope)
 			m_hbox.pack_start(m_maxLabel, Gtk::PACK_SHRINK);
 				m_maxLabel.set_label("Max waveforms");
 			m_hbox.pack_start(m_maxBox, Gtk::PACK_EXPAND_WIDGET);
-				m_maxBox.set_text("100");
+				SetMaxWaveforms(10);
 		m_vbox.pack_start(m_scroller, Gtk::PACK_EXPAND_WIDGET);
 			m_scroller.add(m_tree);
 			m_scroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -105,6 +105,13 @@ HistoryWindow::~HistoryWindow()
 	}
 }
 
+void HistoryWindow::SetMaxWaveforms(int n)
+{
+	char tmp[128];
+	snprintf(tmp, sizeof(tmp), "%d", n);
+	m_maxBox.set_text(tmp);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Event handlers
 
@@ -176,11 +183,8 @@ void HistoryWindow::OnWaveformDataReady()
 	m_tree.get_selection()->select(row);
 
 	//Remove extra waveforms, if we have any.
-	//If not visible, destroy all waveforms other than the most recent
 	string smax = m_maxBox.get_text();
 	size_t nmax = atoi(smax.c_str());
-	if(!is_visible())
-		nmax = 1;
 	auto children = m_model->children();
 	while(children.size() > nmax)
 	{

diff --git a/glscopeclient/HistoryWindow.h b/glscopeclient/HistoryWindow.h
@@ -62,6 +62,8 @@ class HistoryWindow : public Gtk::Window
 	void OnWaveformDataReady();
 	void JumpToHistory(TimePoint timestamp);
 
+	void SetMaxWaveforms(int n);
+
 protected:
 	virtual bool on_delete_event(GdkEventAny* ignored);
 	virtual void OnSelectionChanged();

diff --git a/glscopeclient/OscilloscopeWindow.cpp b/glscopeclient/OscilloscopeWindow.cpp
@@ -468,6 +468,15 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
 		LoadDecodes(node["decodes"], table);
 		LoadUIConfiguration(node["ui_config"], table);
 	}
+	show_all();
+
+	//Create history windows for all of our scopes
+	for(auto scope : m_scopes)
+	{
+		auto hist = new HistoryWindow(this, scope);
+		hist->hide();
+		m_historyWindows[scope] = hist;
+	}
 
 	//Re-title the window for the new scope
 	SetTitle();
@@ -478,7 +487,6 @@ void OscilloscopeWindow::DoFileOpen(string filename, bool loadLayout, bool loadW
 
 	//Start threads to poll scopes etc
 	g_app->StartScopeThreads();
-	show_all();
 }
 
 /**
@@ -509,7 +517,7 @@ void OscilloscopeWindow::LoadInstruments(const YAML::Node& node, bool reconnect,
 
 		//Sanity check make/model/serial. If mismatch, stop
 		string message;
-		bool fail;
+		bool fail = false;
 		if(inst["name"].as<string>() != scope->GetName())
 		{
 			message = string("Unable to connect to oscilloscope: instrument has model name \"") +
@@ -678,8 +686,9 @@ void OscilloscopeWindow::LoadUIConfiguration(const YAML::Node& node, IDTable& ta
 	{
 		//Create the splitter
 		auto sn = it.second;
+		auto dir = sn["dir"].as<string>();
 		Gtk::Paned* split = NULL;
-		if(sn["dir"].as<string>() == "h")
+		if(dir == "h")
 			split = new Gtk::HPaned;
 		else
 			split = new Gtk::VPaned;
@@ -696,7 +705,7 @@ void OscilloscopeWindow::LoadUIConfiguration(const YAML::Node& node, IDTable& ta
 		if(a)
 			split->pack1(*a);
 		if(b)
-			split->pack1(*b);
+			split->pack2(*b);
 		split->set_position(sn["split"].as<int>());
 	}
 

diff --git a/glscopeclient/WaveformArea.cpp b/glscopeclient/WaveformArea.cpp
@@ -442,8 +442,6 @@ void WaveformArea::CreateWidgets()
 
 void WaveformArea::on_realize()
 {
-	LogDebug("realize waveform area\n");
-
 	//Let the base class create the GL context, then select it
 	Gtk::GLArea::on_realize();
 	make_current();