tell/X06SA
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-S_Changer
2019-02-12 13:44:08 +01:00
parent 911022b078
commit ae5a71bcdd
39 changed files with 106 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
script/data/samples.py
View File

@@ -134,18 +134,32 @@ def update_puck_table():
#Sample mount/unmount
def same_address(puck_add_1, sample_pos_1, puck_add_2, sample_pos_2):
if str(puck_add_1) != str(puck_add_2):
return False
try:
sample_pos_1 = int(sample_pos_1)
except:
return False
try:
sample_pos_2 = int(sample_pos_2)
except:
return False
return sample_pos_1 == sample_pos_2
def update_samples_info_sample_mount(puck_address, sample_position, sample_detected, sample_id):
try:
if (samples_info is not None) and (puck_address is not None):
if (samples_info is not None) and (puck_address is not None):
for si in samples_info:
if str(si["puckAddress"]) == str(puck_address) and str(si["samplePosition"]) == str(sample_position):
if same_address( si["puckAddress"], si["samplePosition"], puck_address, sample_position):
if sample_detected:
if si["sampleStatus"] != "Mounted":
si["sampleStatus"] = "Mounted"
si["sampleStatus"] = "Mounted"
try:
mount_count = int(si["sampleMountCount"])
except:
mount_count = 0
mount_count = 0
si["sampleMountCount"] = mount_count + 1
else:
si["sampleStatus"] = "Unknown"
@@ -157,12 +171,13 @@ def update_samples_info_sample_mount(puck_address, sample_position, sample_detec
return
except:
pass
def update_samples_info_sample_unmount(puck_address, sample_position):
try:
if (samples_info is not None) and (puck_address is not None):
for si in samples_info:
if str(si["puckAddress"]) == str(puck_address) and str(si["samplePosition"]) == str(sample_position):
if same_address( si["puckAddress"], si["samplePosition"], puck_address, sample_position):
si["sampleStatus"] = "HasBeenMounted"
save_samples_info()
return
@@ -173,7 +188,7 @@ def update_samples_info_sample_scan(puck_address, sample_position, sample_detect
try:
if (samples_info is not None) and (puck_address is not None):
for si in samples_info:
if str(si["puckAddress"]) == str(puck_address) and str(si["samplePosition"]) == str(sample_position):
if same_address( si["puckAddress"], si["samplePosition"], puck_address, sample_position):
if sample_detected:
if si["sampleStatus"] == "Unknown":
si["sampleStatus"] = "Present"
@@ -185,7 +200,7 @@ def update_samples_info_sample_scan(puck_address, sample_position, sample_detect
save_samples_info()
return
except:
pass
pass