🐛[bugfix] Model : overlay fadeの処理を修正

overlay ONを複数起動しないように修正

src-python/config.json

@@ -1,167 +0,0 @@
-{
-    "SELECTED_TAB_NO": "1",
-    "SELECTED_TRANSLATION_ENGINES": {
-        "1": "CTranslate2",
-        "2": "CTranslate2",
-        "3": "CTranslate2"
-    },
-    "SELECTED_YOUR_LANGUAGES": {
-        "1": {
-            "primary": {
-                "language": "Japanese",
-                "country": "Japan"
-            }
-        },
-        "2": {
-            "primary": {
-                "language": "Japanese",
-                "country": "Japan"
-            }
-        },
-        "3": {
-            "primary": {
-                "language": "Japanese",
-                "country": "Japan"
-            }
-        }
-    },
-    "SELECTED_TARGET_LANGUAGES": {
-        "1": {
-            "primary": {
-                "language": "English",
-                "country": "United States"
-            },
-            "secondary": {
-                "language": "English",
-                "country": "United States"
-            },
-            "tertiary": {
-                "language": "English",
-                "country": "United States"
-            }
-        },
-        "2": {
-            "primary": {
-                "language": "English",
-                "country": "United States"
-            },
-            "secondary": {
-                "language": "English",
-                "country": "United States"
-            },
-            "tertiary": {
-                "language": "English",
-                "country": "United States"
-            }
-        },
-        "3": {
-            "primary": {
-                "language": "English",
-                "country": "United States"
-            },
-            "secondary": {
-                "language": "English",
-                "country": "United States"
-            },
-            "tertiary": {
-                "language": "English",
-                "country": "United States"
-            }
-        }
-    },
-    "SELECTED_TRANSCRIPTION_ENGINE": "Google",
-    "MULTI_LANGUAGE_TRANSLATION": false,
-    "CONVERT_MESSAGE_TO_ROMAJI": false,
-    "CONVERT_MESSAGE_TO_HIRAGANA": false,
-    "MAIN_WINDOW_SIDEBAR_COMPACT_MODE": false,
-    "TRANSPARENCY": 100,
-    "UI_SCALING": 100,
-    "TEXTBOX_UI_SCALING": 100,
-    "MESSAGE_BOX_RATIO": 10,
-    "FONT_FAMILY": "Yu Gothic UI",
-    "UI_LANGUAGE": "en",
-    "RESTORE_MAIN_WINDOW_GEOMETRY": true,
-    "MAIN_WINDOW_GEOMETRY": {
-        "x_pos": 0,
-        "y_pos": 0,
-        "width": 870,
-        "height": 654
-    },
-    "AUTO_MIC_SELECT": true,
-    "SELECTED_MIC_HOST": "MME",
-    "SELECTED_MIC_DEVICE": "Headset Microphone (Oculus Virt",
-    "MIC_THRESHOLD": 300,
-    "MIC_AUTOMATIC_THRESHOLD": false,
-    "MIC_RECORD_TIMEOUT": 3,
-    "MIC_PHRASE_TIMEOUT": 3,
-    "MIC_MAX_PHRASES": 10,
-    "MIC_WORD_FILTER": [],
-    "MIC_AVG_LOGPROB": -0.8,
-    "MIC_NO_SPEECH_PROB": 0.6,
-    "AUTO_SPEAKER_SELECT": true,
-    "SELECTED_SPEAKER_DEVICE": "ヘッドホン (Oculus Virtual Audio Device) [Loopback]",
-    "SPEAKER_THRESHOLD": 300,
-    "SPEAKER_AUTOMATIC_THRESHOLD": false,
-    "SPEAKER_RECORD_TIMEOUT": 3,
-    "SPEAKER_PHRASE_TIMEOUT": 3,
-    "SPEAKER_MAX_PHRASES": 10,
-    "SPEAKER_AVG_LOGPROB": -0.8,
-    "SPEAKER_NO_SPEECH_PROB": 0.6,
-    "OSC_IP_ADDRESS": "127.0.0.1",
-    "OSC_PORT": 9000,
-    "AUTH_KEYS": {
-        "DeepL_API": null
-    },
-    "USE_EXCLUDE_WORDS": true,
-    "SELECTED_TRANSLATION_COMPUTE_DEVICE": {
-        "device": "cpu",
-        "device_index": 0,
-        "device_name": "cpu"
-    },
-    "SELECTED_TRANSCRIPTION_COMPUTE_DEVICE": {
-        "device": "cpu",
-        "device_index": 0,
-        "device_name": "cpu"
-    },
-    "CTRANSLATE2_WEIGHT_TYPE": "small",
-    "WHISPER_WEIGHT_TYPE": "base",
-    "AUTO_CLEAR_MESSAGE_BOX": true,
-    "SEND_ONLY_TRANSLATED_MESSAGES": false,
-    "SEND_MESSAGE_BUTTON_TYPE": "show",
-    "OVERLAY_SMALL_LOG": false,
-    "OVERLAY_SMALL_LOG_SETTINGS": {
-        "x_pos": 0.0,
-        "y_pos": 0.0,
-        "z_pos": 0.0,
-        "x_rotation": 0.0,
-        "y_rotation": 0.0,
-        "z_rotation": 0.0,
-        "display_duration": 5,
-        "fadeout_duration": 2,
-        "opacity": 1.0,
-        "ui_scaling": 1.0,
-        "tracker": "HMD"
-    },
-    "OVERLAY_LARGE_LOG": false,
-    "OVERLAY_LARGE_LOG_SETTINGS": {
-        "x_pos": 0.0,
-        "y_pos": 0.0,
-        "z_pos": 0.0,
-        "x_rotation": 0.0,
-        "y_rotation": 0.0,
-        "z_rotation": 0.0,
-        "display_duration": 5,
-        "fadeout_duration": 2,
-        "opacity": 1.0,
-        "ui_scaling": 0.015625,
-        "tracker": "LeftHand"
-    },
-    "SEND_MESSAGE_TO_VRC": true,
-    "SEND_MESSAGE_FORMAT": "[message]",
-    "SEND_MESSAGE_FORMAT_WITH_T": "[message]([translation])",
-    "RECEIVED_MESSAGE_FORMAT": "[message]",
-    "RECEIVED_MESSAGE_FORMAT_WITH_T": "[message]([translation])",
-    "SEND_RECEIVED_MESSAGE_TO_VRC": false,
-    "LOGGER_FEATURE": false,
-    "VRC_MIC_MUTE_SYNC": false
-}

src-python/models/overlay/overlay.py

@@ -98,7 +98,7 @@ class Overlay:
             for size in self.settings.keys():
                 self.updateImage(Image.new("RGBA", (1, 1), (0, 0, 0, 0)), size)
                 self.updateColor([1, 1, 1], size)
-                self.updateOpacity(self.settings[size]["opacity"], size, True)
+                self.updateOpacity(self.settings[size]["opacity"], size)
                 self.updateUiScaling(self.settings[size]["ui_scaling"], size)
                 self.updatePosition(
                     self.settings[size]["x_pos"],
@@ -132,8 +132,7 @@ class Overlay:
                 while self.initialized is False:
                     time.sleep(0.1)
                 self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4)
-            self.fadeRatio[size] = 1
-            self.updateOpacity(self.settings[size]["opacity"], size, True)
+            self.updateOpacity(self.settings[size]["opacity"], size)
             self.lastUpdate[size] = time.monotonic()
 
     def clearImage(self, size):
@@ -148,7 +147,7 @@ class Overlay:
             r, g, b = col
             self.overlay.setOverlayColor(self.handle[size], r, g, b)
 
-    def updateOpacity(self, opacity, size, with_fade=True):
+    def updateOpacity(self, opacity, size, with_fade=False):
         self.settings[size]["opacity"] = opacity
 
         if self.initialized is True:
@@ -235,7 +234,7 @@ class Overlay:
         if self.settings[size]["fadeout_duration"] != 0:
             self.evaluateOpacityFade(size)
         else:
-            self.updateOpacity(self.settings[size]["opacity"], size, True)
+            self.updateOpacity(self.settings[size]["opacity"], size)
 
     def mainloop(self):
         self.loop = True

src-python/webui_controller.py

@@ -1167,6 +1167,7 @@ class Controller:
     @staticmethod
     def setEnableOverlaySmallLog(*args, **kwargs) -> dict:
         config.OVERLAY_SMALL_LOG = True
+        if config.OVERLAY_LARGE_LOG is False:
             model.startOverlay()
         return {"status":200, "result":config.OVERLAY_SMALL_LOG}
 
@@ -1196,6 +1197,7 @@ class Controller:
     @staticmethod
     def setEnableOverlayLargeLog(*args, **kwargs) -> dict:
         config.OVERLAY_LARGE_LOG = True
+        if config.OVERLAY_SMALL_LOG is False:
             model.startOverlay()
         return {"status":200, "result":config.OVERLAY_LARGE_LOG}