Tidied up todos

openflexure_microscope/camera/base.py

@@ -42,11 +42,6 @@ def generate_numbered_basename(obj_list: list) -> str:
     return basename
 
 
-def shunt_captures(target_list: list):
-    for obj in target_list:  # For each older capture
-        obj.shunt()  # Shunt capture from memory to storage
-
-
 class CameraEvent(object):
     """
     A frame-signaller object used by any instances or subclasses of BaseCamera.
@@ -295,7 +290,6 @@ class BaseCamera(metaclass=ABCMeta):
         output = CaptureObject(filepath=filepath)
 
         # Update capture list
-        shunt_captures(self.images)
         self.images.append(output)
 
         return output
@@ -336,7 +330,6 @@ class BaseCamera(metaclass=ABCMeta):
         output = CaptureObject(filepath=filepath)
 
         # Update capture list
-        shunt_captures(self.videos)
         self.videos.append(output)
 
         return output

openflexure_microscope/camera/capture.py

@@ -99,6 +99,7 @@ def capture_from_exif(path, exif_dict):
 class CaptureObject(object):
     """
     StreamObject used to store and process on-disk capture data, and metadata.
+    Serves to simplify modifying properties of on-disk capture data.
 
     Attributes:
         timestring (str): Timestring of capture creation time
@@ -314,10 +315,5 @@ class CaptureObject(object):
         else:
             return False
 
-    def shunt(self):
-        # TODO: Remove
-        pass
-
     def close(self):
-        # TODO: Remove
         pass

openflexure_microscope/camera/pi.py

@@ -131,7 +131,6 @@ class PiCameraStreamer(BaseCamera):
         Args:
             config (dict): Dictionary of config parameters.
         """
-        # TODO: Include timing and batching logic when applying PiCamera settings
 
         paused_stream = False
         logging.debug("PiCameraStreamer: Applying config:")
@@ -260,9 +259,6 @@ class PiCameraStreamer(BaseCamera):
         """Start the on board GPU camera preview."""
         logging.info("Starting the GPU preview")
 
-        # TODO: Commented out as I honestly can't remember why this was here. May need to put back?
-        # self.start_stream_recording()
-
         try:
             if not self.camera.preview:
                 logging.debug("Starting preview")