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

Tidied up new config load/save. Fixes #6.

Browse source
This commit is contained in:
Joel Collins 2018-11-23 12:17:27 +00:00
parent c887f990b5
commit c87878a7dc
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
openflexure_microscope/camera/pi.py
View file

@ -51,7 +51,7 @@ from .set_picamera_gain import set_analog_gain, set_digital_gain
from .config import load_config, save_config, convert_config from .config import load_config, save_config, convert_config
HERE = os.path.abspath(os.path.dirname(__file__)) HERE = os.path.abspath(os.path.dirname(__file__))
DEFAULT_CONFIG = os.path.join(HERE, 'config_picamera.yaml') DEFAULT_CONFIG_PATH = os.path.join(HERE, 'config_picamera.yaml')
class StreamingCamera(BaseCamera): class StreamingCamera(BaseCamera):
@ -97,11 +97,11 @@ class StreamingCamera(BaseCamera):
Open config_picamera.yaml file and write to camera. Open config_picamera.yaml file and write to camera.
Args: Args:
config_path (str): Path to the config YAML file. config_path (str): Path to the config YAML file. If `None`, defaults to `DEFAULT_CONFIG_PATH`
""" """
global DEFAULT_CONFIG global DEFAULT_CONFIG_PATH
if not config_path: if not config_path:
config_data = load_config(DEFAULT_CONFIG) config_data = load_config(DEFAULT_CONFIG_PATH)
else: else:
config_data = load_config(config_path) config_data = load_config(config_path)
@ -109,14 +109,14 @@ class StreamingCamera(BaseCamera):
def save_config(self, config_path: str=None): def save_config(self, config_path: str=None):
""" """
Open config_picamera.yaml file and write to camera. Save current config dictionary to a YAML file.
Args: Args:
config_path (str): Path to the config YAML file. config_path (str): Path to the config YAML file. If `None`, defaults to `DEFAULT_CONFIG_PATH`
""" """
global DEFAULT_CONFIG global DEFAULT_CONFIG_PATH
if not config_path: if not config_path:
config_path = DEFAULT_CONFIG config_path = DEFAULT_CONFIG_PATH
save_config(self.config, config_path) save_config(self.config, config_path)