From acae7644ebbf4854a98514c2d7e668d10e337b48 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Sun, 15 Jun 2025 15:54:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[bugfix]=20ttf=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E3=83=90=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/model.py | 12 +++---- src-python/models/overlay/overlay_image.py | 40 ++++++++++++++-------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src-python/model.py b/src-python/model.py index b40936b5..6646ee1e 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -96,7 +96,7 @@ class Model: "large": overlay_large_log_settings, } self.overlay = Overlay(overlay_settings) - self.overlay_image = OverlayImage() + self.overlay_image = OverlayImage(config.PATH_LOCAL) self.mic_audio_queue = None self.mic_mute_status = None self.kks = kakasi() @@ -725,13 +725,13 @@ class Model: def createOverlayImageSmallMessage(self, message): ui_language = config.UI_LANGUAGE convert_languages = { - "en": "Japanese", + "en": "Default", "jp": "Japanese", "ko":"Korean", "zh-Hans":"Chinese Simplified", "zh-Hant":"Chinese Traditional", } - language = convert_languages.get(ui_language, "Japanese") + language = convert_languages.get(ui_language, "Default") return self.overlay_image.createOverlayImageSmallLog(message, language) def clearOverlayImageSmallLog(self): @@ -777,14 +777,14 @@ class Model: def createOverlayImageLargeMessage(self, message): ui_language = config.UI_LANGUAGE convert_languages = { - "en": "Japanese", + "en": "Default", "jp": "Japanese", "ko":"Korean", "zh-Hans":"Chinese Simplified", "zh-Hant":"Chinese Traditional", } - language = convert_languages.get(ui_language, "Japanese") - overlay_image = OverlayImage() + language = convert_languages.get(ui_language, "Default") + overlay_image = OverlayImage(config.PATH_LOCAL) for _ in range(2): overlay_image.createOverlayImageLargeLog("send", message, language) diff --git a/src-python/models/overlay/overlay_image.py b/src-python/models/overlay/overlay_image.py index 52fd242d..39de7f83 100644 --- a/src-python/models/overlay/overlay_image.py +++ b/src-python/models/overlay/overlay_image.py @@ -11,14 +11,20 @@ except ImportError: class OverlayImage: LANGUAGES = { - "Japanese": "NotoSansJP-Regular", - "Korean": "NotoSansKR-Regular", - "Chinese Simplified": "NotoSansSC-Regular", - "Chinese Traditional": "NotoSansTC-Regular", + "Default": "NotoSansJP-Regular.ttf", + "Japanese": "NotoSansJP-Regular.ttf", + "Korean": "NotoSansKR-Regular.ttf", + "Chinese Simplified": "NotoSansSC-Regular.ttf", + "Chinese Traditional": "NotoSansTC-Regular.ttf", } - def __init__(self): + def __init__(self, root_path: str=None): self.message_log = [] + if root_path is None: + self.root_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts") + else: + self.root_path = os_path.join(root_path, "_internal", "fonts") + print(self.root_path) @staticmethod def concatenateImagesVertically(img1: Image, img2: Image, margin: int = 0) -> Image: @@ -54,16 +60,16 @@ class OverlayImage: return colors def createTextboxSmallLog(self, text:str, language:str, text_color:tuple, base_width:int, base_height:int, font_size:int) -> Image: - font_family = self.LANGUAGES.get(language, "NotoSansJP-Regular") + font_family = self.LANGUAGES.get(language, self.LANGUAGES["Default"]) img = Image.new("RGBA", (base_width, base_height), (0, 0, 0, 0)) draw = ImageDraw.Draw(img) try: - font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", f"{font_family}.ttf") + font_path = os_path.join(self.root_path, font_family) font = ImageFont.truetype(font_path, font_size) except Exception: errorLogging() - font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf") + font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", font_family) font = ImageFont.truetype(font_path, font_size) text_width = draw.textlength(text, font) @@ -98,7 +104,9 @@ class OverlayImage: draw = ImageDraw.Draw(background) draw.rounded_rectangle([(0, 0), img.size], radius=50, fill=background_color, outline=background_outline_color, width=5) - return Image.alpha_composite(background, img) + img = Image.alpha_composite(background, img) + img.save("overlay_small.png") + return img @staticmethod def getUiSizeLargeLog() -> dict: @@ -131,17 +139,17 @@ class OverlayImage: anchor = "lm" if message_type == "receive" else "rm" text_x = 0 if message_type == "receive" else ui_size["width"] align = "left" if message_type == "receive" else "right" - font_family = self.LANGUAGES.get(language, "NotoSansJP-Regular") + font_family = self.LANGUAGES.get(language, self.LANGUAGES["Default"]) img = Image.new("RGBA", (0, 0), (0, 0, 0, 0)) draw = ImageDraw.Draw(img) try: - font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", f"{font_family}.ttf") + font_path = os_path.join(self.root_path, font_family) font = ImageFont.truetype(font_path, font_size) except Exception: errorLogging() - font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf") + font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", font_family) font = ImageFont.truetype(font_path, font_size) text_width = draw.textlength(text, font) @@ -172,11 +180,11 @@ class OverlayImage: draw = ImageDraw.Draw(img) try: - font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", "NotoSansJP-Regular.ttf") + font_path = os_path.join(self.root_path, self.LANGUAGES["Default"]) font = ImageFont.truetype(font_path, font_size) except Exception: errorLogging() - font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", "NotoSansJP-Regular.ttf") + font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", self.LANGUAGES["Default"]) font = ImageFont.truetype(font_path, font_size) text_height = font_size + ui_padding @@ -242,7 +250,9 @@ class OverlayImage: background = Image.new("RGBA", (width, height), (0, 0, 0, 0)) draw = ImageDraw.Draw(background) draw.rounded_rectangle([(0, 0), (width, height)], radius=ui_radius, fill=background_color, outline=background_outline_color, width=5) - return Image.alpha_composite(background, img) + img = Image.alpha_composite(background, img) + img.save("overlay_large.png") + return img if __name__ == "__main__": overlay = OverlayImage() From ab5c6b7bb55a16e047080a40fd76ef06976e5da8 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 16 Jun 2025 06:45:13 +0900 Subject: [PATCH 2/3] [Refactor] Improve overlay image creation logic for large logs and translations --- src-python/controller.py | 65 ++++++++++++++++++---- src-python/model.py | 7 +-- src-python/models/overlay/overlay_image.py | 40 +++++++++---- 3 files changed, 86 insertions(+), 26 deletions(-) diff --git a/src-python/controller.py b/src-python/controller.py index 969fff98..6fc96071 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -340,11 +340,25 @@ class Controller: model.logger.info(f"[SENT] {message}{translation}") if config.OVERLAY_LARGE_LOG is True and model.overlay.initialized is True: - if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True and len(translation) > 0: - overlay_image = model.createOverlayImageLargeLog("send", translation[0], "") + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True: + if len(translation) > 0: + overlay_image = model.createOverlayImageLargeLog( + "send", + None, + None, + translation, + config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO] + ) + model.updateOverlayLargeLog(overlay_image) else: - overlay_image = model.createOverlayImageLargeLog("send", message, translation[0] if len(translation) > 0 else "") - model.updateOverlayLargeLog(overlay_image) + overlay_image = model.createOverlayImageLargeLog( + "send", + message, + config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"], + translation, + config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO] + ) + model.updateOverlayLargeLog(overlay_image) def speakerMessage(self, result:dict) -> None: message = result["text"] @@ -425,11 +439,24 @@ class Controller: model.updateOverlaySmallLog(overlay_image) if config.OVERLAY_LARGE_LOG is True and model.overlay.initialized is True: - if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True and len(translation) > 0: - overlay_image = model.createOverlayImageLargeLog("receive", translation[0], "") + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True: + if len(translation) > 0: + overlay_image = model.createOverlayImageLargeLog( + "receive", + None, + None, + translation, + ) + model.updateOverlayLargeLog(overlay_image) else: - overlay_image = model.createOverlayImageLargeLog("receive", message, translation[0] if len(translation) > 0 else "") - model.updateOverlayLargeLog(overlay_image) + overlay_image = model.createOverlayImageLargeLog( + "receive", + message, + language, + translation, + config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO] + ) + model.updateOverlayLargeLog(overlay_image) if config.SEND_RECEIVED_MESSAGE_TO_VRC is True: osc_message = self.messageFormatter("RECEIVED", translation, [message]) @@ -544,11 +571,25 @@ class Controller: model.oscSendMessage(osc_message) if config.OVERLAY_LARGE_LOG is True: - if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True and len(translation) > 0: - overlay_image = model.createOverlayImageLargeLog("send", translation[0], "") + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True: + if len(translation) > 0: + overlay_image = model.createOverlayImageLargeLog( + "send", + None, + None, + translation, + config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO], + ) + model.updateOverlayLargeLog(overlay_image) else: - overlay_image = model.createOverlayImageLargeLog("send", message, translation[0] if len(translation) > 0 else "") - model.updateOverlayLargeLog(overlay_image) + overlay_image = model.createOverlayImageLargeLog( + "send", + message, + config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"], + translation, + config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO], + ) + model.updateOverlayLargeLog(overlay_image) if model.checkWebSocketServerAlive() is True: model.websocketSendMessage( diff --git a/src-python/model.py b/src-python/model.py index 6646ee1e..8b0ba6c1 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -769,10 +769,9 @@ class Model: if (self.overlay.settings[size]["ui_scaling"] != config.OVERLAY_SMALL_LOG_SETTINGS["ui_scaling"]): self.overlay.updateUiScaling(config.OVERLAY_SMALL_LOG_SETTINGS["ui_scaling"], size) - def createOverlayImageLargeLog(self, message_type:str, message:str, translation:str): - your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] - target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] - return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_language) + def createOverlayImageLargeLog(self, message_type:str, message:str, your_language:str, translation:list, target_languages:dict): + target_languages = [data["language"] for data in target_languages.values() if data["enable"] is True] + return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_languages) def createOverlayImageLargeMessage(self, message): ui_language = config.UI_LANGUAGE diff --git a/src-python/models/overlay/overlay_image.py b/src-python/models/overlay/overlay_image.py index 39de7f83..ec943475 100644 --- a/src-python/models/overlay/overlay_image.py +++ b/src-python/models/overlay/overlay_image.py @@ -199,17 +199,37 @@ class OverlayImage: draw.text((text_x, text_y), text, text_color, anchor=anchor, stroke_width=0, font=font) return img - def createTextboxLargeLog(self, message_type:str, message:str, your_language:str, translation:str, target_language:str, date_time:str) -> Image: - message_type_img = self.createTextImageMessageType(message_type, date_time) - if translation and target_language: - img = self.createTextImageLargeLog(message_type, "small", message, your_language) - translation_img = self.createTextImageLargeLog(message_type, "large", translation, target_language) - img = self.concatenateImagesVertically(img, translation_img) - else: - img = self.createTextImageLargeLog(message_type, "large", message, your_language) - return self.concatenateImagesVertically(message_type_img, img) + def createTextboxLargeLog(self, message_type: str, message: str = None, your_language: str = None, translation: list = [], target_language: list = [], date_time: str = None) -> Image: + # テキスト画像のリストを作成 + images = [self.createTextImageMessageType(message_type, date_time)] - def createOverlayImageLargeLog(self, message_type:str, message:str, your_language:str, translation:str="", target_language:str=None) -> Image: + # 翻訳がある場合 + if translation and target_language: + # 元のメッセージがある場合は小さいサイズで追加 + if message is not None: + images.append( + self.createTextImageLargeLog(message_type, "small", message, your_language) + ) + + # 翻訳をすべて大きいサイズで追加 + for trans, lang in zip(translation, target_language): + images.append( + self.createTextImageLargeLog(message_type, "large", trans, lang) + ) + else: + # 翻訳がない場合は元のメッセージのみ + images.append( + self.createTextImageLargeLog(message_type, "large", message, your_language) + ) + + # すべてのテキスト画像を縦に結合 + combined_img = images[0] + for img in images[1:]: + combined_img = self.concatenateImagesVertically(combined_img, img) + + return combined_img + + def createOverlayImageLargeLog(self, message_type:str, message:str=None, your_language:str=None, translation:list=[], target_language:list=[]) -> Image: ui_color = self.getUiColorLargeLog() background_color = ui_color["background_color"] background_outline_color = ui_color["background_outline_color"] From e25cd62891ff19e342e5804df85af472d592bb1f Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 16 Jun 2025 11:29:54 +0900 Subject: [PATCH 3/3] [Refactor] Improve overlay image creation logic for small logs and translations --- src-python/controller.py | 20 +++++++++--- src-python/model.py | 11 +++---- src-python/models/overlay/overlay_image.py | 37 ++++++++++++++++++---- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src-python/controller.py b/src-python/controller.py index 6fc96071..fcae50b6 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -432,11 +432,23 @@ class Controller: if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.OVERLAY_SMALL_LOG is True and model.overlay.initialized is True: - if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True and len(translation) > 0: - overlay_image = model.createOverlayImageSmallLog(translation[0], "") + if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True: + if len(translation) > 0: + overlay_image = model.createOverlayImageSmallLog( + None, + None, + translation, + config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO], + ) + model.updateOverlaySmallLog(overlay_image) else: - overlay_image = model.createOverlayImageSmallLog(message, translation[0] if len(translation) > 0 else "") - model.updateOverlaySmallLog(overlay_image) + overlay_image = model.createOverlayImageSmallLog( + message, + language, + translation, + config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO], + ) + model.updateOverlaySmallLog(overlay_image) if config.OVERLAY_LARGE_LOG is True and model.overlay.initialized is True: if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True: diff --git a/src-python/model.py b/src-python/model.py index 8b0ba6c1..9f905ec3 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -717,9 +717,8 @@ class Model: self.speaker_energy_recorder.stop() self.speaker_energy_recorder = None - def createOverlayImageSmallLog(self, message, translation): - your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] - target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] + def createOverlayImageSmallLog(self, message:str, your_language:str, translation:list, target_language:dict): + target_language = [data["language"] for data in target_language.values() if data["enable"] is True] return self.overlay_image.createOverlayImageSmallLog(message, your_language, translation, target_language) def createOverlayImageSmallMessage(self, message): @@ -769,9 +768,9 @@ class Model: if (self.overlay.settings[size]["ui_scaling"] != config.OVERLAY_SMALL_LOG_SETTINGS["ui_scaling"]): self.overlay.updateUiScaling(config.OVERLAY_SMALL_LOG_SETTINGS["ui_scaling"], size) - def createOverlayImageLargeLog(self, message_type:str, message:str, your_language:str, translation:list, target_languages:dict): - target_languages = [data["language"] for data in target_languages.values() if data["enable"] is True] - return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_languages) + def createOverlayImageLargeLog(self, message_type:str, message:str, your_language:str, translation:list, target_language:dict): + target_language = [data["language"] for data in target_language.values() if data["enable"] is True] + return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_language) def createOverlayImageLargeMessage(self, message): ui_language = config.UI_LANGUAGE diff --git a/src-python/models/overlay/overlay_image.py b/src-python/models/overlay/overlay_image.py index ec943475..11d8cf06 100644 --- a/src-python/models/overlay/overlay_image.py +++ b/src-python/models/overlay/overlay_image.py @@ -86,7 +86,8 @@ class OverlayImage: draw.text((text_x, text_y), text, text_color, anchor="mm", stroke_width=0, font=font, align="center") return img - def createOverlayImageSmallLog(self, message:str, your_language:str, translation:str="", target_language:str=None) -> Image: + def createOverlayImageSmallLog(self, message: str, your_language: str, translation: list = [], target_language: list = []) -> Image: + # UI設定を取得 ui_size = self.getUiSizeSmallLog() width, height, font_size = ui_size["width"], ui_size["height"], ui_size["font_size"] @@ -95,17 +96,40 @@ class OverlayImage: background_color = ui_colors["background_color"] background_outline_color = ui_colors["background_outline_color"] - img = self.createTextboxSmallLog(message, your_language, text_color, width, height, font_size) - if translation and target_language: - translation_img = self.createTextboxSmallLog(translation, target_language, text_color, width, height, font_size) - img = self.concatenateImagesVertically(img, translation_img) + # テキストボックス画像のリストを作成 + textbox_images = [] + # 翻訳がある場合 + if translation and target_language: + # 元のメッセージがある場合は追加 + if message: + textbox_images.append( + self.createTextboxSmallLog(message, your_language, text_color, width, height, font_size) + ) + + # 翻訳をすべて追加 + for trans, lang in zip(translation, target_language): + textbox_images.append( + self.createTextboxSmallLog(trans, lang, text_color, width, height, font_size) + ) + else: + # 翻訳がない場合は元のメッセージのみ + textbox_images.append( + self.createTextboxSmallLog(message, your_language, text_color, width, height, font_size) + ) + + # すべてのテキストボックスを縦に結合 + img = textbox_images[0] + for textbox_img in textbox_images[1:]: + img = self.concatenateImagesVertically(img, textbox_img) + + # 角丸背景を作成 background = Image.new("RGBA", img.size, (0, 0, 0, 0)) draw = ImageDraw.Draw(background) draw.rounded_rectangle([(0, 0), img.size], radius=50, fill=background_color, outline=background_outline_color, width=5) + # 背景とテキストを合成 img = Image.alpha_composite(background, img) - img.save("overlay_small.png") return img @staticmethod @@ -271,7 +295,6 @@ class OverlayImage: draw = ImageDraw.Draw(background) draw.rounded_rectangle([(0, 0), (width, height)], radius=ui_radius, fill=background_color, outline=background_outline_color, width=5) img = Image.alpha_composite(background, img) - img.save("overlay_large.png") return img if __name__ == "__main__":