From 239f4277d84cb51e78f68effc8d1ab4d75c73c0d Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 9 Mar 2017 14:08:53 +0100 Subject: [PATCH] Closedown --- devices/CurrentCamera.properties | 10 +++++----- script/local.py | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 6456883..cd80f4e 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Thu Mar 09 13:02:14 CET 2017 +#Thu Mar 09 13:58:41 CET 2017 colormap=Temperature colormapAutomatic=true colormapMax=0.0 @@ -19,9 +19,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=472.798095703125 -spatialCalOffsetY=5502.50439453125 -spatialCalScaleX=-29.54988184900188 -spatialCalScaleY=-26.71118617574497 +spatialCalOffsetX=16275.9921875 +spatialCalOffsetY=15891.47265625 +spatialCalScaleX=-18.90359092620482 +spatialCalScaleY=-19.37984500632817 spatialCalUnits=mm transpose=false diff --git a/script/local.py b/script/local.py index cf238f1..3f01beb 100755 --- a/script/local.py +++ b/script/local.py @@ -176,13 +176,14 @@ class Sinusoid(ReadonlyRegisterBase): #Pseudo devices +""" add_device(Sinusoid("phase"), True) add_device(Sinusoid("bpm_q"), True) add_device(Sinusoid("center_x"), True) add_device(Sinusoid("center_y"), True) center_x.setPolling(100) center_y.setPolling(100) - +""" #Camtool "child" pseudo-devices class CamtoolValue(Readable): def __init__(self, channel):