v1.9.5: 优化并行模式、图片序列号，提高编辑器稳定性

Author: hgmzhn

desktop_qt_ui/editor/editor_model.py

@@ -191,4 +191,4 @@ def update_region_data(self, index: int, key: str, value: Any):
     def update_region_silent(self, index: int, new_data: dict):
         """静默更新整个区域数据,不发出信号"""
         if 0 <= index < len(self._regions):
-            self._regions[index].update(new_data)
+            self._regions[index].update(new_data)

desktop_qt_ui/editor/graphics_view.py

@@ -208,6 +208,17 @@ def clear_all_state(self):
                 self.scene.removeItem(self._preview_item)
                 self._preview_item = None
 
+            # 清空框选矩形
+            if self._box_select_rect_item:
+                try:
+                    if self._box_select_rect_item.scene():
+                        self.scene.removeItem(self._box_select_rect_item)
+                except RuntimeError:
+                    pass  # C++ 对象已被删除
+            self._box_select_rect_item = None
+            self._is_box_selecting = False
+            self._box_select_start_pos = None
+
             # 清空缓存
             if hasattr(self, '_text_render_cache'):
                 self._text_render_cache.clear()
@@ -246,6 +257,7 @@ def on_image_changed(self, image):
         self._inpainted_image_item = None
         self._preview_item = None
         self._image_np = None
+        self._box_select_rect_item = None  # scene.clear() 会删除所有 item
 
         if image is None:
             return
@@ -1154,8 +1166,17 @@ def mousePressEvent(self, event):
                 self._is_box_selecting = True
                 self._box_select_start_pos = self.mapToScene(event.pos())
 
-                # 创建框选矩形
-                if self._box_select_rect_item is None:
+                # 创建框选矩形（检查是否需要重新创建）
+                need_create = self._box_select_rect_item is None
+                if not need_create:
+                    # 检查 C++ 对象是否仍然有效
+                    try:
+                        _ = self._box_select_rect_item.scene()
+                    except RuntimeError:
+                        need_create = True
+                        self._box_select_rect_item = None
+                
+                if need_create:
                     pen = QPen(QColor(0, 120, 215, 180))  # 蓝色半透明
                     pen.setWidth(2)
                     pen.setStyle(Qt.PenStyle.DashLine)
@@ -1186,12 +1207,24 @@ def mouseMoveEvent(self, event):
         """Handle mouse move for drawing."""
         # 处理框选
         if self._is_box_selecting and self._box_select_start_pos:
-            current_pos = self.mapToScene(event.pos())
-            # 更新框选矩形
-            rect = QRectF(self._box_select_start_pos, current_pos).normalized()
-            self._box_select_rect_item.setRect(rect)
-            event.accept()
-            return
+            # 检查框选矩形是否仍然有效（可能在切换图片时被删除）
+            if self._box_select_rect_item is None:
+                self._is_box_selecting = False
+                self._box_select_start_pos = None
+                return
+            try:
+                current_pos = self.mapToScene(event.pos())
+                # 更新框选矩形
+                rect = QRectF(self._box_select_start_pos, current_pos).normalized()
+                self._box_select_rect_item.setRect(rect)
+                event.accept()
+                return
+            except RuntimeError:
+                # C++ 对象已被删除，重置状态
+                self._box_select_rect_item = None
+                self._is_box_selecting = False
+                self._box_select_start_pos = None
+                return
 
         if self._is_drawing_textbox:
             self._update_textbox_drawing(event.pos())
@@ -1231,31 +1264,36 @@ def mouseReleaseEvent(self, event):
         # 处理框选完成
         if self._is_box_selecting and event.button() == Qt.MouseButton.LeftButton:
             self._is_box_selecting = False
+            self._box_select_start_pos = None
 
-            # 隐藏框选矩形
+            # 隐藏框选矩形（检查对象是否仍然有效）
             if self._box_select_rect_item:
-                select_rect = self._box_select_rect_item.rect()
-                self._box_select_rect_item.setVisible(False)
-                
-                # 查找框内的所有 RegionTextItem
-                selected_indices = []
-                for i, item in enumerate(self._region_items):
-                    if isinstance(item, RegionTextItem):
-                        # 检查 item 的边界是否与选择框相交
-                        item_rect = item.sceneBoundingRect()
-                        if select_rect.intersects(item_rect):
-                            selected_indices.append(i)
-                
-                # 更新选择
-                ctrl_pressed = bool(event.modifiers() & Qt.KeyboardModifier.ControlModifier)
-                if ctrl_pressed:
-                    # Ctrl+框选：添加到现有选择
-                    current_selection = self.model.get_selection()
-                    new_selection = list(set(current_selection + selected_indices))
-                    self.model.set_selection(new_selection)
-                else:
-                    # 普通框选：替换选择
-                    self.model.set_selection(selected_indices)
+                try:
+                    select_rect = self._box_select_rect_item.rect()
+                    self._box_select_rect_item.setVisible(False)
+                    
+                    # 查找框内的所有 RegionTextItem
+                    selected_indices = []
+                    for i, item in enumerate(self._region_items):
+                        if isinstance(item, RegionTextItem):
+                            # 检查 item 的边界是否与选择框相交
+                            item_rect = item.sceneBoundingRect()
+                            if select_rect.intersects(item_rect):
+                                selected_indices.append(i)
+                    
+                    # 更新选择
+                    ctrl_pressed = bool(event.modifiers() & Qt.KeyboardModifier.ControlModifier)
+                    if ctrl_pressed:
+                        # Ctrl+框选：添加到现有选择
+                        current_selection = self.model.get_selection()
+                        new_selection = list(set(current_selection + selected_indices))
+                        self.model.set_selection(new_selection)
+                    else:
+                        # 普通框选：替换选择
+                        self.model.set_selection(selected_indices)
+                except RuntimeError:
+                    # C++ 对象已被删除，重置引用
+                    self._box_select_rect_item = None
 
             event.accept()
             return

desktop_qt_ui/services/export_service.py

@@ -184,26 +184,27 @@ def _perform_backend_render_export(self, image: Image.Image, regions_data: List[
                 )
 
                 if rendered_text_layer:
-                    # Composite the text layer onto the original image
-                    final_image = image.copy()
-                    if final_image.mode != 'RGBA':
-                        temp_img = final_image.convert('RGBA')
-                        final_image.close()  # 释放旧图像
-                        final_image = temp_img
-                    if rendered_text_layer.mode != 'RGBA':
-                        temp_layer = rendered_text_layer.convert('RGBA')
-                        rendered_text_layer.close()  # 释放旧图像
-                        rendered_text_layer = temp_layer
-
-                    # Ensure sizes match before pasting, resizing if necessary
-                    if final_image.size != rendered_text_layer.size:
-                        self.logger.warning(f"Size mismatch: Original {final_image.size}, Rendered {rendered_text_layer.size}. Resizing text layer.")
-                        temp_layer = rendered_text_layer.resize(final_image.size, Image.LANCZOS)
-                        rendered_text_layer.close()  # 释放旧图像
-                        rendered_text_layer = temp_layer
-
-                    final_image.paste(rendered_text_layer, (0, 0), rendered_text_layer)
-                    rendered_text_layer.close()  # 释放渲染层
+                    # 检查是否开启了超分（通过尺寸判断）
+                    # 如果后端返回的图片尺寸与原图不同，说明进行了超分处理
+                    # 此时后端返回的是完整的渲染结果（超分背景+文字），直接使用即可
+                    if image.size != rendered_text_layer.size:
+                        self.logger.info(f"检测到超分: 原图 {image.size}, 渲染结果 {rendered_text_layer.size}. 直接使用超分后的完整结果。")
+                        final_image = rendered_text_layer
+                        rendered_text_layer = None  # 避免后续释放
+                    else:
+                        # 尺寸相同，按原逻辑合成文字层到原图
+                        final_image = image.copy()
+                        if final_image.mode != 'RGBA':
+                            temp_img = final_image.convert('RGBA')
+                            final_image.close()
+                            final_image = temp_img
+                        if rendered_text_layer.mode != 'RGBA':
+                            temp_layer = rendered_text_layer.convert('RGBA')
+                            rendered_text_layer.close()
+                            rendered_text_layer = temp_layer
+
+                        final_image.paste(rendered_text_layer, (0, 0), rendered_text_layer)
+                        rendered_text_layer.close()
 
                     # --- Safer saving logic ---
                     temp_output_path = output_path + ".tmp"
@@ -277,6 +278,12 @@ def _perform_backend_render_export(self, image: Image.Image, regions_data: List[
 
     def _save_regions_data(self, regions_data: List[Dict[str, Any]], json_path: str, mask: Optional[np.ndarray] = None, config: Optional[Dict[str, Any]] = None):
         """保存区域数据到JSON文件，确保格式与TextBlock兼容"""
+        # 获取超分倍率，用于放大坐标
+        upscale_ratio = 1
+        if config:
+            upscale_config = config.get('upscale', {})
+            upscale_ratio = upscale_config.get('upscale_ratio', 0) or 1
+        
         # 准备保存数据，确保数据格式正确
         save_data = []
         for region in regions_data:
@@ -441,19 +448,19 @@ def _prepare_translator_params(self, config: Dict[str, Any]) -> Dict[str, Any]:
         """准备翻译器参数"""
         translator_params = {}
 
-        # 提取字体路径
+        # 字体路径处理：让后端自己处理，不在这里转换
+        # 后端的 set_font 会在路径不存在时自动回退到 DEFAULT_FONT
+        # 只有当配置中是绝对路径且存在时才传递
         render_config = config.get('render', {})
-        font_filename = render_config.get('font_path')
-        if font_filename:
-            font_full_path = os.path.join(
-                os.path.dirname(os.path.dirname(__file__)), 'fonts', font_filename
-            )
-            font_full_path = os.path.abspath(font_full_path)
-            if os.path.exists(font_full_path):
-                translator_params['font_path'] = font_full_path
-                # 同时更新 config 中的 font_path
-                config['render']['font_path'] = font_full_path
-                self.logger.info(f"设置字体路径: {font_full_path}")
+        font_path_value = render_config.get('font_path')
+        if font_path_value and os.path.isabs(font_path_value) and os.path.exists(font_path_value):
+            translator_params['font_path'] = font_path_value
+            self.logger.info(f"设置字体路径: {font_path_value}")
+        else:
+            # 清除相对路径，让后端使用默认字体
+            if 'render' in config and 'font_path' in config['render']:
+                config['render']['font_path'] = None
+            self.logger.info("使用后端默认字体")
 
         # 提取输出格式
         output_format = self.get_output_format_from_config(config)

doc/CHANGELOG_v1.9.5.md

@@ -0,0 +1,14 @@
+# v1.9.5 更新日志
+
+发布日期：2025-12-13
+
+## ⚡ 优化
+
+### 并行翻译模式
+- **并行模式优化**：改进了并行翻译的处理逻辑
+- **图片序列号优化**：优化了发送的图片序列号管理，提高批量处理效率
+
+### 编辑器稳定性
+- **提高编辑器稳定性**：修复了框选操作时切换图片可能导致的崩溃问题
+- **超分导出修复**：修复了开启超分时导出图片文字丢失的问题
+- **字体路径修复**：修复了打包环境下字体路径解析问题

manga_translator/rendering/text_render.py

@@ -274,7 +274,21 @@ def update_font_selection():
 
 def set_font(path: str):
     global FONT
-    if not path or not os.path.exists(path):
+    
+    # 处理相对路径：尝试在 BASE_PATH 下查找
+    resolved_path = path
+    if path and not os.path.isabs(path) and not os.path.exists(path):
+        # 尝试 BASE_PATH/fonts/filename 或 BASE_PATH/path
+        possible_paths = [
+            os.path.join(BASE_PATH, 'fonts', os.path.basename(path)),
+            os.path.join(BASE_PATH, path),
+        ]
+        for p in possible_paths:
+            if os.path.exists(p):
+                resolved_path = p
+                break
+    
+    if not resolved_path or not os.path.exists(resolved_path):
         if path:
             logger.error(f'Could not load font: {path}')
         try:
@@ -287,9 +301,9 @@ def set_font(path: str):
         return
 
     try:
-        FONT = freetype.Face(Path(path).open('rb'))
+        FONT = freetype.Face(Path(resolved_path).open('rb'))
     except (freetype.ft_errors.FT_Exception, FileNotFoundError):
-        logger.error(f'Could not load font: {path}')
+        logger.error(f'Could not load font: {resolved_path}')
         try:
             FONT = freetype.Face(Path(DEFAULT_FONT).open('rb'))
         except (freetype.ft_errors.FT_Exception, FileNotFoundError):

packaging/VERSION

@@ -1 +1 @@
-v1.9.4
+v1.9.5