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

Fixed finding captures by UUID

Browse source
This commit is contained in:
Joel Collins 2020-01-14 15:29:35 +00:00
parent 0f16c5c894
commit bf9a1e358e
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/camera/base.py
View file

@ -9,7 +9,7 @@ import logging
from abc import ABCMeta, abstractmethod
from .capture import CaptureObject
from openflexure_microscope.utilities import entry_by_id
from openflexure_microscope.utilities import entry_by_uuid
from openflexure_microscope.common.labthings_core.lock import StrictLock
@ -250,11 +250,11 @@ class BaseCamera(metaclass=ABCMeta):
def image_from_id(self, image_id):
"""Return an image StreamObject with a matching ID."""
return entry_by_id(image_id, self.images)
return entry_by_uuid(image_id, self.images)
def video_from_id(self, video_id):
"""Return a video StreamObject with a matching ID."""
return entry_by_id(video_id, self.videos)
return entry_by_uuid(video_id, self.videos)
# CREATING NEW CAPTURES