Allow opening session files from command line args

Author: azonenberg

src/ngscopeclient/MainWindow.cpp

@@ -755,7 +755,8 @@ void MainWindow::RenderUI()
 		}
 	}
 
-	//Handle error messages
+	//Handle error messages and other blocking notifications
+	RenderReconnectPopup();
 	RenderErrorPopup();
 	RenderLoadWarningPopup();
 
@@ -1677,6 +1678,47 @@ void MainWindow::ShowErrorPopup(const string& title, const string& msg)
 	m_errorPopupMessage = msg;
 }
 
+/**
+	@brief Popup message when reconnecting to a session
+ */
+void MainWindow::RenderReconnectPopup()
+{
+	const char* title = "Open Session";
+
+	if(!m_startupSession.empty())
+		ImGui::OpenPopup(title);
+
+	if(ImGui::BeginPopupModal(title, nullptr, ImGuiWindowFlags_AlwaysAutoResize))
+	{
+		ImGui::TextUnformatted("Do you want to reconnect to the lab instruments or load session data for offline analysis?\n");
+		ImGui::Separator();
+
+		if(ImGui::Button("Reconnect"))
+		{
+			DoOpenFile(m_startupSession, true);
+			m_startupSession = "";
+			ImGui::CloseCurrentPopup();
+		}
+
+		ImGui::SameLine();
+		if(ImGui::Button("Load Offline"))
+		{
+			DoOpenFile(m_startupSession, false);
+			m_startupSession = "";
+			ImGui::CloseCurrentPopup();
+		}
+
+		ImGui::SameLine();
+		if(ImGui::Button("Cancel"))
+		{
+			m_startupSession = "";
+			ImGui::CloseCurrentPopup();
+		}
+
+		ImGui::EndPopup();
+	}
+}
+
 /**
 	@brief Popup message when something big goes wrong
  */

src/ngscopeclient/MainWindow.h

@@ -220,6 +220,9 @@ class MainWindow : public VulkanWindow
 	std::map<uintptr_t, std::string> GetGraphEditorGroups()
 	{ return m_graphEditorGroups; }
 
+	void SetStartupSession(const std::string& path)
+	{ m_startupSession = path; }
+
 protected:
 	virtual void DoRender(vk::raii::CommandBuffer& cmdBuf);
 
@@ -398,6 +401,9 @@ class MainWindow : public VulkanWindow
 	///@brief Pending requests to display a channel in a waveform area (from CreateFilter())
 	std::set< std::pair<OscilloscopeChannel*, WaveformArea*> > m_pendingChannelDisplayRequests;
 
+	///@brief Pending request to open a session
+	std::string m_startupSession;
+
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Session state
 
@@ -506,6 +512,7 @@ class MainWindow : public VulkanWindow
 	bool m_showingLoadWarnings;
 	bool m_loadConfirmationChecked;
 
+	void RenderReconnectPopup();
 	void RenderErrorPopup();
 	void RenderLoadWarningPopup();
 public:

src/ngscopeclient/main.cpp

@@ -53,6 +53,8 @@ int main(int argc, char* argv[])
 	//Global settings
 	Severity console_verbosity = Severity::NOTICE;
 
+	string sessionToOpen;
+	vector<string> instrumentConnectionStrings;
 	for(int i=1; i<argc; i++)
 	{
 		string s(argv[i]);
@@ -61,8 +63,21 @@ int main(int argc, char* argv[])
 		if(ParseLoggerArguments(i, argc, argv, console_verbosity))
 			continue;
 
-		//TODO: other arguments
+		//Other switch (unrecognized)
+		else if(s.find("-") == 0)
+		{
+			//Don't know what it is
+			fprintf(stderr, "Unrecognized argument \"%s\"\n", s.c_str());
+			return 1;
+		}
 
+		//If it ends in .scopesession assume it's a session file
+		else if(s.find(".scopesession") != string::npos)
+			sessionToOpen = s;
+
+		//Assume it's an instrument
+		else
+			instrumentConnectionStrings.push_back(s);
 	}
 
 	//Set up logging to the GUI
@@ -105,6 +120,13 @@ int main(int argc, char* argv[])
 		}
 	#endif
 
+	//Can't load a session and reconnect to an instrument, has to be one or the other
+	if( !sessionToOpen.empty() && !instrumentConnectionStrings.empty())
+	{
+		LogError("Cannot load a session and connect to an instrument simultaneously\n");
+		return 1;
+	}
+
 	//Complain if the OpenMP wait policy isn't set right
 	const char* policy = getenv("OMP_WAIT_POLICY");
 	#ifndef _WIN32
@@ -154,8 +176,20 @@ int main(int argc, char* argv[])
 		shared_ptr<QueueHandle> queue(g_vkQueueManager->GetRenderQueue("g_mainWindow.render"));
 		g_mainWindow = make_unique<MainWindow>(queue);
 
-		//Main event loop
 		auto& session = g_mainWindow->GetSession();
+
+		//Load a session on startup if requested
+		if(!sessionToOpen.empty())
+			g_mainWindow->SetStartupSession(sessionToOpen);
+
+		//Initialize the session with the requested arguments
+		//TODO: support connecting to things other than scopes
+		//(this will make more sense when we unify our driver model)
+		/*
+		vector<string> instrumentConnectionStrings;
+		*/
+
+		//Main event loop
 		while(!glfwWindowShouldClose(g_mainWindow->GetWindow()))
 		{
 			//Check which event loop model to use