Update scripts and plugins to 2.0

This commit is contained in:
2025-08-04 12:38:24 +02:00
parent b45d3b4202
commit b631d4c589
44 changed files with 347 additions and 350 deletions

View File

@@ -1,10 +1,11 @@
import ch.psi.pshell.core.Context;
import ch.psi.pshell.framework.Context;
import ch.psi.pshell.imaging.Overlay;
import ch.psi.pshell.imaging.Overlays.Rect;
import ch.psi.pshell.imaging.Renderer;
import ch.psi.pshell.imaging.DeviceRenderer;
import ch.psi.pshell.imaging.RendererListener;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import ch.psi.pshell.framework.Panel;
import ch.psi.pshell.imaging.Renderer;
import ch.psi.pshell.utils.State;
import java.awt.Rectangle;
import java.util.HashMap;
@@ -135,7 +136,7 @@ public class Imaging extends Panel {
private void initComponents() {
buttonGroup1 = new javax.swing.ButtonGroup();
renderer = new ch.psi.pshell.imaging.Renderer();
renderer = new ch.psi.pshell.imaging.DeviceRenderer();
jPanel4 = new javax.swing.JPanel();
jPanel2 = new javax.swing.JPanel();
buttonStartAutoIntensity = new javax.swing.JButton();
@@ -712,7 +713,7 @@ public class Imaging extends Panel {
", exposure=" + (Double.isNaN(exposure) ? "None" : exposure) +
")";
this.evalAsync(cmd).handle((ret, t) -> {
if ((t != null) && (!getContext().isAborted())) {
if ((t != null) && (!Context.isAborted())) {
showException((Exception) t);
}
return t;
@@ -807,7 +808,7 @@ public class Imaging extends Panel {
", exposure=" + (Double.isNaN(exposure) ? "None" : exposure) +
")";
this.evalAsync(cmd).handle((ret, t) -> {
if ((t != null) && (!getContext().isAborted())) {
if ((t != null) && (!Context.isAborted())) {
showException((Exception) t);
}
return t;
@@ -868,7 +869,7 @@ public class Imaging extends Panel {
private javax.swing.JRadioButton radioObjective;
private javax.swing.JRadioButton radioStigA;
private javax.swing.JRadioButton radioStigB;
private ch.psi.pshell.imaging.Renderer renderer;
private ch.psi.pshell.imaging.DeviceRenderer renderer;
private javax.swing.JSpinner spinnerAverage;
private javax.swing.JSpinner spinnerExposition;
private javax.swing.JSpinner spinnerExpositionIntensity;