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

Closedown

Browse Source
This commit is contained in:
x03daop
2016-04-26 16:46:51 +02:00
parent 2fa00aad22
commit 89283bcd32
7 changed files with 185 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/HoloScan.form
View File

@@ -72,7 +72,7 @@
<Component id="motorPanelPhi" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="28" max="32767" attributes="0"/>
<EmptySpace min="0" pref="23" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
@@ -357,7 +357,7 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" pref="199" max="32767" attributes="0"/>
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
<Component id="checkImage" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkImageIntegration" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkSpectrum" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -431,18 +431,21 @@
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Spectrum"/>
<Property name="name" type="java.lang.String" value="Scienta.spectrum" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
@@ -450,6 +453,12 @@
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts2">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 2"/>
@@ -500,15 +509,6 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
@@ -531,7 +531,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<EmptySpace min="0" pref="45" max="32767" attributes="0"/>
</Group>
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="205" max="32767" attributes="0"/>

28
plugins/HoloScan.java
View File

@@ -135,9 +135,10 @@ public class HoloScan extends Panel {
panelSensors = new javax.swing.JPanel();
checkImage = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkTotalCount = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkCounts2 = new javax.swing.JCheckBox();
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
@@ -146,7 +147,6 @@ public class HoloScan extends Panel {
checkCur2 = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
checkAngleDistribution = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -226,7 +226,7 @@ public class HoloScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(motorPanelPhi, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
.addGap(0, 28, Short.MAX_VALUE)
.addGap(0, 23, Short.MAX_VALUE)
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -342,16 +342,22 @@ public class HoloScan extends Panel {
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("CountsR2"); // NOI18N
@@ -380,12 +386,6 @@ public class HoloScan extends Panel {
}
});
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
@@ -393,7 +393,7 @@ public class HoloScan extends Panel {
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 199, Short.MAX_VALUE)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
@@ -471,7 +471,7 @@ public class HoloScan extends Panel {
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE))
.addGap(0, 45, Short.MAX_VALUE))
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 205, Short.MAX_VALUE))
.addContainerGap())

86
plugins/ManipulatorScan.form
View File

@@ -72,7 +72,7 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="motorPanel" max="32767" attributes="0"/>
<Component id="comboMotor" pref="146" max="32767" attributes="0"/>
<Component id="comboMotor" max="32767" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
@@ -401,33 +401,6 @@
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Total Counts"/>
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="Sample Current"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="Ref Current"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImage">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Image"/>
@@ -436,10 +409,22 @@
<Property name="name" type="java.lang.String" value="Scienta.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
<Properties>
<Property name="text" type="java.lang.String" value="Aux Current"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">
@@ -448,6 +433,13 @@
<Property name="name" type="java.lang.String" value="Scienta.spectrum" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Total Counts"/>
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
@@ -478,24 +470,32 @@
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
<Property name="text" type="java.lang.String" value="Sample Current"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
<Property name="text" type="java.lang.String" value="Ref Current"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="Aux Current"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">

74
plugins/ManipulatorScan.java
View File

@@ -153,20 +153,20 @@ public class ManipulatorScan extends Panel {
jLabel7 = new javax.swing.JLabel();
jLabel8 = new javax.swing.JLabel();
panelSensors = new javax.swing.JPanel();
buttonScientaSetup = new javax.swing.JButton();
checkTotalCount = new javax.swing.JCheckBox();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkImage = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkTotalCount = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkCounts2 = new javax.swing.JCheckBox();
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -260,7 +260,7 @@ public class ManipulatorScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(motorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(comboMotor, 0, 146, Short.MAX_VALUE)))
.addComponent(comboMotor, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGroup(panelPositionerLayout.createSequentialGroup()
.addComponent(jLabel3)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -345,34 +345,30 @@ public class ManipulatorScan extends Panel {
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonScientaSetupActionPerformed(evt);
}
});
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
@@ -388,17 +384,21 @@ public class ManipulatorScan extends Panel {
checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonScientaSetupActionPerformed(evt);
}
});
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);

78
plugins/PhotonEnergy.form
View File

@@ -412,26 +412,6 @@
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="Sample Current"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="Ref Current"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImage">
<Properties>
<Property name="selected" type="boolean" value="true"/>
@@ -441,12 +421,6 @@
<Property name="name" type="java.lang.String" value="Scienta.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="Aux Current"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
<Properties>
<Property name="selected" type="boolean" value="true"/>
@@ -456,18 +430,21 @@
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Spectrum"/>
<Property name="name" type="java.lang.String" value="Scienta.spectrum" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
@@ -475,6 +452,12 @@
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts2">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 2"/>
@@ -499,15 +482,32 @@
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
<Property name="text" type="java.lang.String" value="Sample Current"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="Ref Current"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="Aux Current"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
@@ -527,7 +527,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<EmptySpace min="0" pref="84" max="32767" attributes="0"/>
</Group>
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="241" max="32767" attributes="0"/>

62
plugins/PhotonEnergy.java
View File

@@ -199,20 +199,20 @@ public class PhotonEnergy extends Panel {
jLabel9 = new javax.swing.JLabel();
spinnerHigh = new javax.swing.JSpinner();
panelSensors = new javax.swing.JPanel();
buttonScientaSetup = new javax.swing.JButton();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkImage = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkTotalCount = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkCounts2 = new javax.swing.JCheckBox();
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -419,44 +419,34 @@ public class PhotonEnergy extends Panel {
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonScientaSetupActionPerformed(evt);
}
});
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setSelected(true);
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("CountsR2"); // NOI18N
@@ -469,11 +459,21 @@ public class PhotonEnergy extends Panel {
checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonScientaSetupActionPerformed(evt);
}
});
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
@@ -559,7 +559,7 @@ public class PhotonEnergy extends Panel {
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE))
.addGap(0, 84, Short.MAX_VALUE))
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE))
.addContainerGap())

3
script/local.py
View File

@@ -258,6 +258,9 @@ def adjust_sensors():
for dev in ["Scienta.spectrum","EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix"]:
if dev in SENSORS:
SENSORS=SENSORS+[SENSORS.pop(SENSORS.index(dev))]
for dev in ["Counts"]:
if dev in SENSORS:
SENSORS=[SENSORS.pop(SENSORS.index(dev))] + SENSORS
#Device aliases for data files
set_device_alias(Scienta.dataMatrix, "ScientaImage")