添加项目名称和背景颜色字段

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj

@@ -104,6 +104,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\Editor\RightBar\EditorSettingWidget.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetComponent\ColorPicker.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.cpp" />
@@ -154,6 +155,7 @@
     <ClCompile Include="src\Renderer\VirtualTextureManager.cpp" />
     <ClCompile Include="src\SvgParser.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetComponent\StrokeStyleWidget.cpp" />
+    <QtUic Include="EditorSettingWidget.ui" />
     <QtUic Include="EditorWidget.ui" />
     <QtUic Include="EditorWidgetItem.ui" />
     <QtUic Include="MainWindow.ui" />
@@ -197,6 +199,7 @@
     <QtMoc Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\ColorPicker.h" />
+    <QtMoc Include="src\Editor\RightBar\EditorSettingWidget.h" />
     <ClInclude Include="src\Editor\util\EncodeUtil.hpp" />
     <ClInclude Include="src\Editor\util\JsonUtil.hpp" />
     <ClInclude Include="src\Editor\ElementManager.h" />

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters

@@ -82,6 +82,9 @@
     <QtUic Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.ui">
       <Filter>Form Files</Filter>
     </QtUic>
+    <QtUic Include="EditorSettingWidget.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Editor\EditorWidgetItem.cpp">
@@ -234,6 +237,9 @@
     <ClCompile Include="src\Editor\EditorWidgetComponent\ColorPicker.cpp">
       <Filter>Source Files\Editor</Filter>
     </ClCompile>
+    <ClCompile Include="src\Editor\RightBar\EditorSettingWidget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="src\Renderer\RendererGLWidget.h">
@@ -281,6 +287,9 @@
     <QtMoc Include="src\Editor\EditorWidgetComponent\ColorPicker.h">
       <Filter>Header Files\Editor</Filter>
     </QtMoc>
+    <QtMoc Include="src\Editor\RightBar\EditorSettingWidget.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\data.json" />

ArchitectureColoredPainting/EditorSetting.ui

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EditorSettingWidget</class>
+ <widget class="QWidget" name="EditorSettingWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QPushButton" name="backgroundColorButton">
+       <property name="text">
+        <string>设置背景颜色</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

ArchitectureColoredPainting/EditorSettingWidget.ui

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EditorSettingWidget</class>
+ <widget class="QWidget" name="EditorSettingWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item alignment="Qt::AlignHCenter">
+      <widget class="QPushButton" name="backgroundColorButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>设置背景颜色</string>
+       </property>
+      </widget>
+     </item>
+     <item alignment="Qt::AlignHCenter">
+      <widget class="QPushButton" name="renameButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>设置项目名称</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

ArchitectureColoredPainting/EditorWidgetItem.ui

@@ -147,7 +147,7 @@
               </size>
              </property>
              <property name="currentIndex">
-              <number>1</number>
+              <number>2</number>
              </property>
              <widget class="InfoDisplayWidget" name="LayerDisplay">
               <attribute name="title">
@@ -159,6 +159,11 @@
                <string>图元池</string>
               </attribute>
              </widget>
+             <widget class="EditorSettingWidget" name="EditorSetting">
+              <attribute name="title">
+               <string>设置</string>
+              </attribute>
+             </widget>
             </widget>
            </item>
            <item>
@@ -229,6 +234,12 @@
    <header>ElementPoolWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>EditorSettingWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">EditorSettingWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

ArchitectureColoredPainting/src/Editor/EditorWidget.cpp

@@ -47,3 +47,11 @@ EditorWidget::EditorWidget(QWidget* parent) : QWidget(parent)
 		});
 }
 
+void EditorWidget::renameTab(QWidget* target, QString name)
+{
+	int index = this->tabWidget->indexOf(target);
+	if (index != -1)
+	{
+		this->tabWidget->setTabText(index, name);
+	}
+}

ArchitectureColoredPainting/src/Editor/EditorWidget.h

@@ -18,6 +18,6 @@ private:
 public:
 	EditorWidget(QWidget* parent = nullptr);
 	~EditorWidget()=default;
- 
+	void renameTab(QWidget* target, QString name);
 };
 

ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp

@@ -1,8 +1,11 @@
 #include "EditorWidgetItem.h"
+#include "EditorWidget.h"
+#include <QTimer>
 
 EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(parent)
 {
     QImage x;
+    this->parent = parent;
     displayLayer = nullptr;
     displayElement = nullptr;
     ui.setupUi(this);
@@ -12,9 +15,12 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
     this->filePath = filePath;
     layerInfoDisplayWidget = dynamic_cast<InfoDisplayWidget *>(tabWidget->widget(0));
     elementInfoDisplayWidget = dynamic_cast<ElementPoolWidget *>(tabWidget->widget(1));
+	editorSettingWidget = dynamic_cast<EditorSettingWidget*>(tabWidget->widget(2));
     elementInfoDisplayWidget->enableEdit();
     qDebug() << layerInfoDisplayWidget;
     qDebug() << elementInfoDisplayWidget;
+	connect(editorSettingWidget, &EditorSettingWidget::backgroundColorChanged, this, &EditorWidgetItem::handleBackgroundColorChange);
+	connect(editorSettingWidget, &EditorSettingWidget::projectNameChanged, this, &EditorWidgetItem::handleProjectNameChange);
     connect(previewWindow, &PreviewWindow::refreshElementPreviewByIndex, elementInfoDisplayWidget, &ElementPoolWidget::refreshPictureByIndex);
 	connect(previewWindow, &PreviewWindow::layerInfoChanged, layerInfoDisplayWidget, &InfoDisplayWidget::triggerSelfRefresh);
 	connect(treeWidget, &LayerTreeWidget::displayLayerChange, previewWindow, &PreviewWindow::currentLayerChanged);
@@ -53,6 +59,15 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
 		treeWidget->refresh();
 		treeWidget->addTopLevelItem(treeWidget->root->getQTreeItem());
     }
+    this->backgroundColor = source.value("background-color").toVariant().value<QColor>();
+	this->projectName = source.value("project-name").toString();
+    qDebug() << this->backgroundColor;
+    qDebug() << this->projectName;
+    QTimer::singleShot(300, this, [this]() {
+        	handleBackgroundColorChange(this->backgroundColor);
+	        handleProjectNameChange(this->projectName);
+        });
+
 }
 
 EditorWidgetItem::~EditorWidgetItem()
@@ -100,9 +115,28 @@ void EditorWidgetItem::saveImpl(QString filePath) const
 	json.insert("height", 1080);
 	json.insert("root-layer", source1.value("root-layer"));
     json.insert("elements", source2.value("elements"));
+    json.insert("project-name", this->projectName);
+	json.insert("background-color", QJsonValue::fromVariant(QVariant::fromValue(this->backgroundColor)));
 	QJsonDocument doc(json);
 	QFile file(filePath);
 	file.open(QIODevice::WriteOnly);
 	file.write(doc.toJson());
 	file.close();
+}
+
+void EditorWidgetItem::handleBackgroundColorChange(QColor color)
+{
+	this->backgroundColor = color;
+	previewWindow->setBackgroundColor(color);
+}
+
+void EditorWidgetItem::handleProjectNameChange(QString name)
+{
+	this->projectName = name;
+    auto parent = dynamic_cast<EditorWidget*>(this->parent);
+    qDebug() << name << "   " << parent<<" "<<this;
+    if (parent != nullptr)
+    {
+		parent->renameTab(this, name);
+    }
 }

ArchitectureColoredPainting/src/Editor/EditorWidgetItem.h

@@ -6,6 +6,7 @@
 #include "LayerManager.h"
 #include "LayerTreeWidget.h"
 #include "PreviewWindow.h"
+#include "EditorSettingWidget.h"
 #include "ui_EditorWidgetItem.h"
 #include <QPainter>
 #include <QTreeWidget>
@@ -26,11 +27,17 @@ class EditorWidgetItem : public QWidget
     QTabWidget *tabWidget;
     InfoDisplayWidget* layerInfoDisplayWidget;
     ElementPoolWidget* elementInfoDisplayWidget;
+    EditorSettingWidget* editorSettingWidget;
     // QT DATA PART
     LayerWrapper *displayLayer;
     GraphicElement *displayElement;
-    QString filePath;
+    QWidget* parent;
     void saveImpl(QString filePath)const;
+public:
+    // PROJECT INFO
+    QString filePath;
+    QString projectName;
+    QColor backgroundColor;
 
   public:
     EditorWidgetItem(QString filePath, QWidget *parent = nullptr);
@@ -38,6 +45,8 @@ class EditorWidgetItem : public QWidget
     void paintEvent(QPaintEvent *event) override;
     void save() const;
     void saveAs(QString filePath)const;
+    void handleBackgroundColorChange(QColor color);
+    void handleProjectNameChange(QString name);
 
   private slots:
     void onLayerChange(LayerWrapper *layer);

ArchitectureColoredPainting/src/Editor/PreviewWindow.cpp

@@ -13,6 +13,7 @@ PreviewWindow::PreviewWindow(QWidget *parent) : QOpenGLWidget(parent)
     painter->setRenderHint(QPainter::HighQualityAntialiasing);
     layerManager = nullptr;
     currentLayer = nullptr;
+	backgroundColor = QColor(255, 255, 255, 255);
 }
 
 void PreviewWindow::initialize(LayerManager *layerManager,QSize windowSize)
@@ -44,7 +45,7 @@ void PreviewWindow::initializeGL()
 
 void PreviewWindow::paintGL()
 {
-    glClearColor(1.0, 1.0, 1.0, 1.0);
+	glClearColor(backgroundColor.redF(), backgroundColor.greenF(), backgroundColor.blueF(), backgroundColor.alphaF());
     glClear(GL_COLOR_BUFFER_BIT);
     painter->begin(this);
     painter->setRenderHint(QPainter::Antialiasing);
@@ -112,4 +113,10 @@ void PreviewWindow::mouseMoveEvent(QMouseEvent* event)
 void PreviewWindow::mouseReleaseEvent(QMouseEvent* event)
 {
 	emit layerInfoChanged();
+}
+
+void PreviewWindow::setBackgroundColor(QColor color)
+{
+	this->backgroundColor = color;
+    this->repaint();
 }

ArchitectureColoredPainting/src/Editor/PreviewWindow.h

@@ -23,6 +23,7 @@ class PreviewWindow : public QOpenGLWidget, protected QOpenGLFunctions
 	QRectF viewportRect;
     LayerWrapper* currentLayer;
     QPointF m_lastPos;
+    QColor backgroundColor;
     void mousePressEvent(QMouseEvent* event) override;
 	void mouseMoveEvent(QMouseEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
@@ -35,6 +36,7 @@ class PreviewWindow : public QOpenGLWidget, protected QOpenGLFunctions
     void paintGL() override;
     void resizeGL(int w, int h) override;
     Renderer::ElementRenderer* const getRenderer()const;
+    void setBackgroundColor(QColor color);
 
   public slots:
     void currentLayerChanged(LayerWrapper*);

ArchitectureColoredPainting/src/Editor/RightBar/EditorSettingWidget.cpp

@@ -0,0 +1,21 @@
+#include "EditorSettingWidget.h"
+#include <QPushButton>
+#include <QColorDialog>
+#include <QInputDialog>
+
+EditorSettingWidget::EditorSettingWidget(QWidget* parent)
+	: QWidget(parent)
+{
+	ui.setupUi(this);
+	connect(ui.backgroundColorButton, &QPushButton::clicked, this, [this]() {
+			QColor color = QColorDialog::getColor(Qt::white, this, QString::fromLocal8Bit("选择背景颜色"));
+			if (color.isValid())
+			{
+				emit backgroundColorChanged(color);
+			}
+		});
+	connect(ui.renameButton, &QPushButton::clicked, this, [this]() {
+			QString name = QInputDialog::getText(this, QString::fromLocal8Bit("重命名"), QString::fromLocal8Bit("请输入新的项目名称"));
+			emit projectNameChanged(name);
+		});
+}

ArchitectureColoredPainting/src/Editor/RightBar/EditorSettingWidget.h

@@ -0,0 +1,21 @@
+#pragma once
+#include <qwidget.h>
+#include "ui_EditorSettingWidget.h"
+
+class EditorSettingWidget :
+    public QWidget
+{
+    Q_OBJECT;
+    
+  private:
+      Ui::EditorSettingWidget ui;
+    
+  public:
+      EditorSettingWidget(QWidget* parent = nullptr);
+
+  signals:
+	  void backgroundColorChanged(QColor);
+      void projectNameChanged(QString);
+    
+};
+

data.json

@@ -1,4 +1,6 @@
 {
+  "project-name": "样例1",
+  "background-color": "#ffffff",
   "height": 1080,
   "width": 1080,
   "elements": [