diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 065c22b..9623b79 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,11 +1,11 @@ -#Wed Aug 10 12:34:59 CEST 2022 -spatialCalOffsetY=-485.427166868422 -spatialCalOffsetX=-638.5965043983313 +#Wed Aug 24 15:39:35 CEST 2022 +spatialCalOffsetY=-108.48214394316378 +spatialCalOffsetX=-183.47905653612258 colormapLogarithmic=false scale=1.0 grayscale=false -spatialCalScaleX=-35.21126791588346 -spatialCalScaleY=-48.38709170854271 +spatialCalScaleX=-35.211268559800395 +spatialCalScaleY=-48.387098039899556 colormapMax=255.0 rescaleOffset=0.0 roiWidth=-1 diff --git a/script/local.py b/script/local.py index 5d90fe1..970a31a 100644 --- a/script/local.py +++ b/script/local.py @@ -26,10 +26,7 @@ _load(util.spec_from_file_location("zmq", PYHOME + "/lib/python" + PYVER + "/sit import zmq #zmq.LINGER = 0 -from bsread import source as bs_source - -from bsread import Source, PUB, SUB, PUSH, PULL, DEFAULT_DISPATCHER_URL - +from bsread import source, Source, PUB, SUB, PUSH, PULL, DEFAULT_DISPATCHER_URL from cam_server import CamClient, PipelineClient, ProxyClient, config from cam_server.utils import get_host_port_from_stream_address diff --git a/script/test/test_stream_out.py b/script/test/test_stream_out.py index 8b4f647..9897e65 100644 --- a/script/test/test_stream_out.py +++ b/script/test/test_stream_out.py @@ -29,7 +29,7 @@ def send(): thread = Thread(target=send) thread.start() -with bs_source(host="127.0.0.1", port=OUTPUT_PORT, mode=SUB, receive_timeout = 3000) as stream: +with source(host="127.0.0.1", port=OUTPUT_PORT, mode=SUB, receive_timeout = 3000) as stream: data = stream.receive() if not data: raise Exception("Received None message.")