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
2017-03-30 14:04:31 +02:00
parent 542c97720f
commit 6b7ae3d3c4
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/CurrentCamera.properties
+10 -10
View File
@@ -1,16 +1,16 @@
#Thu Mar 30 11:38:02 CEST 2017
#Thu Mar 30 13:50:04 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapAutomatic=false
colormapMax=56778.0
colormapMin=0.0
flipHorizontally=false
flipVertically=false
grayscale=false
imageHeight=1024
imageWidth=1280
imageHeight=1680
imageWidth=1744
invert=false
regionStartX=1
regionStartY=1
regionStartX=433
regionStartY=241
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.477868576451
spatialCalOffsetY=-1024.4742906541314
spatialCalScaleX=-8.699279809007425
spatialCalScaleY=-8.747949625839508
spatialCalOffsetX=-231.47925413234378
spatialCalOffsetY=-230.51919169112023
spatialCalScaleX=-18.903590791947614
spatialCalScaleY=-19.379844234974605
spatialCalUnits=mm
transpose=false
plugins/ScreenPanel.java
+4 -4
View File
@@ -1622,12 +1622,12 @@ public class ScreenPanel extends Panel {
panel.add(p1, BorderLayout.NORTH);
JPanel p2 = new JPanel(new BorderLayout());
((BorderLayout) p2.getLayout()).setHgap(5);
p2.add(new JLabel("Reference marker width: "), BorderLayout.WEST);
p2.add(new JLabel("Reference marker width (um): "), BorderLayout.WEST);
p2.add(textWidth, BorderLayout.EAST);
panel.add(p2, BorderLayout.CENTER);
JPanel p3 = new JPanel(new BorderLayout());
((BorderLayout) p3.getLayout()).setHgap(5);
p3.add(new JLabel("Reference marker height: "), BorderLayout.WEST);
p3.add(new JLabel("Reference marker height(um): "), BorderLayout.WEST);
p3.add(textHeight, BorderLayout.EAST);
panel.add(p3, BorderLayout.SOUTH);
textWidth.setPreferredSize(new Dimension(70, textWidth.getPreferredSize().height));
@@ -1655,10 +1655,10 @@ public class ScreenPanel extends Panel {
HashMap c = new HashMap();
c.put("reference_marker", Arrays.asList(new Integer[]{x1, y1, x2, y2}));
if (textWidth.getText().trim().length() > 0){
c.put("reference_marker_width", Integer.valueOf(textWidth.getText()));
c.put("reference_marker_width", Double.valueOf(textWidth.getText()));
}
if (textHeight.getText().trim().length() > 0){
c.put("reference_marker_height", Integer.valueOf(textHeight.getText()));
c.put("reference_marker_height", Double.valueOf(textHeight.getText()));
}
((Camtool) camera).setCalibration(cameraName, c);
Logger.getLogger(ScreenPanel.class.getName()).warning("Updated " + cameraName + " calibration: " + x1 + ", "+ x2 + ", " + y1 + ", " + y2);