From 89283bcd325060cf0dcfe95f31a43c5895a8b7c1 Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 26 Apr 2016 16:46:51 +0200 Subject: [PATCH] Closedown --- plugins/HoloScan.form | 36 +++++++-------- plugins/HoloScan.java | 28 ++++++------ plugins/ManipulatorScan.form | 86 ++++++++++++++++++------------------ plugins/ManipulatorScan.java | 74 +++++++++++++++---------------- plugins/PhotonEnergy.form | 78 ++++++++++++++++---------------- plugins/PhotonEnergy.java | 62 +++++++++++++------------- script/local.py | 3 ++ 7 files changed, 185 insertions(+), 182 deletions(-) diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form index d62e93b2..757e856b 100644 --- a/plugins/HoloScan.form +++ b/plugins/HoloScan.form @@ -72,7 +72,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -431,18 +431,21 @@ + + + + + + + + + - - - - - - @@ -450,6 +453,12 @@ + + + + + + @@ -500,15 +509,6 @@ - - - - - - - - - @@ -531,7 +531,7 @@ - + diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java index 25a82653..d016eba3 100644 --- a/plugins/HoloScan.java +++ b/plugins/HoloScan.java @@ -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()) diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form index ae93dab4..fe5bb76c 100644 --- a/plugins/ManipulatorScan.form +++ b/plugins/ManipulatorScan.form @@ -72,7 +72,7 @@ - + @@ -401,33 +401,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -436,10 +409,22 @@ - + - - + + + + + + + + + + + + + + @@ -448,6 +433,13 @@ + + + + + + + @@ -478,24 +470,32 @@ - + - - - - - + + - + - - - - - + + + + + + + + + + + + + + + + diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java index 942ebb3a..69417e65 100644 --- a/plugins/ManipulatorScan.java +++ b/plugins/ManipulatorScan.java @@ -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); diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form index d2ddb1cd..97e31ab5 100644 --- a/plugins/PhotonEnergy.form +++ b/plugins/PhotonEnergy.form @@ -412,26 +412,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -441,12 +421,6 @@ - - - - - - @@ -456,18 +430,21 @@ + + + + + + + + + - - - - - - @@ -475,6 +452,12 @@ + + + + + + @@ -499,15 +482,32 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -527,7 +527,7 @@ - + diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java index cdd2673e..f71e6d53 100644 --- a/plugins/PhotonEnergy.java +++ b/plugins/PhotonEnergy.java @@ -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()) diff --git a/script/local.py b/script/local.py index 44ba671a..d1129ee3 100644 --- a/script/local.py +++ b/script/local.py @@ -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")