pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2023-08-15 11:39:59 +02:00
parent 425eb19873
commit 5b369efe2d
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/ManipulatorScan.java
View File

@@ -3,7 +3,8 @@
*/
import ch.psi.pshell.device.Motor;
import ch.psi.pshell.epics.Scienta;
import ch.psi.pshell.device.Startable;
import ch.psi.pshell.epics.AreaDetector;
import ch.psi.pshell.ui.ScriptProcessor;
import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
@@ -40,10 +41,10 @@ public class ManipulatorScan extends ScriptProcessor {
@Override
public void onInitialize(int runCount) {
comboMotorActionPerformed(null);
Scienta scienta = (Scienta) getDevice("Scienta");
dvpAcqTime.setDevice(scienta.getAcquisitionTime());
AreaDetector scienta = (AreaDetector) getDevice("Scienta");
dvpAcqTime.setDevice(scienta.getChild(scienta.getName() + " acquire time"));
}
protected void onTimer(){
try{
int steps = radioSteps.isSelected() ?
@@ -607,7 +608,7 @@ public class ManipulatorScan extends ScriptProcessor {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try {
abort();
getDevice("Scienta").stop();
((Startable) getDevice("Scienta")).stop();
} catch (Exception ex) {
showException(ex);
}