Closedown

This commit is contained in:
x03daop
2015-07-16 15:26:38 +02:00
parent 314e355d1d
commit 6d1c15e14c
2 changed files with 61 additions and 50 deletions

View File

@@ -2,6 +2,7 @@
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.core.Controller;
import ch.psi.pshell.dev.Device;
import ch.psi.pshell.dev.DeviceListener;
import ch.psi.pshell.epics.Scienta;
@@ -148,33 +149,39 @@ public class XPSSpectrum extends Panel {
}
}
};
public final String STEP_VAR = "xps_spectrum_step";
public final String CURRERNT_RANGE_VAR = "cur_range";
public final String CURRERNT_ITERATION_VAR = "cur_iteration";
int currentScanIndex ;
RangeSelection[] scanRanges;
Task monitoringTask = new Task() {
@Override
protected Object execute() throws Exception {
Object index = XPSSpectrum.this.eval(STEP_VAR, true);
if ((index!=null) && (index instanceof Integer) && ((Integer)index > 0)){
int scanIndex = ((Integer)index)-1;
Object index = XPSSpectrum.this.eval(CURRERNT_RANGE_VAR, true);
if ((index!=null) && (index instanceof Integer) && ((Integer)index >= 0)){
int scanIndex = (Integer)index;
if (scanIndex!=currentScanIndex){
buttonSkip.setEnabled(true);
}
currentScanIndex = scanIndex;
buttonSkip.setVisible((scanRanges.length>1) && (currentScanIndex < (scanRanges.length-1)));
RangeSelection range = rangeSelectionPanel.getRangesOrdered()[scanIndex];
for (int row = 0; row< rangeSelectionPanel.getTable().getRowCount(); row++){
if (range.equals((Double)rangeSelectionPanel.getTable().getValueAt(row, 0), (Double)rangeSelectionPanel.getTable().getValueAt(row, 2))){
rangeSelectionPanel.getTable().setRowSelectionInterval(row, row);
break;
}
if (row == (rangeSelectionPanel.getTable().getRowCount()-1)){
rangeSelectionPanel.getTable().clearSelection();
}
}
int current_iteration = (Integer) XPSSpectrum.this.eval(CURRERNT_ITERATION_VAR, true);
int iterations = (Integer)scanRanges[currentScanIndex].getVars()[2];
buttonSkip.setVisible((iterations>1) && (current_iteration < (iterations-1)));
if (detailedScan){
RangeSelection range = rangeSelectionPanel.getRangesOrdered()[scanIndex];
for (int row = 0; row< rangeSelectionPanel.getTable().getRowCount(); row++){
if (range.equals((Double)rangeSelectionPanel.getTable().getValueAt(row, 0), (Double)rangeSelectionPanel.getTable().getValueAt(row, 2))){
rangeSelectionPanel.getTable().setRowSelectionInterval(row, row);
break;
}
if (row == (rangeSelectionPanel.getTable().getRowCount()-1)){
rangeSelectionPanel.getTable().clearSelection();
}
}
}
} else {
rangeSelectionPanel.getTable().clearSelection();
}
@@ -183,6 +190,17 @@ public class XPSSpectrum extends Panel {
}
};
void start() throws Controller.ControllerStateException{
HashMap<String, Object> args = new HashMap<>();
args.put("ranges", scanRanges);
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
currentScanIndex = -1;
runAsync("XPSSpectrum", args);
monitoringTask.schedule(100, 500);
running = true;
}
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@@ -472,20 +490,15 @@ public class XPSSpectrum extends Panel {
private void buttonInitialScanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonInitialScanActionPerformed
try {
//getApp().startTask(task);
HashMap<String, Object> args = new HashMap<>();
rangeSelectionPanel.clear();
detailedScan = false;
RangeSelection initialRange = new RangeSelection(valueLow.getValue(),valueHigh.getValue());
int iterations = (int)valueIterations.getValue();
initialRange.setVars(new Object[]{valueSize.getValue(),valueTime.getValue(),iterations});
scanRanges = new RangeSelection[]{initialRange};
args.put("ranges", scanRanges);
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
rangeSelectionPanel.clear();
detailedScan = false;
currentScanIndex = -1;
runAsync("XPSSpectrum", args);
running = true;
start();
} catch (Exception ex) {
showException(ex);
}
@@ -494,15 +507,10 @@ public class XPSSpectrum extends Panel {
private void buttonDetailedScanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDetailedScanActionPerformed
try {
scanRanges = rangeSelectionPanel.getRangesOrdered();
HashMap<String, Object> args = new HashMap<>();
args.put("ranges", scanRanges);
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
detailedScan = true;
currentScanIndex = -1;
runAsync("XPSSpectrum", args);
monitoringTask.schedule(100, 500);
running = true;
scanRanges = rangeSelectionPanel.getRangesOrdered();
start();
} catch (Exception ex) {
showException(ex);
}