pshell_config/x04sa-es3
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Script execution

Browse Source
This commit is contained in:
gac-x04sa
2018-11-06 11:48:39 +01:00
parent 61770cef60
commit be06114b2b
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
script/device/Image.py
View File

@@ -63,7 +63,6 @@ class Image(DeviceBase, Readable):
self.corrected_intensity = ImageCorrectedIntensity(self)
self.last_filename = None
self.last_image = None
#self.current_reading = None
self.image_lock = threading.Lock()
@@ -101,34 +100,23 @@ class Image(DeviceBase, Readable):
filename = str(filename)
self.image_lock.acquire(True)
print "ACQUIRE"
try:
#print " -> ", filename, self.last_filename
if filename == self.last_filename:
print "EQUAL"
return self.last_image
#elif filename == self.current_reading:
# while self.current_reading is not None:
# time.sleep(0.005)
# return self.last_image
#self.current_reading = filename
print "Reading image : " + filename + " - " + str(hash(self))
print ("Reading image : " + str(filename))
try:
ret = img_read(filename, self.pixel.image_header_length, self.pixel.PIX_XDIM, self.pixel.PIX_YDIM,self.pixel.PIX_COLOR_DEPTH)
except:
log("Error reading data file: " + str(filename) + " - " + str(sys.exc_info()[1]), False)
print "NONE"
print ("Error reading data file: " + str(filename) + " - " + str(sys.exc_info()[1]))
self.last_filename = None
self.last_image = None
#self.current_reading = None
return None
ret = Convert.reshape(ret, self.pixel.PIX_YDIM, self.pixel.PIX_XDIM)
self.last_filename = filename
self.last_image = ret
#self.current_reading = None
return ret
finally:
print "RELEASE"
self.image_lock.release()
def read(self):
return self.get_int()