Merge pull request micro-manager#2036 from nicost/PairedStageControl

LightSheetControl renamed to PairedStageControl.
nicost · Dec 17, 2024 · 239da63 · 239da63
2 parents 352b97b + 957b7da
commit 239da63
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 94 deletions.
diff --git a/...LightSheetControl/src/main/java/org/micromanager/lightsheetcontrol/LightSheetControl.java b/...LightSheetControl/src/main/java/org/micromanager/lightsheetcontrol/LightSheetControl.java
diff --git a/plugins/LightSheetControl/build.xml → plugins/PairedStageControl/build.xml b/plugins/LightSheetControl/build.xml → plugins/PairedStageControl/build.xml
@@ -1,3 +1,3 @@
-<project name="LightSheetControl" default="jar">
+<project name="PairedStageControl" default="jar">
 	<import file="../javapluginbuild.xml"/>
 </project>
diff --git a/...redStageControl/src/main/java/org/micromanager/pairedstagecontrol/PairedStageControl.java b/...redStageControl/src/main/java/org/micromanager/pairedstagecontrol/PairedStageControl.java
@@ -0,0 +1,84 @@
+/**
+ *
+ * @author kthorn
+ */
+
+package org.micromanager.pairedstagecontrol;
+
+import java.util.Iterator;
+import mmcorej.DeviceType;
+import mmcorej.StrVector;
+import org.micromanager.MenuPlugin;
+import org.micromanager.Studio;
+import org.scijava.plugin.Plugin;
+import org.scijava.plugin.SciJavaPlugin;
+
+@Plugin(type = MenuPlugin.class)
+public class PairedStageControl implements MenuPlugin, SciJavaPlugin {
+   public static final String menuName = "Paired Stage Control";
+   public static final String tooltipDescription =
+         "Combines the movement of two stages through the Utilities-MultiStage device.";
+   private Studio studio_;
+   private PairedStageControlFrame myFrame_;
+
+   @Override
+   public String getSubMenu() {
+      return "Device Control";
+   }
+
+   @Override
+   public void onPluginSelected() {
+      if (myFrame_ == null) {
+         String multiStageName = "";
+         //Find multi stage device
+         StrVector stages = studio_.core().getLoadedDevicesOfType(DeviceType.StageDevice);
+         final Iterator<String> stageIter = stages.iterator();
+         while (stageIter.hasNext()) {
+            String devName = "";
+            String devLabel = stageIter.next();
+            try {
+               devName = studio_.core().getDeviceName(devLabel);
+            } catch (Exception ex) {
+               studio_.logs().logError(ex, "Error when requesting stage name");
+            }
+            if (devName.equals("Multi Stage")) {
+               multiStageName = devLabel;
+            }
+         }
+         if (multiStageName.isEmpty()) {
+            studio_.logs().showError("Cannot find multi stage device. "
+                  + "This plugin does not work without one. "
+                  + "Use the Hardware Configuration wizard and select Utilities > MultiStage");
+            return;
+         }
+         myFrame_ = new PairedStageControlFrame(studio_, multiStageName);
+      }
+      myFrame_.setVisible(true);
+   }
+
+   @Override
+   public void setContext(Studio studio) {
+      studio_ = studio;
+   }
+
+   @Override
+   public String getName() {
+      return menuName;
+   }
+
+   @Override
+   public String getHelpText() {
+      return "Plugin for controlling AZ100 light sheet microscope in the Nikon Imaging Center,"
+            + " UCSF. See Kurt Thorn with questions.";
+   }
+
+   @Override
+   public String getVersion() {
+      return "v0.2";
+   }
+
+   @Override
+   public String getCopyright() {
+      return "University of California, 2016, 2024";
+   }
+}
diff --git a/...tsheetcontrol/LightSheetControlFrame.java → ...stagecontrol/PairedStageControlFrame.java b/...tsheetcontrol/LightSheetControlFrame.java → ...stagecontrol/PairedStageControlFrame.java
@@ -1,4 +1,4 @@
-package org.micromanager.lightsheetcontrol;
+package org.micromanager.pairedstagecontrol;
 
 import java.awt.event.ActionEvent;
 import java.io.File;
@@ -8,21 +8,15 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
 import javax.swing.AbstractListModel;
-import javax.swing.GroupLayout;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.LayoutStyle;
 import javax.swing.WindowConstants;
-import mmcorej.DeviceType;
-import mmcorej.StrVector;
 import net.miginfocom.swing.MigLayout;
 import org.apache.commons.math3.stat.regression.SimpleRegression;
 import org.micromanager.Studio;
@@ -34,7 +28,7 @@
  * UI part of the LightSheetControlFrame.  ALso does the fitting,
  * and sets the slope and intercept of stage 2 based on data.
  */
-public class LightSheetControlFrame extends JFrame {
+public class PairedStageControlFrame extends JFrame {
 
    private final Studio studio_;
    private String stage1_ = "";
@@ -49,31 +43,11 @@ public class LightSheetControlFrame extends JFrame {
     *
     * @param studio - what do we do without it?
     */
-   public LightSheetControlFrame(Studio studio) {
+   public PairedStageControlFrame(Studio studio, String multiStageName) {
       studio_ = studio;
       rpm_ = new RPModel();
+      multiStageName_ = multiStageName;
 
-      //Find multi stage device
-      StrVector stages = studio_.core().getLoadedDevicesOfType(DeviceType.StageDevice);
-      final Iterator<String> stageIter = stages.iterator();
-      while (stageIter.hasNext()) {
-         String devName = "";
-         String devLabel = stageIter.next();
-         try {
-            devName = studio_.core().getDeviceName(devLabel);
-         } catch (Exception ex) {
-            studio_.logs().logError(ex, "Error when requesting stage name");
-         }
-         if (devName.equals("Multi Stage")) {
-            multiStageName_ = devLabel;
-         }
-      }
-      if (multiStageName_.isEmpty()) {
-         studio_.logs().showError("Cannot find multi stage device. "
-               + "This plugin does not work without one. <br>"
-               + "Use the Hardware Configuration wizard and select Utilities > MultiStage");
-         return;
-      }
       try {
          stage1_ = studio_.core().getProperty(multiStageName_, "PhysicalStage-1");
       } catch (Exception ex) {
@@ -335,7 +309,7 @@ private class Helper extends Thread {
       public void run() {
          try {
             ij.plugin.BrowserLauncher.openURL(
-                  "http://micro-manager.org/wiki/LightSheetControl");
+                  "http://micro-manager.org/wiki/PairedStageControl");
          } catch (IOException e1) {
             studio_.logs().showError(e1);
          }

diff --git a/...ger/lightsheetcontrol/ReferencePoint.java → ...er/pairedstagecontrol/ReferencePoint.java b/...ger/lightsheetcontrol/ReferencePoint.java → ...er/pairedstagecontrol/ReferencePoint.java
@@ -2,7 +2,7 @@
  * @author kthorn
  */
 
-package org.micromanager.lightsheetcontrol;
+package org.micromanager.pairedstagecontrol;
 
 import java.io.Serializable;
 

diff --git a/...lightsheetcontrol/ReferencePointList.java → ...airedstagecontrol/ReferencePointList.java b/...lightsheetcontrol/ReferencePointList.java → ...airedstagecontrol/ReferencePointList.java
@@ -3,7 +3,7 @@
  * @author kthorn
  */
 
-package org.micromanager.lightsheetcontrol;
+package org.micromanager.pairedstagecontrol;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...ger/lightsheetcontrol/XYChartPlotter.java → ...er/pairedstagecontrol/XYChartPlotter.java b/...ger/lightsheetcontrol/XYChartPlotter.java → ...er/pairedstagecontrol/XYChartPlotter.java
@@ -1,4 +1,4 @@
-package org.micromanager.lightsheetcontrol;
+package org.micromanager.pairedstagecontrol;
 
 import java.awt.Color;
 import java.awt.geom.Ellipse2D;