!46 feat: graphviz_render中新增高清缩放模式，通过ui右上角按钮切换

* feat: graphviz_render中新增高清缩放模式，通过ui右上角按钮切换

Author: DuanYH

tools/graphviz_render/requirements.txt

@@ -2,3 +2,5 @@ Pillow==9.0.0
 Pillow==7.0.0
 Pillow==11.1.0
 PyQt5==5.15.11
+python3-pyqt5.qtsvg
+

tools/graphviz_render/src/data_processing.py

@@ -28,7 +28,7 @@
 from PyQt5.QtCore import QThread, pyqtSignal
 
 class DataProcessing(QThread):
-    data_received = pyqtSignal(QPixmap)
+    data_received = pyqtSignal(QPixmap, bytes)
 
     def __init__(self):
         super().__init__()
@@ -37,9 +37,10 @@ def __init__(self):
         self._cond = threading.Condition(self._lock)   # 数据变更条件变量
 
         # 共享状态变量
-        self._last_dot_data = ''             # 最后接收的DOT数据 
+        self._last_dot_data = ''             # 最后接收的DOT数据
         self._running = True                 # 线程运行标志
         self._original_image = None          # 原始图像缓存
+        self._svg_bytes = b''                # SVG字节数据缓存（用于高清光栅化）
         self._pending_update = False         # 更新标记
 
     def run(self):
@@ -62,28 +63,38 @@ def _process_update(self):
 
         try:
             # 生成图像（耗时操作）
-            image = self._render_dot(current_data)
+            image, svg_bytes = self._render_dot(current_data)
             if image:
                 self._original_image = image
+                self._svg_bytes = svg_bytes
                 self._update_display()
         except Exception as e:
             print(f"Render error: {e}")
 
-    def _render_dot(self, dot_data: str) -> Image.Image:
-        """DOT数据渲染方法"""
-        proc = subprocess.Popen(
+    def _render_dot(self, dot_data: str):
+        """DOT数据渲染方法，同时生成 PNG（预览）和 SVG（高清光栅化用）"""
+        # 渲染 SVG（矢量格式，用于缩放后高清重绘）
+        proc_svg = subprocess.Popen(
+            ['dot', '-Tsvg'],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+        svg_out, _ = proc_svg.communicate(dot_data.encode())
+
+        # 渲染 PNG（用于初始快速预览）
+        proc_png = subprocess.Popen(
             ['dot', '-Tpng'],
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE
         )
-        stdout, stderr = proc.communicate(dot_data.encode())
+        png_out, stderr = proc_png.communicate(dot_data.encode())
 
-        if proc.returncode != 0:
+        if proc_png.returncode != 0:
             raise RuntimeError(f"Graphviz error: {stderr.decode()}")
 
-        return Image.open(BytesIO(stdout))
-
+        return Image.open(BytesIO(png_out)), svg_out
 
     def _update_display(self):
         """图像显示更新"""
@@ -95,8 +106,8 @@ def _update_display(self):
             qimg = self._pil_to_qimage(self._original_image)
             pixmap = QPixmap.fromImage(qimg)
 
-            # 发射信号（跨线程安全）
-            self.data_received.emit(pixmap)
+            # 发射信号（跨线程安全），同时携带 SVG 数据供高清光栅化
+            self.data_received.emit(pixmap, self._svg_bytes)
         except Exception as e:
             print(f"Display error: {e}")
 

tools/graphviz_render/src/main.py

@@ -22,7 +22,6 @@
 
 import os
 import sys
-import signal
 
 from ui.viewer import GraphvizViewer
 from signal_handler import SignalHandler

tools/graphviz_render/src/signal_handler.py

@@ -19,7 +19,7 @@
 #
 
 import signal
-from PyQt5.QtCore import QObject, pyqtSignal, QTimer
+from PyQt5.QtCore import QObject, pyqtSignal
 
 class SignalHandler(QObject):
     sig_interrupt = pyqtSignal()

tools/graphviz_render/src/transform/__init__.py

@@ -19,3 +19,4 @@
 #
 
 from .zoomable import ZoomableGraphicsView
+from .zoomable_svg import ZoomableSvgGraphicsView

tools/graphviz_render/src/transform/zoomable.py

@@ -27,13 +27,13 @@
 class ZoomableGraphicsView(QGraphicsView):
     def __init__(self, parent=None):
         super().__init__(parent)
-        
+
         # 初始化视图设置
         self._setup_view()
         self._setup_scene()
         self._setup_interaction()
         self._setup_indicators()
-        
+
         # 初始化参数
         self._zoom_factor = 1.0
         self.min_zoom = 0.1
@@ -67,7 +67,7 @@ def _setup_scene(self):
         self.scene = QGraphicsScene(self)
         self.scene.setSceneRect(-1e6, -1e6, 2e6, 2e6)  # 超大场景范围
         self.setScene(self.scene)
-        
+
         self.pixmap_item = QGraphicsPixmapItem()
         self.pixmap_item.setTransformationMode(Qt.SmoothTransformation)
         self.pixmap_item.setShapeMode(QGraphicsPixmapItem.BoundingRectShape)
@@ -92,14 +92,14 @@ def _setup_indicators(self):
         self.center_indicator.setVisible(False)
         self.scene.addItem(self.center_indicator)
 
-    def update_image(self, pixmap: QPixmap):
-        """更新图像并自适应视图"""
+    def update_image(self, pixmap: QPixmap, svg_bytes: bytes = b''):
+        """更新图像并自适应视图（svg_bytes 参数由方案B使用，此处忽略）"""
         self.pixmap_item.setPixmap(pixmap)
         self._center_pixmap(pixmap)
         if self.fisrt_refresh:
             self.fisrt_refresh = False
             self.fit_to_view()
-        
+
     def _center_pixmap(self, pixmap: QPixmap):
         """居中放置图元"""
         self.pixmap_item.setPos(-pixmap.width()/2, -pixmap.height()/2)
@@ -120,7 +120,7 @@ def wheelEvent(self, event: QWheelEvent):
         zoom_in = event.angleDelta().y() > 0
         factor = 1.25 if zoom_in else 0.8
         new_zoom = self._zoom_factor * factor
-        
+
         # 应用缩放限制
         if self.min_zoom <= new_zoom <= self.max_zoom:
             self.scale(factor, factor)
@@ -142,7 +142,7 @@ def keyPressEvent(self, event: QKeyEvent):
                 new_zoom = self._zoom_factor * factor
 
             # 应用缩放限制
-            if  self.min_zoom <= new_zoom <= self.max_zoom:
+            if self.min_zoom <= new_zoom <= self.max_zoom:
                 self.scale(factor, factor)
                 self._zoom_factor = new_zoom
                 return
@@ -156,9 +156,9 @@ def mousePressEvent(self, event: QMouseEvent):
             self.dragging = True
             self.last_mouse_pos = event.pos()
             self.setCursor(Qt.ClosedHandCursor)
-            
+
         super().mousePressEvent(event)
-    
+
     def mouseDoubleClickEvent(self, event: QMouseEvent):
         """鼠标双击事件处理（增强版）"""
         if event.button() == Qt.RightButton:
@@ -167,7 +167,7 @@ def mouseDoubleClickEvent(self, event: QMouseEvent):
             return
         elif event.button() == Qt.LeftButton:
             event.accept()
-            factor = 2
+            factor = 1.25
             new_zoom = self._zoom_factor * factor
 
             # 应用缩放限制
@@ -183,13 +183,13 @@ def mouseMoveEvent(self, event: QMouseEvent):
         if self.dragging:
             delta = event.pos() - self.last_mouse_pos
             self.last_mouse_pos = event.pos()
-            
+
             # 更新滚动条实现拖拽
             self.horizontalScrollBar().setValue(
                 self.horizontalScrollBar().value() - delta.x())
             self.verticalScrollBar().setValue(
                 self.verticalScrollBar().value() - delta.y())
-            
+
         super().mouseMoveEvent(event)
 
     def mouseReleaseEvent(self, event: QMouseEvent):
@@ -206,10 +206,10 @@ def _fit_and_center_animation(self):
 
         # 先执行自适应调整
         self.fit_to_view()
-        
+
         # 获取最终场景中心坐标
         final_center = self.pixmap_item.sceneBoundingRect().center()
-        
+
         # 创建组合动画
         self._create_center_animation(final_center)
 
@@ -218,14 +218,14 @@ def _create_center_animation(self, target_center: QPointF):
         # 平移动画
         anim_h = QPropertyAnimation(self.horizontalScrollBar(), b"value")
         anim_v = QPropertyAnimation(self.verticalScrollBar(), b"value")
-        
+
         # 缩放动画
         current_zoom = self._zoom_factor
         anim_zoom = QPropertyAnimation(self, b"zoom_factor")
         anim_zoom.setDuration(400)
         anim_zoom.setStartValue(current_zoom)
         anim_zoom.setEndValue(1.0)  # 自适应后的标准缩放值
-        
+
         # 配置动画参数
         for anim in [anim_h, anim_v]:
             anim.setDuration(400)
@@ -234,19 +234,19 @@ def _create_center_animation(self, target_center: QPointF):
         # 计算目标滚动值
         view_center = self.mapToScene(self.viewport().rect().center())
         delta = target_center - view_center
-        
+
         # 设置动画参数
         anim_h.setStartValue(self.horizontalScrollBar().value())
         anim_h.setEndValue(self.horizontalScrollBar().value() + delta.x())
-        
+
         anim_v.setStartValue(self.verticalScrollBar().value())
         anim_v.setEndValue(self.verticalScrollBar().value() + delta.y())
-        
+
         # 启动动画
         anim_zoom.start()
         anim_h.start()
         anim_v.start()
-        
+
         # 显示指示器
         self.center_indicator.setPos(target_center)
         self.center_indicator.setVisible(True)