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

👍️[Update] Controller : Config WindowのOPEN/CLOSE機能を削除

Browse Source
This commit is contained in:
misyaguziya
2024-09-27 17:37:20 +09:00
parent 0611ed21e3
commit 107320ad28
3 changed files with 8 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-python/config.py
View File

@@ -170,15 +170,6 @@ class Config:
if isinstance(value, bool): if isinstance(value, bool):
self._ENABLE_CHECK_ENERGY_RECEIVE = value 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 # @property
# def SENT_MESSAGES_LOG(self): # def SENT_MESSAGES_LOG(self):
# return self._SENT_MESSAGES_LOG # return self._SENT_MESSAGES_LOG
@@ -1009,7 +1000,6 @@ class Config:
self._ENABLE_FOREGROUND = False self._ENABLE_FOREGROUND = False
self._ENABLE_CHECK_ENERGY_SEND = False self._ENABLE_CHECK_ENERGY_SEND = False
self._ENABLE_CHECK_ENERGY_RECEIVE = False self._ENABLE_CHECK_ENERGY_RECEIVE = False
self._IS_OPENED_CONFIG_WINDOW = False
# self._SENT_MESSAGES_LOG = [] # self._SENT_MESSAGES_LOG = []
# self._CURRENT_SENT_MESSAGES_LOG_INDEX = 0 # self._CURRENT_SENT_MESSAGES_LOG_INDEX = 0

45
src-python/webui_controller.py
View File

@@ -58,14 +58,10 @@ class Controller:
def updateSelectedMicDevice(self, host, device) -> None: def updateSelectedMicDevice(self, host, device) -> None:
config.SELECTED_MIC_HOST = host config.SELECTED_MIC_HOST = host
config.SELECTED_MIC_DEVICE = device config.SELECTED_MIC_DEVICE = device
if config.IS_OPENED_CONFIG_WINDOW is False: if config.ENABLE_TRANSCRIPTION_SEND is True:
if config.ENABLE_TRANSCRIPTION_SEND is True: model.startMicTranscript()
model.stopMicTranscript() if config.ENABLE_CHECK_ENERGY_SEND is True:
model.startMicTranscript() model.startCheckMicEnergy()
else:
if config.ENABLE_CHECK_ENERGY_SEND is True:
model.stopCheckMicEnergy()
model.startCheckMicEnergy
self.run( self.run(
200, 200,
self.run_mapping["selected_mic_device"], self.run_mapping["selected_mic_device"],
@@ -74,14 +70,10 @@ class Controller:
def updateSelectedSpeakerDevice(self, device) -> None: def updateSelectedSpeakerDevice(self, device) -> None:
config.SELECTED_SPEAKER_DEVICE = device config.SELECTED_SPEAKER_DEVICE = device
if config.IS_OPENED_CONFIG_WINDOW is False: if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
if config.ENABLE_TRANSCRIPTION_RECEIVE is True: model.startSpeakerTranscript()
model.stopSpeakerTranscript() if config.ENABLE_CHECK_ENERGY_RECEIVE is True:
model.startSpeakerTranscript() model.startCheckSpeakerEnergy()
else:
if config.ENABLE_CHECK_ENERGY_RECEIVE is True:
model.stopCheckSpeakerEnergy()
model.startCheckSpeakerEnergy()
self.run( self.run(
200, 200,
self.run_mapping["selected_speaker_device"], self.run_mapping["selected_speaker_device"],
@@ -381,27 +373,6 @@ class Controller:
config.ENABLE_FOREGROUND = False config.ENABLE_FOREGROUND = False
return {"status":200, "result":config.ENABLE_FOREGROUND} 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 @staticmethod
def getSelectedTabNo(*args, **kwargs) -> dict: def getSelectedTabNo(*args, **kwargs) -> dict:
return {"status":200, "result":config.SELECTED_TAB_NO} return {"status":200, "result":config.SELECTED_TAB_NO}

3
src-python/webui_mainloop.py
View File

@@ -58,9 +58,6 @@ mapping = {
"/set/enable/foreground": {"status": True, "variable":controller.setEnableForeground}, "/set/enable/foreground": {"status": True, "variable":controller.setEnableForeground},
"/set/disable/foreground": {"status": True, "variable":controller.setDisableForeground}, "/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}, "/get/data/selected_tab_no": {"status": True, "variable":controller.getSelectedTabNo},
"/set/data/selected_tab_no": {"status": True, "variable":controller.setSelectedTabNo}, "/set/data/selected_tab_no": {"status": True, "variable":controller.setSelectedTabNo},