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

Removed old picamera_lst_path attribute

Browse source
This commit is contained in:
Joel Collins 2020-11-17 16:21:05 +00:00
parent 39a112301a
commit 85f77fa867
1 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
openflexure_microscope/camera/pi.py
View file

@ -102,19 +102,12 @@ class PiCameraStreamer(BaseCamera):
self.jpeg_quality = 100 #: int: JPEG quality self.jpeg_quality = 100 #: int: JPEG quality
self.mjpeg_quality = 75 #: int: MJPEG quality self.mjpeg_quality = 75 #: int: MJPEG quality
# Set default lens shading table path
self.picamera_lst_path = settings_file_path(
"picamera_lst.npy"
) #: str: Path of .npy lens shading table file
# Run this initialisation method
self._wait_for_camera()
# Start stream recording (and set resolution) # Start stream recording (and set resolution)
self.start_stream_recording() self.start_stream_recording()
# Wait until frames are available # Wait until frames are available
logging.info("Waiting for frames") logging.debug("Waiting for frames...")
self.stream.new_frame.wait() self.stream.new_frame.wait()
logging.info("Frames incoming!") logging.debug("Camera initialised")
@property @property
def configuration(self): def configuration(self):
@ -136,15 +129,6 @@ class PiCameraStreamer(BaseCamera):
if self.camera: if self.camera:
self.camera.close() self.camera.close()
def _wait_for_camera(self, timeout=5):
"""Wait for camera object, with 5 second timeout."""
timeout_time = time.time() + timeout
while not self.camera:
if time.time() > timeout_time:
raise TimeoutError("Timeout waiting for camera")
else:
pass
# HANDLE SETTINGS # HANDLE SETTINGS
def read_settings(self) -> dict: def read_settings(self) -> dict:
""" """