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

02.2026

Browse Source
This commit is contained in:
gobbo_a
2026-02-09 15:06:52 +01:00
parent 4f6a49c538
commit f841fbc0ea
163 changed files with 576 additions and 49654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/SfCamera.java
View File

@@ -1,7 +1,7 @@
import ch.psi.pshell.core.JsonSerializer;
import ch.psi.pshell.utils.EncoderJson;
import ch.psi.pshell.epics.PsiCamera;
import ch.psi.utils.IO;
import ch.psi.pshell.utils.IO;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@@ -178,7 +178,7 @@ public class SfCamera extends PsiCamera{
throw new IOException("Cannot open camera config file: " + configFile.toFile());
}
json = new String(Files.readAllBytes(configFile));
setup = (CameraConfig) JsonSerializer.decode(json, CameraConfig.class);
setup = (CameraConfig) EncoderJson.decode(json, CameraConfig.class);
CameraPars cameraPars = null;
getConfig().roiX = 0; getConfig().roiY = 0;
@@ -188,7 +188,7 @@ public class SfCamera extends PsiCamera{
Path parsFile = Paths.get(configFolder, prefix + "_parameters.json");
if (parsFile.toFile().exists()){
String cameraParsJson = new String(Files.readAllBytes(parsFile));
cameraPars = (CameraPars) JsonSerializer.decode(cameraParsJson, CameraPars.class);
cameraPars = (CameraPars) EncoderJson.decode(cameraParsJson, CameraPars.class);
if (cameraPars.getRoiEnable()){
ArrayList<Integer> roi = cameraPars.getRoi();
if ((roi.get(1)>0) && (roi.get(3)>0)){