Closedown

This commit is contained in:
2015-11-06 17:45:34 +01:00
parent 92c3f3d31e
commit 74fa1d101c
3 changed files with 7 additions and 11 deletions

View File

@@ -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

View File

@@ -17,7 +17,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Component id="renderer" pref="137" max="32767" attributes="0"/>
<Component id="renderer" pref="94" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="123" max="-2" attributes="0"/>
@@ -53,7 +53,7 @@
<Component id="processVariablePanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="processVariablePanel2" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="159" max="32767" attributes="0"/>
<EmptySpace pref="97" max="32767" attributes="0"/>
<Component id="buttonDefineBeam" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
</Group>
@@ -79,7 +79,6 @@
</Border>
</Property>
<Property name="deviceName" type="java.lang.String" value="cy"/>
<Property name="showAdvanced" type="boolean" value="false"/>
<Property name="showStatus" type="boolean" value="false"/>
<Property name="showTitle" type="boolean" value="true"/>
</Properties>
@@ -112,7 +111,6 @@
</Border>
</Property>
<Property name="deviceName" type="java.lang.String" value="cz"/>
<Property name="showAdvanced" type="boolean" value="false"/>
<Property name="showStatus" type="boolean" value="false"/>
<Property name="showTitle" type="boolean" value="true"/>
</Properties>

View File

@@ -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))
);