diff --git a/src-python/config.py b/src-python/config.py index 25748b7f..bc61ccd5 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -170,15 +170,6 @@ class Config: if isinstance(value, bool): self._ENABLE_CHECK_ENERGY_RECEIVE = value - @property - def IS_OPENED_CONFIG_WINDOW(self): - return self._IS_OPENED_CONFIG_WINDOW - - @IS_OPENED_CONFIG_WINDOW.setter - def IS_OPENED_CONFIG_WINDOW(self, value): - if isinstance(value, bool): - self._IS_OPENED_CONFIG_WINDOW = value - # @property # def SENT_MESSAGES_LOG(self): # return self._SENT_MESSAGES_LOG @@ -1009,7 +1000,6 @@ class Config: self._ENABLE_FOREGROUND = False self._ENABLE_CHECK_ENERGY_SEND = False self._ENABLE_CHECK_ENERGY_RECEIVE = False - self._IS_OPENED_CONFIG_WINDOW = False # self._SENT_MESSAGES_LOG = [] # self._CURRENT_SENT_MESSAGES_LOG_INDEX = 0 diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 0d14543d..0a2ff0a5 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -58,14 +58,10 @@ class Controller: def updateSelectedMicDevice(self, host, device) -> None: config.SELECTED_MIC_HOST = host config.SELECTED_MIC_DEVICE = device - if config.IS_OPENED_CONFIG_WINDOW is False: - if config.ENABLE_TRANSCRIPTION_SEND is True: - model.stopMicTranscript() - model.startMicTranscript() - else: - if config.ENABLE_CHECK_ENERGY_SEND is True: - model.stopCheckMicEnergy() - model.startCheckMicEnergy + if config.ENABLE_TRANSCRIPTION_SEND is True: + model.startMicTranscript() + if config.ENABLE_CHECK_ENERGY_SEND is True: + model.startCheckMicEnergy() self.run( 200, self.run_mapping["selected_mic_device"], @@ -74,14 +70,10 @@ class Controller: def updateSelectedSpeakerDevice(self, device) -> None: config.SELECTED_SPEAKER_DEVICE = device - if config.IS_OPENED_CONFIG_WINDOW is False: - if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - model.stopSpeakerTranscript() - model.startSpeakerTranscript() - else: - if config.ENABLE_CHECK_ENERGY_RECEIVE is True: - model.stopCheckSpeakerEnergy() - model.startCheckSpeakerEnergy() + if config.ENABLE_TRANSCRIPTION_RECEIVE is True: + model.startSpeakerTranscript() + if config.ENABLE_CHECK_ENERGY_RECEIVE is True: + model.startCheckSpeakerEnergy() self.run( 200, self.run_mapping["selected_speaker_device"], @@ -381,27 +373,6 @@ class Controller: config.ENABLE_FOREGROUND = False return {"status":200, "result":config.ENABLE_FOREGROUND} - def setEnableConfigWindow(self, *args, **kwargs) -> dict: - config.IS_OPENED_CONFIG_WINDOW = True - if config.ENABLE_TRANSCRIPTION_SEND is True: - self.stopThreadingTranscriptionSendMessage() - if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - self.stopThreadingTranscriptionReceiveMessage() - return {"status":200, "result":True} - - def setDisableConfigWindow(self, *args, **kwargs) -> dict: - config.IS_OPENED_CONFIG_WINDOW = False - model.stopCheckMicEnergy() - model.stopCheckSpeakerEnergy() - - if config.ENABLE_TRANSCRIPTION_SEND is True: - self.startThreadingTranscriptionSendMessage() - if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - sleep(2) - if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - self.startThreadingTranscriptionReceiveMessage() - return {"status":200, "result":True} - @staticmethod def getSelectedTabNo(*args, **kwargs) -> dict: return {"status":200, "result":config.SELECTED_TAB_NO} diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 25ff20cc..7a588373 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -58,9 +58,6 @@ mapping = { "/set/enable/foreground": {"status": True, "variable":controller.setEnableForeground}, "/set/disable/foreground": {"status": True, "variable":controller.setDisableForeground}, - "/set/enable/config_window": {"status": True, "variable":controller.setEnableConfigWindow}, - "/set/disable/config_window": {"status": True, "variable":controller.setDisableConfigWindow}, - "/get/data/selected_tab_no": {"status": True, "variable":controller.getSelectedTabNo}, "/set/data/selected_tab_no": {"status": True, "variable":controller.setSelectedTabNo},