pshell/pshell-apps
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added mechanism to display help of additional (undeclared) options.

Browse Source
This commit is contained in:
gobbo_a
2025-12-08 16:59:45 +01:00
parent d4af0e985e
commit 0056b0e113
8 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
screenpanel-sls/src/main/java/ScreenPanelSLS.java
View File

@@ -8,7 +8,6 @@ import ch.psi.pshell.epics.ChannelDouble;
import ch.psi.pshell.epics.Epics;
import ch.psi.pshell.imaging.Overlay;
import ch.psi.pshell.imaging.Overlays;
import ch.psi.pshell.imaging.Source;
import ch.psi.pshell.workbench.App;
import ch.psi.pshell.framework.Context;
import ch.psi.pshell.framework.Panel;
@@ -115,6 +114,7 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi
Logger.getLogger(ScreenPanelSLS.class.getName()).log(Level.SEVERE, null, ex);
}
}).start();
startTimer(2000);
} catch (Exception ex) {
Logger.getLogger(ScreenPanelSLS.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -150,6 +150,7 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi
@Override
public void onStop() {
stopTimer();
super.onStop();
}
@@ -199,23 +200,12 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi
@Override
protected void onTimer() {
//for (Device dev : new Device[]{screen, exposure}) {
// if (dev != null) {
// dev.request();
// }
//}
checkAppState();
if (App.hasArgument("s")) {
try {
((Source) getDevice("image")).initialize();
} catch (IOException ex) {
logger.log(Level.SEVERE, null, ex);
} catch (InterruptedException ex) {
logger.log(Level.SEVERE, null, ex);
for (Device dev : new Device[]{screen, exposure, flStep, mirror, ledPower}) {
if ((dev != null) && (dev.getState().isNormal())) {
dev.request();
}
}
}
checkAppState();
}
@Override