Add updates for API9 compat

Author: medengineer

CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 get_filename_component(PROJECT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} ABSOLUTE)
 get_filename_component(PLUGIN_NAME ${PROJECT_FOLDER} NAME)
 
-set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for Mac OS X" FORCE)
+#set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for Mac OS X" FORCE)
 
 project(OE_PLUGIN_${PLUGIN_NAME})
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
@@ -66,7 +66,7 @@ if(MSVC)
 	target_link_libraries(${PLUGIN_NAME} ${GUI_BIN_DIR}/open-ephys.lib)
 	target_compile_options(${PLUGIN_NAME} PRIVATE /sdl- /W0)
 
-	install(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION ${GUI_BIN_DIR}/plugins  CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
+	install(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION ${GUI_BIN_DIR}/plugins-api9  CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
 
 	set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../libs)
 
@@ -85,17 +85,17 @@ if(MSVC)
 elseif(LINUX)
 	target_link_libraries(${PLUGIN_NAME} GL X11 Xext Xinerama asound dl freetype pthread rt)
 	set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS
-		"-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$$ORIGIN/../shared'")
+		"-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$$ORIGIN/../shared-api9'")
 	target_compile_options(${PLUGIN_NAME} PRIVATE -fPIC -rdynamic)
 	target_compile_options(${PLUGIN_NAME} PRIVATE -O3) #enable optimization for linux debug
 
-	install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${GUI_BIN_DIR}/plugins)
+	install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${GUI_BIN_DIR}/plugins-api9)
 elseif(APPLE)
 	set_target_properties(${PLUGIN_NAME} PROPERTIES BUNDLE TRUE)
 	set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS
-	"-undefined dynamic_lookup -rpath @loader_path/../../../../shared")
+	"-undefined dynamic_lookup -rpath @loader_path/../../../../shared-api9")
 
-	install(TARGETS ${PLUGIN_NAME} DESTINATION $ENV{HOME}/Library/Application\ Support/open-ephys/PlugIns)
+	install(TARGETS ${PLUGIN_NAME} DESTINATION $ENV{HOME}/Library/Application\ Support/open-ephys/plugins-api9)
 	set(CMAKE_PREFIX_PATH /opt/local)
 endif()
 

README.md

@@ -17,6 +17,16 @@ Before starting data acquisition, you will need to press the 'Connect' button in
 
 To initialize the connection on the Matlab side, you will need to call your generated script from Matlab following the instructions below. Once the connection has been initiated on both sides, pressing the Play button in the Open Ephys GUI will automatically stream the incoming data to Matlab, and then back to the GUI for further processing. 
 
+## Quickstart
+
+1. Start with the Plotter example in the MatlabInterface/Resources folder. In the Matlab Command Window call:
+
+    Plotter(‘127.0.0.1’, 1234)
+
+2. Click the ‘Connect' button in the MatlabInterface plugin in OpenEphys GUI.
+
+3. Start acquisition via the GUI to automatically plot data in Matlab.
+
 ### Matlab API
 
 In order to process the incoming data in Matlab, you will need to leverage the included Matlab API. The API was designed specifically to introduce/reinforce object-oriented programming and to encourage Matlab evangelists to consider developing plugins in C++. 

Source/MatlabInterface.cpp

@@ -9,9 +9,9 @@ MatlabInterface::MatlabInterface()
 {
 	setProcessorType(Plugin::Processor::FILTER);
 
-	addStringParameter(Parameter::GLOBAL_SCOPE, "host_address", "Set host address", "127.0.0.1", true);
-    addStringParameter(Parameter::GLOBAL_SCOPE, "port_number", "Set port number", "1234", true);
-	addSelectedChannelsParameter(Parameter::STREAM_SCOPE, "Channel", "The continuous channel to analyze", 1);
+	addStringParameter(Parameter::PROCESSOR_SCOPE, "host_address", "Host address", "Set host address", "127.0.0.1", true);
+    addStringParameter(Parameter::PROCESSOR_SCOPE, "port_number", "Port number", "Set port number", "1234", true);
+	addSelectedChannelsParameter(Parameter::STREAM_SCOPE, "channel", "Channel", "The continuous channel to analyze", 1);
 
 }
 
@@ -59,7 +59,7 @@ AudioProcessorEditor* MatlabInterface::createEditor()
 
 void MatlabInterface::parameterValueChanged(Parameter* param)
 {
-	if (param->getName().equalsIgnoreCase("Channel"))
+	if (param->getName().equalsIgnoreCase("channel"))
 	{
 		Array<var>* array = param->getValue().getArray();
 
@@ -107,5 +107,5 @@ void MatlabInterface::updateSettings()
 	isEnabled = connected;
 
 	for (auto stream : getDataStreams())
-        parameterValueChanged(stream->getParameter("Channel"));
+        parameterValueChanged(stream->getParameter("channel"));
 }

Source/MatlabInterfaceEditor.cpp

@@ -65,17 +65,17 @@ MatlabInterfaceEditor::MatlabInterfaceEditor(MatlabInterface* parentNode)
 
 	desiredWidth = 230;
 
-	addTextBoxParameterEditor("host_address", 10, 25);
+	addTextBoxParameterEditor(Parameter::PROCESSOR_SCOPE, "host_address", 15, 29);
 
-	addTextBoxParameterEditor("port_number", 115, 25);
+	addTextBoxParameterEditor(Parameter::PROCESSOR_SCOPE, "port_number", 15, 54);
 
 	connectButton = std::make_unique<UtilityButton>("Connect", Font("Small Text", 13, Font::bold));
 	connectButton->setRadius(3.0f);
-	connectButton->setBounds(70, 75, 90, 20);
+	connectButton->setBounds(15, 79, 90, 20);
 	connectButton->addListener(this);
 	addAndMakeVisible(connectButton.get());
 
-	addSelectedChannelsParameterEditor("Channel", 75, 100);
+	addSelectedChannelsParameterEditor(Parameter::STREAM_SCOPE, "channel", 15, 104);
 
 	count = 0;
 }