pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
root
2017-11-27 08:31:31 +01:00
parent 32ab7cb2db
commit 8d9794c431
35 changed files with 693 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/WireScan.java
View File

@@ -816,15 +816,15 @@ public class WireScan extends Panel {
parameters.add(spinnerVel.getValue());
ArrayList bpms = new ArrayList();
for (JComboBox cb : bpmCombos){
if (!cb.getSelectedItem().toString().isEmpty()){
if (cb.getSelectedItem()!=null && (!cb.getSelectedItem().toString().isEmpty())){
bpms.add(cb.getSelectedItem().toString());
}
}
parameters.add(bpms);
ArrayList blms = new ArrayList();
for (JComboBox cb : blmCombos){
if (!cb.getSelectedItem().toString().isEmpty()){
blms.add(cb.getSelectedItem().toString());
if ((cb.getSelectedItem()!=null) && (!cb.getSelectedItem().toString().isEmpty())){
blms.add(cb.getSelectedItem().toString());
}
}
parameters.add(blms);
@@ -853,6 +853,7 @@ public class WireScan extends Panel {
}
} catch (Exception ex) {
showException(ex);
ex.printStackTrace();
}
}//GEN-LAST:event_buttonScanActionPerformed
@@ -889,7 +890,8 @@ public class WireScan extends Panel {
}
}//GEN-LAST:event_buttonParkActionPerformed
String caqtdm = "caqtdm -noMsg -stylefile sfop.qss -attach";
//String caqtdm = "caqtdm -noMsg -stylefile sfop.qss -attach";
String caqtdm = "caqtdm -noMsg -stylefile sfop.qss";
private void buttonMotorPanelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMotorPanelActionPerformed
try {
String cmd = caqtdm + " -macro 'P=" + comboWireScanner.getSelectedItem() + ":,M=MOTOR_1' /sf/common/config/qt/motorx_all.ui";