pshell_config/x09lb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x09lb
2022-10-03 11:49:07 +02:00
parent fbd1fa0e9e
commit 4f0ee31008
4 changed files with 100 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/devices.properties
View File

@@ -4,6 +4,6 @@ sample_y=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRY|||true
sample_z=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRZ|||true
dummy_x=ch.psi.pshell.device.DummyMotor||||true
dummy_y=ch.psi.pshell.device.DummyMotor||||true
sample_r=ch.psi.pshell.epics.Motor|X09LB-ES3-SAMPLE:ROT1|||true
#sample_r=ch.psi.pshell.epics.Motor|X09LB-ES3-SAMPLE:ROT1|||true
ccd=ch.psi.pshell.epics.AreaDetector|X09LB-ES2-CCD|||true
image=ch.psi.pshell.imaging.CameraSource|ccd|||true

6
config/variables.properties
View File

@@ -1,4 +1,4 @@
#Mon Oct 03 10:56:11 CEST 2022
#Mon Oct 03 11:43:30 CEST 2022
LastRunDate=221003
DaySequentialNumber=14
FileSequentialNumber=14
DaySequentialNumber=26
FileSequentialNumber=26

109
plugins/Scan1D.form
View File

@@ -6,58 +6,6 @@
</Component>
<Component class="javax.swing.ButtonGroup" name="buttonGroup2">
</Component>
<Container class="javax.swing.JPanel" name="panelSensors">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Sensors"/>
</Border>
</Property>
</Properties>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkImage" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="108" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="checkImage" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="checkCurrent" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JCheckBox" name="checkImage">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="CCD Image"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="ccd.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCurrent">
<Properties>
<Property name="text" type="java.lang.String" value="Machine Current"/>
<Property name="name" type="java.lang.String" value="current" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
</NonVisualComponents>
<Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -80,7 +28,9 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="292" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="panelSensors" linkSize="7" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="panelPositioner" linkSize="7" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jPanel3" linkSize="7" min="-2" max="-2" attributes="0"/>
@@ -94,6 +44,7 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="panelPositioner" max="32767" attributes="0"/>
<Component id="panelSensors" max="32767" attributes="0"/>
<Component id="jPanel3" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -381,6 +332,58 @@
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelSensors">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Sensors"/>
</Border>
</Property>
</Properties>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkImage" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="108" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="checkImage" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="checkCurrent" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JCheckBox" name="checkImage">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="CCD Image"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="ccd.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCurrent">
<Properties>
<Property name="text" type="java.lang.String" value="Machine Current"/>
<Property name="name" type="java.lang.String" value="current" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">

77
plugins/Scan1D.java
View File

@@ -116,9 +116,6 @@ public class Scan1D extends ScriptProcessor {
buttonGroup1 = new javax.swing.ButtonGroup();
buttonGroup2 = new javax.swing.ButtonGroup();
panelSensors = new javax.swing.JPanel();
checkImage = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
panelPositioner = new javax.swing.JPanel();
jLabel1 = new javax.swing.JLabel();
comboMotor = new javax.swing.JComboBox();
@@ -140,43 +137,14 @@ public class Scan1D extends ScriptProcessor {
jLabel6 = new javax.swing.JLabel();
jLabel7 = new javax.swing.JLabel();
jLabel8 = new javax.swing.JLabel();
panelSensors = new javax.swing.JPanel();
checkImage = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
buttonQueue = new javax.swing.JButton();
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
checkImage.setSelected(true);
checkImage.setText("CCD Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("ccd.dataMatrix"); // NOI18N
checkCurrent.setText("Machine Current");
checkCurrent.setName("current"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
.addComponent(checkCurrent))
.addContainerGap(108, Short.MAX_VALUE))
);
panelSensorsLayout.setVerticalGroup(
panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addComponent(checkImage)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(checkCurrent)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
setPreferredSize(new java.awt.Dimension(792, 567));
panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioner"));
@@ -350,6 +318,38 @@ public class Scan1D extends ScriptProcessor {
.addContainerGap(159, Short.MAX_VALUE))
);
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
checkImage.setSelected(true);
checkImage.setText("CCD Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("ccd.dataMatrix"); // NOI18N
checkCurrent.setText("Machine Current");
checkCurrent.setName("current"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
.addComponent(checkCurrent))
.addContainerGap(108, Short.MAX_VALUE))
);
panelSensorsLayout.setVerticalGroup(
panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addComponent(checkImage)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(checkCurrent)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
buttonStart.setText("Start");
@@ -402,14 +402,16 @@ public class Scan1D extends ScriptProcessor {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(292, 292, 292)
.addContainerGap()
.addComponent(panelSensors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelPositioner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner});
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner, panelSensors});
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -417,6 +419,7 @@ public class Scan1D extends ScriptProcessor {
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelPositioner, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelSensors, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);