every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Refactor] main.pyからview.setGuiVariable系への引数で、型変換していたのをなくし、view側で変換するように。

Browse Source 
(型変換はview側の都合だと思ったため)
This commit is contained in:
Sakamoto Shiina
2023-10-05 13:28:14 +09:00
parent 5e110cea8b
commit 5270c680a5
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main.py
View File

@@ -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:

32
view.py
View File

@@ -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)