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

Removed redundant start_workers() calls

Browse source
This commit is contained in:
Joel Collins 2018-11-07 12:04:08 +00:00
parent a7598c5e5b
commit 54f906f525
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openflexure_microscope/camera/pi.py
View file

@ -106,8 +106,6 @@ class StreamingCamera(BaseCamera):
if not self.state['record_active']: # If not recording a video if not self.state['record_active']: # If not recording a video
#self.start_worker()
if self.state['stream_active']: # If stream is active if self.state['stream_active']: # If stream is active
logging.info("Pausing stream to update settings.") logging.info("Pausing stream to update settings.")
self.pause_stream_for_capture() # Pause stream self.pause_stream_for_capture() # Pause stream
@ -164,8 +162,6 @@ class StreamingCamera(BaseCamera):
def change_zoom(self, zoom_value: int=1) -> None: def change_zoom(self, zoom_value: int=1) -> None:
"""Change the camera zoom, handling recentering and scaling.""" """Change the camera zoom, handling recentering and scaling."""
#self.start_worker()
zoom_value = float(zoom_value) zoom_value = float(zoom_value)
if zoom_value < 1: if zoom_value < 1:
zoom_value = 1 zoom_value = 1
@ -187,16 +183,12 @@ class StreamingCamera(BaseCamera):
def start_preview(self) -> bool: def start_preview(self) -> bool:
"""Start the onboard GPU camera preview.""" """Start the onboard GPU camera preview."""
#self.start_worker()
self.camera.start_preview() self.camera.start_preview()
self.state['preview_active'] = True self.state['preview_active'] = True
return True return True
def stop_preview(self) -> bool: def stop_preview(self) -> bool:
"""Stop the onboard GPU camera preview.""" """Stop the onboard GPU camera preview."""
#self.start_worker()
self.camera.stop_preview() self.camera.stop_preview()
self.state['preview_active'] = False self.state['preview_active'] = False
return True return True
@ -224,7 +216,6 @@ class StreamingCamera(BaseCamera):
# Start recording method only if a current recording is not running # Start recording method only if a current recording is not running
if not self.state['record_active']: if not self.state['record_active']:
#self.start_worker()
# If no target is specified, store to StreamingCamera # If no target is specified, store to StreamingCamera
if not target: if not target:
@ -341,7 +332,6 @@ class StreamingCamera(BaseCamera):
(default 'h264') (default 'h264')
resize ((int, int)): Resize the captured image. resize ((int, int)): Resize the captured image.
""" """
#self.start_worker()
# If no target is specified, store to StreamingCamera # If no target is specified, store to StreamingCamera
if not target: if not target:
@ -389,7 +379,6 @@ class StreamingCamera(BaseCamera):
use_video_port (bool): Capture from the video port used for streaming (lower resolution, faster) use_video_port (bool): Capture from the video port used for streaming (lower resolution, faster)
resize ((int, int)): Resize the captured image. resize ((int, int)): Resize the captured image.
""" """
#self.start_worker()
if use_video_port: if use_video_port:
resolution = self.settings['video_resolution'] resolution = self.settings['video_resolution']