Merge pull request #115 from open-ephys-plugins/issue-108

Hide UI elements if context is uninitialized

Author: bparks13

CMakeLists.txt

@@ -67,7 +67,6 @@ foreach( src_file IN ITEMS ${SRC_FILES})
 	source_group("${group_name}" FILES "${src_file}")
 endforeach()
 
-
 function(vs_set_all_configurations target_name target_config_name)
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
         string(TOUPPER ${config} config_upper)
@@ -78,7 +77,6 @@ function(vs_set_all_configurations target_name target_config_name)
     endforeach()
 endfunction()
 
-
 # add liboni project
 
 set(LIBONI_DIR "${CMAKE_CURRENT_SOURCE_DIR}/liboni/api/liboni")
@@ -106,14 +104,15 @@ target_link_libraries(${PLUGIN_NAME} "${LIBONI_NAME}")
 set(RIFFA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/liboni/drivers/riffa/windows/lib")
 set(RIFFA_NAME riffa)
 set(RIFFA_PNAME "submodule_${RIFFA_NAME}")
+set(RELEASE_CONFIGURATION "Release")
 
 include_external_msproject (
     ${RIFFA_PNAME}
     "${RIFFA_DIR}/riffa.vcxproj"
     PLATFORM  ${CMAKE_LIBRARY_ARCHITECTURE}
 )
 
-vs_set_all_configurations(${RIFFA_PNAME} "Release")
+vs_set_all_configurations(${RIFFA_PNAME} "${RELEASE_CONFIGURATION}")
 
 # add onidriver_riffa project
 
@@ -127,11 +126,10 @@ include_external_msproject (
     PLATFORM  ${CMAKE_LIBRARY_ARCHITECTURE}
 )
 
-vs_set_all_configurations(${ONIDRIVER_RIFFA_PNAME} "Release")
-
+vs_set_all_configurations(${ONIDRIVER_RIFFA_PNAME} "${RELEASE_CONFIGURATION}")
 
 add_dependencies(${ONIDRIVER_RIFFA_PNAME} ${RIFFA_PNAME}) 
 
 # Ensure needed DLLs are installed to the shared folder
 
-install(FILES "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/$<CONFIG>/riffa.dll" "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/$<CONFIG>/${ONIDRIVER_RIFFA_NAME}.dll" DESTINATION ${GUI_BIN_DIR}/shared)
+install(FILES "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${RELEASE_CONFIGURATION}/riffa.dll" "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${RELEASE_CONFIGURATION}/${ONIDRIVER_RIFFA_NAME}.dll" DESTINATION ${GUI_BIN_DIR}/shared)

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

@@ -37,31 +37,23 @@ OnixSource::OnixSource(SourceNode* sn) :
 	}
 	catch (const std::system_error& e)
 	{
-		LOGE("Failed to create context. ", e.what());
-		CoreServices::sendStatusMessage("Failed to create context." + std::string(e.what()));
-		AlertWindow::showMessageBox(
-			MessageBoxIconType::WarningIcon,
+		Onix1::showWarningMessageBoxAsync(
 			"Failed to Create Context",
-			"There was an error creating the context. Check the error logs for more details."
+			e.what()
 		);
-		return;
 	}
 	catch (const error_t& e)
 	{
-		LOGE("Failed to initialize context. ", e.what());
-		CoreServices::sendStatusMessage("Failed to create context. " + std::string(e.what()));
-		AlertWindow::showMessageBox(
-			MessageBoxIconType::WarningIcon,
+		Onix1::showWarningMessageBoxAsync(
 			"Failed to Initialize Context",
-			"There was an error initializing the context. Check the error logs for more details."
+			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()
@@ -73,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);
@@ -161,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;
@@ -928,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;
 	}