Completed channels
This commit is contained in:
gac-x09la
@@ -32,7 +32,7 @@ public final class ScientaPanel extends DevicePanel {
|
||||
} else if (origin == valueHigh) {
|
||||
getDevice().getHighEnergy().writeAsync(value);
|
||||
} else if (origin == valueSize) {
|
||||
getDevice().getStepSize().writeAsync(value);
|
||||
getDevice().getEnergyStepSize().writeAsync(value);
|
||||
} else if (origin == valueSlices) {
|
||||
getDevice().getSlices().writeAsync((int) value);
|
||||
} else if (origin == valueIterations) {
|
||||
@@ -92,6 +92,13 @@ public final class ScientaPanel extends DevicePanel {
|
||||
//cameraPanel.startTimer(3000, 0);
|
||||
startTimer(3000, 0);
|
||||
}
|
||||
|
||||
valueLow.setMaxValue(getDevice().getLowEnergy().getMaxValue());
|
||||
valueLow.setMinValue(getDevice().getLowEnergy().getMinValue());
|
||||
valueCenter.setMaxValue(getDevice().getCenterEnergy().getMaxValue());
|
||||
valueCenter.setMinValue(getDevice().getCenterEnergy().getMinValue());
|
||||
valueHigh.setMaxValue(getDevice().getHighEnergy().getMaxValue());
|
||||
valueHigh.setMinValue(getDevice().getHighEnergy().getMinValue());
|
||||
}
|
||||
|
||||
DeviceListener progressListener = new DeviceAdapter() {
|
||||
@@ -163,7 +170,7 @@ public final class ScientaPanel extends DevicePanel {
|
||||
dd.high = getDevice().getHighEnergy().getValue();
|
||||
dd.width = getDevice().getEnergyWidth().getValue();
|
||||
//dd.frames = getDevice().getFrames().getValue();
|
||||
dd.size = getDevice().getStepSize().getValue();
|
||||
dd.size = getDevice().getEnergyStepSize().getValue();
|
||||
dd.slices = getDevice().getSlices().getValue();
|
||||
|
||||
dd.current = getDevice().getCurrentStep().getValue().intValue();
|
||||
@@ -267,7 +274,6 @@ public final class ScientaPanel extends DevicePanel {
|
||||
jLabel17 = new javax.swing.JLabel();
|
||||
valueIterations = new ch.psi.pshell.swing.ValueSelection();
|
||||
buttonZeroSupplies = new javax.swing.JButton();
|
||||
jPanel3 = new javax.swing.JPanel();
|
||||
jPanel7 = new javax.swing.JPanel();
|
||||
|
||||
cameraPanel.setBorder(null);
|
||||
@@ -443,15 +449,12 @@ public final class ScientaPanel extends DevicePanel {
|
||||
jLabel12.setText("Low:");
|
||||
|
||||
valueLow.setDecimals(2);
|
||||
valueLow.setMaxValue(2000.0);
|
||||
valueLow.setMinValue(0.0);
|
||||
valueLow.setShowButtons(false);
|
||||
|
||||
jLabel13.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel13.setText("Center:");
|
||||
|
||||
valueCenter.setDecimals(2);
|
||||
valueCenter.setMaxValue(2000.0);
|
||||
valueCenter.setMinValue(0.0);
|
||||
valueCenter.setShowButtons(false);
|
||||
|
||||
@@ -459,8 +462,6 @@ public final class ScientaPanel extends DevicePanel {
|
||||
jLabel14.setText("High:");
|
||||
|
||||
valueHigh.setDecimals(2);
|
||||
valueHigh.setMaxValue(2000.0);
|
||||
valueHigh.setMinValue(0.0);
|
||||
valueHigh.setShowButtons(false);
|
||||
|
||||
jLabel15.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
@@ -469,7 +470,6 @@ public final class ScientaPanel extends DevicePanel {
|
||||
valueWidth.setDecimals(2);
|
||||
valueWidth.setEnabled(false);
|
||||
valueWidth.setMaxValue(2000.0);
|
||||
valueWidth.setMinValue(0.0);
|
||||
valueWidth.setShowButtons(false);
|
||||
|
||||
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
|
||||
@@ -644,16 +644,7 @@ public final class ScientaPanel extends DevicePanel {
|
||||
|
||||
jPanel6Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {jPanel1, jPanel4});
|
||||
|
||||
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
|
||||
jPanel3.setLayout(jPanel3Layout);
|
||||
jPanel3Layout.setHorizontalGroup(
|
||||
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGap(0, 100, Short.MAX_VALUE)
|
||||
);
|
||||
jPanel3Layout.setVerticalGroup(
|
||||
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGap(0, 100, Short.MAX_VALUE)
|
||||
);
|
||||
jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder("Collect"));
|
||||
|
||||
javax.swing.GroupLayout jPanel7Layout = new javax.swing.GroupLayout(jPanel7);
|
||||
jPanel7.setLayout(jPanel7Layout);
|
||||
@@ -663,7 +654,7 @@ public final class ScientaPanel extends DevicePanel {
|
||||
);
|
||||
jPanel7Layout.setVerticalGroup(
|
||||
jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGap(0, 100, Short.MAX_VALUE)
|
||||
.addGap(0, 125, Short.MAX_VALUE)
|
||||
);
|
||||
|
||||
javax.swing.GroupLayout scientaPanelLayout = new javax.swing.GroupLayout(scientaPanel);
|
||||
@@ -672,9 +663,6 @@ public final class ScientaPanel extends DevicePanel {
|
||||
scientaPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(scientaPanelLayout.createSequentialGroup()
|
||||
.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
);
|
||||
scientaPanelLayout.setVerticalGroup(
|
||||
@@ -682,10 +670,8 @@ public final class ScientaPanel extends DevicePanel {
|
||||
.addGroup(scientaPanelLayout.createSequentialGroup()
|
||||
.addComponent(jPanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
);
|
||||
|
||||
@@ -702,7 +688,7 @@ public final class ScientaPanel extends DevicePanel {
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(cameraPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addGap(0, 5, Short.MAX_VALUE))
|
||||
.addComponent(scientaPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
@@ -819,7 +805,6 @@ public final class ScientaPanel extends DevicePanel {
|
||||
private javax.swing.JLabel jLabel9;
|
||||
private javax.swing.JPanel jPanel1;
|
||||
private javax.swing.JPanel jPanel2;
|
||||
private javax.swing.JPanel jPanel3;
|
||||
private javax.swing.JPanel jPanel4;
|
||||
private javax.swing.JPanel jPanel5;
|
||||
private javax.swing.JPanel jPanel6;
|
||||
|
||||
Reference in New Issue
Block a user