rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed reloading timestamp in new format

Browse source
This commit is contained in:
Joel Collins 2020-11-03 16:11:30 +00:00
parent b69c90345f
commit 86732b8782
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openflexure_microscope/captures/capture.py
View file

@ -91,8 +91,8 @@ def capture_from_path(path):
# Populate capture parameters # Populate capture parameters
capture.id = image_metadata.get("id") capture.id = image_metadata.get("id")
capture.datetime = dateutil.parser.isoparse( capture.time = dateutil.parser.isoparse(
image_metadata.get("acquisitionDate") image_metadata.get("time") or image_metadata.get("acquisitionDate")
) )
capture.format = image_metadata.get("format") capture.format = image_metadata.get("format")
capture.tags = image_metadata.get("tags") capture.tags = image_metadata.get("tags")
@ -120,7 +120,7 @@ class CaptureObject(object):
# Store a nice ID # Store a nice ID
self.id = uuid.uuid4() #: str: Unique capture ID self.id = uuid.uuid4() #: str: Unique capture ID
logging.debug("Created CaptureObject {}".format(self.id)) logging.debug("Created CaptureObject {}".format(self.id))
self.time = datetime.datetime.now() self.time = datetime.datetime.now()
# Create file name. Default to UUID # Create file name. Default to UUID
@ -177,7 +177,6 @@ class CaptureObject(object):
else: else:
return False return False
@property @property
def dataset(self) -> str: def dataset(self) -> str:
""" """
@ -190,7 +189,7 @@ class CaptureObject(object):
return { return {
"id": dataset.get("id"), "id": dataset.get("id"),
"name": dataset.get("name"), "name": dataset.get("name"),
"type": dataset.get("type") "type": dataset.get("type"),
} }
# HANDLE TAGS # HANDLE TAGS