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-19 12:20:35 +02:00
parent aac9dc3603
commit 5e1371dae4
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
devices/CurrentCamera.properties
View File

@@ -1,12 +1,12 @@
#Mon Sep 19 11:22:10 CEST 2016
#Mon Sep 19 12:19:29 CEST 2016
colormap=Grayscale
colormapAutomatic=true
colormapMax=0.0
colormapMin=0.0
flipHorizontally=false
flipVertically=false
flipHorizontally=true
flipVertically=true
grayscale=false
imageHeight=1024
imageHeight=1628
imageWidth=1280
invert=false
rescaleFactor=1.0
@@ -18,9 +18,9 @@ roiY=0
rotation=0.0
rotationCrop=true
scale=1.0
spatialCalOffsetX=NaN
spatialCalOffsetY=NaN
spatialCalScaleX=NaN
spatialCalScaleY=NaN
spatialCalOffsetX=-685.0
spatialCalOffsetY=-874.0
spatialCalScaleX=14.146772767462423
spatialCalScaleY=12.708498808578236
spatialCalUnits=mm
transpose=false

21
plugins/ScreenPanel.java
View File

@@ -689,8 +689,8 @@ public class ScreenPanel extends Panel {
final public ChannelDouble posX, posY;
final public ChannelDoubleArray profileX, profileY;
final public ChannelIntegerArray shape;
final public ChannelInteger roiEnabled;
final public ChannelIntegerArray roiShape;
//final public ChannelInteger roiEnabled;
//final public ChannelIntegerArray roiShape;
final public ChannelInteger bgEnable, bgCapture, bgCaptureRemain;
final public ChannelDouble calOffX, calOffY, calScaleX, calScaleY;
@@ -716,9 +716,10 @@ public class ScreenPanel extends Panel {
profileX = new ChannelDoubleArray(name + " profile x", dataPrefix + "profile.x");
profileY = new ChannelDoubleArray(name + " profile y", dataPrefix + "profile.y");
//shape = new ChannelIntegerArray(name + " shape", dataPrefix + (roi ? "roi.output.shape" : "image.shape"));
shape = new ChannelIntegerArray(name + " shape", dataPrefix + ("image.shape"));
roiShape = new ChannelIntegerArray(name + " roi shape", dataPrefix + "roi.roi");
roiEnabled = new ChannelInteger(name + " roi enabled", dataPrefix + "roi.enabled");
//shape = new ChannelIntegerArray(name + " shape", dataPrefix + ("image.shape"));
shape = new ChannelIntegerArray(name + " shape", dataPrefix + ("roi.output.shape"));
//roiShape = new ChannelIntegerArray(name + " roi shape", dataPrefix + "roi.roi");
//roiEnabled = new ChannelInteger(name + " roi enabled", dataPrefix + "roi.enabled");
//origin = new ChannelDoubleArray(name + " origin X", roi ? (dataPrefix + "roi.origin_out") : (prefix + "origin"));
origin = new ChannelDoubleArray(name + " origin X", dataPrefix + "roi.origin_out");
bgEnable = new ChannelInteger(name + " bg enable", this.prefix + "pipeline.bg.enabled");
@@ -771,8 +772,8 @@ public class ScreenPanel extends Panel {
profileX.initialize();
profileY.initialize();
shape.initialize();
roiShape.initialize();
roiEnabled.initialize();
//roiShape.initialize();
//roiEnabled.initialize();
origin.initialize();
bgEnable.initialize();
bgCapture.initialize();
@@ -786,17 +787,19 @@ public class ScreenPanel extends Panel {
ex.printStackTrace();
}
if (roiEnabled.read() > 0) {
/*
if (roiEnabled.read() > 0) {
int[] s = roiShape.read();
//for (int x : s) System.out.println(x);
getConfig().imageHeight = s[3];
getConfig().imageWidth = s[2];
} else {
*/
int[] s = shape.read();
//for (int x : s){ System.out.println(x);}
getConfig().imageHeight = s[0];
getConfig().imageWidth = s[1];
}
//}
getConfig().save();
getDevice().setSize(getConfig().imageHeight * getConfig().imageWidth);