Startup
This commit is contained in:
@@ -96,9 +96,11 @@ public class HoloScan extends Panel {
|
||||
for (Component c : panelPositioners.getComponents()) {
|
||||
c.setEnabled(enableControls);
|
||||
}
|
||||
for (Component c : panelScan.getComponents()) {
|
||||
c.setEnabled(enableControls);
|
||||
}
|
||||
|
||||
labelAcqTime.setEnabled(enableControls);
|
||||
labelTotalTime.setEnabled(enableControls);
|
||||
buttonStart.setEnabled(enableControls);
|
||||
checkEndScan.setEnabled(enableControls);
|
||||
|
||||
buttonAbort.setEnabled(value && getState().isInitialized());
|
||||
|
||||
@@ -193,9 +195,9 @@ public class HoloScan extends Panel {
|
||||
buttonStart = new javax.swing.JButton();
|
||||
buttonAbort = new javax.swing.JButton();
|
||||
checkEndScan = new javax.swing.JCheckBox();
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
labelAcqTime = new javax.swing.JLabel();
|
||||
dvpAcqTime = new ch.psi.pshell.swing.DeviceValuePanel();
|
||||
jLabel2 = new javax.swing.JLabel();
|
||||
labelTotalTime = new javax.swing.JLabel();
|
||||
textTotalTime = new javax.swing.JLabel();
|
||||
|
||||
panelPositioners.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioners"));
|
||||
@@ -508,11 +510,11 @@ public class HoloScan extends Panel {
|
||||
|
||||
checkEndScan.setText("Turn off beam at end");
|
||||
|
||||
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel1.setText("Acquisition time(s):");
|
||||
labelAcqTime.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
labelAcqTime.setText("Acquisition time(s):");
|
||||
|
||||
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel2.setText("Total time:");
|
||||
labelTotalTime.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
labelTotalTime.setText("Total time:");
|
||||
|
||||
textTotalTime.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
|
||||
textTotalTime.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
|
||||
@@ -528,8 +530,8 @@ public class HoloScan extends Panel {
|
||||
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(panelScanLayout.createSequentialGroup()
|
||||
.addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel1)
|
||||
.addComponent(jLabel2))
|
||||
.addComponent(labelAcqTime)
|
||||
.addComponent(labelTotalTime))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(textTotalTime, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
@@ -541,7 +543,7 @@ public class HoloScan extends Panel {
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
panelScanLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel2});
|
||||
panelScanLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {labelAcqTime, labelTotalTime});
|
||||
|
||||
panelScanLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
|
||||
|
||||
@@ -554,12 +556,12 @@ public class HoloScan extends Panel {
|
||||
.addComponent(buttonAbort)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel1)
|
||||
.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(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(textTotalTime)
|
||||
.addComponent(jLabel2))
|
||||
.addComponent(labelTotalTime))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(checkEndScan)
|
||||
.addGap(26, 26, 26))
|
||||
@@ -646,18 +648,18 @@ public class HoloScan extends Panel {
|
||||
private javax.swing.JCheckBox checkTotalCount;
|
||||
private javax.swing.JCheckBox checkZigzag;
|
||||
private ch.psi.pshell.swing.DeviceValuePanel dvpAcqTime;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel11;
|
||||
private javax.swing.JLabel jLabel12;
|
||||
private javax.swing.JLabel jLabel13;
|
||||
private javax.swing.JLabel jLabel14;
|
||||
private javax.swing.JLabel jLabel2;
|
||||
private javax.swing.JLabel jLabel4;
|
||||
private javax.swing.JLabel jLabel5;
|
||||
private javax.swing.JLabel jLabel6;
|
||||
private javax.swing.JLabel jLabel7;
|
||||
private javax.swing.JLabel jLabel8;
|
||||
private javax.swing.JLabel jLabel9;
|
||||
private javax.swing.JLabel labelAcqTime;
|
||||
private javax.swing.JLabel labelTotalTime;
|
||||
private ch.psi.pshell.swing.MotorReadoutPanel motorPanelPhi;
|
||||
private ch.psi.pshell.swing.MotorReadoutPanel motorPanelTheta;
|
||||
private javax.swing.JPanel panelPositioners;
|
||||
|
||||
Reference in New Issue
Block a user