From 5270c680a59d9e13ad2a1d85dcc8dd7bd6e3a5cf Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:28:14 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20main.py=E3=81=8B=E3=82=89view.setG?= =?UTF-8?q?uiVariable=E7=B3=BB=E3=81=B8=E3=81=AE=E5=BC=95=E6=95=B0?= =?UTF-8?q?=E3=81=A7=E3=80=81=E5=9E=8B=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E3=81=AA=E3=81=8F=E3=81=97?= =?UTF-8?q?=E3=80=81view=E5=81=B4=E3=81=A7=E5=A4=89=E6=8F=9B=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=80=82=20(=E5=9E=8B?= =?UTF-8?q?=E5=A4=89=E6=8F=9B=E3=81=AFview=E5=81=B4=E3=81=AE=E9=83=BD?= =?UTF-8?q?=E5=90=88=E3=81=A0=E3=81=A8=E6=80=9D=E3=81=A3=E3=81=9F=E3=81=9F?= =?UTF-8?q?=E3=82=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 13 ++++++------- view.py | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/main.py b/main.py index 94d943cd..5cefaa00 100644 --- a/main.py +++ b/main.py @@ -425,7 +425,7 @@ def callbackSetMicRecordTimeout(value): if 0 <= value and value <= config.INPUT_MIC_PHRASE_TIMEOUT: view.clearErrorMessage() config.INPUT_MIC_RECORD_TIMEOUT = value - view.setGuiVariable_MicRecordTimeout(str(config.INPUT_MIC_RECORD_TIMEOUT)) + view.setGuiVariable_MicRecordTimeout(config.INPUT_MIC_RECORD_TIMEOUT) else: raise ValueError() except: @@ -438,7 +438,7 @@ def callbackSetMicPhraseTimeout(value): if 0 <= value and value >= config.INPUT_MIC_RECORD_TIMEOUT: view.clearErrorMessage() config.INPUT_MIC_PHRASE_TIMEOUT = value - view.setGuiVariable_MicPhraseTimeout(str(config.INPUT_MIC_PHRASE_TIMEOUT)) + view.setGuiVariable_MicPhraseTimeout(config.INPUT_MIC_PHRASE_TIMEOUT) else: raise ValueError() except: @@ -451,7 +451,7 @@ def callbackSetMicMaxPhrases(value): if 0 <= value: view.clearErrorMessage() config.INPUT_MIC_MAX_PHRASES = value - view.setGuiVariable_MicMaxPhrases(str(config.INPUT_MIC_MAX_PHRASES)) + view.setGuiVariable_MicMaxPhrases(config.INPUT_MIC_MAX_PHRASES) else: raise ValueError() except: @@ -505,7 +505,6 @@ def callbackCheckSpeakerThreshold(is_turned_on): model.startCheckSpeakerEnergy(setProgressBarSpeakerEnergy) view.replaceSpeakerThresholdCheckButton_Active() view.setWidgetsStatus_ThresholdCheckButton_Normal() - else: view.setWidgetsStatus_ThresholdCheckButton_Disabled() model.stopCheckSpeakerEnergy() @@ -519,7 +518,7 @@ def callbackSetSpeakerRecordTimeout(value): if 0 <= value and value <= config.INPUT_SPEAKER_PHRASE_TIMEOUT: view.clearErrorMessage() config.INPUT_SPEAKER_RECORD_TIMEOUT = value - view.setGuiVariable_SpeakerRecordTimeout(str(config.INPUT_SPEAKER_RECORD_TIMEOUT)) + view.setGuiVariable_SpeakerRecordTimeout(config.INPUT_SPEAKER_RECORD_TIMEOUT) else: raise ValueError() except: @@ -532,7 +531,7 @@ def callbackSetSpeakerPhraseTimeout(value): if 0 <= value and value >= config.INPUT_SPEAKER_RECORD_TIMEOUT: view.clearErrorMessage() config.INPUT_SPEAKER_PHRASE_TIMEOUT = value - view.setGuiVariable_SpeakerPhraseTimeout(str(config.INPUT_SPEAKER_PHRASE_TIMEOUT)) + view.setGuiVariable_SpeakerPhraseTimeout(config.INPUT_SPEAKER_PHRASE_TIMEOUT) else: raise ValueError() except: @@ -545,7 +544,7 @@ def callbackSetSpeakerMaxPhrases(value): if 0 <= value: view.clearErrorMessage() config.INPUT_SPEAKER_MAX_PHRASES = value - view.setGuiVariable_SpeakerMaxPhrases(str(config.INPUT_SPEAKER_MAX_PHRASES)) + view.setGuiVariable_SpeakerMaxPhrases(config.INPUT_SPEAKER_MAX_PHRASES) else: raise ValueError() except: diff --git a/view.py b/view.py index 88661660..dd32167b 100644 --- a/view.py +++ b/view.py @@ -728,8 +728,8 @@ class View(): - def setGuiVariable_MicEnergyThreshold(self, value:int): - self.view_variable.VAR_MIC_ENERGY_THRESHOLD__SLIDER.set(value) + def setGuiVariable_MicEnergyThreshold(self, value): + self.view_variable.VAR_MIC_ENERGY_THRESHOLD__SLIDER.set(int(value)) self.view_variable.VAR_MIC_ENERGY_THRESHOLD__ENTRY.set(str(value)) def setLatestConfigVariable_MicEnergyThreshold(self, _e=None): @@ -737,8 +737,8 @@ class View(): self.clearErrorMessage() - def setGuiVariable_SpeakerEnergyThreshold(self, value:int): - self.view_variable.VAR_SPEAKER_ENERGY_THRESHOLD__SLIDER.set(value) + def setGuiVariable_SpeakerEnergyThreshold(self, value): + self.view_variable.VAR_SPEAKER_ENERGY_THRESHOLD__SLIDER.set(int(value)) self.view_variable.VAR_SPEAKER_ENERGY_THRESHOLD__ENTRY.set(str(value)) def setLatestConfigVariable_SpeakerEnergyThreshold(self, _e=None): @@ -747,27 +747,27 @@ class View(): - def setGuiVariable_MicRecordTimeout(self, value:str="", delete=False): + def setGuiVariable_MicRecordTimeout(self, value, delete=False): if delete is True: self._clearEntryBox(vrct_gui.config_window.sb__entry_mic_record_timeout) - self.view_variable.VAR_MIC_RECORD_TIMEOUT.set(value) + self.view_variable.VAR_MIC_RECORD_TIMEOUT.set(str(value)) def setLatestConfigVariable_MicRecordTimeout(self, _e=None): self.setGuiVariable_MicRecordTimeout(config.INPUT_MIC_RECORD_TIMEOUT) self.clearErrorMessage() - def setGuiVariable_MicPhraseTimeout(self, value:str="", delete=False): + def setGuiVariable_MicPhraseTimeout(self, value, delete=False): if delete is True: self._clearEntryBox(vrct_gui.config_window.sb__entry_mic_phrase_timeout) - self.view_variable.VAR_MIC_PHRASE_TIMEOUT.set(value) + self.view_variable.VAR_MIC_PHRASE_TIMEOUT.set(str(value)) def setLatestConfigVariable_MicPhraseTimeout(self, _e=None): self.setGuiVariable_MicPhraseTimeout(config.INPUT_MIC_PHRASE_TIMEOUT) self.clearErrorMessage() - def setGuiVariable_MicMaxPhrases(self, value:str="", delete=False): + def setGuiVariable_MicMaxPhrases(self, value, delete=False): if delete is True: self._clearEntryBox(vrct_gui.config_window.sb__entry_mic_max_phrases) - self.view_variable.VAR_MIC_MAX_PHRASES.set(value) + self.view_variable.VAR_MIC_MAX_PHRASES.set(str(value)) def setLatestConfigVariable_MicMaxPhrases(self, _e=None): self.setGuiVariable_MicMaxPhrases(config.INPUT_MIC_MAX_PHRASES) @@ -775,27 +775,27 @@ class View(): - def setGuiVariable_SpeakerRecordTimeout(self, value:str="", delete=False): + def setGuiVariable_SpeakerRecordTimeout(self, value, delete=False): if delete is True: self._clearEntryBox(vrct_gui.config_window.sb__entry_speaker_record_timeout) - self.view_variable.VAR_SPEAKER_RECORD_TIMEOUT.set(value) + self.view_variable.VAR_SPEAKER_RECORD_TIMEOUT.set(str(value)) def setLatestConfigVariable_SpeakerRecordTimeout(self, _e=None): self.setGuiVariable_SpeakerRecordTimeout(config.INPUT_SPEAKER_RECORD_TIMEOUT) self.clearErrorMessage() - def setGuiVariable_SpeakerPhraseTimeout(self, value:str="", delete=False): + def setGuiVariable_SpeakerPhraseTimeout(self, value, delete=False): if delete is True: self._clearEntryBox(vrct_gui.config_window.sb__entry_speaker_phrase_timeout) - self.view_variable.VAR_SPEAKER_PHRASE_TIMEOUT.set(value) + self.view_variable.VAR_SPEAKER_PHRASE_TIMEOUT.set(str(value)) def setLatestConfigVariable_SpeakerPhraseTimeout(self, _e=None): self.setGuiVariable_SpeakerPhraseTimeout(config.INPUT_SPEAKER_PHRASE_TIMEOUT) self.clearErrorMessage() - def setGuiVariable_SpeakerMaxPhrases(self, value:str="", delete=False): + def setGuiVariable_SpeakerMaxPhrases(self, value, delete=False): if delete is True: self._clearEntryBox(vrct_gui.config_window.sb__entry_speaker_max_phrases) - self.view_variable.VAR_SPEAKER_MAX_PHRASES.set(value) + self.view_variable.VAR_SPEAKER_MAX_PHRASES.set(str(value)) def setLatestConfigVariable_SpeakerMaxPhrases(self, _e=None): self.setGuiVariable_SpeakerMaxPhrases(config.INPUT_SPEAKER_MAX_PHRASES)