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
2016-08-30 15:04:11 +02:00
parent bc93fbdcc1
commit dd03fb0bc7
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
devices/CurrentCamera.properties
View File

@@ -1,8 +1,8 @@
#Mon Aug 29 18:46:30 CEST 2016
#Tue Aug 30 14:52:41 CEST 2016
colormap=Grayscale
colormapAutomatic=false
colormapMax=500.778
colormapMin=91.051
colormapMax=104.529
colormapMin=93.74
flipHorizontally=false
flipVertically=false
grayscale=false
@@ -18,9 +18,9 @@ roiY=0
rotation=0.0
rotationCrop=true
scale=1.0
spatialCalOffsetX=NaN
spatialCalOffsetY=NaN
spatialCalScaleX=NaN
spatialCalScaleY=NaN
spatialCalOffsetX=1158.0
spatialCalOffsetY=1383.0
spatialCalScaleX=0.037037037037037035
spatialCalScaleY=0.008064516129032258
spatialCalUnits=mm
transpose=false

28
plugins/Cameras.java
View File

@@ -16,6 +16,7 @@ import ch.psi.utils.swing.StandardDialog;
import ch.psi.utils.swing.TextEditor;
import ch.psi.pshell.epics.PsiCamera;
import ch.psi.pshell.core.JsonSerializer;
import ch.psi.pshell.ui.App;
import ch.psi.pshell.imaging.Data;
import ch.psi.utils.swing.Editor.EditorDialog;
import java.awt.Dimension;
@@ -60,9 +61,13 @@ public class Cameras extends Panel {
}
}
comboCameras.setModel(model);
comboCameras.setSelectedItem(-1);
if (model.getSize()>0){
try {
setCamera((String)comboCameras.getSelectedItem());
//setCamera((String)comboCameras.getSelectedItem());
if (App.hasArgument("cam")){
setCamera(App.getArgument("cam"));
}
} catch (Exception ex) {
}
}
@@ -158,14 +163,23 @@ public class Cameras extends Panel {
camera.getConfig().flipVertically = config.getMirrorY();
camera.getConfig().rotation = config.getRotate();
camera.getConfig().rotationCrop = true;
camera.getConfig().roiX = config.getRoiEnable() ? config.getRoi().get(0) : 0;
camera.getConfig().roiY = config.getRoiEnable() ?config.getRoi().get(1) : 0;
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().spatialCalOffsetX = (config.getOrigin()!=null) ? config.getOrigin().get(0) : Double.NaN;
camera.getConfig().spatialCalOffsetY = (config.getOrigin()!=null) ? config.getOrigin().get(1) : Double.NaN;
camera.getConfig().spatialCalScaleX = (config.getUnitSize()!=null) && (config.getOrigin().get(0)!=0) ? 1.0/(config.getOrigin().get(0)*1000) : Double.NaN;
camera.getConfig().spatialCalScaleY= (config.getUnitSize()!=null) && (config.getOrigin().get(1)!=0) ? 1.0/(config.getOrigin().get(1)*1000) : Double.NaN;
//camera.getConfig().spatialCalOffsetX = (config.getOrigin()!=null) ? config.getOrigin().get(0) : Double.NaN;
//camera.getConfig().spatialCalOffsetY = (config.getOrigin()!=null) ? config.getOrigin().get(1) : Double.NaN;
//camera.getConfig().spatialCalScaleX = (config.getUnitSize()!=null) && (config.getOrigin().get(0)!=0) ? 1.0/(config.getOrigin().get(0)*1000) : Double.NaN;
//camera.getConfig().spatialCalScaleY= (config.getUnitSize()!=null) && (config.getOrigin().get(1)!=0) ? 1.0/(config.getOrigin().get(1)*1000) : Double.NaN;
ArrayList<Integer> calibration = config.getCalibration();
if ((calibration!=null) && (calibration.size()!=4)){
calibration=null;
}
camera.getConfig().spatialCalOffsetX = (calibration!=null) ? - calibration.get(2) : Double.NaN;
camera.getConfig().spatialCalOffsetY = (calibration!=null) ? - calibration.get(3) : Double.NaN;
camera.getConfig().spatialCalScaleX = (calibration!=null) && (calibration.get(0)!=0) ? 1.0/(calibration.get(0)) : Double.NaN;
camera.getConfig().spatialCalScaleY= (calibration!=null) && (calibration.get(1)!=0) ? 1.0/(calibration.get(1)) : Double.NaN;
} catch (Exception ex){
config = null;