From 995f1738ed7eceaec6a7c02aa70eec83182f6e9f Mon Sep 17 00:00:00 2001 From: sfop Date: Fri, 4 Nov 2016 11:42:56 +0100 Subject: [PATCH] Closedown --- config/jcae.properties | 4 ++-- devices/CurrentCamera.properties | 4 ++-- plugins/ScreenPanel.java | 2 +- script/test/averager.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/jcae.properties b/config/jcae.properties index c95539c..aadac65 100755 --- a/config/jcae.properties +++ b/config/jcae.properties @@ -1,8 +1,8 @@ -#Fri Sep 09 17:52:49 CEST 2016 +#Fri Nov 04 11:42:44 CET 2016 ch.psi.jcae.ContextFactory.addressList=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.120.255 ch.psi.jcae.ContextFactory.maxArrayBytes=50000000 ch.psi.jcae.ChannelFactory.retries=1 -ch.psi.jcae.ChannelFactory.timeout=500 +ch.psi.jcae.ChannelFactory.timeout=1000 ch.psi.jcae.impl.DefaultChannelService.retries=4 ch.psi.jcae.impl.DefaultChannelService.timeout=1000 ch.psi.jcae.ContextFactory.serverPort= diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index ea8cf54..03c5528 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,10 +1,10 @@ -#Fri Nov 04 11:28:30 CET 2016 +#Fri Nov 04 11:36:17 CET 2016 colormap=Temperature colormapAutomatic=true colormapMax=0.0 colormapMin=0.0 flipHorizontally=false -flipVertically=true +flipVertically=false grayscale=false imageHeight=1200 imageWidth=1246 diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index ec7ef8b..6195a22 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -716,7 +716,7 @@ public class ScreenPanel extends Panel { buttonPauseActionPerformed(null); } if (renderer.getShowReticle() != buttonReticle.isSelected()) { - buttonReticle.setSelected(renderer.getShowReticle()); + //buttonReticle.setSelected(renderer.getShowReticle()); } if ((renderer.getMarker() == null) && buttonMarker.isSelected()) { buttonMarker.setSelected(false); diff --git a/script/test/averager.py b/script/test/averager.py index 818f9c9..7f7b0a9 100644 --- a/script/test/averager.py +++ b/script/test/averager.py @@ -1,2 +1,2 @@ -av = create_averager(center_x, 5, 0.1) +av = create_averager(gun_phase.readback, 5, 0.1) res= tscan(av, 10, 0.1) \ No newline at end of file