From ebdb175f325f3af97f640fef84980da6c982046f Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 3 Nov 2015 16:43:42 +0100 Subject: [PATCH] Startup --- plugins/HoloScan.form | 12 ++++++++++++ plugins/HoloScan.java | 13 ++++++++++++- plugins/PhotonEnergy.form | 12 ++++++++++++ plugins/PhotonEnergy.java | 13 ++++++++++++- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form index c32c92d0..bd987395 100644 --- a/plugins/HoloScan.form +++ b/plugins/HoloScan.form @@ -433,6 +433,7 @@ + @@ -449,6 +450,8 @@ + + @@ -564,6 +567,15 @@ + + + + + + + + + diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java index 43ba7c75..8303f4cd 100644 --- a/plugins/HoloScan.java +++ b/plugins/HoloScan.java @@ -155,6 +155,7 @@ 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(); @@ -428,6 +429,12 @@ 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( @@ -449,7 +456,8 @@ public class HoloScan extends Panel { .addComponent(checkCurrent) .addComponent(checkCur1) .addComponent(checkCur2) - .addComponent(checkCur3)) + .addComponent(checkCur3) + .addComponent(checkAngleDistribution)) .addGap(0, 14, Short.MAX_VALUE))) .addContainerGap()) ); @@ -461,6 +469,8 @@ public class HoloScan extends Panel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkImageIntegration) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(checkAngleDistribution) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkSpectrum) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkTotalCount) @@ -590,6 +600,7 @@ public class HoloScan extends Panel { private javax.swing.ButtonGroup buttonGroup2; private javax.swing.JButton buttonScientaSetup; private javax.swing.JButton buttonStart; + private javax.swing.JCheckBox checkAngleDistribution; private javax.swing.JCheckBox checkCounts1; private javax.swing.JCheckBox checkCounts2; private javax.swing.JCheckBox checkCounts3; diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form index c93f9741..2fbe1fdb 100644 --- a/plugins/PhotonEnergy.form +++ b/plugins/PhotonEnergy.form @@ -371,6 +371,7 @@ + @@ -387,6 +388,8 @@ + + @@ -502,6 +505,15 @@ + + + + + + + + + diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java index 5e6d77c4..454db9a4 100644 --- a/plugins/PhotonEnergy.java +++ b/plugins/PhotonEnergy.java @@ -206,6 +206,7 @@ public class PhotonEnergy extends Panel { checkCounts3 = new javax.swing.JCheckBox(); checkCounts4 = new javax.swing.JCheckBox(); checkCurrent = new javax.swing.JCheckBox(); + checkAngleDistribution = new javax.swing.JCheckBox(); jPanel3 = new javax.swing.JPanel(); buttonStart = new javax.swing.JButton(); buttonAbort = new javax.swing.JButton(); @@ -462,6 +463,12 @@ 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 + javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors); panelSensors.setLayout(panelSensorsLayout); panelSensorsLayout.setHorizontalGroup( @@ -483,7 +490,8 @@ public class PhotonEnergy extends Panel { .addComponent(checkCurrent) .addComponent(checkCur1) .addComponent(checkCur2) - .addComponent(checkCur3)) + .addComponent(checkCur3) + .addComponent(checkAngleDistribution)) .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); @@ -495,6 +503,8 @@ public class PhotonEnergy extends Panel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkImageIntegration) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(checkAngleDistribution) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkSpectrum) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkTotalCount) @@ -624,6 +634,7 @@ public class PhotonEnergy extends Panel { private javax.swing.ButtonGroup buttonGroup2; private javax.swing.JButton buttonScientaSetup; private javax.swing.JButton buttonStart; + private javax.swing.JCheckBox checkAngleDistribution; private javax.swing.JCheckBox checkCounts1; private javax.swing.JCheckBox checkCounts2; private javax.swing.JCheckBox checkCounts3;