Closedown

This commit is contained in:
sfop
2017-03-30 09:06:41 +02:00
parent 6e0e506ea4
commit fdedb9645d
3 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
#Wed Mar 29 14:43:23 CEST 2017
#Thu Mar 30 09:01:35 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapMax=3000.0
@@ -21,9 +21,9 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=-601.4914234119722
spatialCalOffsetY=-605.4987852604538
spatialCalScaleX=-14.25508083989166
spatialCalScaleY=-13.524936559666116
spatialCalOffsetX=-50.03909304143862
spatialCalOffsetY=-50.048875855327466
spatialCalScaleX=-1.0
spatialCalScaleY=-1.0
spatialCalUnits=mm
transpose=false

View File

@@ -1,4 +1,4 @@
#Fri Mar 24 09:56:37 CET 2017
#Thu Mar 30 09:01:02 CEST 2017
colormap=Temperature
colormapAutomatic=true
colormapMax=578.797
@@ -18,9 +18,9 @@ roiY=0
rotation=0.0
rotationCrop=false
scale=1.0
spatialCalOffsetX=16275.9921875
spatialCalOffsetY=15891.47265625
spatialCalScaleX=-18.90359092620482
spatialCalScaleY=-19.37984500632817
spatialCalOffsetX=50.0
spatialCalOffsetY=50.0
spatialCalScaleX=-1.0
spatialCalScaleY=-1.0
spatialCalUnits=mm
transpose=false

View File

@@ -313,7 +313,7 @@ def is_camtool_running():
def kill_camtool():
return exec_cmd("killall -9 " + CAMTOOL_SERVER_SCRIPT)
def run_camtool():
def _run_camtool():
try:
cmd = "source /opt/gfa/python\n"
port = camtool.url[camtool.url.rfind(":")+1:]
@@ -326,7 +326,7 @@ def run_camtool():
def check_camtool():
if is_camtool_running():
return False
fork(run_camtool)
fork(_run_camtool)
start =time.time()
while not is_camtool_running():
if time.time() - start > 2.0: