This commit is contained in:
root
2018-11-26 09:44:17 +01:00
parent 02cb40fb12
commit 35e61c605d
23 changed files with 521 additions and 127 deletions

View File

@@ -4,6 +4,7 @@
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.pshell.device.DeviceListener;
import ch.psi.pshell.epics.ChannelDouble;
import ch.psi.pshell.epics.ChannelInteger;
import ch.psi.pshell.epics.Epics;
@@ -927,14 +928,70 @@ public class WireScan extends Panel {
onStateChange(getState(), getState());
}//GEN-LAST:event_comboWireScannerActionPerformed
ChannelDouble channelStartX;
ChannelDouble channelEndX;
ChannelDouble channelStartY;
ChannelDouble channelEndY;
private void comboScanTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboScanTypeActionPerformed
try {
if (channelStartX != null){
channelStartX.close();
channelStartX = null;
}
if (channelEndX != null){
channelEndX.close();
channelEndX = null;
}
if (channelStartY != null){
channelStartY.close();
channelStartY = null;
}
if (channelEndY != null){
channelEndY.close();
channelEndY = null;
}
if (!isBackground()){
boolean set1 = isSet1();
spinnerStartX.setValue(Epics.get(currentScannner + (set1 ? ":W1X" : ":W2X") + "_START_SP", Double.class));
spinnerEndX.setValue(Epics.get(currentScannner + (set1 ? ":W1X" : ":W2X") + "_END_SP", Double.class));
spinnerStartY.setValue(Epics.get(currentScannner + (set1 ? ":W1Y" : ":W2Y") + "_START_SP", Double.class));
spinnerEndY.setValue(Epics.get(currentScannner + (set1 ? ":W1Y" : ":W2Y") + "_END_SP", Double.class));
boolean set1 = isSet1();
channelStartX = new ChannelDouble("Start X", currentScannner + (set1 ? ":W1X" : ":W2X") + "_START_SP");
channelEndX = new ChannelDouble("End X", currentScannner + (set1 ? ":W1X" : ":W2X") + "_END_SP");
channelStartY = new ChannelDouble("Start Y", currentScannner + (set1 ? ":W1Y" : ":W2Y") + "_START_SP");
channelEndY = new ChannelDouble("End X", currentScannner + (set1 ? ":W1Y" : ":W2Y") + "_END_SP");
channelStartX.initialize(); channelStartX.setMonitored(true);
channelEndX.initialize(); channelEndX.setMonitored(true);
channelStartY.initialize(); channelStartY.setMonitored(true);
channelEndY.initialize(); channelEndY.setMonitored(true);
channelStartX.addListener(new DeviceAdapter() {
@Override
public void onValueChanged(Device device, Object value, Object former) {
spinnerStartX.setValue(((Number)value).doubleValue());
}
});
channelEndX.addListener(new DeviceAdapter() {
@Override
public void onValueChanged(Device device, Object value, Object former) {
spinnerEndX.setValue(((Number)value).doubleValue());
}
});
channelStartY.addListener(new DeviceAdapter() {
@Override
public void onValueChanged(Device device, Object value, Object former) {
spinnerStartY.setValue(((Number)value).doubleValue());
}
});
channelEndY.addListener(new DeviceAdapter() {
@Override
public void onValueChanged(Device device, Object value, Object former) {
spinnerEndY.setValue(((Number)value).doubleValue());
}
});
spinnerStartX.setValue(channelStartX.read());
spinnerEndX.setValue(channelEndX.read());
spinnerStartY.setValue(channelStartY.read());
spinnerEndY.setValue(channelEndY.read());
}
} catch (Exception ex) {
showException(ex);