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

Startup

Browse Source
This commit is contained in:
sfop
2016-09-01 09:34:10 +02:00
parent 0f160bc67b
commit dc44cd44cc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Cameras.java
View File

@@ -46,7 +46,7 @@ public class Cameras extends Panel {
public Cameras() {
initComponents();
renderer.setPersistenceFile(Paths.get(getController().getSetup().getContextPath(), "Renderer_Cameras.bin"));
setPersistedComponents(new Component[]{});
setPersistedComponents(new Component[]{checkCamtool});
}
final String configFolder = "/afs/psi.ch/intranet/SF/Applications/config/camtool";
@@ -176,7 +176,7 @@ public class Cameras extends Panel {
//SwingUtils.showMessage(null, "", json);
try {
if (checkCamtool.isSelected()) {
camera = new Camtool("CurrentCamera", cameraName, true, true);
camera = new Camtool("CurrentCamera", cameraName, false, true);
} else {
camera = new PsiCamera("CurrentCamera", cameraName);
config = (CameraConfig) JsonSerializer.decode(cameraConfigJson, CameraConfig.class);
@@ -264,7 +264,7 @@ public class Cameras extends Panel {
//final public CamToolVarY posVarY;
public Camtool(String name, String prefix) {
this(name, prefix, true, true);
this(name, prefix, false, true);
}
public Camtool(String name, String prefix, boolean latch, boolean roi) {