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

Closedown

Browse Source
This commit is contained in:
sfop
2017-03-15 15:03:26 +01:00
parent 917d5ea14e
commit 0d74f85075
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
devices/CurrentCamera.properties
View File

@@ -1,13 +1,13 @@
#Wed Mar 15 10:39:06 CET 2017
#Wed Mar 15 13:17:39 CET 2017
colormap=Temperature
colormapAutomatic=true
colormapMax=0.0
colormapMin=0.0
flipHorizontally=false
flipVertically=false
flipVertically=true
grayscale=false
imageHeight=2160
imageWidth=2560
imageHeight=1200
imageWidth=1246
invert=false
rescaleFactor=1.0
rescaleOffset=0.0
@@ -19,9 +19,9 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=0.0
spatialCalOffsetY=0.0
spatialCalScaleX=1.0
spatialCalScaleY=1.0
spatialCalOffsetX=-630.0
spatialCalOffsetY=-612.0
spatialCalScaleX=-26.761819803746654
spatialCalScaleY=-26.595744680851062
spatialCalUnits=mm
transpose=false

10
devices/camtool.properties
View File

@@ -1,4 +1,4 @@
#Tue Feb 14 15:22:15 CET 2017
#Wed Mar 15 13:19:22 CET 2017
colormap=Temperature
colormapAutomatic=true
colormapMax=578.797
@@ -18,9 +18,9 @@ roiY=0
rotation=0.0
rotationCrop=false
scale=1.0
spatialCalOffsetX=0.0
spatialCalOffsetY=0.0
spatialCalScaleX=1.0
spatialCalScaleY=1.0
spatialCalOffsetX=8751.115234375
spatialCalOffsetY=16090.42578125
spatialCalScaleX=-26.761820720381525
spatialCalScaleY=-26.595745478002502
spatialCalUnits=mm
transpose=false

2
plugins/ScreenPanel.form
View File

@@ -186,7 +186,7 @@
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="comboCameras" pref="178" max="32767" attributes="0"/>
<Component id="comboCameras" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="buttonConfig" linkSize="3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>

6
plugins/ScreenPanel.java
View File

@@ -1401,7 +1401,7 @@ public class ScreenPanel extends Panel {
}
void saveSnapshot() throws Exception {
String snapshotFile = getContext().getSetup().expandPath("{images}/snapshot.png");
String snapshotFile = getContext().getSetup().expandPath("{images}/{date}_{time}_snapshot.png");
renderer.saveSnapshot(snapshotFile, "png", true);
getContext().setExecutionPars("snapshot");
String path = "/data";
@@ -1411,8 +1411,8 @@ public class ScreenPanel extends Panel {
message.append("Camera: ").append(cameraName).append(" (").
append((camera instanceof Camtool) ? "camtool" : "direct").append(")").append("\n");
message.append("Data file: ").append(getContext().getExecutionPars().getPath()).append("\n");
if ((fitOv != null) && (fitOv.length > 3)) {
Overlays.Text text = (Overlays.Text) fitOv[3];
if ((fitOv != null) && (fitOv.length > 5)) {
Overlays.Text text = (Overlays.Text) fitOv[5];
message.append(text.getText()).append("\n");
}
elog("ScreenPanel Snapshot", message.toString(), new String[]{snapshotFile});

1
script/RFscan/GunScan.py
View File

@@ -29,7 +29,6 @@ phase.initialize()
#camtool.getCameras()
check_camtool()
is_camtool_running()
camtool.start("simulation")
#x = Channel("SINEG01-DSCR190:X-SIM", type = 'd', alias='SCR-X')