Refactor OnixSourceEditor:

- Update version retrieval, improve context initialization checks, and enhance UI elements in OnixSourceEditor
- Add a blank element that is overlaid on existing editor elements if the context cannot be initialized

Author: bparks13

Source/Onix1.cpp

@@ -37,8 +37,6 @@ Onix1::Onix1(int hostIndex)
 	if (rc != ONI_ESUCCESS)
 		throw error_t(rc);
 
-	oni_version(&major, &minor, &patch);
-
 	rc = getOption(ONI_OPT_ACQCLKHZ, &ACQ_CLK_HZ);
 	if (rc != ONI_ESUCCESS)
 		throw error_t(rc);
@@ -155,9 +153,9 @@ int Onix1::issueReset()
 	return rc;
 }
 
-std::string Onix1::getVersion() const 
+std::string Onix1::getVersion()
 { 
-	return std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(patch);
+	return std::to_string(ONI_VERSION_MAJOR) + "." + std::to_string(ONI_VERSION_MINOR) + "." + std::to_string(ONI_VERSION_PATCH);
 }
 
 double Onix1::convertTimestampToSeconds(uint64_t timestamp) const

Source/Onix1.h

@@ -109,7 +109,7 @@ namespace OnixSourcePlugin
 
 		int issueReset();
 
-		std::string getVersion() const;
+		static std::string getVersion();
 
 		double convertTimestampToSeconds(uint64_t timestamp) const;
 
@@ -130,10 +130,6 @@ namespace OnixSourcePlugin
 		CriticalSection registerLock;
 		CriticalSection frameLock;
 
-		int major;
-		int minor;
-		int patch;
-
 		uint32_t ACQ_CLK_HZ;
 
 		template<typename opt_t>

Source/OnixSource.cpp

@@ -41,21 +41,19 @@ OnixSource::OnixSource(SourceNode* sn) :
 			"Failed to Create Context",
 			e.what()
 		);
-		return;
 	}
 	catch (const error_t& e)
 	{
 		Onix1::showWarningMessageBoxAsync(
 			"Failed to Initialize Context",
 			e.what()
 		);
-		return;
 	}
 
 	portA = std::make_shared<PortController>(PortName::PortA, context);
 	portB = std::make_shared<PortController>(PortName::PortB, context);
 
-	if (!context->isInitialized()) { LOGE("Failed to initialize context."); return; }
+	if (context == nullptr || !context->isInitialized()) { LOGE("Failed to initialize context."); return; }
 }
 
 OnixSource::~OnixSource()
@@ -67,14 +65,6 @@ OnixSource::~OnixSource()
 	}
 }
 
-std::string OnixSource::getLiboniVersion()
-{
-	if (context != nullptr && context->isInitialized())
-		return context->getVersion();
-	else
-		return "";
-}
-
 void OnixSource::registerParameters()
 {
 	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "passthroughA", "Passthrough A", "Enables passthrough mode for e-variant headstages on Port A", false, true);
@@ -155,7 +145,7 @@ bool OnixSource::configureDevice(OnixDeviceVector& sources,
 			Onix1::showWarningMessageBoxAsync(
 				"Invalid Headstage Selection",
 				"Expected to find " + editor->getHeadstageSelected(OnixDevice::getOffset(deviceIdx)) + " on " + OnixDevice::getPortName(deviceIdx) +
-					", but found " + hubName + " instead. Confirm that the correct headstage is selected, and try to connect again.");
+				", but found " + hubName + " instead. Confirm that the correct headstage is selected, and try to connect again.");
 		}
 
 		return false;
@@ -922,15 +912,15 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 				else
 				{
 					Onix1::showWarningMessageBoxAsync(
-						"Unknown Composite Source", 
+						"Unknown Composite Source",
 						"Found an unknown composite source (" + source->getName() + ") on hub " + source->getHubName() +
 						" at address " + std::to_string(source->getDeviceIdx()));
 				}
 			}
 			else
 			{
 				Onix1::showWarningMessageBoxAsync(
-					"Unknown Source", 
+					"Unknown Source",
 					"Found an unknown source (" + source->getName() + ") on hub " + source->getHubName() +
 					" at address " + std::to_string(source->getDeviceIdx()));
 			}

Source/OnixSource.h

@@ -118,8 +118,6 @@ namespace OnixSourcePlugin
 
 		std::map<int, std::string> getHubNames();
 
-		std::string getLiboniVersion();
-
 		void updateSourceBuffers();
 
 		// DataThread Methods

Source/OnixSourceCanvas.cpp

@@ -59,7 +59,7 @@ void OnixSourceCanvas::addHub(std::string hubName, int offset)
 
 	if (context == nullptr || !context->isInitialized())
 	{
-		Onix1::showWarningMessageBoxAsync("Invalid Context", "Unable to find an initialized context when adding hubs to the canvas.");
+		LOGE("Unable to find an initialized context when adding " + hubName + " to the canvas.");
 		return;
 	}