ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj

@@ -61,14 +61,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>$(SolutionDir)QGoodWindow;%(AdditionalIncludeDirectories);$(Qt_INCLUDEPATH_)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)ArchitectureColoredPainting\src\Editor\RightBar;$(SolutionDir)ArchitectureColoredPainting\src\Editor\;$(SolutionDir)QGoodWindow;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)QGoodWindow;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
@@ -105,8 +105,6 @@
     <ClCompile Include="src\Editor\LayerManager.cpp" />
     <ClCompile Include="src\Editor\LayerWrapper.cpp" />
     <ClCompile Include="src\Editor\PreviewWindow.cpp" />
-    <ClCompile Include="src\Editor\RightBar\InfoDisplayWidget.cpp" />
-    <ClCompile Include="src\Editor\RightBar\LayerTreeWidget.cpp" />
     <ClCompile Include="src\Editor\third-party modules\qquick\qquicksvgparser.cpp" />
     <ClCompile Include="src\Editor\third-party modules\util\SvgFileLoader.cpp" />
     <ClCompile Include="src\IconWidget.cpp" />
@@ -164,8 +162,6 @@
     <None Include="Shaders\ssgi.comp" />
   </ItemGroup>
   <ItemGroup>
-    <QtMoc Include="src\Editor\RightBar\LayerTreeWidget.h" />
-    <QtMoc Include="src\Editor\RightBar\InfoDisplayWidget.h" />
     <ClInclude Include="src\Editor\third-party modules\qquick\qtquickglobal.h" />
     <ClInclude Include="src\Editor\third-party modules\qquick\qtquickglobal_p.h" />
     <ClInclude Include="src\Editor\third-party modules\qquick\qquicksvgparser_p.h" />

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters

@@ -173,13 +173,6 @@
     </ClCompile>
     <ClCompile Include="src\Editor\third-party modules\SvgHelper.cpp">
       <Filter>Source Files\Editor\third-party modules</Filter>
-      <Filter>Source Files\Editor\third-party modules</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Editor\RightBar\LayerTreeWidget.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Editor\RightBar\InfoDisplayWidget.cpp">
-      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Renderer\Painting\ElementStyle.cpp">
       <Filter>Source Files\Renderer\Painting</Filter>
@@ -213,12 +206,6 @@
     <QtMoc Include="src\Editor\PreviewWindow.h">
       <Filter>Header Files\Editor</Filter>
     </QtMoc>
-    <QtMoc Include="src\Editor\RightBar\LayerTreeWidget.h">
-      <Filter>Header Files</Filter>
-    </QtMoc>
-    <QtMoc Include="src\Editor\RightBar\InfoDisplayWidget.h">
-      <Filter>Header Files</Filter>
-    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <None Include="Shaders\shader.frag">
@@ -346,6 +333,9 @@
     <ClInclude Include="src\Editor\ElementManager.h">
       <Filter>Header Files\Editor</Filter>
     </ClInclude>
+    <ClInclude Include="src\Editor\LayerWrapper.h">
+      <Filter>Header Files\Editor</Filter>
+    </ClInclude>
     <ClInclude Include="src\Renderer\Painting\LineTree.h">
       <Filter>Header Files\Renderer\Painting</Filter>
     </ClInclude>
@@ -367,13 +357,6 @@
     <ClInclude Include="src\Editor\third-party modules\util\SvgFileLoader.h">
       <Filter>Header Files\Editor\util</Filter>
     </ClInclude>
-    <ClInclude Include="src\Editor\LayerWrapper.h">
-      <Filter>Header Files\Editor</Filter>
-      <Filter>Header Files\Editor\third-party modules\qquick</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Editor\third-party modules\util\SvgFileLoader.h">
-      <Filter>Header Files\Editor\util</Filter>
-    </ClInclude>
     <ClInclude Include="src\Renderer\Painting\ElementStyle.h">
       <Filter>Header Files\Renderer\Painting</Filter>
     </ClInclude>

ArchitectureColoredPainting/EditorWidget.ui

@@ -27,60 +27,18 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QWidget" name="MainWindow" native="true">
+    <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,30">
-     <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,30">
      <item>
-       <widget class="QLabel" name="Title">
+      <widget class="QLabel" name="title">
        <property name="text">
         <string>纹理编辑</string>
        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
       </widget>
      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,18,5">
-        <item>
-         <widget class="QWidget" name="LeftBar" native="true"/>
-        </item>
      <item>
       <widget class="PreviewWindow" name="Preview"/>
      </item>
-        <item>
-         <widget class="QWidget" name="RightBar" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_4" stretch="1,2">
-           <item>
-            <widget class="QTabWidget" name="DisplayTab">
-             <property name="currentIndex">
-              <number>0</number>
-             </property>
-             <widget class="InfoDisplayWidget" name="LayerDisplay">
-              <attribute name="title">
-               <string>Layer</string>
-              </attribute>
-             </widget>
-             <widget class="QWidget" name="ElementDisplay">
-              <attribute name="title">
-               <string>Element</string>
-              </attribute>
-             </widget>
-            </widget>
-           </item>
-           <item>
-            <widget class="LayerTreeWidget" name="LayerTree">
-             <property name="contextMenuPolicy">
-              <enum>Qt::CustomContextMenu</enum>
-             </property>
-            </widget>
-           </item>
     </layout>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
    </item>
   </layout>
  </widget>
@@ -91,17 +49,6 @@
    <extends>QOpenGLWidget</extends>
    <header>PreviewWindow.h</header>
   </customwidget>
-  <customwidget>
-   <class>LayerTreeWidget</class>
-   <extends>QTreeWidget</extends>
-   <header location="global">LayerTreeWidget.h</header>
-  </customwidget>
-  <customwidget>
-   <class>InfoDisplayWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">InfoDisplayWidget.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

ArchitectureColoredPainting/Shaders/painting.comp

@@ -876,49 +876,6 @@ void drawLine(in float d, in uint styleIndex, out vec4 elementColor, out vec2 me
 	}
 }
 
-void drawLine(in float d, in uint styleIndex, out vec4 elementColor, out vec2 metallicRoughness)
-{
-	elementColor = vec4(1);
-	metallicRoughness = vec2(0.8);
-	switch(int(elementData[styleIndex+3]))
-	{
-		case 0:
-		{
-			elementColor = vec4(elementData[styleIndex+7],elementData[styleIndex+8],elementData[styleIndex+9],1);
-			metallicRoughness = vec2(elementData[styleIndex+10],elementData[styleIndex+11]);
-			break;
-		}
-		case 1:
-		{
-			elementColor = vec4(mix(vec3(0), vec3(1), d), 1);
-			metallicRoughness = vec2(0,0.8);
-			break;
-		}
-		case 2:
-		{
-			float levels[] = {0.25,0.5,0.75};
-			vec3 colors[] = {vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(1,1,0)};
-			int i = 0;
-			while(i<3)
-			{
-				if(d<levels[i])
-				{
-					elementColor = vec4(colors[i], 1);
-					metallicRoughness = vec2(0,0.8);
-					break;
-				}
-				i++;
-			}
-			if(i==3)
-			{
-				elementColor = vec4(colors[i], 1);
-				metallicRoughness = vec2(0,0.8);
-			}
-			break;
-		}
-	}
-}
-
 bool drawElement(uint elementIndex, vec2 localUV, out vec3 color, out vec2 metallicRoughness, inout vec3 debugBVH = vec3(0))
 {
 	bool hitElement = false;

ArchitectureColoredPainting/src/Editor/EditorWidget.cpp

@@ -2,18 +2,9 @@
 
 EditorWidget::EditorWidget(QWidget *parent) : QWidget(parent)
 {
-    displayLayer = nullptr;
-    displayElement = nullptr;
     ui.setupUi(this);
     previewWindow = ui.Preview;
-    treeWidget = ui.LayerTree;
+    qDebug() << "123";
-    tabWidget = ui.DisplayTab;
-    layerInfoDisplayWidget = dynamic_cast<InfoDisplayWidget *>(tabWidget->widget(0));
-    elementInfoDisplayWidget = dynamic_cast<InfoDisplayWidget *>(tabWidget->widget(1));
-    connect(treeWidget, &LayerTreeWidget::displayLayerChange, this, &EditorWidget::onLayerChange);
-    connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshPreview, this,
-            &EditorWidget::triggerRefreshPreview);
-    // &EditorWidget::triggerRefreshPreview);
     // test
     QFile settingFile;
     settingFile.setFileName("../data.json");
@@ -28,10 +19,6 @@ EditorWidget::EditorWidget(QWidget *parent) : QWidget(parent)
     elementManager = new ElementManager(source);
     layerManager = new LayerManager(source, elementManager);
     previewWindow->initialize(layerManager);
-    if (layerManager->getRoot() != nullptr)
-    {
-        treeWidget->addTopLevelItem(layerManager->getRoot()->qTreeItem);
-    }
 }
 
 EditorWidget::~EditorWidget()
@@ -41,16 +28,3 @@ EditorWidget::~EditorWidget()
 void EditorWidget::paintEvent(QPaintEvent *event)
 {
 }
-
-void EditorWidget::onLayerChange(LayerWrapper *layer)
-{
-    displayLayer = layer;
-    // TODO : notify InfoDisplayWidget and update
-    dynamic_cast<InfoDisplayWidget *>(tabWidget->widget(0))->setLayer(layer);
-    this->update();
-}
-
-void EditorWidget::triggerRefreshPreview()
-{
-    previewWindow->update();
-}

ArchitectureColoredPainting/src/Editor/EditorWidget.h

@@ -1,38 +1,24 @@
 #pragma once
 
 #include "ElementManager.h"
-#include "InfoDisplayWidget.h"
 #include "LayerManager.h"
-#include "LayerTreeWidget.h"
 #include "PreviewWindow.h"
 #include "ui_EditorWidget.h"
 #include <QPainter>
-#include <QTreeWidget>
 #include <QWidget>
+
 class EditorWidget : public QWidget
 {
     Q_OBJECT
 
   private:
-    // DATA PART
+    Ui::EditorWidgetClass ui;
     PreviewWindow *previewWindow;
     ElementManager *elementManager;
     LayerManager *layerManager;
-    // QT GUI PART
-    Ui::EditorWidgetClass ui;
-    LayerTreeWidget *treeWidget;
-    QTabWidget *tabWidget;
-    InfoDisplayWidget *layerInfoDisplayWidget, *elementInfoDisplayWidget;
-    // QT DATA PART
-    LayerWrapper *displayLayer;
-    GraphicElement *displayElement;
 
   public:
     EditorWidget(QWidget *parent = nullptr);
     ~EditorWidget();
     void paintEvent(QPaintEvent *event) override;
-
-  private slots:
-    void onLayerChange(LayerWrapper *layer);
-    void triggerRefreshPreview();
 };

ArchitectureColoredPainting/src/Editor/GraphicElement.cpp

@@ -11,14 +11,12 @@ void SimpleElement::loadSvgFile(const QString& filePath)
 	// TODO ÑùʽÎÊÌâ
     SvgFileLoader loader;
     loader.loadSvgFile(filePath, painterPath);
-	qDebug() << "load svg file success "<<painterPath.elementCount();
 }
 
 SimpleElement::SimpleElement(QJsonObject jsonSource) : jsonSource(jsonSource)
 {
     painterPath.clear();
-    loadSvgFile("D:\\Projects\\BigC\\svg\\3.svg");
+	loadSvgFile(jsonSource.value("data").toObject().value("include").toString());
-	//loadSvgFile(jsonSource.value("data").toObject().value("include").toString());
 }
 
 GroupElement::GroupElement(FolderLayerWrapper *sourceLayer)

ArchitectureColoredPainting/src/Editor/LayerManager.cpp

@@ -7,10 +7,6 @@ LayerManager::LayerManager(QJsonObject source, ElementManager *elementManager)
     else
         root = new LeafLayerWrapper(rootJson, elementManager, nullptr);
 }
-LayerWrapper *LayerManager::getRoot() const
-{
-    return root;
-}
 void LayerManager::paint(QPainter *painter) const
 {
     painter->drawPath(root->getCache());
@@ -61,11 +57,3 @@ bool LayerManager::changeParent(FolderLayerWrapper *newParent) const
     selectedLayers[0]->setParent(newParent);
     return true;
 }
-void LayerManager::addLayer(LayerWrapper *layer)
-{
-    layerSet.insert(layer);
-}
-void LayerManager::removeLayer(LayerWrapper *layer)
-{
-    layerSet.erase(layer);
-}

ArchitectureColoredPainting/src/Editor/LayerManager.h

@@ -3,11 +3,9 @@
 #include "LayerWrapper.h"
 #include <QJsonArray>
 #include <QPainter>
-#include <set>
 #include <utility>
 #include <vector>
 using std::pair;
-using std::set;
 using std::vector;
 class ElementManager;
 class LayerWrapper;
@@ -23,13 +21,8 @@ class LayerManager
     LayerPtrs involvedLeafLayersCache;
     bool singleSelectedCheck() const;
     bool multipleSelectedCheck() const;
-    set<LayerWrapper *> layerSet;
 
   public:
-    void addLayer(LayerWrapper *layer);
-    void removeLayer(LayerWrapper *layer);
-    LayerWrapper *getRoot() const;
-    LayerManager() = default;
     LayerManager(QJsonObject source, ElementManager *elementManager);
     void paint(QPainter *painter) const;
     bool rename(QString newName) const;

ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp

@@ -33,17 +33,9 @@ LayerWrapper::LayerWrapper(QJsonObject json, LayerWrapper *parent)
 {
     this->parent = shared_ptr<LayerWrapper>(parent);
     auto transformJson = json.value("transform").toObject();
-    property.name = json.value("name").toString();
+    property.offset = { transformJson.value("offset").toObject().value("x").toDouble(), transformJson.value("offset").toObject().value("y").toDouble() };
-    property.offset = {transformJson.value("offset").toObject().value("x").toDouble(),
+    property.scale = { transformJson.value("scale").toObject().value("x").toDouble(), transformJson.value("scale").toObject().value("y").toDouble() };
-                       transformJson.value("offset").toObject().value("y").toDouble()};
-    property.scale = {transformJson.value("scale").toObject().value("x").toDouble(),
-                      transformJson.value("scale").toObject().value("y").toDouble()};
     property.rotation = { transformJson.value("rotation").toDouble()};
-    qTreeItem = new QTreeWidgetItem();
-    qTreeItem->setText(0, property.name);
-    if (parent != nullptr)
-        parent->qTreeItem->addChild(qTreeItem);
-    qTreeItem->setData(0, Qt::UserRole, QVariant::fromValue(this));
 }
 
 FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *elementManager, LayerWrapper *parent)
@@ -79,16 +71,16 @@ LeafLayerWrapper::LeafLayerWrapper(QJsonObject json, ElementManager *elementMana
 void LayerWrapper::SimpleProperty::apply(QPainterPath &cache) const
 {
     QTransform trans;
-    double centerX = cache.boundingRect().center().x();
+    double delX = cache.boundingRect().width();
-    double centerY = cache.boundingRect().center().y();
+    double delY = cache.boundingRect().height();
-    qDebug() << name << "  " << cache.boundingRect().center();
+    trans.translate(-delX,-delY);
-    qDebug() << name << " " << cache.boundingRect();
-    trans.translate(centerX, centerY);
     trans.scale(scale.x(), scale.y());
     trans.rotate(rotation);
-    trans.translate(-centerX, -centerY);
-    trans.translate(offset.x(), offset.y());
     cache = trans.map(cache);
+    trans.reset();
+    trans.translate(delX+offset.x(), delY+offset.y());
+    cache = trans.map(cache);
+    // cache.translate(offset);
 }
 void LayerWrapper::refresh()
 {
@@ -106,8 +98,7 @@ void FolderLayerWrapper::refresh()
 void LeafLayerWrapper::refresh()
 {
     cache.clear();
-    if (wrappedElement != nullptr)
+    if (wrappedElement != nullptr) {
-    {
         cache.addPath(wrappedElement->getPaintObject());
     }
     LayerWrapper::refresh();
@@ -122,12 +113,3 @@ void FolderLayerWrapper::removeAllChild()
 {
     children.clear();
 }
-
-namespace LayerEvent
-{
-
-static void onDoubleClick(QTreeWidgetItem *qItem, LayerWrapper *layerWrapper)
-{
-}
-
-} // namespace LayerEvent

ArchitectureColoredPainting/src/Editor/LayerWrapper.h

@@ -7,9 +7,7 @@
 #include <QGraphicsScene>
 #include <QJSonObject>
 #include <QLine>
-#include <QObject>
 #include <QPoint>
-#include <QTreeWidget>
 #include <memory>
 #include <vector>
 using std::shared_ptr;
@@ -21,7 +19,6 @@ class ElementManager;
 
 class LayerWrapper
 {
-
   protected:
     shared_ptr<LayerWrapper> parent;
     QPointF referencePoint;
@@ -29,7 +26,6 @@ class LayerWrapper
     QPainterPath cache;
 
   public:
-    QTreeWidgetItem *qTreeItem;
     struct SimpleProperty
     {
         QString name = "";
@@ -46,11 +42,6 @@ class LayerWrapper
     LayerWrapper *getParent() const; // invoke by manager, then invoke parent's applyStyles
     LayerWrapper(QJsonObject json, LayerWrapper *parent);
     LayerWrapper() = default;
-    // TODO : export Function
-    // virtual LayerWrapper *addChild() = 0;  // Leaf Child Only
-    // virtual LayerWrapper *addParent() = 0; // Folder Parent Only
-    // virtual void deleteSelf() const = 0;
-    // virtual void deleteAll() const = 0;
 };
 
 class FolderLayerWrapper : public LayerWrapper
@@ -77,5 +68,3 @@ class LeafLayerWrapper : public LayerWrapper
     LeafLayerWrapper() = default;
     LeafLayerWrapper(QJsonObject json, ElementManager *elementManager, LayerWrapper *parent);
 };
-
-Q_DECLARE_METATYPE(LayerWrapper *)

ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp

@@ -1,80 +0,0 @@
-#include "InfoDisplayWidget.h"
-#include <QLineEdit>
-#include <QTextBlock>
-void InfoDisplayWidget::setLayer(LayerWrapper *layer)
-{
-    this->displayLayer = layer;
-    generateLayerForm();
-}
-void InfoDisplayWidget::setElement(GraphicElement *element)
-{
-    this->displayElement = element;
-    generateElementForm();
-}
-void InfoDisplayWidget::generateLayerForm()
-{
-    QLayoutItem *item;
-    if (this->layout() != nullptr)
-    {
-        while ((item = this->layout()->takeAt(0)) != nullptr)
-        {
-            delete item->widget();
-            delete item;
-        }
-        delete this->layout();
-    }
-
-    QFormLayout *layout = new QFormLayout();
-    layout->setRowWrapPolicy(QFormLayout::WrapAllRows);
-    if (this->displayLayer == nullptr)
-    {
-        layout->addRow("no selected layer", new QLabel());
-    }
-    else
-    {
-        QLineEdit *name = new QLineEdit(this->displayLayer->property.name, this);
-        QLineEdit *rotation = new QLineEdit(QString::number(this->displayLayer->property.rotation, 'f', 0), this);
-        QLineEdit *offsetX = new QLineEdit(QString::number(this->displayLayer->property.offset.x()), this);
-        QLineEdit *offsetY = new QLineEdit(QString::number(this->displayLayer->property.offset.y()), this);
-        QLineEdit *scaleX = new QLineEdit(QString::number(this->displayLayer->property.scale.x()), this);
-        QLineEdit *scaleY = new QLineEdit(QString::number(this->displayLayer->property.scale.y()), this);
-        name->setDisabled(true);
-        rotation->setValidator(new QIntValidator(-1000, 1000, this));
-        connect(rotation, &QLineEdit::textChanged, [=](QString content) {
-            this->displayLayer->property.rotation = content.toDouble();
-            emit requireRefreshPreview();
-        });
-        offsetX->setValidator(new QIntValidator(-1000, 1000, this));
-        connect(offsetX, &QLineEdit::textChanged, [=](QString content) {
-            this->displayLayer->property.offset = {content.toDouble(), this->displayLayer->property.offset.y()};
-            emit requireRefreshPreview();
-        });
-        offsetY->setValidator(new QIntValidator(-1000, 1000, this));
-        connect(offsetY, &QLineEdit::textChanged, [=](QString content) {
-            this->displayLayer->property.offset = {this->displayLayer->property.offset.x(), content.toDouble()};
-            emit requireRefreshPreview();
-        });
-        scaleX->setValidator(new QDoubleValidator(0.01, 100, 4, this));
-        connect(scaleX, &QLineEdit::textChanged, [=](QString content) {
-            this->displayLayer->property.scale = {content.toDouble(), this->displayLayer->property.scale.y()};
-            emit requireRefreshPreview();
-        });
-        scaleY->setValidator(new QDoubleValidator(0.01, 100, 4, this));
-        connect(scaleY, &QLineEdit::textChanged, [=](QString content) {
-            this->displayLayer->property.scale = {this->displayLayer->property.scale.x(), content.toDouble()};
-            emit requireRefreshPreview();
-        });
-
-        layout->addRow("layer name:", name);
-        layout->addRow("rotation:", rotation);
-        layout->addRow("offset-X:", offsetX);
-        layout->addRow("offset-Y:", offsetY);
-        layout->addRow("scale-X:", scaleX);
-        layout->addRow("scale-Y:", scaleY);
-        layout->setRowWrapPolicy(QFormLayout::DontWrapRows);
-    }
-    this->setLayout(layout);
-}
-void InfoDisplayWidget::generateElementForm()
-{
-}

ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.h

@@ -1,23 +0,0 @@
-#pragma once
-#include "GraphicElement.h"
-#include "LayerWrapper.h"
-#include <QFormLayout>
-#include <QLabel>
-#include <QWidget>
-
-class InfoDisplayWidget : public QWidget
-{
-    Q_OBJECT
-  private:
-    LayerWrapper *displayLayer;
-    GraphicElement *displayElement;
-
-  public:
-    void setLayer(LayerWrapper *layer);
-    void setElement(GraphicElement *element);
-    void generateLayerForm();
-    void generateElementForm();
-
-  signals:
-    void requireRefreshPreview();
-};

ArchitectureColoredPainting/src/Editor/RightBar/LayerTreeWidget.cpp

@@ -1,59 +0,0 @@
-#include "LayerTreeWidget.h"
-#include <QInputDialog>
-#include <QMenu>
-LayerTreeWidget::LayerTreeWidget(QWidget *parent)
-{
-    emit displayLayerChange(nullptr);
-    this->selectedItem = nullptr;
-    this->copiedItem = nullptr;
-    this->setContextMenuPolicy(Qt::CustomContextMenu);
-    this->setHeaderLabel("Layer Content");
-    connect(this, &QTreeWidget::customContextMenuRequested, this, &LayerTreeWidget::popMenu);
-    connect(this, &QTreeWidget::currentItemChanged, [=](QTreeWidgetItem *currentItem) {
-        this->selectedItem = currentItem;
-        emit displayLayerChange(this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper *>());
-    });
-    // connect(this, &QTreeWidget::itemDoubleClicked, this, &LayerTreeWidget::onItemDoubleClicked);
-}
-
-// void LayerTreeWidget::mouseDoubleClickEvent(QMouseEvent *event)
-//{
-//     // stay empty to avoid the default behavior
-// }
-//
-// void LayerTreeWidget::onItemDoubleClicked(QTreeWidgetItem *item, int column)
-//{
-//     this->selectedItem = item;
-//     // TODO
-// }
-
-void LayerTreeWidget::popMenu(const QPoint &pos)
-{
-    QMenu menu;
-    QTreeWidgetItem *item = itemAt(pos);
-    this->selectedItem = item;
-    // TODO
-    menu.addAction("Add Child", this, &LayerTreeWidget::onRenameEvent);
-    menu.addAction("Rename", this, &LayerTreeWidget::onRenameEvent);
-    menu.addAction("Copy", this, &LayerTreeWidget::onRenameEvent);
-    if (item != nullptr && item->childCount() > 0)
-        menu.addAction("Delete (Self Only)", this, &LayerTreeWidget::onRenameEvent);
-    menu.addAction("Delete", this, &LayerTreeWidget::onRenameEvent);
-    menu.exec(mapToGlobal(pos));
-}
-
-void LayerTreeWidget::onRenameEvent()
-{
-    if (this->selectedItem == nullptr)
-        return;
-    qDebug() << this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper *>()->property.name;
-    bool bOk = false;
-    QString sName =
-        QInputDialog::getText(this, "Rename", "New Name:", QLineEdit::Normal, this->selectedItem->text(0), &bOk);
-    if (bOk && !sName.isEmpty())
-    {
-        this->selectedItem->setText(0, sName);
-        this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper *>()->property.name = sName;
-    }
-    emit displayLayerChange(this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper *>());
-}

ArchitectureColoredPainting/src/Editor/RightBar/LayerTreeWidget.h

@@ -1,21 +0,0 @@
-#pragma once
-#include "LayerWrapper.h"
-#include <QPoint>
-#include <QTreeWidget>
-class LayerTreeWidget : public QTreeWidget
-{
-    Q_OBJECT
-  private:
-    QTreeWidgetItem *selectedItem;
-    LayerWrapper *copiedItem;
-
-  public:
-    LayerTreeWidget(QWidget *parent = nullptr);
-    void onRenameEvent();
-    void popMenu(const QPoint &pos);
-    // void mouseDoubleClickEvent(QMouseEvent *event) override;
-    // void onItemDoubleClicked(QTreeWidgetItem *item, int column = 0);
-
-  signals:
-    void displayLayerChange(LayerWrapper *);
-};

data.json

@@ -6,7 +6,7 @@
 			"name": "ababa",
 			"type": "svg-file",
 			"data": {
-				"include": "./svg/2.svg"
+				"include": "./svg/ababa.svg"
 			}
 		},
 		{

svg/0.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 106.93 99.81"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>0</title><g id="图层_2" data-name="图层 2"><polyline class="cls-1" points="27.24 16.75 27.24 2.15 7.2 2.15 7.2 22.78 46.7 22.78"/></g><g id="图层_3" data-name="图层 3"><polyline class="cls-1" points="27.24 30.37 27.24 44.97 0 44.97"/></g><g id="图层_4" data-name="图层 4"><path class="cls-1" d="M292.82,107.78s0,0,0,0,0,3.59,0,7.62c0,3.85,0,5.78.06,6.43a19.94,19.94,0,0,0,2.87,7.58,15.85,15.85,0,0,0,6.61,6.23A14.75,14.75,0,0,0,310,137a11.69,11.69,0,0,0,7.59-2.92,11,11,0,0,0,3.2-6.84c.15-1.27.58-4.84-1.79-7.64a8.54,8.54,0,0,0-3.56-2.44c-1.32-.52-3.32-1.31-5.06-.33a5.41,5.41,0,0,0-2.14,3,3.48,3.48,0,0,0-.16,2.71c.78,1.86,3.36,2.14,3.47,2.15" transform="translate(-287.18 -56.2)"/></g><g id="图层_5" data-name="图层 5"><path class="cls-1" d="M339.72,85.41V58.75a69.07,69.07,0,0,1,14.79,0c5.9.63,9.31,1,12.84,3.5,1.76,1.22,6.37,4.43,6.68,9.92.25,4.38-2.27,9.26-6.72,11-3.5,1.39-8.46,1-10.71-2.06-.14-.18-2-2.82-.92-5.46.63-1.51,2.34-3.23,4.28-2.92a3.76,3.76,0,0,1,2.33,1.55" transform="translate(-287.18 -56.2)"/></g><g id="图层_6" data-name="图层 6"><path class="cls-1" d="M301.38,145.93a8.21,8.21,0,0,1-.77,5.83c-.26.44-2.5,4.23-5.84,3.7a5,5,0,0,1-3.89-3.5c-.1-.35-1-3,.58-4.09a3.28,3.28,0,0,1,3.89.58" transform="translate(-287.18 -56.2)"/><path class="cls-1" d="M323.18,115.76a7.37,7.37,0,0,1,7.39-8.17c.49,0,4.07.12,5.65,2.92.19.34,1.52,2.7.19,4.67a4.33,4.33,0,0,1-4.67,1.56" transform="translate(-287.18 -56.2)"/></g><g id="图层_7" data-name="图层 7"><path class="cls-1" d="M352.17,86.57a14.23,14.23,0,0,0-4.67,2.73c-1.59,1.4-3.37,3-3.5,5.45a6.45,6.45,0,0,0,2.14,4.86c1.28,1.1,3.68,2.22,5.84,1.17,1.64-.8,3.31-3,2.53-4.67a3.6,3.6,0,0,0-3.31-1.75" transform="translate(-287.18 -56.2)"/><path class="cls-1" d="M382.34,66.53a17.27,17.27,0,0,0,3.89.39c2.16,0,3.53,0,4.86-1a6.15,6.15,0,0,0,2.34-3.89c.17-1,.53-2.93-.78-4.29a4.32,4.32,0,0,0-4.48-.77A3.62,3.62,0,0,0,386,58.75a3.75,3.75,0,0,0,.2,3.31" transform="translate(-287.18 -56.2)"/></g></svg>

svg/1.svg

@@ -1 +0,0 @@
-<svg id="图层_2" data-name="图层 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 21.63"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>1</title><polyline class="cls-1" points="20.54 15.1 20.54 0.5 0.5 0.5 0.5 21.13 40 21.13"/></svg>

svg/2.svg

@@ -1 +0,0 @@
-<svg id="图层_3" data-name="图层 3" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27.74 15.09"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>2</title><polyline class="cls-1" points="27.24 0 27.24 14.6 0 14.6"/></svg>

svg/3.svg

@@ -1 +0,0 @@
-<svg id="图层_4" data-name="图层 4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 29.07 30.28"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>3</title><path class="cls-1" d="M292.82,107.78s0,0,0,0,0,3.59,0,7.62c0,3.85,0,5.78.06,6.43a19.94,19.94,0,0,0,2.87,7.58,15.85,15.85,0,0,0,6.61,6.23A14.75,14.75,0,0,0,310,137a11.69,11.69,0,0,0,7.59-2.92,11,11,0,0,0,3.2-6.84c.15-1.27.58-4.84-1.79-7.64a8.54,8.54,0,0,0-3.56-2.44c-1.32-.52-3.32-1.31-5.06-.33a5.41,5.41,0,0,0-2.14,3,3.48,3.48,0,0,0-.16,2.71c.78,1.86,3.36,2.14,3.47,2.15" transform="translate(-292.3 -107.25)"/></svg>

svg/4.svg

@@ -1 +0,0 @@
-<svg id="图层_5" data-name="图层 5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35.33 27.55"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>4</title><path class="cls-1" d="M339.72,85.41V58.75a69.07,69.07,0,0,1,14.79,0c5.9.63,9.31,1,12.84,3.5,1.76,1.22,6.37,4.43,6.68,9.92.25,4.38-2.27,9.26-6.72,11-3.5,1.39-8.46,1-10.71-2.06-.14-.18-2-2.82-.92-5.46.63-1.51,2.34-3.23,4.28-2.92a3.76,3.76,0,0,1,2.33,1.55" transform="translate(-339.22 -57.85)"/></svg>

svg/5.svg

@@ -1 +0,0 @@
-<svg id="图层_6" data-name="图层 6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 47.45 48.92"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>5</title><path class="cls-1" d="M301.38,145.93a8.21,8.21,0,0,1-.77,5.83c-.26.44-2.5,4.23-5.84,3.7a5,5,0,0,1-3.89-3.5c-.1-.35-1-3,.58-4.09a3.28,3.28,0,0,1,3.89.58" transform="translate(-290.04 -107.09)"/><path class="cls-1" d="M323.18,115.76a7.37,7.37,0,0,1,7.39-8.17c.49,0,4.07.12,5.65,2.92.19.34,1.52,2.7.19,4.67a4.33,4.33,0,0,1-4.67,1.56" transform="translate(-290.04 -107.09)"/></svg>

svg/6.svg

@@ -1 +0,0 @@
-<svg id="图层_7" data-name="图层 7" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50.62 45.5"><defs><style>.cls-1{fill:none;stroke:#00ff1c;stroke-miterlimit:10;}</style></defs><title>6</title><path class="cls-1" d="M352.17,86.57a14.23,14.23,0,0,0-4.67,2.73c-1.59,1.4-3.37,3-3.5,5.45a6.45,6.45,0,0,0,2.14,4.86c1.28,1.1,3.68,2.22,5.84,1.17,1.64-.8,3.31-3,2.53-4.67a3.6,3.6,0,0,0-3.31-1.75" transform="translate(-343.49 -56.2)"/><path class="cls-1" d="M382.34,66.53a17.27,17.27,0,0,0,3.89.39c2.16,0,3.53,0,4.86-1a6.15,6.15,0,0,0,2.34-3.89c.17-1,.53-2.93-.78-4.29a4.32,4.32,0,0,0-4.48-.77A3.62,3.62,0,0,0,386,58.75a3.75,3.75,0,0,0,.2,3.31" transform="translate(-343.49 -56.2)"/></svg>