From 1686f5d641f7e5826c0efc5f5d5bfb3ae626889f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AE=E7=94=9F=E8=8B=A5=E6=A2=A6?= <1070753498@qq.com>
Date: Wed, 28 Aug 2024 16:14:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=87=8D=E6=9E=84=E5=9B=BE=E5=BD=A2=E5=BA=93?=
=?UTF-8?q?=E4=BB=A5=E5=BC=95=E5=85=A5=E5=9C=86=E8=A7=92=E7=9F=A9=E5=BD=A2?=
=?UTF-8?q?=E7=BB=98=E5=88=B6=E5=8A=9F=E8=83=BD]:=20=E5=BC=95=E5=85=A5?=
=?UTF-8?q?=E4=BA=86=E6=96=B0=E7=9A=84`GraphicsRoundedRectItem`=E7=B1=BB?=
=?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=9C=86=E8=A7=92=E7=9F=A9=E5=BD=A2?=
=?UTF-8?q?=E7=9A=84=E7=BB=98=E5=88=B6=EF=BC=8C=E5=B9=B6=E9=87=8D=E6=9E=84?=
=?UTF-8?q?=E4=BA=86=E7=9B=B8=E5=85=B3=E7=B1=BB=E4=BB=A5=E9=80=82=E5=BA=94?=
=?UTF-8?q?=E8=BF=99=E4=B8=80=E6=96=B0=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将文档目录从`doc`更名为`docs`，并更新了所有相关的文件引用路径。
- 删除了旧的圆角编辑窗口图片，并新增了`RoundEdit.jpg`图片。
- 更新了`README.md`中的图片引用路径，并修正了图片显示问题。
- 在`Qt-Graphics.pro`中增加了对新文件`docs/**`的包含。
- 重命名和移动了图片文件，从`doc/`到`docs/`，并新增了`RoundEdit.jpg`。
- 在`drawwidget.cpp`中增加了对圆角矩形和旋转矩形的支持。
- 在`maskdialog.cpp`中进行了一些代码改进，使用`auto`关键字简化类型声明。
- 重构了`rounddialog.cc`和`rounddialog.hpp`，使用新的`GraphicsRoundedRectItem`代替了旧的`GraphicsRectItem`，并增加了预览和遮罩功能。
- 更新了`subtitlsplicingwidget.cc`，将图片格式从`ARGB32`改为`RGBA8888_Premultiplied`以保持一致性。
- 在`CMakeLists.txt`中添加了对新组件`graphicsroundedrectitem`的编译指令。
- 在`basicgraphicsitem.cpp`和`basicgraphicsitem.h`中增加了显示边框的选项，并在各类图形项中实现了边框绘制。
- 更新了`graphics.pro`，增加了对新头文件和源文件的包含。
- 在`graphicsarcitem.cpp`、`graphicscircleitem.cpp`、`graphicslineitem.cpp`、`graphicspixmapitem.cpp`、`graphicspolygonitem.cpp`、`graphicsringitem.cpp`和`graphicsrotatedrectitem.cpp`中增加了边框绘制功能。
- 重构了`graphicsrectitem.cpp`和`graphicsrectitem.h`，现在`GraphicsRectItem`继承自`GraphicsRoundedRectItem`，并使用新的圆角矩形实现。
- 新增了`graphicsroundedrectitem.cc`和`graphicsroundedrectitem.hpp`，提供了圆角矩形的实现。
---
.github/workflows/cmake.yml | 4 +-
.github/workflows/qmake.yml | 4 +-
Qt-Graphics.pro | 2 +-
README.md | 14 +-
doc/RoundEdit_1.png | Bin 625226 -> 0 bytes
doc/RoundEdit_2.png | Bin 529335 -> 0 bytes
doc/RoundEdit_3.png | Bin 468497 -> 0 bytes
{doc => docs}/DrawScene.png | Bin
{doc => docs}/FilmSubTiltleSplicing.png | Bin
{doc => docs}/ImageView.png | Bin
{doc => docs}/MaskEdit.png | Bin
{doc => docs}/Record_Screenshot.gif | Bin
docs/RoundEdit.jpg | Bin 0 -> 666465 bytes
examples/common/viewer.cc | 6 +-
examples/graphics/drawwidget.cpp | 8 +-
examples/graphics/imagecaptureview.cc | 6 +-
examples/graphics/imageviewer.cpp | 14 +-
examples/graphics/listiitemview.cc | 27 +-
examples/graphics/maskdialog.cpp | 14 +-
examples/graphics/openglviewer.cc | 2 +-
examples/graphics/recordwidget.cc | 2 +-
examples/graphics/rounddialog.cc | 275 ++++++++++-----------
examples/graphics/rounddialog.hpp | 8 +-
examples/graphics/subtitlsplicingwidget.cc | 4 +-
examples/graphics/vulkanviewer.cc | 2 +-
examples/rhiviewer/rhiviewer.cc | 2 +-
src/graphics/CMakeLists.txt | 2 +
src/graphics/basicgraphicsitem.cpp | 31 ++-
src/graphics/basicgraphicsitem.h | 15 +-
src/graphics/graphics.pro | 2 +
src/graphics/graphicsarcitem.cpp | 5 +-
src/graphics/graphicscircleitem.cpp | 1 +
src/graphics/graphicslineitem.cpp | 1 +
src/graphics/graphicspixmapitem.cpp | 22 +-
src/graphics/graphicspolygonitem.cpp | 21 +-
src/graphics/graphicsrectitem.cpp | 213 ++--------------
src/graphics/graphicsrectitem.h | 28 +--
src/graphics/graphicsringitem.cpp | 1 +
src/graphics/graphicsrotatedrectitem.cpp | 1 +
src/graphics/graphicsroundedrectitem.cc | 243 ++++++++++++++++++
src/graphics/graphicsroundedrectitem.hpp | 56 +++++
41 files changed, 586 insertions(+), 450 deletions(-)
delete mode 100644 doc/RoundEdit_1.png
delete mode 100644 doc/RoundEdit_2.png
delete mode 100644 doc/RoundEdit_3.png
rename {doc => docs}/DrawScene.png (100%)
rename {doc => docs}/FilmSubTiltleSplicing.png (100%)
rename {doc => docs}/ImageView.png (100%)
rename {doc => docs}/MaskEdit.png (100%)
rename {doc => docs}/Record_Screenshot.gif (100%)
create mode 100644 docs/RoundEdit.jpg
create mode 100644 src/graphics/graphicsroundedrectitem.cc
create mode 100644 src/graphics/graphicsroundedrectitem.hpp
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 78b56a8..4dd34eb 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -3,14 +3,14 @@ name: CMake Build
on:
push:
paths-ignore:
- - 'doc/**'
+ - 'docs/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
pull_request:
paths-ignore:
- - 'doc/**'
+ - 'docs/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
diff --git a/.github/workflows/qmake.yml b/.github/workflows/qmake.yml
index e279306..fe4ff04 100644
--- a/.github/workflows/qmake.yml
+++ b/.github/workflows/qmake.yml
@@ -3,14 +3,14 @@ name: QMake Build
on:
push:
paths-ignore:
- - 'doc/**'
+ - 'docs/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
pull_request:
paths-ignore:
- - 'doc/**'
+ - 'docs/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
diff --git a/Qt-Graphics.pro b/Qt-Graphics.pro
index 36fca8f..32a2853 100644
--- a/Qt-Graphics.pro
+++ b/Qt-Graphics.pro
@@ -6,7 +6,7 @@ SUBDIRS += \
examples
DISTFILES += \
- doc/** \
+ docs/** \
.clang* \
LICENSE \
README*
diff --git a/README.md b/README.md
index 1cfa44a..507e254 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
## 看图界面
-
+
-
+
-
+
-
+
-
+
-
-
+