Commit c15539d3 authored by Manuela Kuhn's avatar Manuela Kuhn
Browse files

Fixed examples

parent ed0a43eb
......@@ -15,7 +15,7 @@ if not API_PATH in sys.path:
del API_PATH
from dataTransferAPI import dataTransfer
from dectris import albula
#from dectris import albula
class LiveView(QThread):
......@@ -34,8 +34,8 @@ class LiveView(QThread):
mutex = None
zmqQuery = None
zmqSignalIp = "haspp11eval01.desy.de"
# zmqSignalIp = "zitpcx19282.desy.de"
# zmqSignalIp = "haspp11eval01.desy.de"
zmqSignalIp = "zitpcx19282.desy.de"
# zmqSignalIp = "zitpcx22614w.desy.de"
zmqDataPort = "50022"
# basePath = BASE_PATH + os.sep + "data" + os.sep + "target"
......@@ -107,18 +107,18 @@ class LiveView(QThread):
# time.sleep(0.2)
# display image
try:
self.subframe.loadFile(receivedFile)
# viewer or subframe has been closed by the user
except:
self.mutex.unlock()
time.sleep(0.1)
try:
self.subframe = self.viewer.openSubFrame()
except:
self.viewer = albula.openMainFrame()
self.subframe = self.viewer.openSubFrame()
continue
# try:
# self.subframe.loadFile(receivedFile)
# # viewer or subframe has been closed by the user
# except:
# self.mutex.unlock()
# time.sleep(0.1)
# try:
# self.subframe = self.viewer.openSubFrame()
# except:
# self.viewer = albula.openMainFrame()
# self.subframe = self.viewer.openSubFrame()
# continue
self.mutex.unlock()
# wait interval
interval = 0.0
......
......@@ -9,7 +9,6 @@ API_PATH = BASE_PATH + os.sep + "APIs"
if not API_PATH in sys.path:
sys.path.append ( API_PATH )
del API_PATH
del BASE_PATH
from dataTransferAPI import dataTransfer
......@@ -18,7 +17,8 @@ signalHost = "zitpcx19282.desy.de"
#signalHost = "zitpcx22614w.desy.de"
targets = ["zitpcx19282.desy.de", "50101", 0]
#targets = ["zitpcx22614w.desy.de", "50101", 0]
basePath = BASE_PATH + os.sep + "data" + os.sep + "target"
baseTargetPath = BASE_PATH + os.sep + "data" + os.sep + "target"
del BASE_PATH
print
print "==== TEST: Query for the newest filename ===="
......@@ -37,7 +37,7 @@ while True:
break
print
print query.generateTargetFilepath(basePath, metadata)
print query.generateTargetFilepath(baseTargetPath, metadata)
print
# time.sleep(0.1)
......
......@@ -14,10 +14,10 @@ del BASE_PATH
from dataTransferAPI import dataTransfer
#signalHost = "zitpcx19282.desy.de"
signalHost = "zitpcx22614w.desy.de"
#targets = ["zitpcx19282.desy.de", "50101", 0]
targets = ["zitpcx22614w.desy.de", "50101", 0]
signalHost = "zitpcx19282.desy.de"
#signalHost = "zitpcx22614w.desy.de"
targets = ["zitpcx19282.desy.de", "50101", 0]
#targets = ["zitpcx22614w.desy.de", "50101", 0]
print
print "==== TEST: Query for the newest filename ===="
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment