From 0595d3c620a766f890f2462cbccc8b949057c160 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 18 Feb 2020 16:16:06 +0000 Subject: [PATCH] Let camera object handle its own library rebuild --- openflexure_microscope/api/microscope.py | 5 +---- openflexure_microscope/camera/base.py | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openflexure_microscope/api/microscope.py b/openflexure_microscope/api/microscope.py index 2f534b49..09711e50 100644 --- a/openflexure_microscope/api/microscope.py +++ b/openflexure_microscope/api/microscope.py @@ -1,5 +1,4 @@ from openflexure_microscope import Microscope -from openflexure_microscope.camera.capture import build_captures_from_exif import logging @@ -8,8 +7,6 @@ default_microscope = Microscope() # Restore loaded capture array to camera object logging.debug("Restoring captures...") -default_microscope.camera.images = build_captures_from_exif( - default_microscope.camera.paths["default"] -) +default_microscope.camera.rebuild_captures() logging.debug("Microscope successfully attached!") diff --git a/openflexure_microscope/camera/base.py b/openflexure_microscope/camera/base.py index f74bbc0a..edd55dca 100644 --- a/openflexure_microscope/camera/base.py +++ b/openflexure_microscope/camera/base.py @@ -8,7 +8,7 @@ import logging from abc import ABCMeta, abstractmethod -from .capture import CaptureObject +from .capture import CaptureObject, build_captures_from_exif from openflexure_microscope.utilities import entry_by_uuid from labthings.core.lock import StrictLock @@ -177,6 +177,9 @@ class BaseCamera(metaclass=ABCMeta): shutil.rmtree(self.paths["temp"]) logging.debug("Cleared {}.".format(self.paths["temp"])) + def rebuild_captures(self): + self.images = build_captures_from_exif(self.paths["default"]) + # START AND STOP WORKER THREAD def start_worker(self, timeout: int = 5) -> bool: