diff --git a/config/devices.properties b/config/devices.properties index e1761ee..540cdb4 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,5 +1,9 @@ diode=ch.psi.pshell.epics.ChannelDouble X10SA-ES-KBOX_K:READOUT Read 6 shutter=ch.psi.pshell.epics.ChannelInteger X10SA-ES-PH1:SET +omega=ch.psi.pshell.epics.Motor X10SA-ES-DF1:OMEGA +x=ch.psi.pshell.epics.Motor X10SA-ES-DF1:GMX +cy=ch.psi.pshell.epics.Motor X10SA-ES-DFS:TRY1 +cz=ch.psi.pshell.epics.Motor X10SA-ES-DFS:TRZ1 apertureX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX1 apertureY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY1 beamstopX=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRX1 diff --git a/config/plugins.properties b/config/plugins.properties index c2e8ba0..a748d3f 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1 +1 @@ -./home/plugins/Image.java=enabled +./home/plugins/Microscope.java=enabled diff --git a/plugins/Image.form b/plugins/Microscope.form similarity index 99% rename from plugins/Image.form rename to plugins/Microscope.form index 73fff2b..b72a155 100644 --- a/plugins/Image.form +++ b/plugins/Microscope.form @@ -42,7 +42,7 @@ - + diff --git a/plugins/Image.java b/plugins/Microscope.java similarity index 97% rename from plugins/Image.java rename to plugins/Microscope.java index 3bc42a0..e1b246d 100644 --- a/plugins/Image.java +++ b/plugins/Microscope.java @@ -16,8 +16,8 @@ import java.awt.Point; /** * */ -public class Image extends Panel { - public Image() { +public class Microscope extends Panel { + public Microscope() { initComponents(); } @@ -68,7 +68,7 @@ public class Image extends Panel { jButton1 = new javax.swing.JButton(); renderer.setAutoscrolls(true); - renderer.setDeviceName("mic"); + renderer.setDeviceName("mic-low"); renderer.setMode(ch.psi.pshell.imaging.RendererMode.Fixed); renderer.setShowStatus(false);