Merge branch 'stream-browser-dialog-refactoring' of github.com:fredzo…

…/scopehal-apps

devdoc/Introduction.md

@@ -24,6 +24,9 @@ End user documentation is located at https://www.ngscopeclient.org/manual/conten
 \defgroup drivers Instrument drivers
 \ingroup libscopehal
 
+\defgroup miscdrivers Miscellaneous instrument drivers
+\ingroup drivers
+
 \defgroup scopedrivers Oscilloscope / LA drivers
 \ingroup drivers
 

src/ngscopeclient/PreferenceSchema.cpp

@@ -165,6 +165,10 @@ void PreferenceManager::InitializeDefaults()
 				.Description("Color for icon captions"));
 
 		auto& stream = appearance.AddCategory("Stream Browser");
+			stream.AddPreference(
+				Preference::Real("instrument_badge_latch_duration", 0.4)
+				.Label("Intrument badge latch duration (seconds)")
+				.Description("Duration during which instrument badges are preserved (to prevent flashing)."));
 			stream.AddPreference(
 				Preference::Color("download_wait_badge_color", ColorFromString("#CC4C4C"))
 				.Label("Download wait badge color")

src/ngscopeclient/Session.cpp

@@ -964,13 +964,18 @@ bool Session::PreLoadInstruments(int version, const YAML::Node& node, bool onlin
 			if(!PreLoadMisc(version, inst, online))
 				return false;
 		}
+		else if(type == "vna")
+		{
+			if(!PreLoadVNA(version, inst, online))
+				return false;
+		}
 
 		//Unknown instrument type - too new file format?
 		else
 		{
 			m_mainWindow->ShowErrorPopup(
 				"File load error",
-				string("Instrument ") + nick.c_str() + " is of unknown type " + inst["type"].as<string>());
+				string("Instrument ") + nick.c_str() + " is of unknown type " + type.c_str());
 			return false;
 		}
 	}
@@ -1120,6 +1125,73 @@ bool Session::PreLoadOscilloscope(int version, const YAML::Node& node, bool onli
 	return true;
 }
 
+bool Session::PreLoadVNA(int version, const YAML::Node& node, bool online)
+{
+	//Create the instrument
+	shared_ptr<Oscilloscope> scope = nullptr;
+
+	auto transtype = node["transport"].as<string>();
+	auto driver = node["driver"].as<string>();
+
+	if(online)
+	{
+		if( (transtype == "null") && (driver != "demo") )
+		{
+			m_mainWindow->ShowErrorPopup(
+				"Unable to reconnect",
+				"The session file does not contain any connection information.\n\n"
+				"Loading in offline mode.");
+		}
+
+		else
+		{
+			//Create the scope
+			auto transport = CreateTransportForNode(node);
+
+			if(transport && transport->IsConnected())
+			{
+				scope = SCPIVNA::CreateVNA(driver, transport);
+				if(!VerifyInstrument(node, scope))
+					scope = nullptr;
+			}
+			else
+			{
+				delete transport;
+
+				m_mainWindow->ShowErrorPopup(
+					"Unable to reconnect",
+					string("Failed to reconnect to oscilloscope at ") + node["args"].as<string>() + ".\n\n"
+					"Loading this instrument in offline mode.");
+			}
+		}
+	}
+
+	if(!scope)
+	{
+		//Create the mock scope
+		scope = make_shared<MockOscilloscope>(
+			node["name"].as<string>(),
+			node["vendor"].as<string>(),
+			node["serial"].as<string>(),
+			transtype,
+			driver,
+			node["args"].as<string>()
+			);
+	}
+
+	//Make any config settings to the instrument from our preference settings
+	ApplyPreferences(scope);
+
+	//All good. Add to our list of scopes etc
+	AddInstrument(scope, false);
+	m_idtable.emplace(node["id"].as<uintptr_t>(), (Instrument*)scope.get());
+
+	//Run the preload
+	scope->PreLoadConfiguration(version, node, m_idtable, m_warnings);
+
+	return true;
+}
+
 bool Session::PreLoadLoad(int version, const YAML::Node& node, bool online)
 {
 	//Create the instrument

src/ngscopeclient/Session.h

@@ -340,6 +340,7 @@ class Session
 	bool PreLoadInstruments(int version, const YAML::Node& node, bool online);
 	SCPITransport* CreateTransportForNode(const YAML::Node& node);
 	bool VerifyInstrument(const YAML::Node& node, std::shared_ptr<Instrument> inst);
+	bool PreLoadVNA(int version, const YAML::Node& node, bool online);
 	bool PreLoadOscilloscope(int version, const YAML::Node& node, bool online);
 	bool PreLoadPowerSupply(int version, const YAML::Node& node, bool online);
 	bool PreLoadRFSignalGenerator(int version, const YAML::Node& node, bool online);