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

Merge branch 'bugfix_config_window_compact_mode' into UI_2.0

Browse Source
This commit is contained in:
Sakamoto Shiina
2023-09-06 00:58:51 +09:00
parent 93a130801f 5db665ecf1
commit 89352885a0
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.py
View File

@@ -202,10 +202,20 @@ def callbackToggleForeground(is_turned_on):
# Compact Mode Switch # Compact Mode Switch
def callbackEnableConfigWindowCompactMode(): def callbackEnableConfigWindowCompactMode():
config.IS_CONFIG_WINDOW_COMPACT_MODE = True config.IS_CONFIG_WINDOW_COMPACT_MODE = True
model.stopCheckMicEnergy()
view.replaceConfigWindowMicThresholdCheckButtonToPassive()
model.stopCheckSpeakerEnergy()
view.replaceConfigWindowSpeakerThresholdCheckButtonToPassive()
view.reloadConfigWindowSettingBoxContainer() view.reloadConfigWindowSettingBoxContainer()
def callbackDisableConfigWindowCompactMode(): def callbackDisableConfigWindowCompactMode():
config.IS_CONFIG_WINDOW_COMPACT_MODE = False config.IS_CONFIG_WINDOW_COMPACT_MODE = False
model.stopCheckMicEnergy()
view.replaceConfigWindowMicThresholdCheckButtonToPassive()
model.stopCheckSpeakerEnergy()
view.replaceConfigWindowSpeakerThresholdCheckButtonToPassive()
view.reloadConfigWindowSettingBoxContainer() view.reloadConfigWindowSettingBoxContainer()
# Appearance Tab # Appearance Tab
@@ -276,7 +286,7 @@ def setProgressBarMicEnergy(energy):
def callbackCheckMicThreshold(is_turned_on): def callbackCheckMicThreshold(is_turned_on):
print("callbackCheckMicThreshold", is_turned_on) print("callbackCheckMicThreshold", is_turned_on)
if is_turned_on is True: if is_turned_on is True:
view.setConfigWindowCompactModeSwitchStatusToDisabled() # view.setConfigWindowCompactModeSwitchStatusToDisabled()
view.setConfigWindowThresholdCheckWidgetsStatusToDisabled() view.setConfigWindowThresholdCheckWidgetsStatusToDisabled()
model.startCheckMicEnergy(setProgressBarMicEnergy) model.startCheckMicEnergy(setProgressBarMicEnergy)
@@ -288,7 +298,7 @@ def callbackCheckMicThreshold(is_turned_on):
view.replaceConfigWindowMicThresholdCheckButtonToPassive() view.replaceConfigWindowMicThresholdCheckButtonToPassive()
view.setConfigWindowThresholdCheckWidgetsStatusToNormal() view.setConfigWindowThresholdCheckWidgetsStatusToNormal()
view.setConfigWindowCompactModeSwitchStatusToNormal() # view.setConfigWindowCompactModeSwitchStatusToNormal()
def callbackSetMicRecordTimeout(value): def callbackSetMicRecordTimeout(value):
print("callbackSetMicRecordTimeout", int(value)) print("callbackSetMicRecordTimeout", int(value))
@@ -337,7 +347,7 @@ def setProgressBarSpeakerEnergy(energy):
def callbackCheckSpeakerThreshold(is_turned_on): def callbackCheckSpeakerThreshold(is_turned_on):
print("callbackCheckSpeakerThreshold", is_turned_on) print("callbackCheckSpeakerThreshold", is_turned_on)
if is_turned_on is True: if is_turned_on is True:
view.setConfigWindowCompactModeSwitchStatusToDisabled() # view.setConfigWindowCompactModeSwitchStatusToDisabled()
view.setConfigWindowThresholdCheckWidgetsStatusToDisabled() view.setConfigWindowThresholdCheckWidgetsStatusToDisabled()
model.startCheckSpeakerEnergy(setProgressBarSpeakerEnergy) model.startCheckSpeakerEnergy(setProgressBarSpeakerEnergy)
@@ -350,7 +360,7 @@ def callbackCheckSpeakerThreshold(is_turned_on):
view.replaceConfigWindowSpeakerThresholdCheckButtonToPassive() view.replaceConfigWindowSpeakerThresholdCheckButtonToPassive()
view.setConfigWindowThresholdCheckWidgetsStatusToNormal() view.setConfigWindowThresholdCheckWidgetsStatusToNormal()
view.setConfigWindowCompactModeSwitchStatusToNormal() # view.setConfigWindowCompactModeSwitchStatusToNormal()
def callbackSetSpeakerRecordTimeout(value): def callbackSetSpeakerRecordTimeout(value):
print("callbackSetSpeakerRecordTimeout", int(value)) print("callbackSetSpeakerRecordTimeout", int(value))

20
model.py
View File

@@ -231,7 +231,10 @@ class Model:
def sendMicTranscript(): def sendMicTranscript():
mic_transcriber.transcribeAudioQueue(mic_audio_queue, config.SOURCE_LANGUAGE, config.SOURCE_COUNTRY) mic_transcriber.transcribeAudioQueue(mic_audio_queue, config.SOURCE_LANGUAGE, config.SOURCE_COUNTRY)
message = mic_transcriber.getTranscript() message = mic_transcriber.getTranscript()
fnc(message) try:
fnc(message)
except:
pass
self.mic_print_transcript = threadFnc(sendMicTranscript) self.mic_print_transcript = threadFnc(sendMicTranscript)
self.mic_print_transcript.daemon = True self.mic_print_transcript.daemon = True
@@ -248,7 +251,10 @@ class Model:
def sendMicEnergy(): def sendMicEnergy():
if mic_energy_queue.empty() is False: if mic_energy_queue.empty() is False:
energy = mic_energy_queue.get() energy = mic_energy_queue.get()
fnc(energy) try:
fnc(energy)
except:
pass
sleep(0.01) sleep(0.01)
mic_energy_queue = Queue() mic_energy_queue = Queue()
@@ -284,7 +290,10 @@ class Model:
def sendSpkTranscript(): def sendSpkTranscript():
spk_transcriber.transcribeAudioQueue(spk_audio_queue, config.TARGET_LANGUAGE, config.TARGET_COUNTRY) spk_transcriber.transcribeAudioQueue(spk_audio_queue, config.TARGET_LANGUAGE, config.TARGET_COUNTRY)
message = spk_transcriber.getTranscript() message = spk_transcriber.getTranscript()
fnc(message) try:
fnc(message)
except:
pass
self.spk_print_transcript = threadFnc(sendSpkTranscript) self.spk_print_transcript = threadFnc(sendSpkTranscript)
self.spk_print_transcript.daemon = True self.spk_print_transcript.daemon = True
@@ -301,7 +310,10 @@ class Model:
def sendSpeakerEnergy(): def sendSpeakerEnergy():
if speaker_energy_queue.empty() is False: if speaker_energy_queue.empty() is False:
energy = speaker_energy_queue.get() energy = speaker_energy_queue.get()
fnc(energy) try:
fnc(energy)
except:
pass
sleep(0.01) sleep(0.01)
speaker_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0] speaker_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0]