[重构图形绘制组件并修复线条定位问题]: 对GraphicsPixmapItem进行模块化重构，修复SectionalSubtitlesView中线条定位计算错误，提升代码质量和用户体验

-**重构GraphicsPixmapItem**: 将掩码绘制功能拆分为CursorManager和MaskPainter辅助类，改进代码结构和可维护性
-**修复SectionalSubtitlesView线条定位**: 使用场景实际边界计算线条位置，确保线条不会超出边界范围
-**统一头文件保护**: 将#ifndef宏定义改为#pragma once指令，简化头文件管理
-**优化信号参数类型**: 将itemSelected信号参数从QGraphicsItem*改为具体GraphicsTextItem*类型，提高类型安全性
-**重命名GeometryCache接口**: setControlPoints改为setGeometryData，boundingRect/shape改为visualBoundingRect/visualShape，更准确反映功能
-**改进掩码编辑模式**: 将Mode枚举改为MaskEditingMode，相关方法重命名为setMaskEditingMode/setBrushSize等，语义更清晰
-**修复视图缩放因子更新**: 在paint事件中动态更新光标缩放比例，确保光标显示正确
-**清理资源管理**: 使用QScopedPointer管理私有实现，确保资源正确释放
-**调整线条边距**: 将SubtitleDividerLineItem的边距从0.5调整为1，改善视觉效果

Author: RealChuan

examples/graphics/drawscene.hpp

@@ -1,5 +1,4 @@
-#ifndef DRAWSCENE_HPP
-#define DRAWSCENE_HPP
+#pragma once
 
 #include <QGraphicsScene>
 
@@ -18,7 +17,7 @@ class DrawScene : public QGraphicsScene
 
 signals:
     void deleteItem();
-    void itemSelected(QGraphicsItem *item);
+    void itemSelected(Graphics::GraphicsTextItem *item);
 
 private slots:
     void editorLostFocus(Graphics::GraphicsTextItem *item);
@@ -31,5 +30,3 @@ private slots:
     bool m_drawText = false;
     QColor m_textColor;
 };
-
-#endif // DRAWSCENE_HPP

examples/graphics/drawwidget.cpp

@@ -191,9 +191,9 @@ void DrawWidget::textColorChanged()
     textButtonTriggered();
 }
 
-void DrawWidget::itemSelected(QGraphicsItem *item)
+void DrawWidget::itemSelected(Graphics::GraphicsTextItem *item)
 {
-    auto textItem = qgraphicsitem_cast<GraphicsTextItem *>(item);
+    auto *textItem = qgraphicsitem_cast<GraphicsTextItem *>(item);
     if (!textItem) {
         return;
     }

examples/graphics/drawwidget.h

@@ -6,6 +6,10 @@ class QToolBar;
 class QListWidgetItem;
 class QGraphicsItem;
 
+namespace Graphics {
+class GraphicsTextItem;
+}
+
 class DrawWidget : public QWidget
 {
     Q_OBJECT
@@ -21,7 +25,7 @@ private slots:
     void handleFontChange();
     void textButtonTriggered();
     void textColorChanged();
-    void itemSelected(QGraphicsItem *item);
+    void itemSelected(Graphics::GraphicsTextItem *item);
 
 private:
     void setupUI();

examples/graphics/maskdialog.cpp

@@ -88,14 +88,14 @@ void MaskDialog::onButtonClicked(int id)
     if (!pixmapItem) {
         return;
     }
-    GraphicsPixmapItem::Mode mode = GraphicsPixmapItem::Normal;
+    auto mode = GraphicsPixmapItem::MaskEditingMode::Normal;
     switch (id) {
-    case 1: mode = GraphicsPixmapItem::MaskDraw; break;
-    case 2: mode = GraphicsPixmapItem::MaskErase; break;
-    case 3: pixmapItem->clearMask(); break;
+    case 1: mode = GraphicsPixmapItem::MaskEditingMode::Draw; break;
+    case 2: mode = GraphicsPixmapItem::MaskEditingMode::Erase; break;
+    case 3: pixmapItem->resetMask(); break;
     default: break;
     }
-    pixmapItem->setPaintMode(mode);
+    pixmapItem->setMaskEditingMode(mode);
 }
 
 void MaskDialog::onPenSizeChanged(int value)
@@ -104,7 +104,7 @@ void MaskDialog::onPenSizeChanged(int value)
     if (!pixmapItem) {
         return;
     }
-    pixmapItem->setPenSize(value);
+    pixmapItem->setBrushSize(value);
 }
 
 void MaskDialog::onOpacityChanged(double value)
@@ -113,7 +113,7 @@ void MaskDialog::onOpacityChanged(double value)
     if (!pixmapItem) {
         return;
     }
-    pixmapItem->setOpacity(value);
+    pixmapItem->setMaskOpacity(value);
 }
 
 void MaskDialog::onSave()

examples/graphics/sectionalsubtitlesview.cc

@@ -29,12 +29,35 @@ SectionalSubtitlesView::~SectionalSubtitlesView() {}
 
 void SectionalSubtitlesView::setImageAfter()
 {
-    auto rect = sceneRect();
-    auto y = rect.height() / 5.0 * 4;
-    scene()->addItem(d_ptr->line1Ptr.data());
-    scene()->addItem(d_ptr->line2Ptr.data());
-    d_ptr->line1Ptr->setLine(QLineF(1, y, rect.width() - 1, y));
-    d_ptr->line2Ptr->setLine(QLineF(1, rect.height() - 1, rect.width() - 1, rect.height() - 1));
+    scene()->addItem(d_ptr->line1Ptr.get());
+    scene()->addItem(d_ptr->line2Ptr.get());
+
+    const auto sceneRect = this->sceneRect();
+
+    // 使用 sceneRect 的实际边界，而不是假设左上角为 (0,0)
+    const auto left = sceneRect.left();
+    const auto right = sceneRect.right();
+    const auto top = sceneRect.top();
+    const auto bottom = sceneRect.bottom();
+    const auto width = sceneRect.width();
+    const auto height = sceneRect.height();
+
+    // 计算线的位置
+    const auto topLineY = top + height * 0.8; // 从实际顶部开始计算的4/5位置
+
+    // 计算边距，确保线条不会超出边界
+    const auto margin = std::max({d_ptr->line1Ptr->margin(), d_ptr->line2Ptr->margin(), 1.0}) / 2.0;
+    const auto x1 = left + margin;   // 左侧位置（考虑实际左边界）
+    const auto x2 = right - margin;  // 右侧位置（考虑实际右边界）
+    const auto y2 = bottom - margin; // 底部位置（考虑实际底部边界）
+
+    // 创建水平线
+    QLineF topLine(x1, topLineY, x2, topLineY);
+    QLineF bottomLine(x1, y2, x2, y2);
+
+    // 设置线条
+    d_ptr->line1Ptr->setLine(topLine);
+    d_ptr->line2Ptr->setLine(bottomLine);
 }
 
 auto SectionalSubtitlesView::clipImage() const -> QImage
@@ -64,7 +87,7 @@ auto SectionalSubtitlesView::info() const -> StitchingImageInfo
 
 auto SectionalSubtitlesView::line1RatioOfHeight() const -> double
 {
-    return (static_cast<int>(d_ptr->line1Ptr->line().y1()) * 1.0 / pixmap().size().height());
+    return d_ptr->line1Ptr->line().y1() / sceneRect().height();
 }
 
 void SectionalSubtitlesView::setLine1RatioOfHeight(double value)
@@ -76,7 +99,7 @@ void SectionalSubtitlesView::setLine1RatioOfHeight(double value)
 
 auto SectionalSubtitlesView::line2RatioOfHeight() const -> double
 {
-    return (static_cast<int>(d_ptr->line2Ptr->line().y1()) * 1.0 / pixmap().size().height());
+    return d_ptr->line2Ptr->line().y1() / sceneRect().height();
 }
 
 void SectionalSubtitlesView::setLine2RatioOfHeight(double value)

examples/graphics/subtitledividerlineitem.cc

@@ -5,7 +5,7 @@
 SubtitleDividerLineItem::SubtitleDividerLineItem(QGraphicsItem *parent)
     : GraphicsLineItem(parent)
 {
-    setMargin(0.5);
+    setMargin(1);
     setShowBoundingRect(false);
     setShowShape(false);
 }

src/graphics/geometrycache.hpp

@@ -13,9 +13,9 @@ class GeometryCache
     GeometryCache() = default;
     ~GeometryCache() = default;
 
-    void setControlPoints(const QPolygonF &points) { setControlPoints(points, {}, {}); }
+    void setControlPoints(const QPolygonF &points) { setGeometryData(points, {}, {}); }
 
-    void setControlPoints(const QPolygonF &points, const QRectF &bounds, const QPainterPath &path)
+    void setGeometryData(const QPolygonF &points, const QRectF &bounds, const QPainterPath &path)
     {
         if (m_controlPoints == points && m_bounds == bounds && m_basePath == path) {
             return;
@@ -29,25 +29,24 @@ class GeometryCache
 
     QPolygonF controlPoints() const { return m_controlPoints; }
 
-    QRectF boundingRect(double margin, double penWidth, double expandAmount)
+    QRectF visualBoundingRect(double margin, double penWidth, double expandAmount)
     {
-        updateCachedData(margin, penWidth, expandAmount);
+        updateCacheIfNeeded(margin, penWidth, expandAmount);
         return m_cachedBounds;
     }
 
-    QPainterPath shape(double margin, double penWidth, double expandAmount)
+    QPainterPath visualShape(double margin, double penWidth, double expandAmount)
     {
-        updateCachedData(margin, penWidth, expandAmount);
+        updateCacheIfNeeded(margin, penWidth, expandAmount);
         return m_cachedPath;
     }
 
-    bool isValid() const { return !m_bounds.isNull() && !m_controlPoints.isEmpty(); }
-    void invalidate() { m_bounds = QRectF(); }
+    bool hasValidGeometry() const { return !m_bounds.isNull() && !m_controlPoints.isEmpty(); }
 
 private:
-    void updateCachedData(double margin, double penWidth, double expandAmount)
+    void updateCacheIfNeeded(double margin, double penWidth, double expandAmount)
     {
-        const double expansion = computeExpansion(margin, penWidth, expandAmount);
+        const double expansion = calculateTotalExpansion(margin, penWidth, expandAmount);
         if (!m_cacheDirty && qFuzzyCompare(m_cachedExpansion, expansion)) {
             return; // 缓存仍然有效
         }
@@ -59,7 +58,7 @@ class GeometryCache
         m_cachedBounds = m_cachedPath.controlPointRect();
     }
 
-    static double computeExpansion(double margin, double penWidth, double expandAmount)
+    static double calculateTotalExpansion(double margin, double penWidth, double expandAmount)
     {
         return std::max({margin * 0.5, penWidth, expandAmount});
     }
@@ -71,8 +70,7 @@ class GeometryCache
     bool m_cacheDirty = true;     // 路径是否需要重新计算
     double m_cachedExpansion = 0; // 路径扩展长度
     QPainterPath m_cachedPath;    // 缓存路径
-
-    QRectF m_cachedBounds; // 缓存矩形
+    QRectF m_cachedBounds;        // 缓存矩形
 };
 
 using GeometryCachePtr = QScopedPointer<GeometryCache>;

src/graphics/graphicsarcitem.cpp

@@ -136,9 +136,9 @@ auto GraphicsArcItem::setArc(const Arc &arc) -> bool
 
     prepareGeometryChange();
     d_ptr->arch = arc;
-    geometryCache()->setControlPoints(anchorPoints,
-                                      Utils::createBoundingRect(pts, 0),
-                                      d_ptr->arcPath);
+    geometryCache()->setGeometryData(anchorPoints,
+                                     Utils::createBoundingRect(pts, 0),
+                                     d_ptr->arcPath);
 
     return true;
 }

src/graphics/graphicsbasicitem.cpp

@@ -52,20 +52,22 @@ GraphicsBasicItem::~GraphicsBasicItem() {}
 
 auto GraphicsBasicItem::isValid() const -> bool
 {
-    return d_ptr->geometryCachePtr->isValid();
+    return d_ptr->geometryCachePtr->hasValidGeometry();
 }
 
 auto GraphicsBasicItem::boundingRect() const -> QRectF
 {
-    return d_ptr->geometryCachePtr->isValid()
-               ? d_ptr->geometryCachePtr->boundingRect(margin(), pen().width(), d_ptr->minExpandSize)
+    return d_ptr->geometryCachePtr->hasValidGeometry()
+               ? d_ptr->geometryCachePtr->visualBoundingRect(margin(),
+                                                             pen().width(),
+                                                             d_ptr->minExpandSize)
                : scene()->sceneRect();
 }
 
 auto GraphicsBasicItem::shape() const -> QPainterPath
 {
-    return d_ptr->geometryCachePtr->isValid()
-               ? d_ptr->geometryCachePtr->shape(margin(), pen().width(), d_ptr->minExpandSize)
+    return d_ptr->geometryCachePtr->hasValidGeometry()
+               ? d_ptr->geometryCachePtr->visualShape(margin(), pen().width(), d_ptr->minExpandSize)
                : QAbstractGraphicsShapeItem::shape();
 }
 

src/graphics/graphicscircleitem.cpp

@@ -76,7 +76,7 @@ auto GraphicsCircleItem::setCircle(const Circle &circle) -> bool
 
     prepareGeometryChange();
     d_ptr->circle = circle;
-    geometryCache()->setControlPoints(d_ptr->circle.controlPoints(), rect, shape);
+    geometryCache()->setGeometryData(d_ptr->circle.controlPoints(), rect, shape);
 
     return true;
 }