From 257868fd4ccd508164aec73c293ac68ab8af0dd3 Mon Sep 17 00:00:00 2001
From: ArgonarioD <arnordorian@sina.com>
Date: Thu, 16 Mar 2023 01:56:05 +0800
Subject: [PATCH] =?UTF-8?q?[style]=20=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90L?=
 =?UTF-8?q?ayerStyle=E5=BA=8F=E5=88=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArchitectureColoredPainting.vcxproj       |  1 +
 ...rchitectureColoredPainting.vcxproj.filters |  3 +++
 .../src/Editor/LayerStyle.cpp                 | 21 +++++++++++++++++++
 .../src/Editor/LayerStyle.h                   |  6 ++++++
 .../src/Editor/LayerWrapper.cpp               |  4 ++++
 .../src/Editor/LayerWrapper.h                 |  1 +
 6 files changed, 36 insertions(+)

diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
index 4f5655d..91c9f62 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
@@ -197,6 +197,7 @@
     <QtMoc Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\ColorPicker.h" />
+    <ClInclude Include="src\Editor\util\JsonUtil.hpp" />
     <ClInclude Include="src\Editor\ElementManager.h" />
     <QtMoc Include="src\Editor\ElementPoolWidget.h" />
     <ClInclude Include="src\Editor\GraphicElement.h" />
diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
index 90248ca..71f1e04 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
@@ -477,6 +477,9 @@
     <ClInclude Include="src\Editor\LayerStyle.h">
       <Filter>Header Files\Editor\Style</Filter>
     </ClInclude>
+    <ClInclude Include="src\Editor\util\JsonUtil.hpp">
+      <Filter>Header Files\Editor\util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="res\MainWindow.qrc">
diff --git a/ArchitectureColoredPainting/src/Editor/LayerStyle.cpp b/ArchitectureColoredPainting/src/Editor/LayerStyle.cpp
index 588ae94..9b65355 100644
--- a/ArchitectureColoredPainting/src/Editor/LayerStyle.cpp
+++ b/ArchitectureColoredPainting/src/Editor/LayerStyle.cpp
@@ -1,5 +1,6 @@
 #include "LayerStyle.h"
 #include "./EditorWidgetComponent/StrokeStyleWidget.h"
+#include "./util/JsonUtil.hpp"
 #include <qtmaterialcheckbox.h>
 #include <QHBoxLayout>
 #include <QDialogButtonBox>
@@ -118,6 +119,16 @@ StrokeElementLayerStyle::StrokeElementLayerStyle(const StrokeElementLayerStyle&
     enableEachSideIndependent = other.enableEachSideIndependent;
 }
 
+QJsonObject StrokeElementLayerStyle::toJson() const
+{
+    QJsonObject json;
+    json.insert("type", "stroke");
+    json.insert("enableEachSideIndependent", enableEachSideIndependent);
+    json.insert("left", JsonUtil::toQJsonArray<GLfloat>(strokePair.first->encoded()));
+    json.insert("right", JsonUtil::toQJsonArray<GLfloat>(strokePair.second->encoded()));
+    return json;
+}
+
 std::unique_ptr<LayerStyle> StrokeElementLayerStyle::clone() const
 {
     return std::make_unique<StrokeElementLayerStyle>(StrokeElementLayerStyle(*this));
@@ -161,7 +172,17 @@ FillElementLayerStyle::FillElementLayerStyle(const FillElementLayerStyle& other)
     }
 }
 
+QJsonObject FillElementLayerStyle::toJson() const
+{
+    return QJsonObject();
+}
+
 std::unique_ptr<LayerStyle> FillElementLayerStyle::clone() const
 {
     return std::make_unique<FillElementLayerStyle>(FillElementLayerStyle(*this));
 }
+
+std::unique_ptr<LayerStyle> LayerStyle::fromJson(const QJsonObject& json)
+{
+    return std::unique_ptr<LayerStyle>();
+}
diff --git a/ArchitectureColoredPainting/src/Editor/LayerStyle.h b/ArchitectureColoredPainting/src/Editor/LayerStyle.h
index 7d5fb25..6717299 100644
--- a/ArchitectureColoredPainting/src/Editor/LayerStyle.h
+++ b/ArchitectureColoredPainting/src/Editor/LayerStyle.h
@@ -5,6 +5,7 @@
 #include <QWidget>
 #include <QObject>
 #include <QListWidget>
+#include <QJsonObject>
 #include "../Renderer/Painting/ElementStyle.h"
 #include "../Renderer/Painting/MaterialStyleStroke.h"
 #include "../Renderer/Painting/MaterialStyleFill.h"
@@ -23,10 +24,13 @@ class LayerStyle : public Renderer::ElementStyle
 {
 public:
     const static std::vector<std::pair<QString, std::function<std::unique_ptr<LayerStyle>()>>> types;
+    static std::unique_ptr<LayerStyle> fromJson(const QJsonObject& json);
+
     virtual QString getStyleName() const = 0;
     virtual QWidget* getInputWidget() = 0;
     virtual QWidget* getListDisplayWidget() const = 0;
     virtual ~LayerStyle() {};
+    virtual QJsonObject toJson() const = 0;
     virtual std::unique_ptr<LayerStyle> clone() const = 0;
 };
 
@@ -43,6 +47,7 @@ public:
     StrokeElementLayerStyle() = default;
     StrokeElementLayerStyle(const StrokeElementLayerStyle& other);
     ~StrokeElementLayerStyle() = default;
+    QJsonObject toJson() const override;
     std::unique_ptr<LayerStyle> clone() const override;
 
     bool enableEachSideIndependent = false;
@@ -59,5 +64,6 @@ public:
     FillElementLayerStyle(const FillElementLayerStyle& other);
     ~FillElementLayerStyle() = default;
     std::vector<std::shared_ptr<Renderer::MaterialStyleFill>> materialStyles;
+    QJsonObject toJson() const override;
     std::unique_ptr<LayerStyle> clone() const override;
 };
\ No newline at end of file
diff --git a/ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp b/ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp
index d5f28e7..960b547 100644
--- a/ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp
+++ b/ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp
@@ -240,6 +240,10 @@ QJsonObject LeafLayerWrapper::toJson() const
 	QJsonObject json = LayerWrapper::toJson();
 	json.insert("element", wrappedElement->index);
 	json.insert("is-folder", false);
+    QJsonArray stylesJson;
+    for (auto& style : styles)
+		stylesJson.push_back(style->toJson());
+    json.insert("styles", stylesJson);
 	return json;
 }
 
diff --git a/ArchitectureColoredPainting/src/Editor/LayerWrapper.h b/ArchitectureColoredPainting/src/Editor/LayerWrapper.h
index 7df5d13..f753dcb 100644
--- a/ArchitectureColoredPainting/src/Editor/LayerWrapper.h
+++ b/ArchitectureColoredPainting/src/Editor/LayerWrapper.h
@@ -6,6 +6,7 @@
 #include <QGraphicsItemGroup>
 #include <QGraphicsScene>
 #include <QJSonObject>
+#include <QJsonArray>
 #include <QLine>
 #include <QObject>
 #include <QPoint>