From 477517d919135a23a0130488c2edd8f1dfd4ebc2 Mon Sep 17 00:00:00 2001
From: karlis <2995621482@qq.com>
Date: Wed, 8 Mar 2023 12:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ui=EF=BC=8C=E5=89=94=E9=99=A4?=
=?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ArchitectureColoredPainting/EditorWidget.ui | 8 +-
.../EditorWidgetItem.ui | 75 ++++++++++++++-----
.../src/Editor/RightBar/InfoDisplayWidget.cpp | 12 +--
.../src/Editor/RightBar/InfoDisplayWidget.h | 1 -
4 files changed, 67 insertions(+), 29 deletions(-)
diff --git a/ArchitectureColoredPainting/EditorWidget.ui b/ArchitectureColoredPainting/EditorWidget.ui
index 526cef6..4b7d672 100644
--- a/ArchitectureColoredPainting/EditorWidget.ui
+++ b/ArchitectureColoredPainting/EditorWidget.ui
@@ -7,7 +7,7 @@
0
0
1139
- 685
+ 862
@@ -169,6 +169,12 @@
-
+
+
+ 0
+ 800
+
+
0
diff --git a/ArchitectureColoredPainting/EditorWidgetItem.ui b/ArchitectureColoredPainting/EditorWidgetItem.ui
index deec7a8..93811f0 100644
--- a/ArchitectureColoredPainting/EditorWidgetItem.ui
+++ b/ArchitectureColoredPainting/EditorWidgetItem.ui
@@ -7,13 +7,22 @@
0
0
1124
- 695
+ 1010
+
+
+ 0
+ 0
+
+
RendererWidget
+
+ 0
+
0
@@ -28,19 +37,21 @@
-
-
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
- -
-
+
-
@@ -49,32 +60,62 @@
-
-
+
+
+ 20
+
+
+ 11
+
+
+ 11
+
+
+ 0
+
+
+ 11
+
-
+
+
+ 0
+ 0
+
+
1
- Layer
+ 图层信息
- Element
+ 图元池
-
+
+
+ 0
+ 0
+
+
Qt::CustomContextMenu
+
+
+
- 1
+ 图层树
diff --git a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
index 5dc5748..69c176d 100644
--- a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
+++ b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
@@ -17,7 +17,7 @@ void InfoDisplayWidget::generateLayerForm()
QLayoutItem *item;
if (this->layout() != nullptr)
{
- while ((item = this->layout()->takeAt(0)) != nullptr)
+ while (this->layout()->count() > 0 && (item = this->layout()->takeAt(0)) != nullptr)
{
delete item->widget();
delete item;
@@ -80,7 +80,7 @@ void InfoDisplayWidget::generateLayerForm()
QListWidgetItem* item = new QListWidgetItem("样式列表");
item->setFlags(Qt::NoItemFlags);
styleList->addItem(item);
- static vector styleNames = { "样例1", "样例2", "样例3" };
+ static vector styleNames = { "样例1", "样例2", "样例3" , "样例4" , "样例5" , "样例6" , "样例7" , "样例8" };
auto createStyleItem = [this, styleList](int index) {
QListWidgetItem* item = new QListWidgetItem;
QWidget* w = new QWidget;
@@ -137,16 +137,8 @@ void InfoDisplayWidget::generateLayerForm()
this->setLayout(layout);
}
-
-void InfoDisplayWidget::generateElementForm()
-{
-
-}
-
void InfoDisplayWidget::triggerSelfRefresh()
{
if (this->displayLayer != nullptr)
this->generateLayerForm();
- else
- this->generateElementForm();
}
\ No newline at end of file
diff --git a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.h b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.h
index 376dbf2..11f642b 100644
--- a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.h
+++ b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.h
@@ -16,7 +16,6 @@ class InfoDisplayWidget : public QWidget
public:
void setLayer(LayerWrapper *layer);
void generateLayerForm();
- void generateElementForm();
public slots:
void triggerSelfRefresh();