diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 597ed2f..c74632b 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,13 +1,13 @@ -#Thu May 04 11:39:44 CEST 2017 +#Thu May 04 14:44:03 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=800.0 colormapMin=0.0 -flipHorizontally=true +flipHorizontally=false flipVertically=false grayscale=false -imageHeight=2160 -imageWidth=2560 +imageHeight=1024 +imageWidth=1280 invert=false regionStartX=1 regionStartY=1 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-1279.0 -spatialCalOffsetY=-1079.0 -spatialCalScaleX=-53.020711215318485 +spatialCalOffsetX=-1279.4997788627065 +spatialCalOffsetY=-1079.4997788915095 +spatialCalScaleX=-53.02070816236811 spatialCalScaleY=-53.02454840203798 spatialCalUnits=mm transpose=false diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index 5149878..7f56b3e 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -895,7 +895,11 @@ public class ScreenPanel extends Panel { //Parallelizing initialization devicesInitTask = new Thread(() -> { try { - screen = new DiscretePositioner("CurrentScreen", cameraName + ":SET_SCREEN1_POS", cameraName + ":GET_SCREEN1_POS"); + if (cameraName.contains("DSRM")){ + screen = new DiscretePositioner("CurrentScreen", cameraName + ":POSITION_SP", cameraName + ":POSITION"); + } else { + screen = new DiscretePositioner("CurrentScreen", cameraName + ":SET_SCREEN1_POS", cameraName + ":GET_SCREEN1_POS"); + } screen.setMonitored(true); screen.initialize(); DefaultComboBoxModel model = new DefaultComboBoxModel(); @@ -2774,7 +2778,11 @@ public class ScreenPanel extends Panel { ChannelInteger setpoint = null; try { int index = comboScreen.getSelectedIndex(); - setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS"); + if (cameraName.contains("DSRM")){ + setpoint = new ChannelInteger(null, cameraName + ":POSITION_SP"); + } else { + setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS"); + } setpoint.initialize(); if (setpoint.read() != index) { setpoint.write(index);