Closedown

This commit is contained in:
gac-x11ma
2025-11-03 12:24:38 +01:00
parent 39ed41cb00
commit 2293a6e94a
4 changed files with 51 additions and 36 deletions

View File

@@ -3,13 +3,13 @@ cam2=ch.psi.pshell.epics.AreaDetector|X11MA-ES1-CAM2|||true
peemcam=ch.psi.pshell.epics.AreaDetector|X11MA-ES1-PEEMCAM|||true
ai1_temperature=ch.psi.pshell.epics.ReadonlyProcessVariable|X11MA-PC-ET7000:SW-K|Read||true
#ai1-raw=ch.psi.pshell.modbus.AnalogInput|et7026 1||5000|
et7026=ch.psi.pshell.modbus.ModbusTCP|129.129.121.94:502|||
et7026=ch.psi.pshell.modbus.ModbusTCP|129.129.121.44:502|||
ai0=ch.psi.pshell.modbus.ReadonlyProcessVariable|et7026 0||5000|
ai1=ch.psi.pshell.modbus.ReadonlyProcessVariable|et7026 1||5000|
ao0=ch.psi.pshell.modbus.ProcessVariable|et7026 0||5000|
ao1=ch.psi.pshell.modbus.ProcessVariable|et7026 1||5000|
ais=ch.psi.pshell.modbus.AnalogInputArray|et7026 0 6||5000|false
et7244=ch.psi.pshell.modbus.ModbusTCP|129.129.121.110:502|||
et7244=ch.psi.pshell.modbus.ModbusTCP|129.129.121.45:502|||
di1=ch.psi.pshell.modbus.DigitalInput|et7244 0||5000|
di2=ch.psi.pshell.modbus.DigitalInput|et7244 1||5000|
do1=ch.psi.pshell.modbus.DigitalOutput|et7244 0||5000|

View File

@@ -1,4 +1,4 @@
#Thu Oct 30 14:02:42 CET 2025
DaySequentialNumber=12
FileSequentialNumber=141
#Thu Oct 30 16:27:52 CET 2025
DaySequentialNumber=27
FileSequentialNumber=156
LastRunDate=251030

View File

@@ -17,37 +17,45 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="60" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="spinnerInterval" linkSize="1" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="spinnerSamples" linkSize="1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="74" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="plotPanel" pref="368" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerSamples" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerSamples" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerInterval" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="234" max="32767" attributes="0"/>
</Group>
<Component id="plotPanel" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerInterval" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="94" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -77,5 +85,7 @@
</Property>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.PlotPanel" name="plotPanel">
</Component>
</SubComponents>
</Form>

View File

@@ -44,7 +44,8 @@ public class TestScript extends ScriptProcessor {
@Override
protected void onLoaded() {
plotPanel.initialize();
plotPanel.setActive(true);
}
@Override
@@ -82,15 +83,11 @@ public class TestScript extends ScriptProcessor {
return ret;
}
@Override
public boolean canPause() {
return true;
}
@Override
public void clear() {
spinnerSamples.setValue(10);
spinnerInterval.setValue(0.1);
plotPanel.clear();
}
@@ -102,6 +99,7 @@ public class TestScript extends ScriptProcessor {
jLabel2 = new javax.swing.JLabel();
spinnerInterval = new javax.swing.JSpinner();
spinnerSamples = new javax.swing.JSpinner();
plotPanel = new ch.psi.pshell.swing.PlotPanel();
jLabel1.setText("Samples:");
@@ -116,7 +114,7 @@ public class TestScript extends ScriptProcessor {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(60, 60, 60)
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel2)
@@ -126,7 +124,9 @@ public class TestScript extends ScriptProcessor {
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap(74, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(plotPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 368, Short.MAX_VALUE)
.addContainerGap())
);
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerInterval, spinnerSamples});
@@ -134,21 +134,26 @@ public class TestScript extends ScriptProcessor {
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(26, 26, 26)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1)
.addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2)
.addComponent(spinnerInterval, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(94, Short.MAX_VALUE))
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1)
.addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2)
.addComponent(spinnerInterval, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 234, Short.MAX_VALUE))
.addComponent(plotPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private ch.psi.pshell.swing.PlotPanel plotPanel;
private javax.swing.JSpinner spinnerInterval;
private javax.swing.JSpinner spinnerSamples;
// End of variables declaration//GEN-END:variables