Merge branch 'main' into dev-LayerStyle

* 添加了ColorHelper
 * LayerStyleDialog重复setLayer导致的warning
 * QColorDialog::getColor时由于Qt的bug未正确设置大小导致的warning

ArchitectureColoredPainting/EditorWidgetItem.ui

@@ -180,6 +180,12 @@
              <property name="accessibleName">
               <string/>
              </property>
+             <property name="iconSize">
+              <size>
+               <width>10</width>
+               <height>10</height>
+              </size>
+             </property>
              <column>
               <property name="text">
                <string>图层名</string>
@@ -190,6 +196,11 @@
                <string>关联图元</string>
               </property>
              </column>
+             <column>
+              <property name="text">
+               <string>可见</string>
+              </property>
+             </column>
             </widget>
            </item>
           </layout>

ArchitectureColoredPainting/res/Shaders/element.comp

@@ -1093,6 +1093,7 @@ void main()
             bool onVeryBegin = false;
             bool onVeryEnd = false;
             vec2 tangentEndLast;
+            vec2 tangentFirstBegin;
             uint lastHitIndex = 0;
             bool lastHitElement = false;
             hitElement = false;
@@ -1108,7 +1109,19 @@ void main()
                     pBegin = path[++pathIndex];
                     p3Last = pBegin;
                     p2Last = pBegin;
-                    onVeryBegin = true;
+                    if(endType == 4)
+                    {
+                        //onVeryBegin = false;
+                        vec2 lastP1 = path[pathSize-3];
+                        vec2 lastP2 = path[pathSize-2];
+                        vec2 lastP3 = path[pathSize-1];
+                        if (lastP3 != lastP2)
+                            tangentEndLast = normalize(lastP3 - lastP2);
+                        else
+                            tangentEndLast = normalize(lastP3 - lastP1);
+                    }
+                    else
+                        onVeryBegin = true;
                     continue;
                 }
                 mat4x2 p = mat4x2(p3Last, pTemp, path[++pathIndex], path[++pathIndex]);
@@ -1119,7 +1132,13 @@ void main()
                     vec2 pTemp = path[pathIndex + 1];
                     if (isinf(pTemp.x))
                     {
-                        onVeryEnd = true;
+                        if(endType == 4)
+                        {
+                            //onVeryEnd = false;
+                            tangentBeginNext = tangentFirstBegin;
+                        }
+                        else
+                            onVeryEnd = true;
                     }
                     else
                     {
@@ -1180,6 +1199,8 @@ void main()
                         }
                     }
                     tangentEndLast = tangentEnd;
+                    if(pathIndex == 0)
+                        tangentFirstBegin = tangentBegin;
                 }
                 p3Last = p[3];
                 p2Last = p[2];

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/StrokeStyleWidget.cpp

@@ -3,6 +3,7 @@
 #include "../ColorHelper.hpp"
 #include <qtmaterialraisedbutton.h>
 #include <limits>
+#include <ranges>
 
 constexpr int COLUMN_WIDTH = 0;
 constexpr int COLUMN_COLOR = 1;
@@ -10,11 +11,22 @@ constexpr int COLUMN_METALLIC = 2;
 constexpr int COLUMN_ROUGHNESS = 3;
 constexpr int COLUMN_OPERATIONS = 4;
 
+inline Renderer::Material newMaterial()
+{
+	return {ColorHelper::instance().getPrimary1()};
+}
+
 StrokeStyleWidget::StrokeStyleWidget(
 	std::shared_ptr<MaterialStyleStroke> stroke,
 	QWidget* parent
 ) : QWidget(parent), stroke(stroke)
 {
+	auto& materialMap = radialStroke(stroke)->materialMap;
+	if (materialMap.empty())
+	{
+		materialMap[1.f] = newMaterial();
+	}
+
 	auto* viewLayout = new QVBoxLayout(this);
 	this->setLayout(viewLayout);
 
@@ -30,8 +42,12 @@ StrokeStyleWidget::StrokeStyleWidget(
 	viewLayout->addWidget(strokeProperties);
 	viewLayout->addWidget(widthField);
 
-	initTable(std::dynamic_pointer_cast<Renderer::StrokeRadialGradient>(stroke->materialStroke));
+	initTable(radialStroke(stroke));
 	viewLayout->addWidget(strokeTable);
+
+	initAddButton();
+	viewLayout->addWidget(addButton);
+	
 	this->adjustSize();
 }
 
@@ -83,13 +99,12 @@ void StrokeStyleWidget::initStrokeSettings()
 		});
 }
 
-// TODO: 新增时参数校验
 void StrokeStyleWidget::initTable(std::shared_ptr<Renderer::StrokeRadialGradient> materialStroke)
 {
 	this->strokeTable = new QTableWidget(this);
 	strokeTable->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
 	strokeTable->setColumnCount(5);
-	strokeTable->setRowCount(materialStroke->materialMap.size() + 1);
+	strokeTable->setRowCount(materialStroke->materialMap.size());
 	QStringList headers;
 	headers << QStringLiteral("ÀëÐľàÀëÕ¼±È")
 		<< QStringLiteral("ÑÕÉ«")
@@ -97,44 +112,45 @@ void StrokeStyleWidget::initTable(std::shared_ptr<Renderer::StrokeRadialGradient
 		<< QStringLiteral("´Ö²Ú¶È")
 		<< QStringLiteral("ÆäËû²Ù×÷");
 	strokeTable->setHorizontalHeaderLabels(headers);
+	strokeTable->setMinimumHeight(strokeTable->rowHeight(0) * 5);
+	strokeTable->setMinimumWidth(strokeTable->sizeHint().width());
 	int row = 0;
 	// ÄÚÈÝ
-	for (auto & strokePair : materialStroke->materialMap)
+	for (auto& [width, material] : std::views::reverse(materialStroke->materialMap))
 	{
-		setTableRow(row, strokePair.first, strokePair.second);
+		setTableRow(row, width, material);
 		row++;
 	}
-	// 新增按钮
-	auto* addButton = new QtMaterialRaisedButton("+", strokeTable);
+	connect(strokeTable, &QTableWidget::currentItemChanged, this, &StrokeStyleWidget::onCurrentItemChanged);
+	connect(strokeTable, &QTableWidget::cellChanged, this, &StrokeStyleWidget::onCellChanged);
+}
+
+void StrokeStyleWidget::initAddButton()
+{
+	this->addButton = new QtMaterialRaisedButton("+", strokeTable);
+	addButton->setFixedHeight(this->strokeTable->rowHeight(0));
 	addButton->setBackgroundColor(ColorHelper::instance().getPrimary1());
-	strokeTable->setSpan(row, 0, 1, 5);
-	strokeTable->setCellWidget(row, 0, addButton);
-	strokeTable->setMinimumHeight(strokeTable->rowHeight(row) * 5);
-	strokeTable->setMinimumWidth(strokeTable->sizeHint().width());
-	addButton->setFixedHeight(strokeTable->rowHeight(row));
-	connect(addButton, &QtMaterialRaisedButton::clicked, [this]() {
+	connect(addButton, &QtMaterialRaisedButton::clicked, [this] {
 		handlingRowInsert = true;
 		auto materialMap = &radialStroke(this->stroke)->materialMap;
 		float newWidth;
 		if (materialMap->empty())
 		{
-			newWidth = 0.1;
+			newWidth = 1.f;
 		}
 		else
 		{
-			const auto lastPair = materialMap->rbegin();
-			newWidth = lastPair->first + 0.01;
+			const auto firstPair = materialMap->begin();
+			newWidth = firstPair->first / 2;
 		}
 		const Renderer::Material newMaterial(ColorHelper::instance().getPrimary1());
 		(*materialMap)[newWidth] = newMaterial;
-		int newRow = this->strokeTable->rowCount() - 1;
+		int newRow = this->strokeTable->rowCount();
 		this->strokeTable->insertRow(newRow);
 		setTableRow(newRow, newWidth, (*materialMap)[newWidth]);
 		this->strokeTable->update();
 		handlingRowInsert = false;
 		});
-	connect(strokeTable, &QTableWidget::currentItemChanged, this, &StrokeStyleWidget::onCurrentItemChanged);
-	connect(strokeTable, &QTableWidget::cellChanged, this, &StrokeStyleWidget::onCellChanged);
 }
 
 void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& material)
@@ -166,7 +182,7 @@ void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& ma
 	removeButton->setBackgroundColor(ColorHelper::instance().getPrimary1());
 	removeButton->setFixedSize(20, 20);
 	strokeTable->setCellWidget(row, COLUMN_OPERATIONS, removeButton);
-	connect(removeButton, &QtMaterialRaisedButton::clicked, [this, row]() {
+	connect(removeButton, &QtMaterialRaisedButton::clicked, [this, row] {
 		radialStroke(this->stroke)->materialMap.erase(this->strokeTable->item(row, COLUMN_WIDTH)->text().toFloat());
 		this->strokeTable->removeRow(row);
 		});
@@ -199,9 +215,13 @@ void StrokeStyleWidget::onCellChanged(int row, int column)
 	{
 		float oldWidth = this->currentItemValue.toFloat();
 		auto node = radialStroke(stroke)->materialMap.extract(oldWidth);
+		if (node.empty())
+		{
+			break;
+		}
 		node.key() = changedWidth;
 		radialStroke(stroke)->materialMap.insert(std::move(node));
-		strokeTable->sortItems(COLUMN_WIDTH);
+		strokeTable->sortItems(COLUMN_WIDTH, Qt::DescendingOrder);
 		break;
 	}
 	case COLUMN_METALLIC:

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/StrokeStyleWidget.h

@@ -6,6 +6,7 @@
 #include <QComboBox>
 #include <qtmaterialtextfield.h>
 #include <qtmaterialcheckbox.h>
+#include <qtmaterialraisedbutton.h>
 class StrokeStyleWidget : public QWidget
 {
 	Q_OBJECT
@@ -16,10 +17,12 @@ private:
 	QComboBox* endTypeBox;
 	QtMaterialTextField* widthField;
 	QTableWidget* strokeTable;
+	QtMaterialRaisedButton* addButton;
 	bool handlingRowInsert = false;
 
 	void initStrokeSettings();
 	void initTable(std::shared_ptr<Renderer::StrokeRadialGradient> materialStroke);
+	void initAddButton();
 	void setTableRow(int row, float width, Renderer::Material& material);
 
 public:

ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp

@@ -25,6 +25,7 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
         treeWidget->refresh();
 		previewWindow->refresh();
     };
+    connect(previewWindow, &PreviewWindow::triggerCentralRefresh, centralRefresh);
 	connect(layerInfoDisplayWidget, &InfoDisplayWidget::triggerCentralRefresh, centralRefresh);
 	connect(elementInfoDisplayWidget, &ElementPoolWidget::triggerCentralRefresh, centralRefresh);
 	connect(treeWidget, &LayerTreeWidget::triggerCentralRefresh, centralRefresh);
@@ -33,15 +34,15 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
     connect(previewWindow, &PreviewWindow::refreshElementPreviewByIndex, elementInfoDisplayWidget, &ElementPoolWidget::refreshPictureByIndex);
 	connect(previewWindow, &PreviewWindow::layerInfoChanged, layerInfoDisplayWidget, &InfoDisplayWidget::triggerSelfRefresh);
 	connect(treeWidget, &LayerTreeWidget::displayLayerChange, previewWindow, &PreviewWindow::currentLayerChanged);
-	connect(treeWidget, &LayerTreeWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
-    connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
+	//connect(treeWidget, &LayerTreeWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
+ //   connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
     connect(treeWidget, &LayerTreeWidget::displayLayerChange, this, &EditorWidgetItem::onLayerChange);
-    connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshPreview, this,
-            &EditorWidgetItem::triggerRefreshPreview);
-    connect(treeWidget, &LayerTreeWidget::requireRefreshPreview, this,
-        &EditorWidgetItem::triggerRefreshPreview);
-	connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireSelfRefresh, layerInfoDisplayWidget, &InfoDisplayWidget::triggerSelfRefresh);
-    connect(elementInfoDisplayWidget, &ElementPoolWidget::refreshLayerTree, treeWidget, &LayerTreeWidget::refresh);
+ //   connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshPreview, this,
+ //           &EditorWidgetItem::triggerRefreshPreview);
+ //   connect(treeWidget, &LayerTreeWidget::requireRefreshPreview, this,
+ //       &EditorWidgetItem::triggerRefreshPreview);
+	//connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireSelfRefresh, layerInfoDisplayWidget, &InfoDisplayWidget::triggerSelfRefresh);
+ //   connect(elementInfoDisplayWidget, &ElementPoolWidget::refreshLayerTree, treeWidget, &LayerTreeWidget::refresh);
     // &EditorWidget::triggerRefreshPreview);
     //  test
     QFile settingFile;
@@ -73,9 +74,10 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
 	this->projectName = source.value("project-name").toString();
     qDebug() << this->backgroundColor;
     qDebug() << this->projectName;
-    QTimer::singleShot(300, this, [this]() {
+    QTimer::singleShot(300, this, [this, centralRefresh]() {
         	handleBackgroundColorChange(this->backgroundColor);
 	        handleProjectNameChange(this->projectName);
+            centralRefresh();
         });
 
 }

ArchitectureColoredPainting/src/Editor/GraphicElement.cpp

@@ -127,7 +127,7 @@ bool SimpleElement::isClosed() const
 
 void GroupElement::paint(QPainter* painter, QTransform transform, const LayerStyleContainer& styles)
 {
-	sourceLayer->paint(painter, transform);
+	sourceLayer->paint(painter, transform, true);
 }
 
 bool GroupElement::isClosed() const

ArchitectureColoredPainting/src/Editor/LayerManager.cpp

@@ -13,8 +13,21 @@ LayerWrapper *LayerManager::getRoot() const
 }
 void LayerManager::paint(QPainter *painter, QSize size,LayerWrapper* selecetedLayer) const
 {
+    painter->save();
     root->getCache();
     root->paint(painter);
+    painter->restore();
+    painter->save();
+ //   painter->setBrush(QBrush(Qt::white));
+	//painter->setCompositionMode(QPainter::CompositionMode_Difference);
+    if (selecetedLayer != nullptr)
+    {
+	    painter->setPen(QPen(Qt::gray, 2, Qt::DashLine));
+        selecetedLayer->paintVisualBounding(painter);
+        //painter->setPen(QPen(Qt::gray, 2, Qt::DashDotLine));
+        //selecetedLayer->paintVisualBounding(painter);
+    }
+	painter->restore();
 }
 bool LayerManager::singleSelectedCheck() const
 {

ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp

@@ -47,6 +47,7 @@ LayerWrapper::LayerWrapper(QJsonObject json, FolderLayerWrapper*parent, ElementM
                       transformJson.value("scale").toObject().value("y").toDouble()};
     property.rotation = {transformJson.value("rotation").toDouble()};
     selected = false;
+    hidden = false;
 }
 
 FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *elementManager, FolderLayerWrapper*parent)
@@ -199,6 +200,7 @@ void FolderLayerWrapper::delSelf() {
 QTreeWidgetItem* LayerWrapper::getQTreeItem() 
 {
 	this->qTreeWidgetItem->setData(0, Qt::UserRole, QVariant::fromValue(this));
+    this->qTreeWidgetItem->setCheckState(0, Qt::Checked);
 	return this->qTreeWidgetItem;
 }
 
@@ -280,31 +282,34 @@ int FolderLayerWrapper::getReferencedBy()const
 		return -1;
 }
 
-void LayerWrapper::paint(QPainter* painter, QTransform transform, bool ignoreSelected)
+void LayerWrapper::paint(QPainter* painter, QTransform transform, bool force)
 {
-    if (!ignoreSelected && this->selected)
-    {
-        painter->save();
-		painter->setTransform(transform, ignoreSelected);
-		painter->setPen(QPen(Qt::gray, 2));
-        painter->setPen(Qt::DashLine);
-		painter->drawRect(cache.getBoundingRect());
-		painter->restore();
-    }
+  //  if (this->selected)
+  //  {
+  //      painter->save();
+		//painter->setPen(QPen(Qt::red, 2));
+		//painter->setTransform(transform);
+		//painter->drawRect(this->cache.getBoundingRect());
+		//painter->restore();
+  //  }
 }
 
-void FolderLayerWrapper::paint(QPainter* painter, QTransform transform, bool ignoreSelected)
+void FolderLayerWrapper::paint(QPainter* painter, QTransform transform, bool force)
 {
-    LayerWrapper::paint(painter, transform, ignoreSelected);
+    if (hidden && !force)
+        return;
+    LayerWrapper::paint(painter, transform, force);
     transform = property.transform * transform;
     //qDebug() << transform;
 	for (auto& child : children)
-		child->paint(painter, transform, ignoreSelected);
+		child->paint(painter, transform, force);
 }
 
-void LeafLayerWrapper::paint(QPainter* painter, QTransform transform, bool ignoreSelected)
+void LeafLayerWrapper::paint(QPainter* painter, QTransform transform, bool force)
 {
-    LayerWrapper::paint(painter, transform, ignoreSelected);
+    if (hidden && !force)
+        return;
+    LayerWrapper::paint(painter, transform, force);
     transform = property.transform * transform;
     //qDebug() << transform;
 	if (wrappedElement != nullptr)
@@ -347,11 +352,12 @@ void FolderLayerWrapper::collectDownReachable(std::set<LayerWrapper*>& reachable
 
 void LayerWrapper::refreshTreeItem()
 {
-    
+    hidden = qTreeWidgetItem->checkState(0) == Qt::Unchecked;
 }
 
 void LeafLayerWrapper::refreshTreeItem()
 {
+    LayerWrapper::refreshTreeItem();
     if (typeid(*wrappedElement) == typeid(GroupElement))
     {
         this->qTreeWidgetItem->setText(0, "@ " + this->property.name);
@@ -366,6 +372,7 @@ void LeafLayerWrapper::refreshTreeItem()
 
 void FolderLayerWrapper::refreshTreeItem()
 {
+    LayerWrapper::refreshTreeItem();
     for (auto& child : this->children) {
         child->refreshTreeItem();
     }
@@ -429,3 +436,20 @@ bool LayerWrapper::canApplyStyles() const
 {
 	return typeid(*this) == typeid(LeafLayerWrapper) && !referencingGroupElement();
 }
+
+void LayerWrapper::paintVisualBounding(QPainter* painter) const
+{
+    if (hidden)
+        return;
+	QTransform transform;
+    auto layer = this->parent;
+	while (layer != nullptr)
+	{
+		transform =  transform * layer->property.transform;
+		layer = layer->parent;
+	}
+    painter->save();
+	painter->setTransform(transform);
+	painter->drawRect(cache.getBoundingRect());
+	painter->restore();
+}

ArchitectureColoredPainting/src/Editor/LayerWrapper.h

@@ -37,6 +37,7 @@ class LayerWrapper
   public:
 	QTreeWidgetItem* qTreeWidgetItem;
     bool selected;
+    bool hidden;
     struct SimpleProperty
     {
         QString name = "";
@@ -58,7 +59,7 @@ class LayerWrapper
     FolderLayerWrapper*getParent() const; // invoke by manager, then invoke parent's applyStyles
     LayerWrapper(QJsonObject json, FolderLayerWrapper*parent, ElementManager* elementManager=nullptr);
     LayerWrapper() = default;
-    virtual void paint(QPainter* painter, QTransform transform=QTransform(), bool ignoreSelected = false);
+    virtual void paint(QPainter* painter, QTransform transform=QTransform(), bool force = false);
     // TODO : export Function
     // virtual LayerWrapper *addChild() = 0;  // Leaf Child Only
     // virtual LayerWrapper *addParent() = 0; // Folder Parent Only
@@ -74,6 +75,7 @@ class LayerWrapper
 	virtual size_t referencedCount(bool excludeSelf = false) const;
     virtual bool deleteable(bool excludeSubTree = false) const;
     virtual bool referencingGroupElement() const;
+    virtual void paintVisualBounding(QPainter* painter) const;
     bool canApplyStyles() const;
 };
 
@@ -97,7 +99,7 @@ class FolderLayerWrapper : public LayerWrapper
 	QTreeWidgetItem* getQTreeItem() override;
 	QJsonObject toJson() const override;
     int getReferencedBy()const;
-	void paint(QPainter* painter, QTransform transform = QTransform(), bool ignoreSelected = false) override;
+	void paint(QPainter* painter, QTransform transform = QTransform(), bool force = false) override;
     void collectDownReachable(std::set<LayerWrapper*>& reachable) override;
     void refreshTreeItem() override;
     size_t referencedCount(bool excludeSelf = false) const override;
@@ -115,7 +117,7 @@ class LeafLayerWrapper : public LayerWrapper
     void refresh(LayerWrapper* layer = nullptr) override;
     LeafLayerWrapper(QJsonObject json, ElementManager *elementManager, FolderLayerWrapper*parent);
     QJsonObject toJson() const override;
-	void paint(QPainter* painter, QTransform transform = QTransform(), bool ignoreSelected = false) override;
+	void paint(QPainter* painter, QTransform transform = QTransform(), bool force = false) override;
     void collectDownReachable(std::set<LayerWrapper*>& reachable) override;
     QTreeWidgetItem* getQTreeItem() override;
     void refreshTreeItem() override;

ArchitectureColoredPainting/src/Editor/PixelPath.cpp

@@ -78,7 +78,8 @@ PixelPath PixelPath::trans(QTransform& mat)const
 	painter.setTransform(mat);
 	painter.drawPixmap(0, 0, pixmap);
 	result.painterPath.addPath(this->painterPath);
-	result.boundingRect = mat.mapRect(boundingRect);
+	result.painterPath = mat.map(result.painterPath);
+	result.boundingRect = result.painterPath.boundingRect();
 	return result;
 }
 

ArchitectureColoredPainting/src/Editor/PreviewWindow.cpp

@@ -1,4 +1,5 @@
 #include "PreviewWindow.h"
+#include <QApplication>
 
 PreviewWindow::PreviewWindow(QWidget *parent) : QOpenGLWidget(parent)
 {
@@ -84,7 +85,17 @@ void PreviewWindow::mouseMoveEvent(QMouseEvent* event)
     int dx = event->x() - m_lastPos.x();
     int dy = event->y() - m_lastPos.y();
     if (currentLayer != nullptr) {
-        if (event->buttons() & Qt::LeftButton) {
+        if (QApplication::keyboardModifiers() == Qt::ControlModifier && (event->buttons() & Qt::LeftButton))
+        {
+            currentLayer->property.scale.setX(std::max(0.0, currentLayer->property.scale.x() + dx / 50.0));
+            currentLayer->property.scale.setY(std::max(0.0, currentLayer->property.scale.y() + dy / 50.0));
+        }
+        else if (QApplication::keyboardModifiers() == (Qt::ControlModifier | Qt::ShiftModifier) && (event->buttons() & Qt::LeftButton))
+        {
+            currentLayer->property.scale.setX(std::max(0.0, currentLayer->property.scale.x() * (1.0 + dx / 50.0)));
+            currentLayer->property.scale.setY(std::max(0.0, currentLayer->property.scale.y() * (1.0 + dx / 50.0)));
+        }
+        else if (event->buttons() & Qt::LeftButton) {
             // 如果按下的是左键，那么平移图形
 			currentLayer->property.offset.setX(currentLayer->property.offset.x() + dx);
 			currentLayer->property.offset.setY(currentLayer->property.offset.y() + dy);
@@ -100,19 +111,18 @@ void PreviewWindow::mouseMoveEvent(QMouseEvent* event)
             auto index = -1;
             if (typeid(*layer) == typeid(FolderLayerWrapper))
                 index = dynamic_cast<FolderLayerWrapper*>(layer)->getReferencedBy();
-            if (index != -1)
-                emit refreshElementPreviewByIndex(index);
             layer = layer->getParent();
         }
     }
     // 更新上一次的位置
+    emit triggerCentralRefresh();
     m_lastPos = event->pos();
     this->repaint();
 }
 
 void PreviewWindow::mouseReleaseEvent(QMouseEvent* event)
 {
-	emit layerInfoChanged();
+	//emit layerInfoChanged();
 }
 
 void PreviewWindow::setBackgroundColor(QColor color)

ArchitectureColoredPainting/src/Editor/PreviewWindow.h

@@ -46,4 +46,5 @@ class PreviewWindow : public QOpenGLWidget, protected QOpenGLFunctions
     void layerInfoChanged();
     void refreshElementPreview(GraphicElement*);
     void refreshElementPreviewByIndex(int);
+    void triggerCentralRefresh();
 };

ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp

@@ -21,12 +21,11 @@ void InfoDisplayWidget::generateLayerForm()
     {
         while (this->layout()->count() > 0 && (item = this->layout()->takeAt(0)) != nullptr)
         {
-            delete item->widget();
-            delete item;
+			item->widget()->deleteLater();
+			delete item;
         }
         delete this->layout();
     }
-
     QFormLayout *layout = new QFormLayout();
     layout->setRowWrapPolicy(QFormLayout::WrapAllRows);
     if (this->displayLayer == nullptr)

ArchitectureColoredPainting/src/Editor/RightBar/LayerTreeWidget.cpp

@@ -2,6 +2,7 @@
 #include <QInputDialog>
 #include <QMenu>
 #include "./EditorWidgetComponent/LayerCreateWidget.h"
+#include <QTimer>
 
 LayerTreeWidget::LayerTreeWidget(QWidget *parent)
 {
@@ -26,6 +27,10 @@ LayerTreeWidget::LayerTreeWidget(QWidget *parent)
         }
         emit triggerCentralRefresh();
     });
+    connect(this, &QTreeWidget::itemChanged, this, [=]() {
+        emit triggerCentralRefresh();
+        });
+
     // connect(this, &QTreeWidget::itemDoubleClicked, this, &LayerTreeWidget::onItemDoubleClicked);
 }
 

ArchitectureColoredPainting/src/Editor/util/PaintingUtil.cpp

@@ -83,9 +83,7 @@ FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTr
 		QPainterPath painterPath = pixelPath.getPainterPath();
 		QRectF bound = painterPath.boundingRect();
 		//qDebug() << leafLayer<<"------" << painterPath;
-		//qDebug() << transform;
-		// transform to initial painterPath
-		// transfrom to -1£¬ 1
+		// transform to -1£¬ 1
 		QTransform trans;
 		double maxLen = std::max(bound.width(), bound.height());
 		qDebug() << maxLen << bound;
@@ -102,22 +100,19 @@ FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTr
 		auto baseStyles = leafLayer->styles.toBaseStyles();
 		Renderer::BaseElement element;
 		element.contour = contour;
-		for (auto baseStyle : baseStyles) {
+		for (auto& baseStyle : baseStyles) {
 			double lineWidth = 0;
 			if (baseStyle.material->type() == Renderer::MaterialStyleType::kStroke) {
-				auto material = dynamic_cast<MaterialStyleStroke*>(baseStyle.material.get());
-				material->halfWidth = material->halfWidth / maxLen;
+				auto material = std::static_pointer_cast<MaterialStyleStroke>(baseStyle.material);
+				material->halfWidth /= maxLen;
 				lineWidth = material->halfWidth;
 				qDebug() << material->halfWidth;
 			}
-			QRectF rect = painterPath.boundingRect();
-			rect.setX(-lineWidth + rect.x());
-			rect.setY(-lineWidth + rect.y());
-			rect.setWidth(lineWidth * 2 + rect.width());
-			rect.setHeight(lineWidth * 2 + rect.height());
-			QPainterPath path;
-			path.addRect(rect);
-			rect = transform.map(path).boundingRect();
+			QPainterPathStroker stroker;
+			stroker.setWidth(lineWidth);
+			stroker.setCapStyle(Qt::RoundCap);
+			QPainterPath strokePath = stroker.createStroke(painterPath);
+			auto rect = transform.map(strokePath).boundingRect();
 			elementTransform.bound = glm::vec4(rect.x(), rect.y(), rect.x() + rect.width(), rect.y() + rect.height());
 			qDebug() << elementTransform.bound.x << elementTransform.bound.y << elementTransform.bound.z << elementTransform.bound.z;
 			transform = transform.inverted();
@@ -125,7 +120,7 @@ FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTr
 				transform.m11(), transform.m12(), transform.m21(),
 				transform.m22(), transform.m31(), transform.m32()
 			);
-			qDebug() << transform;
+			//qDebug() << transform;
 			elementTransform.zIndex = 0;
 
 			element.style = baseStyle.material;

ArchitectureColoredPainting/src/Renderer/Painting/MaterialStyleStroke.cpp

@@ -1,5 +1,6 @@
 #include "MaterialStyleStroke.h"
 #include <QDebug>
+#include <array>
 
 using namespace Renderer;
 
@@ -117,4 +118,10 @@ float Renderer::MaterialStyleStroke::getHalfWidth() const
 	return halfWidth;
 }
 
-
+#define endTypeBoxLabel(start, end)	QStringLiteral(start##" -> "##end)
+const std::array<std::pair<QString, StrokeEndType>, 4> Renderer::MaterialStyleStroke::strokeEndTypeNames = {
+	std::pair{endTypeBoxLabel("Բͷ", "Բͷ"), StrokeEndType::kRound},
+	std::pair{endTypeBoxLabel("ƽͷ", "Բͷ"), StrokeEndType::kFlatRound},
+	std::pair{endTypeBoxLabel("Բͷ", "ƽͷ"), StrokeEndType::kRoundFlat},
+	std::pair{endTypeBoxLabel("ƽͷ", "ƽͷ"), StrokeEndType::kFlat}
+};

ArchitectureColoredPainting/src/Renderer/Painting/MaterialStyleStroke.h

@@ -43,7 +43,7 @@ namespace Renderer
 	};
 
 	enum class StrokeType { kBothSides = 2, kLeftSide = 1, kRightSide = 0 };
-	enum class StrokeEndType { kRound = 0b00, kFlat = 0b11, kRoundFlat = 0b10, kFlatRound = 0b01 };
+	enum class StrokeEndType { kRound = 0b00, kFlat = 0b11, kRoundFlat = 0b10, kFlatRound = 0b01, kClosed = 0b100/*用于封闭图形*/ };
 
 	class MaterialStyleStroke : public MaterialStyle
 	{
@@ -59,5 +59,6 @@ namespace Renderer
 		StrokeType strokeType;
 		StrokeEndType endType;
 		std::shared_ptr<MaterialStroke> materialStroke;
+		static const std::array<std::pair<QString, StrokeEndType>, 4> strokeEndTypeNames;
 	};
 }

UnitTest/ElementRendererTest.cpp

@@ -42,17 +42,38 @@ namespace UnitTest
 			{
 				virtual std::vector<Renderer::BaseStyle> toBaseStyles() const override
 				{
-
 					return { BaseStyle(std::make_shared<TransformStyle>(),
-						std::make_shared<MaterialStyleFill>(
-							std::make_shared<FillPlain>(Material(QColor(255,255,0))))) };
+						std::make_shared<MaterialStyleFill>(std::make_shared<FillPlain>(Material(QColor(255,255,0))))) };
+				}
+			} style;
+			TestGLWidget w(style, path);
+			w.show();
+			a.exec();
+		}
+		TEST_METHOD(TestFillPlainAndStrokeRadialGradient)
+		{
+			QApplication a(argc, argv);
+			class Style : public Renderer::ElementStyle
+			{
+				virtual std::vector<Renderer::BaseStyle> toBaseStyles() const override
+				{
+					std::map<float, Material> materialMap = {
+					{0.20, Material{QColor(255,255,255)}},
+					{0.60, Material{QColor(165,176,207)}},
+					{1.00, Material{QColor(58,64,151)}}
+					};
+					return { BaseStyle(std::make_shared<TransformStyle>(),
+						std::make_shared<MaterialStyleFill>(
+							std::make_shared<FillPlain>(Material(QColor(255,255,0))))),
+						BaseStyle(std::make_shared<TransformStyle>(),
+						std::make_shared<MaterialStyleStroke>(10, StrokeType::kBothSides, StrokeEndType::kRound,
+							std::make_shared<StrokeRadialGradient>(materialMap, false))) };
 				}
 			} style;
 			TestGLWidget w(style, path);
 			w.show();
 			a.exec();
 		}
-
 	};
 
 	TEST_CLASS(ElementRendererStokeTypeTest)

UnitTest/UnitTest.cpp

@@ -122,20 +122,6 @@ namespace UnitTest
 	};
 	TEST_CLASS(PaintingUtilTest) 
 	{
-		TEST_METHOD(TransfromTest) 
-		{
-			qInstallMessageHandler(messageHandler);
-			QPainterPath path;
-			path.addRect(0, 0, 20, 20);
-			QTransform trans;
-			qDebug() << path.boundingRect();
-			//qDebug() << trans;
-			//qDebug() << acos(-0.707107);
-			glm::vec2 scale;
-			float rotate;
-			PaintingUtil::decomposeTransform(trans, rotate, scale);
-			qDebug() << rotate;
-			qDebug() << scale.x << scale.y;
-		}
+
 	};
 }

test.json

@@ -59,7 +59,7 @@
                         "name": "Leaf2",
                         "styles": [
                             {
-                                "enableEachSideIndependent": false,
+                                "enableEachSideIndependent": true,
                                 "left": "AAAAQAEAIZwAf////1UA/w==",
                                 "right": "AADgQAAACJw=",
                                 "type": "stroke"