This commit is contained in:
sfop
2017-08-23 14:04:39 +02:00
parent 1207513d79
commit 64de6de219
19 changed files with 5300 additions and 60 deletions

View File

@@ -190,10 +190,13 @@ public class SfCamera extends PsiCamera{
String cameraParsJson = new String(Files.readAllBytes(parsFile));
cameraPars = (CameraPars) JsonSerializer.decode(cameraParsJson, CameraPars.class);
if (cameraPars.getRoiEnable()){
getConfig().roiX = cameraPars.getRoi().get(0);
getConfig().roiY = cameraPars.getRoi().get(2);
getConfig().roiWidth = cameraPars.getRoi().get(1);
getConfig().roiHeight = cameraPars.getRoi().get(3);
ArrayList<Integer> roi = cameraPars.getRoi();
if ((roi.get(1)>0) && (roi.get(3)>0)){
getConfig().roiX = roi.get(0);
getConfig().roiY = roi.get(2);
getConfig().roiWidth = roi.get(1);
getConfig().roiHeight = roi.get(3);
}
}
}