diff --git a/config/imaging.properties b/config/imaging.properties index 89d1f47..3f872aa 100644 --- a/config/imaging.properties +++ b/config/imaging.properties @@ -1,3 +1,3 @@ video=ch.psi.pshell.imaging.MjpegSource http://x10sa-videoserver-1/axis-cgi/mjpg/video.cgi -mic-high=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-13.mjpg -mic-low=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-12.mjpg +mic-low=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-13.mjpg +mic-high=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-12.mjpg diff --git a/plugins/Microscope.form b/plugins/Microscope.form index 0f8045d..02fb57a 100644 --- a/plugins/Microscope.form +++ b/plugins/Microscope.form @@ -17,7 +17,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -79,7 +79,6 @@ - @@ -112,7 +111,6 @@ - diff --git a/plugins/Microscope.java b/plugins/Microscope.java index 2797681..8be4334 100644 --- a/plugins/Microscope.java +++ b/plugins/Microscope.java @@ -25,7 +25,7 @@ public class Microscope extends Panel { //Overridable callbacks @Override public void onInitialize(int runCount) { - initComponents(); + } @Override @@ -61,7 +61,6 @@ public class Microscope extends Panel { motorPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("cy")); motorPanel1.setDeviceName("cy"); - motorPanel1.setShowAdvanced(false); motorPanel1.setShowStatus(false); motorPanel1.setShowTitle(true); @@ -79,7 +78,6 @@ public class Microscope extends Panel { motorPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("cz")); motorPanel2.setDeviceName("cz"); - motorPanel2.setShowAdvanced(false); motorPanel2.setShowStatus(false); motorPanel2.setShowTitle(true); @@ -93,7 +91,7 @@ public class Microscope extends Panel { layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE) + .addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, 94, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGap(123, 123, 123) @@ -124,7 +122,7 @@ public class Microscope extends Panel { .addComponent(processVariablePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(processVariablePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 159, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 97, Short.MAX_VALUE) .addComponent(buttonDefineBeam) .addGap(26, 26, 26)) );