Add more updates for API9 compat

open-ephys-plugins · Sep 27, 2024 · 07939da · 07939da
1 parent f647feb
commit 07939da
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/CMakeLists.txt b/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 "arm64" CACHE STRING "Build architecture for Mac OS X" FORCE)
 
 project(OE_PLUGIN_${PLUGIN_NAME})
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
@@ -102,4 +102,4 @@ endforeach()
 #find_path(LIBNAME_INCLUDE_DIRS includefile.h)
 #
 #target_link_libraries(${PLUGIN_NAME} ${LIBNAME_LIBRARIES})
-#target_include_directories(${PLUGIN_NAME} PRIVATE ${LIBNAME_INCLUDE_DIRS})
+#target_include_directories(${PLUGIN_NAME} PRIVATE ${LIBNAME_INCLUDE_DIRS})
diff --git a/Source/PCAProjectionAxes.cpp b/Source/PCAProjectionAxes.cpp
@@ -45,13 +45,13 @@ PCAProjectionAxes::PCAProjectionAxes(Electrode* electrode_) :
     updateProcessor = false;
     isOverUnit = -1;
 
-    rangeUpButton = new UtilityButton("+", Font("Small Text", 10, Font::plain));
+    rangeUpButton = new UtilityButton("+");
     rangeUpButton->setRadius(3.0f);
     rangeUpButton->addListener(this);
     rangeUpButton->setBounds(35, 10, 20, 15);
     addAndMakeVisible(rangeUpButton);
 
-    rangeDownButton = new UtilityButton("-", Font("Small Text", 10, Font::plain));
+    rangeDownButton = new UtilityButton("-");
     rangeDownButton->setRadius(3.0f);
     rangeDownButton->addListener(this);
     rangeDownButton->setBounds(10, 10, 20, 15);

diff --git a/Source/SpikePlot.cpp b/Source/SpikePlot.cpp
@@ -70,7 +70,7 @@ SpikePlot::SpikePlot(
 
     for (int i = 0; i < electrode->numChannels; i++)
     {
-        UtilityButton* rangeButton = new UtilityButton(String(scales[i], 0), Font("Small Text", 10, Font::plain));
+        UtilityButton* rangeButton = new UtilityButton(String(scales[i]));
         rangeButton->setRadius(3.0f);
         rangeButton->addListener(this);
         addAndMakeVisible(rangeButton);

diff --git a/Source/SpikeSorterCanvas.cpp b/Source/SpikeSorterCanvas.cpp
@@ -42,47 +42,47 @@ SpikeSorterCanvas::SpikeSorterCanvas(SpikeSorter* n) :
     inDrawingPolygonMode = false;
     scrollBarThickness = viewport->getScrollBarThickness();
 
-    addUnitButton = new UtilityButton("New Box Unit", Font("Small Text", 13, Font::plain));
+    addUnitButton = new UtilityButton("New Box Unit");
     addUnitButton->setRadius(3.0f);
     addUnitButton->addListener(this);
     addAndMakeVisible(addUnitButton);
 
-    addPolygonUnitButton = new UtilityButton("New Polygon Unit", Font("Small Text", 13, Font::plain));
+    addPolygonUnitButton = new UtilityButton("New Polygon Unit");
     addPolygonUnitButton->setRadius(3.0f);
     addPolygonUnitButton->addListener(this);
     addAndMakeVisible(addPolygonUnitButton);
 
-    addBoxButton = new UtilityButton("Add Box", Font("Small Text", 13, Font::plain));
+    addBoxButton = new UtilityButton("Add Box");
     addBoxButton->setRadius(3.0f);
     addBoxButton->addListener(this);
     addAndMakeVisible(addBoxButton);
 
-    delUnitButton = new UtilityButton("Delete", Font("Small Text", 13, Font::plain));
+    delUnitButton = new UtilityButton("Delete");
     delUnitButton->setRadius(3.0f);
     delUnitButton->addListener(this);
     addAndMakeVisible(delUnitButton);
 
-    rePCAButton = new UtilityButton("Re-PCA", Font("Small Text", 13, Font::plain));
+    rePCAButton = new UtilityButton("Re-PCA");
     rePCAButton->setRadius(3.0f);
     rePCAButton->addListener(this);
     addAndMakeVisible(rePCAButton);
 
-    newIDbuttons = new UtilityButton("New IDs", Font("Small Text", 13, Font::plain));
+    newIDbuttons = new UtilityButton("New IDs");
     newIDbuttons->setRadius(3.0f);
     newIDbuttons->addListener(this);
     addAndMakeVisible(newIDbuttons);
 
-    deleteAllUnits = new UtilityButton("Delete All", Font("Small Text", 13, Font::plain));
+    deleteAllUnits = new UtilityButton("Delete All");
     deleteAllUnits->setRadius(3.0f);
     deleteAllUnits->addListener(this);
     addAndMakeVisible(deleteAllUnits);
 
-    nextElectrode = new UtilityButton(">>", Font("Small Text", 13, Font::plain));
+    nextElectrode = new UtilityButton(">>");
     nextElectrode->setRadius(3.0f);
     nextElectrode->addListener(this);
     addAndMakeVisible(nextElectrode);
 
-    prevElectrode = new UtilityButton("<<", Font("Small Text", 13, Font::plain));
+    prevElectrode = new UtilityButton("<<");
     prevElectrode->setRadius(3.0f);
     prevElectrode->addListener(this);
     addAndMakeVisible(prevElectrode);