Hard-coding legos to make them work inside micro-manager

HenriquesLab · Oct 4, 2018 · 31c856d · 31c856d
1 parent 2f4e117
commit 31c856d
Show file tree

Hide file tree

Showing 26 changed files with 12 additions and 61 deletions.
diff --git a/.idea/artifacts/NanoJ_Fluidics_IJ_zip.xml b/.idea/artifacts/NanoJ_Fluidics_IJ_zip.xml
diff --git a/.idea/artifacts/NanoJ_Fluidics_MM_zip.xml b/.idea/artifacts/NanoJ_Fluidics_MM_zip.xml
diff --git a/.idea/artifacts/NanoJ_Fluidics_zip.xml b/.idea/artifacts/NanoJ_Fluidics_zip.xml
diff --git a/.idea/artifacts/pumpControl_dummy.xml b/.idea/artifacts/pumpControl_dummy.xml
diff --git a/.idea/artifacts/pumpControl_legoControl.xml b/.idea/artifacts/pumpControl_legoControl.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/...ions/pumpControl_MM/src/nanoj/pumpControl/java/sequentialProtocol/MicroManagerPlugin.java b/...ions/pumpControl_MM/src/nanoj/pumpControl/java/sequentialProtocol/MicroManagerPlugin.java
@@ -5,6 +5,7 @@
 import org.micromanager.MMStudio;
 import org.micromanager.api.MMPlugin;
 import org.micromanager.api.ScriptInterface;
+import org.micromanager.utils.ReportingUtils;
 
 import java.io.File;
 import java.net.URL;
@@ -34,7 +35,7 @@ public void show() {
             userInterface.create(core);
         } catch (Exception e) {
             IJ.log("Error, problem when initiating GUI.");
-            e.printStackTrace();
+            ReportingUtils.logError(e);
         }
     }
 

diff --git a/NanoJ-Fluidics.jar b/NanoJ-Fluidics.jar
diff --git a/NanoJ-Fluidics_IJ.jar b/NanoJ-Fluidics_IJ.jar
diff --git a/NanoJ-Fluidics_MM.jar b/NanoJ-Fluidics_MM.jar
diff --git a/PackagedBinaries/NanoJ-Fluidics.zip b/PackagedBinaries/NanoJ-Fluidics.zip
diff --git a/PackagedBinaries/NanoJ-Fluidics_IJ.zip b/PackagedBinaries/NanoJ-Fluidics_IJ.zip
diff --git a/PackagedBinaries/NanoJ-Fluidics_MM.zip b/PackagedBinaries/NanoJ-Fluidics_MM.zip
diff --git a/PumpPlugins/pumpControl.dummy.jar b/PumpPlugins/pumpControl.dummy.jar
diff --git a/PumpPlugins/pumpControl.harvardElite.jar b/PumpPlugins/pumpControl.harvardElite.jar
diff --git a/PumpPlugins/pumpControl.legoControl.jar b/PumpPlugins/pumpControl.legoControl.jar
diff --git a/Pumps/pumpControl.dummy/META-INF/MANIFEST.MF b/Pumps/pumpControl.dummy/META-INF/MANIFEST.MF
diff --git a/Pumps/pumpControl.dummy/META-INF/services/nanoj.pumpControl.java.pumps.Pump b/Pumps/pumpControl.dummy/META-INF/services/nanoj.pumpControl.java.pumps.Pump
diff --git a/Pumps/pumpControl.dummy/pumpControl.dummy.iml b/Pumps/pumpControl.dummy/pumpControl.dummy.iml
diff --git a/Pumps/pumpControl.legoControl/META-INF/MANIFEST.MF b/Pumps/pumpControl.legoControl/META-INF/MANIFEST.MF
diff --git a/Pumps/pumpControl.legoControl/META-INF/services/nanoj.pumpControl.java.pumps.Pump b/Pumps/pumpControl.legoControl/META-INF/services/nanoj.pumpControl.java.pumps.Pump
diff --git a/Pumps/pumpControl.legoControl/pumpControl.legoControl.iml b/Pumps/pumpControl.legoControl/pumpControl.legoControl.iml
diff --git a/.../pumpControl/java/pumps/DummyControl.java → .../pumpControl/java/pumps/DummyControl.java b/.../pumpControl/java/pumps/DummyControl.java → .../pumpControl/java/pumps/DummyControl.java
diff --git a/...j/pumpControl/java/pumps/LegoControl.java → ...j/pumpControl/java/pumps/LegoControl.java b/...j/pumpControl/java/pumps/LegoControl.java → ...j/pumpControl/java/pumps/LegoControl.java
diff --git a/src/nanoj/pumpControl/java/pumps/Pump.java b/src/nanoj/pumpControl/java/pumps/Pump.java
@@ -141,4 +141,8 @@ public synchronized double[] getReferenceRate(String subPump) {
     public synchronized void updateReferenceRate(String subPump, double[] newRate) {
         referenceRates.put(subPump,newRate);
     }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/src/nanoj/pumpControl/java/pumps/PumpManager.java b/src/nanoj/pumpControl/java/pumps/PumpManager.java
@@ -42,6 +42,12 @@ public void loadPlugins() {
         for (Pump pump : serviceLoader) {
             availablePumps.put(pump.getPumpName(), pump);
         }
+
+        Pump dummy = new DummyControl();
+        availablePumps.put(dummy.getName(), dummy);
+
+        Pump lego = new LegoControl();
+        availablePumps.put(lego.getName(), lego);
     }
 
     public void setCore(CMMCore core) { serialManager = core; }