diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index cbaf0f8..d0c11a4 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Thu Sep 01 09:55:14 CEST 2016 +#Thu Sep 01 10:03:17 CEST 2016 colormap=Temperature colormapAutomatic=true colormapMax=4281.715 @@ -6,8 +6,8 @@ colormapMin=0.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=0 -imageWidth=0 +imageHeight=1200 +imageWidth=1246 invert=false rescaleFactor=1.0 rescaleOffset=0.0 diff --git a/plugins/Cameras.java b/plugins/Cameras.java index 8c5a39a..63bbc57 100644 --- a/plugins/Cameras.java +++ b/plugins/Cameras.java @@ -77,7 +77,6 @@ public class Cameras extends Panel { try { //setCamera((String)comboCameras.getSelectedItem()); if (App.hasArgument("cam")) { - System.out.println("Setting camera:" + App.getArgumentValue("cam")); comboCameras.setSelectedItem(App.getArgumentValue("cam")); } } catch (Exception ex) { @@ -168,7 +167,7 @@ public class Cameras extends Panel { } void setCamera(String cameraName) throws IOException, InterruptedException { - System.out.println("Setting camera:" + cameraName); + System.out.println("Setting camera: " + cameraName); if (camera != null) { camera.close(); camera = null; @@ -215,8 +214,8 @@ public class Cameras extends Panel { camera.getConfig().save(); camera.initialize(); - //camera.setMonitored(true); - camera.setPolling(500); + camera.setMonitored(true); + camera.getDevice().setPolling(500); renderer.setDevice(camera); renderer.setShowReticle(true);