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:
voulot_d
2017-04-04 11:42:34 +02:00
parent 94b403ca4f
commit 3d8fb35bd8
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
devices/CurrentCamera.properties
View File

@@ -1,4 +1,4 @@
#Tue Apr 04 09:20:39 CEST 2017
#Tue Apr 04 11:04:32 CEST 2017
colormap=Flame
colormapAutomatic=false
colormapMax=1000.0
@@ -6,11 +6,11 @@ colormapMin=10.0
flipHorizontally=false
flipVertically=false
grayscale=false
imageHeight=2160
imageWidth=2560
imageHeight=1628
imageWidth=1280
invert=false
regionStartX=1
regionStartY=1
regionStartX=865
regionStartY=267
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
@@ -21,9 +21,9 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=-1223.0
spatialCalOffsetY=-1024.0
spatialCalScaleX=-8.784773060029282
spatialCalScaleY=-8.74794969928923
spatialCalOffsetX=NaN
spatialCalOffsetY=NaN
spatialCalScaleX=NaN
spatialCalScaleY=NaN
spatialCalUnits=mm
transpose=false

26
plugins/ScreenPanel.java
View File

@@ -730,16 +730,20 @@ public class ScreenPanel extends Panel {
config = (CameraConfig) JsonSerializer.decode(cameraConfigJson, CameraConfig.class);
CameraPars cameraPars = null;
camera.getConfig().roiX = 0; camera.getConfig().roiY = 0;
camera.getConfig().roiWidth = -1; camera.getConfig().roiHeight =-1;
try{
Path parsFile = Paths.get(CONFIG_FOLDER, cameraName + "_parameters.json");
if (parsFile.toFile().exists()){
String cameraParsJson = new String(Files.readAllBytes(parsFile));
cameraPars = (CameraPars) JsonSerializer.decode(cameraParsJson, CameraPars.class);
boolean roi = cameraPars.getRoiEnable();
camera.getConfig().roiX = roi ? cameraPars.getRoi().get(0) : 0;
camera.getConfig().roiY = roi ? cameraPars.getRoi().get(2) : 0;
camera.getConfig().roiWidth = roi ? cameraPars.getRoi().get(1) : -1;
camera.getConfig().roiHeight =roi ? cameraPars.getRoi().get(3) : -1;
if (cameraPars.getRoiEnable()){
camera.getConfig().roiX = cameraPars.getRoi().get(0);
camera.getConfig().roiY = cameraPars.getRoi().get(2);
camera.getConfig().roiWidth = cameraPars.getRoi().get(1);
camera.getConfig().roiHeight = cameraPars.getRoi().get(3);
}
}
} catch (Exception ex){
@@ -761,11 +765,13 @@ public class ScreenPanel extends Panel {
camera.getConfig().rotation = 90;
break;
}
camera.getConfig().rotationCrop = false;
//camera.getConfig().roiX = config.getRoiEnable() ? config.getRoi().get(0) : 0;
//camera.getConfig().roiY = config.getRoiEnable() ? config.getRoi().get(1) : 0;
//camera.getConfig().roiWidth = config.getRoiEnable() ? config.getRoi().get(2) : -1;
//camera.getConfig().roiHeight = config.getRoiEnable() ? config.getRoi().get(3) : -1;
camera.getConfig().rotationCrop = false;
//if (config.getRoiEnable()){
// camera.getConfig().roiX = config.getRoi().get(0);
// camera.getConfig().roiY = config.getRoi().get(1);
// camera.getConfig().roiWidth = config.getRoi().get(2);
// camera.getConfig().roiHeight = config.getRoi().get(3);
//}
try {
camera.getConfig().spatialCalOffsetX = config.getCalOffsetX();
camera.getConfig().spatialCalOffsetY = config.getCalOffsetY();