Closedown
This commit is contained in:
gac-x09lb
@@ -3,12 +3,11 @@
|
||||
*/
|
||||
|
||||
import ch.psi.pshell.device.Motor;
|
||||
import ch.psi.pshell.epics.Scienta;
|
||||
import ch.psi.pshell.epics.AreaDetector;
|
||||
import ch.psi.pshell.ui.ScriptProcessor;
|
||||
import ch.psi.utils.State;
|
||||
import ch.psi.utils.swing.SwingUtils;
|
||||
import java.awt.Component;
|
||||
import java.time.LocalTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
@@ -40,22 +39,11 @@ public class Scan1D extends ScriptProcessor {
|
||||
@Override
|
||||
public void onInitialize(int runCount) {
|
||||
comboMotorActionPerformed(null);
|
||||
Scienta scienta = (Scienta) getDevice("Scienta");
|
||||
dvpAcqTime.setDevice(scienta.getAcquisitionTime());
|
||||
AreaDetector ccd = (AreaDetector) getDevice("ccd");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onTimer(){
|
||||
try{
|
||||
int steps = radioSteps.isSelected() ?
|
||||
(Integer)spinnerSteps.getValue():
|
||||
(int) ((radioRelative.isSelected()? ((Double)spinnerRange.getValue()).intValue():
|
||||
(Math.abs((Double)spinnerTo.getValue() - (Double)spinnerFrom.getValue()) )) / (Double)spinnerStepSize.getValue() + 1);
|
||||
int seconds = (int) (Double.valueOf(dvpAcqTime.getLabel().getText()) * steps);
|
||||
int hours= seconds / (60 * 60);
|
||||
textTotalTime.setText(hours >= 24 ? hours+"h": LocalTime.ofSecondOfDay(seconds).toString());
|
||||
} catch (Exception ex){
|
||||
textTotalTime.setText("");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -81,20 +69,17 @@ public class Scan1D extends ScriptProcessor {
|
||||
c.setEnabled(enableControls);
|
||||
}
|
||||
buttonStart.setEnabled(enableControls);
|
||||
checkEndScan.setEnabled(enableControls);
|
||||
spinnerStepSize.setEnabled(enableControls && radioStepSize.isSelected());
|
||||
spinnerSteps.setEnabled(enableControls && radioSteps.isSelected());
|
||||
|
||||
spinnerFrom.setEnabled(enableControls && radioAbsolute.isSelected());
|
||||
spinnerTo.setEnabled(enableControls && radioAbsolute.isSelected());
|
||||
spinnerRange.setEnabled(enableControls && !radioAbsolute.isSelected());
|
||||
|
||||
buttonScientaSetup.setEnabled(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getScript() {
|
||||
return "ManipulatorScan";
|
||||
return "templates/Scan1D";
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -122,8 +107,6 @@ public class Scan1D extends ScriptProcessor {
|
||||
}
|
||||
args.put("LATENCY", (Double) spinnerLatency.getValue());
|
||||
args.put("RELATIVE", radioRelative.isSelected());
|
||||
args.put("ENDSCAN", checkEndScan.isSelected());
|
||||
args.put("FLY_SCAN", checkFlyScan.isSelected());
|
||||
return args;
|
||||
}
|
||||
|
||||
@@ -133,6 +116,9 @@ 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();
|
||||
@@ -154,39 +140,50 @@ public class Scan1D extends ScriptProcessor {
|
||||
jLabel6 = new javax.swing.JLabel();
|
||||
jLabel7 = new javax.swing.JLabel();
|
||||
jLabel8 = new javax.swing.JLabel();
|
||||
checkFlyScan = new javax.swing.JCheckBox();
|
||||
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();
|
||||
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();
|
||||
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();
|
||||
checkEndScan = new javax.swing.JCheckBox();
|
||||
textTotalTime = new javax.swing.JLabel();
|
||||
labelTotalTime = new javax.swing.JLabel();
|
||||
labelAcqTime = new javax.swing.JLabel();
|
||||
dvpAcqTime = new ch.psi.pshell.swing.DeviceValuePanel();
|
||||
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"));
|
||||
|
||||
jLabel1.setText("Motor:");
|
||||
|
||||
comboMotor.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "dummy", "ManipulatorX", "ManipulatorY", "ManipulatorZ", "ManipulatorTheta", "ManipulatorTilt", "ManipulatorPhi" }));
|
||||
comboMotor.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "dummy_x", "sample_x", "sample_y", "sample_x" }));
|
||||
comboMotor.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
comboMotorActionPerformed(evt);
|
||||
@@ -255,8 +252,6 @@ public class Scan1D extends ScriptProcessor {
|
||||
|
||||
jLabel8.setText("Steps:");
|
||||
|
||||
checkFlyScan.setText("Fly Scan");
|
||||
|
||||
javax.swing.GroupLayout panelPositionerLayout = new javax.swing.GroupLayout(panelPositioner);
|
||||
panelPositioner.setLayout(panelPositionerLayout);
|
||||
panelPositionerLayout.setHorizontalGroup(
|
||||
@@ -272,7 +267,7 @@ public class Scan1D extends ScriptProcessor {
|
||||
.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, 152, Short.MAX_VALUE)))
|
||||
.addComponent(comboMotor, 0, 159, Short.MAX_VALUE)))
|
||||
.addGroup(panelPositionerLayout.createSequentialGroup()
|
||||
.addComponent(jLabel3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
@@ -302,8 +297,7 @@ public class Scan1D extends ScriptProcessor {
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(radioStepSize)
|
||||
.addComponent(radioAbsolute)
|
||||
.addComponent(radioRelative)
|
||||
.addComponent(checkFlyScan))
|
||||
.addComponent(radioRelative))
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
@@ -353,123 +347,7 @@ public class Scan1D extends ScriptProcessor {
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel3)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 81, Short.MAX_VALUE)
|
||||
.addComponent(checkFlyScan)
|
||||
.addGap(26, 26, 26))
|
||||
);
|
||||
|
||||
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
|
||||
|
||||
checkImage.setText("Scienta Image");
|
||||
checkImage.setToolTipText("");
|
||||
checkImage.setContentAreaFilled(false);
|
||||
checkImage.setName("Scienta.dataMatrix"); // 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
|
||||
|
||||
checkCounts2.setText("Counts Region 2");
|
||||
checkCounts2.setName("CountsR2"); // NOI18N
|
||||
|
||||
checkCounts3.setText("Counts Region 3");
|
||||
checkCounts3.setName("CountsR3"); // NOI18N
|
||||
|
||||
checkCounts4.setText("Counts Region 4");
|
||||
checkCounts4.setName("CountsR4"); // NOI18N
|
||||
|
||||
checkCurrent.setText("Machine Current");
|
||||
checkCurrent.setName("MachineCurrent"); // 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);
|
||||
panelSensorsLayout.setHorizontalGroup(
|
||||
panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelSensorsLayout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE)
|
||||
.addComponent(checkImage)
|
||||
.addComponent(checkImageIntegration)
|
||||
.addComponent(checkSpectrum)
|
||||
.addComponent(checkCounts1)
|
||||
.addComponent(checkTotalCount)
|
||||
.addComponent(checkCounts2)
|
||||
.addComponent(checkCounts3)
|
||||
.addComponent(checkCounts4)
|
||||
.addComponent(checkCurrent)
|
||||
.addComponent(checkCur1)
|
||||
.addComponent(checkCur2)
|
||||
.addComponent(checkCur3)
|
||||
.addComponent(checkAngleDistribution))
|
||||
.addContainerGap())
|
||||
);
|
||||
panelSensorsLayout.setVerticalGroup(
|
||||
panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelSensorsLayout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(checkImage)
|
||||
.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)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCounts1)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCounts2)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCounts3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCounts4)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCurrent)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCur1)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCur2)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCur3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 97, Short.MAX_VALUE)
|
||||
.addComponent(buttonScientaSetup)
|
||||
.addGap(26, 26, 26))
|
||||
.addContainerGap(159, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
|
||||
@@ -488,17 +366,6 @@ public class Scan1D extends ScriptProcessor {
|
||||
}
|
||||
});
|
||||
|
||||
checkEndScan.setText("Turn off beam at end");
|
||||
|
||||
textTotalTime.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
|
||||
textTotalTime.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
|
||||
|
||||
labelTotalTime.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
labelTotalTime.setText("Total time:");
|
||||
|
||||
labelAcqTime.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
labelAcqTime.setText("Acquisition time(s):");
|
||||
|
||||
buttonQueue.setText("Queue");
|
||||
buttonQueue.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
@@ -510,32 +377,14 @@ public class Scan1D extends ScriptProcessor {
|
||||
jPanel3.setLayout(jPanel3Layout);
|
||||
jPanel3Layout.setHorizontalGroup(
|
||||
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel3Layout.createSequentialGroup()
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
.addGap(0, 9, Short.MAX_VALUE)
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(labelAcqTime)
|
||||
.addComponent(labelTotalTime))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(textTotalTime, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(dvpAcqTime, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(1, 1, 1))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
.addComponent(checkEndScan)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addComponent(buttonQueue, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(buttonQueue, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonStart, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonAbort, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 234, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
jPanel3Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
|
||||
|
||||
jPanel3Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {labelAcqTime, labelTotalTime});
|
||||
|
||||
jPanel3Layout.setVerticalGroup(
|
||||
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
@@ -543,38 +392,24 @@ public class Scan1D extends ScriptProcessor {
|
||||
.addComponent(buttonStart)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonAbort)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonQueue)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(labelAcqTime)
|
||||
.addComponent(dvpAcqTime, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(labelTotalTime)
|
||||
.addComponent(textTotalTime))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(checkEndScan)
|
||||
.addGap(26, 26, 26))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel3Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||
this.setLayout(layout);
|
||||
layout.setHorizontalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(panelSensors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGap(292, 292, 292)
|
||||
.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, panelSensors});
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner});
|
||||
|
||||
layout.setVerticalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
@@ -582,20 +417,11 @@ 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())
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
|
||||
try {
|
||||
showDevicePanel("Scienta");
|
||||
} catch (Exception ex) {
|
||||
SwingUtils.showException(this, ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonScientaSetupActionPerformed
|
||||
|
||||
private void buttonStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStartActionPerformed
|
||||
try {
|
||||
execute();
|
||||
@@ -607,7 +433,7 @@ public class Scan1D extends ScriptProcessor {
|
||||
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
|
||||
try {
|
||||
abort();
|
||||
((Scienta) getDevice("Scienta")).stop();
|
||||
((AreaDetector) getDevice("ccd")).stop();
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
@@ -655,25 +481,10 @@ public class Scan1D extends ScriptProcessor {
|
||||
private javax.swing.ButtonGroup buttonGroup1;
|
||||
private javax.swing.ButtonGroup buttonGroup2;
|
||||
private javax.swing.JButton buttonQueue;
|
||||
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;
|
||||
private javax.swing.JCheckBox checkCounts4;
|
||||
private javax.swing.JCheckBox checkCur1;
|
||||
private javax.swing.JCheckBox checkCur2;
|
||||
private javax.swing.JCheckBox checkCur3;
|
||||
private javax.swing.JCheckBox checkCurrent;
|
||||
private javax.swing.JCheckBox checkEndScan;
|
||||
private javax.swing.JCheckBox checkFlyScan;
|
||||
private javax.swing.JCheckBox checkImage;
|
||||
private javax.swing.JCheckBox checkImageIntegration;
|
||||
private javax.swing.JCheckBox checkSpectrum;
|
||||
private javax.swing.JCheckBox checkTotalCount;
|
||||
private javax.swing.JComboBox comboMotor;
|
||||
private ch.psi.pshell.swing.DeviceValuePanel dvpAcqTime;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel3;
|
||||
private javax.swing.JLabel jLabel4;
|
||||
@@ -682,8 +493,6 @@ public class Scan1D extends ScriptProcessor {
|
||||
private javax.swing.JLabel jLabel7;
|
||||
private javax.swing.JLabel jLabel8;
|
||||
private javax.swing.JPanel jPanel3;
|
||||
private javax.swing.JLabel labelAcqTime;
|
||||
private javax.swing.JLabel labelTotalTime;
|
||||
private ch.psi.pshell.swing.MotorReadoutPanel motorPanel;
|
||||
private javax.swing.JPanel panelPositioner;
|
||||
private javax.swing.JPanel panelSensors;
|
||||
@@ -697,7 +506,6 @@ public class Scan1D extends ScriptProcessor {
|
||||
private javax.swing.JSpinner spinnerStepSize;
|
||||
private javax.swing.JSpinner spinnerSteps;
|
||||
private javax.swing.JSpinner spinnerTo;
|
||||
private javax.swing.JLabel textTotalTime;
|
||||
private javax.swing.JLabel txtSize;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user