From 2aad040dde21c435b56da959ddfa3be6e7c3c39d Mon Sep 17 00:00:00 2001 From: Christoph Schmidt <christoph.,schmidt@tugraz.at> Date: Fri, 5 Jan 2024 13:19:15 +0100 Subject: [PATCH] Changed logging behavior --- examples/main.py | 5 +++-- src/CaptDeviceControl/CaptDeviceConfig.py | 2 +- src/CaptDeviceControl/controller/BaseAD2CaptDevice.py | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/main.py b/examples/main.py index be81ffc..06c06ad 100644 --- a/examples/main.py +++ b/examples/main.py @@ -29,16 +29,17 @@ if __name__ == "__main__": ) - #setup_logging() + setup_logging() app = QApplication() conf = CaptDevice.Config() conf.load("CaptDeviceConfig.yaml") + conf.internal_log_enabled = False model = CaptDevice.Model(conf) - controller = CaptDevice.Controller(model, None, log_file="log.log") + controller = CaptDevice.Controller(model, None) window = CaptDevice.View(model, controller) window.show() diff --git a/src/CaptDeviceControl/CaptDeviceConfig.py b/src/CaptDeviceControl/CaptDeviceConfig.py index 22f6cb7..f9980f5 100644 --- a/src/CaptDeviceControl/CaptDeviceConfig.py +++ b/src/CaptDeviceControl/CaptDeviceConfig.py @@ -12,7 +12,7 @@ import confighandler as cfg class CaptDeviceConfig(cfg.ConfigNode): def __init__(self) -> None: - super().__init__(internal_log=False, internal_log_level=logging.DEBUG) + super().__init__() self.selected_device_index = cfg.Field(0, friendly_name="Selected device", description="Selected device from the device list provided by the DreamWaves API.") diff --git a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py index 027ce0b..fea63aa 100644 --- a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py +++ b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py @@ -39,9 +39,8 @@ class BaseAD2CaptDevice(cmp.CProcessControl): capture_process_state_changed = Signal(AD2Constants.CapturingState, name="capture_process_state_changed") ready_for_recording_changed = Signal(bool, name="ready_for_recording_changed") - def __init__(self, ad2capt_model: AD2CaptDeviceModel, start_capture_flag: Value, - internal_log=True, internal_log_level=logging.WARNING, log_file=None): - super().__init__(internal_log=internal_log, internal_log_level=internal_log_level, log_file=log_file) + def __init__(self, ad2capt_model: AD2CaptDeviceModel, start_capture_flag: Value): + super().__init__() self.model = ad2capt_model -- GitLab