更新至main

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj

@@ -202,6 +202,7 @@
     <QtMoc Include="src\Editor\EditorWidgetComponent\ColorPicker.h" />
     <QtMoc Include="src\Editor\RightBar\EditorSettingWidget.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\FillStyleWidget.h" />
+    <ClInclude Include="src\ColorHelper.hpp" />
     <ClInclude Include="src\Editor\LayerWrapper.h" />
     <ClInclude Include="src\Editor\util\EncodeUtil.hpp" />
     <ClInclude Include="src\Editor\util\JsonUtil.hpp" />

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters

@@ -519,6 +519,9 @@
     <ClInclude Include="src\Editor\LayerWrapper.h">
       <Filter>Header Files\Editor\Layer</Filter>
     </ClInclude>
+    <ClInclude Include="src\ColorHelper.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="res\MainWindow.qrc">

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,6 +1109,18 @@ void main()
                     pBegin = path[++pathIndex];
                     p3Last = pBegin;
                     p2Last = pBegin;
+                    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;
                 }
@@ -1119,6 +1132,12 @@ void main()
                     vec2 pTemp = path[pathIndex + 1];
                     if (isinf(pTemp.x))
                     {
+                        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/ColorHelper.hpp

@@ -0,0 +1,49 @@
+#pragma once
+#include <lib/qtmaterialstyle.h>
+#include <lib/qtmaterialtheme.h>
+#include <QColorDialog>
+
+class ColorHelper
+{
+	QtMaterialTheme theme;
+	QColor primary1;
+public:
+
+	void setPrimary1(const QColor& color)
+	{
+		theme.setColor("primary1", color);
+		primary1 = color;
+	}
+
+	[[nodiscard]] QColor getPrimary1() const
+	{
+		return primary1;
+	}
+
+	ColorHelper()
+	{
+		setPrimary1(QColor::fromRgb(0, 90, 158));
+		QtMaterialStyle::instance().setTheme(&theme);
+	}
+
+	static ColorHelper& instance()
+	{
+		static ColorHelper instance;
+		return instance;
+	}
+
+	static QColor execColorDialog(
+		const QColor& initial = instance().getPrimary1(), 
+		QWidget* parent = nullptr, 
+		const QString& title = ""
+	) {
+		auto dialog = QColorDialog(initial, parent);
+		if (!title.isEmpty())
+		{
+			dialog.setWindowTitle(title);
+		}
+		dialog.adjustSize();
+		dialog.exec();
+		return dialog.selectedColor();
+	}
+};

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/ColorPicker.cpp

@@ -1,5 +1,6 @@
 #include "ColorPicker.h"
 #include <QColorDialog>
+#include <QDebug>
 
 QString getStyleSheet(const QColor& color)
 {
@@ -26,9 +27,8 @@ QColor ColorPicker::getColor() const
 
 void ColorPicker::onClicked()
 {
-	QColorDialog dialog(this->color, this);
+	//const QColor newColor = QColorDialog::getColor(this->color, this);
-	dialog.exec();
+	const QColor newColor = ColorHelper::execColorDialog(this->color, this);
-	QColor newColor = dialog.selectedColor();
 	if (newColor.isValid() && this->color != newColor)
 	{
 		this->color = newColor;

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/ColorPicker.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "../ColorHelper.hpp"
 #include <QPushButton>
 class ColorPicker : public QPushButton
 {
@@ -6,7 +7,7 @@ class ColorPicker : public QPushButton
 private:
 	QColor color;
 public:
-	ColorPicker(const QColor& color = QColor::fromRgb(0, 0, 0), QWidget* parent = nullptr);
+	ColorPicker(const QColor& color = ColorHelper::instance().getPrimary1(), QWidget* parent = nullptr);
 	QColor getColor() const;
 public slots:
 	void onClicked();

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/FillStyleWidget.cpp

@@ -4,7 +4,7 @@
 #include <QLabel>
 #include <qtmaterialtextfield.h>
 
-FillStyleWidget::FillStyleWidget(std::shared_ptr<Renderer::MaterialStyleFill> fill, QWidget* parent)
+FillStyleWidget::FillStyleWidget(std::shared_ptr<MaterialStyleFill> fill, QWidget* parent)
 : QWidget(parent), fill(fill)
 {
     auto* layout = new QGridLayout(this);

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp

@@ -1,16 +1,15 @@
 #include "LayerStyleDialog.h"
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QHBoxLayout>
 #include <QGridLayout>
 
 LayerStyleDialog::LayerStyleDialog(
 	LayerStyleContainer& styles, 
-	std::shared_ptr<LayerStyle> existedStyle, 
+	const std::shared_ptr<LayerStyle>& existedStyle, 
 	QWidget* parent
 ) : QDialog(parent), styles(&styles)
 {
-	auto* dialogLayout = new QVBoxLayout(this);
+	dialogLayout = new QGridLayout;
 	dialogLayout->setAlignment(Qt::AlignmentFlag::AlignHCenter);
 	this->setLayout(dialogLayout);
 
@@ -18,11 +17,9 @@ LayerStyleDialog::LayerStyleDialog(
 	{
 		this->modifyingStyle = existedStyle->clone();
 		
-		this->styleContainer = nullptr;
 		this->styleWidget = modifyingStyle->getInputWidget();
 		this->styleWidget->setParent(this);
-		dialogLayout->addWidget(styleWidget);
+		dialogLayout->addWidget(styleWidget, 1, 0);
-		// do something
 	}
 	else
 	{
@@ -34,13 +31,12 @@ LayerStyleDialog::LayerStyleDialog(
 			typeSelector->addItems(unusedStyleNames);
 			this->modifyingStyle = std::move(styles.makeUnusedStyle(unusedStyleNames[0]));
 
-			dialogLayout->addWidget(typeSelector);
+			dialogLayout->addWidget(typeSelector, 0, 0);
-			this->styleContainer = new QGridLayout(this);
+
-			dialogLayout->addLayout(styleContainer);
 
 			this->styleWidget = this->modifyingStyle->getInputWidget();
 			this->styleWidget->setParent(this);
-			this->styleContainer->addWidget(styleWidget);
+			this->dialogLayout->addWidget(styleWidget, 1, 0);
 			connect(typeSelector, &QComboBox::currentTextChanged,
 				this, &LayerStyleDialog::onStyleTypeSelectorChanged);
 		}
@@ -48,7 +44,8 @@ LayerStyleDialog::LayerStyleDialog(
 	auto* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
 	connect(buttonBox, &QDialogButtonBox::accepted, this, &LayerStyleDialog::accept);
 	connect(buttonBox, &QDialogButtonBox::rejected, this, &LayerStyleDialog::reject);
-	dialogLayout->addWidget(buttonBox);
+	dialogLayout->addWidget(buttonBox, 2, 0);
+	this->adjustSize();
 }
 
 void LayerStyleDialog::accept()
@@ -61,14 +58,14 @@ void LayerStyleDialog::onStyleTypeSelectorChanged(const QString& current)
 {
 	if (this->styleWidget)
 	{
-		this->styleContainer->removeWidget(this->styleWidget);
+		this->dialogLayout->removeWidget(this->styleWidget);
 		this->styleWidget->setParent(nullptr);
 		delete styleWidget;
 	}
 	this->modifyingStyle = std::move(styles->makeUnusedStyle(current));
 	this->styleWidget = this->modifyingStyle->getInputWidget();
 	this->styleWidget->setParent(this);
-	this->styleContainer->addWidget(styleWidget, 0, 0, 1, 1);
+	this->dialogLayout->addWidget(styleWidget, 1, 0);
 	this->styleWidget->adjustSize();
 	this->adjustSize();
 }

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.h

@@ -8,13 +8,13 @@ class LayerStyleDialog : public QDialog
 	Q_OBJECT
 private:
 	QWidget* styleWidget;
-	QGridLayout* styleContainer;
+	QGridLayout* dialogLayout;
 	LayerStyleContainer* styles;
 	std::unique_ptr<LayerStyle> modifyingStyle;
 public:
 	LayerStyleDialog(
 		LayerStyleContainer& styles,
-		std::shared_ptr<LayerStyle> existedStyle = nullptr,
+		const std::shared_ptr<LayerStyle>& existedStyle = nullptr,
 		QWidget* parent = nullptr
 	);
 	std::shared_ptr<LayerStyle> layerStyle;

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/StrokeStyleWidget.cpp

@@ -1,8 +1,11 @@
 #include "StrokeStyleWidget.h"
 #include "ColorPicker.h"
+#include "../ColorHelper.hpp"
 #include <qtmaterialraisedbutton.h>
 #include <limits>
-#include <lib/qtmaterialstyle.h>
+#include <array>
+#include <ranges>
+#include <utility>
 
 constexpr int COLUMN_WIDTH = 0;
 constexpr int COLUMN_COLOR = 1;
@@ -10,11 +13,27 @@ constexpr int COLUMN_METALLIC = 2;
 constexpr int COLUMN_ROUGHNESS = 3;
 constexpr int COLUMN_OPERATIONS = 4;
 
+inline Renderer::Material newMaterial()
+{
+	return {ColorHelper::instance().getPrimary1()};
+}
+
+inline bool isClosedStroke(const std::shared_ptr<MaterialStyleStroke>& stroke)
+{
+	return stroke->endType == Renderer::StrokeEndType::kClosed;
+}
+
 StrokeStyleWidget::StrokeStyleWidget(
-	std::shared_ptr<MaterialStyleStroke> stroke,
+	const 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);
 
@@ -25,13 +44,20 @@ StrokeStyleWidget::StrokeStyleWidget(
 
 	strokeProperties->setLayout(strokePropertiesLayout);
 	strokePropertiesLayout->addWidget(enableGradual);
+	if (!isClosedStroke(stroke))
+	{
 		strokePropertiesLayout->addWidget(endTypeBox);
+	}
 
 	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();
 }
 
@@ -44,30 +70,23 @@ void StrokeStyleWidget::initStrokeSettings()
 		radialStroke(this->stroke)->gradual = checked;
 		});
 
-#define endTypeBoxLabel(start, end)	QStringLiteral(start##" -> "##end)
+	if (!isClosedStroke(stroke))
+	{
 		this->endTypeBox = new QComboBox(this);
-	endTypeBox->addItem(endTypeBoxLabel("圆头", "圆头"));  // kRound
+		for (const auto& displayName : MaterialStyleStroke::strokeEndTypeNames | std::views::keys)
-	endTypeBox->addItem(endTypeBoxLabel("平头", "圆头"));  // kFlatRound
+		{
-	endTypeBox->addItem(endTypeBoxLabel("圆头", "平头"));  // kRoundFlat
+			endTypeBox->addItem(displayName);
-	endTypeBox->addItem(endTypeBoxLabel("平头", "平头"));  // kFlat
+		}
 		endTypeBox->setCurrentIndex(static_cast<int>(this->stroke->endType));
 		connect(endTypeBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
-		switch (index)
+			const auto& [displayName, endType] = MaterialStyleStroke::strokeEndTypeNames[index];
-		{
+			this->stroke->endType = endType;
-		case 0:
-			this->stroke->endType = Renderer::StrokeEndType::kRound;
-			break;
-		case 1:
-			this->stroke->endType = Renderer::StrokeEndType::kFlatRound;
-			break;
-		case 2:
-			this->stroke->endType = Renderer::StrokeEndType::kRoundFlat;
-			break;
-		case 3:
-			this->stroke->endType = Renderer::StrokeEndType::kFlat;
-			break;
-		}
 			});
+	}
+	else
+	{
+		this->endTypeBox = nullptr;
+	}
 
 	this->widthField = new QtMaterialTextField(this);
 	widthField->setLabel(QStringLiteral("本侧描边宽度"));
@@ -83,13 +102,12 @@ void StrokeStyleWidget::initStrokeSettings()
 		});
 }
 
-// TODO: 新增时参数校验
+void StrokeStyleWidget::initTable(const std::shared_ptr<Renderer::StrokeRadialGradient>& materialStroke)
-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 +115,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++;
 	}
-	// 新增按钮
+	connect(strokeTable, &QTableWidget::currentItemChanged, this, &StrokeStyleWidget::onCurrentItemChanged);
-	QtMaterialRaisedButton* addButton = new QtMaterialRaisedButton("+", strokeTable);
+	connect(strokeTable, &QTableWidget::cellChanged, this, &StrokeStyleWidget::onCellChanged);
-	addButton->setBackgroundColor(QtMaterialStyle::instance().themeColor("primary1"));
+}
-	strokeTable->setSpan(row, 0, 1, 5);
+
-	strokeTable->setCellWidget(row, 0, addButton);
+void StrokeStyleWidget::initAddButton()
-	strokeTable->setMinimumHeight(strokeTable->rowHeight(row) * 5);
+{
-	strokeTable->setMinimumWidth(strokeTable->sizeHint().width());
+	this->addButton = new QtMaterialRaisedButton("+", strokeTable);
-	addButton->setFixedHeight(strokeTable->rowHeight(row));
+	addButton->setFixedHeight(this->strokeTable->rowHeight(0));
-	connect(addButton, &QtMaterialRaisedButton::clicked, [this]() {
+	addButton->setBackgroundColor(ColorHelper::instance().getPrimary1());
+	connect(addButton, &QtMaterialRaisedButton::clicked, [this] {
 		handlingRowInsert = true;
-		auto materialMap = &(radialStroke(this->stroke)->materialMap);
+		auto& materialMap = radialStroke(this->stroke)->materialMap;
-		float newWidth = 0;
+		float newWidth;
-		if (materialMap->size() == 0)
+		if (materialMap.empty())
 		{
-			newWidth = 0.1;
+			newWidth = 1.f;
 		}
 		else
 		{
-			auto lastPair = materialMap->rbegin();
+			const auto firstPair = materialMap.begin();
-			newWidth = lastPair->first + 0.01;
+			newWidth = firstPair->first / 2;
 		}
-		Renderer::Material newMaterial(QColor::fromRgb(0, 0, 0));
+		const Renderer::Material newMaterial(ColorHelper::instance().getPrimary1());
-		(*materialMap)[newWidth] = newMaterial;
+		materialMap[newWidth] = newMaterial;
-		int newRow = this->strokeTable->rowCount() - 1;
+		const int newRow = this->strokeTable->rowCount();
 		this->strokeTable->insertRow(newRow);
-		setTableRow(newRow, newWidth, (*materialMap)[newWidth]);
+		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)
@@ -143,14 +162,14 @@ void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& ma
 	widthItem->setData(Qt::EditRole, width);
 	strokeTable->setItem(row, COLUMN_WIDTH, widthItem);
 
-	QColor* colorPtr = &(material.color);
+	QColor* colorPtr = &material.color;
 	auto* colorItem = new QTableWidgetItem;
 	colorItem->setData(Qt::DisplayRole, *colorPtr);
 	strokeTable->setItem(row, COLUMN_COLOR, colorItem);
 	auto* colorPicker = new ColorPicker(*colorPtr, strokeTable);
 	strokeTable->setCellWidget(row, COLUMN_COLOR, colorPicker);
 	connect(colorPicker, &ColorPicker::colorChanged, [this, colorPtr](QColor color) {
-		*colorPtr = color;
+		*colorPtr = std::move(color);
 		this->strokeTable->update();
 		});
 
@@ -163,10 +182,10 @@ void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& ma
 	strokeTable->setItem(row, COLUMN_ROUGHNESS, roughnessItem);
 
 	auto* removeButton = new QtMaterialRaisedButton("-", strokeTable);
-	removeButton->setBackgroundColor(QtMaterialStyle::instance().themeColor("primary1"));
+	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);
 		});
@@ -175,7 +194,7 @@ void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& ma
 void StrokeStyleWidget::onCurrentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous)
 {
 	if (!current) return;
-	int column = current->column();
+	const int column = current->column();
 	if (column != COLUMN_COLOR && column != COLUMN_OPERATIONS)
 	{
 		this->currentItemValue = current->data(Qt::EditRole);
@@ -185,23 +204,27 @@ void StrokeStyleWidget::onCurrentItemChanged(QTableWidgetItem* current, QTableWi
 void StrokeStyleWidget::onCellChanged(int row, int column)
 {
 	if (handlingRowInsert) return;
-	auto changedItem = strokeTable->item(row, column);
+	const auto changedItem = strokeTable->item(row, column);
-	auto changedItemValue = changedItem->text().toFloat();
+	const auto changedItemValue = changedItem->text().toFloat();
 	if (changedItemValue < 0 || 1 < changedItemValue)
 	{
 		changedItem->setData(Qt::EditRole, this->currentItemValue.toFloat());
 		return;
 	}
-	auto changedWidth = strokeTable->item(row, COLUMN_WIDTH)->data(Qt::EditRole).toFloat();
+	const auto changedWidth = strokeTable->item(row, COLUMN_WIDTH)->data(Qt::EditRole).toFloat();
 	switch (column)
 	{
 	case COLUMN_WIDTH:
 	{
 		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,15 +17,17 @@ private:
 	QComboBox* endTypeBox;
 	QtMaterialTextField* widthField;
 	QTableWidget* strokeTable;
+	QtMaterialRaisedButton* addButton;
 	bool handlingRowInsert = false;
 
 	void initStrokeSettings();
-	void initTable(std::shared_ptr<Renderer::StrokeRadialGradient> materialStroke);
+	void initTable(const std::shared_ptr<Renderer::StrokeRadialGradient>& materialStroke);
+	void initAddButton();
 	void setTableRow(int row, float width, Renderer::Material& material);
 
 public:
-	StrokeStyleWidget(std::shared_ptr<Renderer::MaterialStyleStroke> stroke, QWidget* parent = nullptr);
+	StrokeStyleWidget(const std::shared_ptr<MaterialStyleStroke>& stroke, QWidget* parent = nullptr);
-	std::shared_ptr<Renderer::MaterialStyleStroke> stroke;
+	std::shared_ptr<MaterialStyleStroke> stroke;
 
 protected slots:
 	void onCurrentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous);

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(treeWidget, &LayerTreeWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
-    connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
+ //   connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshElementWidget, elementInfoDisplayWidget, &ElementPoolWidget::refresh);
     connect(treeWidget, &LayerTreeWidget::displayLayerChange, this, &EditorWidgetItem::onLayerChange);
-    connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshPreview, this,
+ //   connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireRefreshPreview, this,
-            &EditorWidgetItem::triggerRefreshPreview);
+ //           &EditorWidgetItem::triggerRefreshPreview);
-    connect(treeWidget, &LayerTreeWidget::requireRefreshPreview, this,
+ //   connect(treeWidget, &LayerTreeWidget::requireRefreshPreview, this,
-        &EditorWidgetItem::triggerRefreshPreview);
+ //       &EditorWidgetItem::triggerRefreshPreview);
-	connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireSelfRefresh, layerInfoDisplayWidget, &InfoDisplayWidget::triggerSelfRefresh);
+	//connect(layerInfoDisplayWidget, &InfoDisplayWidget::requireSelfRefresh, layerInfoDisplayWidget, &InfoDisplayWidget::triggerSelfRefresh);
-    connect(elementInfoDisplayWidget, &ElementPoolWidget::refreshLayerTree, treeWidget, &LayerTreeWidget::refresh);
+ //   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/LayerStyle.cpp

@@ -2,6 +2,7 @@
 #include "./EditorWidgetComponent/StrokeStyleWidget.h"
 #include "./EditorWidgetComponent/FillStyleWidget.h"
 #include "./util/EncodeUtil.hpp"
+#include "../ColorHelper.hpp"
 #include <qtmaterialcheckbox.h>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -206,11 +207,11 @@ bool LayerStyleContainer::dropStyle(const QString& styleName)
 
 float LayerStyleContainer::boundingBoxAffectValue() const {
     float maxLineWidth = 0;
-    const auto strokeStyle = styles.at(StrokeElementLayerStyle::displayName());
+    const auto strokeStyle = styles.find(StrokeElementLayerStyle::displayName());
-    if (strokeStyle != nullptr)
+    if (strokeStyle != styles.end())
     {
         if (const auto strokeElementLayerStyle =
-				std::dynamic_pointer_cast<StrokeElementLayerStyle>(strokeStyle);
+            std::dynamic_pointer_cast<StrokeElementLayerStyle>(strokeStyle->second);
             strokeElementLayerStyle != nullptr)
         {
             const auto& leftStyleStroke = strokeElementLayerStyle->strokePair.first;
@@ -247,18 +248,18 @@ std::unique_ptr<StrokeElementLayerStyle> StrokeElementLayerStyle::fromJson(const
     return ptr;
 }
 
-StrokeElementLayerStyle::StrokeElementLayerStyle()
+StrokeElementLayerStyle::StrokeElementLayerStyle(bool isClosed)
 {
     const auto materialMap = std::map<float, Renderer::Material>();
     this->strokePair.first = std::make_shared<MaterialStyleStroke>(
         7,
-        Renderer::StrokeType::kLeftSide, Renderer::StrokeEndType::kFlat,
+        Renderer::StrokeType::kLeftSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
         std::make_shared<Renderer::StrokeRadialGradient>(materialMap, false)
         );
 
     this->strokePair.second = std::make_shared<MaterialStyleStroke>(
 	    7,
-	    Renderer::StrokeType::kRightSide, Renderer::StrokeEndType::kFlat,
+	    Renderer::StrokeType::kRightSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
         std::make_shared<Renderer::StrokeRadialGradient>(materialMap, false)
     );
     
@@ -536,7 +537,7 @@ FillElementLayerStyle::FillElementLayerStyle(const PMaterialStyleFill& fillMater
 	if (!fillMaterialStyle)
 	{
         this->fillMaterialStyle = std::make_shared<MaterialStyleFill>(
-				std::make_shared<Renderer::FillPlain>(Renderer::Material(QColor::fromRgb(0, 0, 0)))
+				std::make_shared<Renderer::FillPlain>(ColorHelper::instance().getPrimary1())
             );
 	}
 }

ArchitectureColoredPainting/src/Editor/LayerStyle.h

@@ -46,7 +46,7 @@ public:
     STYLE_NAME("Ãè±ß", "stroke")
 	static std::unique_ptr<StrokeElementLayerStyle> fromJson(const QJsonObject& json);
 
-    StrokeElementLayerStyle();
+    StrokeElementLayerStyle(bool isClosed);
     StrokeElementLayerStyle(const PMaterialStyleStroke& left, const PMaterialStyleStroke& right = nullptr);
     StrokeElementLayerStyle(const StrokeElementLayerStyle& other);
     ~StrokeElementLayerStyle() override = default;
@@ -88,17 +88,23 @@ public:
 class LayerStyleContainer : public Renderer::ElementStyle
 {
     using DisplayNameWithSupplier = std::map<QString, std::function<std::unique_ptr<LayerStyle>()>>;
-private:
 
-    inline const static DisplayNameWithSupplier commonStyles = { {
+private:
-        StrokeElementLayerStyle::displayName(),
+    inline const static DisplayNameWithSupplier commonStyles = { };
-        [] { return std::make_unique<StrokeElementLayerStyle>(); }
+    inline const static DisplayNameWithSupplier closedOnlyStyles = {
-    } };
+        {
-    inline const static DisplayNameWithSupplier closedOnlyStyles = { {
             FillElementLayerStyle::displayName(),
             [] { return std::make_unique<FillElementLayerStyle>(); }
+		},
+		{
+            StrokeElementLayerStyle::displayName(),
+            [] { return std::make_unique<StrokeElementLayerStyle>(true); }
+		}
+    };
+    inline const static DisplayNameWithSupplier unclosedOnlyStyles = { {
+        StrokeElementLayerStyle::displayName(),
+        [] { return std::make_unique<StrokeElementLayerStyle>(false); }
     } };
-    inline const static DisplayNameWithSupplier unclosedOnlyStyles = { };
 
     DisplayNameWithSupplier unusedStyles;
     DisplayNameWithSupplier usedStyles;

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)
+  //  if (this->selected)
-    {
+  //  {
-        painter->save();
+  //      painter->save();
-		painter->setTransform(transform, ignoreSelected);
+		//painter->setPen(QPen(Qt::red, 2));
-		painter->setPen(QPen(Qt::gray, 2));
+		//painter->setTransform(transform);
-        painter->setPen(Qt::DashLine);
+		//painter->drawRect(this->cache.getBoundingRect());
-		painter->drawRect(cache.getBoundingRect());
+		//painter->restore();
-		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/EditorSettingWidget.cpp

@@ -1,6 +1,6 @@
 #include "EditorSettingWidget.h"
+#include "../ColorHelper.hpp"
 #include <QPushButton>
-#include <QColorDialog>
 #include <QInputDialog>
 
 EditorSettingWidget::EditorSettingWidget(QWidget* parent)
@@ -8,7 +8,7 @@ EditorSettingWidget::EditorSettingWidget(QWidget* parent)
 {
 	ui.setupUi(this);
 	connect(ui.backgroundColorButton, &QPushButton::clicked, this, [this]() {
-			QColor color = QColorDialog::getColor(Qt::white, this, QString::fromLocal8Bit("Ñ¡Ôñ±³¾°ÑÕÉ«"));
+			QColor color = ColorHelper::execColorDialog(Qt::white, this, QString::fromLocal8Bit("Ñ¡Ôñ±³¾°ÑÕÉ«"));
 			if (color.isValid())
 			{
 				emit backgroundColorChanged(color);

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();
+			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

@@ -5,7 +5,7 @@
 #include <queue>
 
 using Renderer::Painting;
-using Renderer::Element;
+using Renderer::BaseElement;
 using Renderer::ElementTransform;
 using Renderer::BaseElement;
 using glm::bvec2;
@@ -24,6 +24,7 @@ struct LayerNode {
 
 QJsonObject PaintingUtil::readJsonFile(QString jsonFilePath) {
 	QFile jsonFile(jsonFilePath);
+	qDebug() << jsonFilePath;
 	jsonFile.open(QFile::ReadOnly);
 	QByteArray fileContent = jsonFile.readAll().trimmed();
 	jsonFile.close();
@@ -43,18 +44,22 @@ Painting PaintingUtil::transfromToPainting(QString jsonFilePath) {
 	//qDebug() << layerManager->toJson();
 	//qDebug() << ((SimpleElement*)((LeafLayerWrapper*)((FolderLayerWrapper*)((FolderLayerWrapper*)layerManager->getRoot())->children[0].get())->children[0].get())->wrappedElement)->painterPath;
 	//qDebug() << ((LeafLayerWrapper*)((FolderLayerWrapper*)((FolderLayerWrapper*)layerManager->getRoot())->children[0].get())->children[0].get())->getCache().painterPath;
+	//qDebug() << elementManager->toJson();
+	//qDebug() << layerManager->toJson(); 
+	//qDebug() << ((SimpleElement*)((LeafLayerWrapper*)((FolderLayerWrapper*)((FolderLayerWrapper*)layerManager->getRoot())->children[0].get())->children[0].get())->wrappedElement)->painterPath;
+	//qDebug() << ((LeafLayerWrapper*)((FolderLayerWrapper*)((FolderLayerWrapper*)layerManager->getRoot())->children[0].get())->children[0].get())->getCache().painterPath;
 	queue<LayerNode> layerQueue;
 	LayerWrapper* root = layerManager->getRoot();
 	root->getCache();
-    double maxLineWidth = getMaxLineWidth(root);
+	//double maxLineWidth = getMaxLineWidth(root);
 	layerQueue.push({ root, root->property.transform });
 	while (!layerQueue.empty()) {
 		auto layerNode = layerQueue.front();
 		layerQueue.pop();
-        FolderLayerWrapper* nowLayer = handleLayerWrapper(layerNode.nowLayer, maxLineWidth, layerNode.transfrom, painting);
+		FolderLayerWrapper* nowLayer = handleLayerWrapper(layerNode.nowLayer, layerNode.transfrom, painting);
 		if (nowLayer != nullptr) {
 			for (auto sonLayer : nowLayer->children) {
-                layerQueue.push({ sonLayer.get(), layerNode.transfrom});
+				layerQueue.push({ sonLayer.get(), layerNode.transfrom });
 			}
 		}
 	}
@@ -62,7 +67,7 @@ Painting PaintingUtil::transfromToPainting(QString jsonFilePath) {
 	return painting;
 }
 
-FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, double& maxLineWidth, QTransform& transform, Painting& painting) {
+FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTransform& transform, Painting& painting) {
 	LeafLayerWrapper* leafLayer = dynamic_cast<LeafLayerWrapper*>(nowLayer);
 
 	transform = nowLayer->property.transform * transform;
@@ -79,170 +84,53 @@ FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, dou
 		QPainterPath painterPath = pixelPath.getPainterPath();
 		QRectF bound = painterPath.boundingRect();
 		//qDebug() << leafLayer<<"------" << painterPath;
-        //qDebug() << transform;
+		// transform to -1£¬ 1
-        //Element element;
-        //ElementTransform elementTrans;
-        //element.ratio = bound.width() / bound.height();
-        // transform to initial painterPath
-        // transfrom to -1£¬ 1
 		QTransform trans;
-        trans.translate(-centerX, -centerY)
+		double maxLen = std::max(bound.width(), bound.height());
-            .scale(1 / nowLayer->property.scale.x(), 1 / nowLayer->property.scale.y())
-            .rotate(-nowLayer->property.rotation)
-            .translate(centerX, centerY)
-            .translate(-nowLayer->property.offset.x(), -nowLayer->property.offset.y());
-        QPainterPath painterPath = trans.map(pixelPath.getPainterPath());
-        // transfrom to -1£¬ 1
-        QTransform trans;
-        double maxLen = std::max(bound.width(), bound.height()) + maxLineWidth * 2;
 		qDebug() << maxLen << bound;
 		trans.scale(1 / maxLen, 1 / maxLen);
 		trans.translate(-bound.center().x(), -bound.center().y());
 
-        qDebug() << trans.map(painterPath);
+		painterPath = trans.map(painterPath);
-        shared_ptr<vector<vector<Renderer::Point> >> contour = std::make_shared<vector<vector<Renderer::Point> >>(PainterPathUtil::transformToLines(trans.map(painterPath)));
+		shared_ptr<vector<vector<Renderer::Point> >> contour = std::make_shared<vector<vector<Renderer::Point> >>(PainterPathUtil::transformToLines(painterPath));
 		QSize screenSize = QSize(1024, 1024);
-        //element.style = std::make_shared<Renderer::ElementStyleStrokeDemo>(0.06);
-         
-        
-        painterPath = transform.map(painterPath);
-        qDebug() << painterPath;
-        bound = painterPath.boundingRect();
 
 		ElementTransform elementTransform;
-        transform =  transform * trans;
+		transform = trans.inverted() * transform * QTransform::fromScale(2. / screenSize.width(), 2. / screenSize.height()) * QTransform::fromTranslate(-1, -1) * QTransform::fromScale(1, -1);
-        //elementTransform.bound = glm::vec4(-1, -1, 1, 1);
+
-        elementTransform.bound = glm::vec4(
+		auto baseStyles = leafLayer->styles.toBaseStyles();
-            2 * (bound.x() - maxLineWidth) / screenSize.width() - 1,
+		Renderer::BaseElement element;
-            2 * (bound.y() - maxLineWidth) / screenSize.height() - 1,
+		element.contour = contour;
-            2 * (bound.x() + bound.width() + maxLineWidth) / screenSize.width() - 1,
+		for (auto& baseStyle : baseStyles) {
-            2 * (bound.y() + bound.height() + maxLineWidth) / screenSize.height() - 1
+			double lineWidth = 0;
-        );
+			if (baseStyle.material->type() == Renderer::MaterialStyleType::kStroke) {
+				auto material = std::static_pointer_cast<MaterialStyleStroke>(baseStyle.material);
+				material->halfWidth /= maxLen;
+				lineWidth = material->halfWidth;
+				qDebug() << material->halfWidth;
+			}
+			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();
 			elementTransform.transform = glm::mat3x2(
 				transform.m11(), transform.m12(), transform.m21(),
 				transform.m22(), transform.m31(), transform.m32()
 			);
-        qDebug() << transform;
+			//qDebug() << transform;
 			elementTransform.zIndex = 0;
 
-        auto baseStyles =  leafLayer->styles.toBaseStyles();
-        BaseElement element; element.contour = contour;
-        for (auto baseStyle : baseStyles) {
-            if (baseStyle.material->type() == Renderer::MaterialStyleType::kStroke) {
-                auto material = dynamic_cast<MaterialStyleStroke*>(baseStyle.material.get());
-                material->halfWidth = material->halfWidth / maxLen;
-                qDebug() << material->halfWidth;
-            }
 			element.style = baseStyle.material;
 			painting.addElement(element, elementTransform);
 		}
 
-        //qDebug() << bound;
-
-        // TODO ¸ÄÓþØÕó
-
-      /*  elementTrans.center = glm::vec2(
-            (2 * bound.center().x() - screenSize.width()) / screenSize.width(),
-            (2 * bound.center().y() - screenSize.height()) / screenSize.height()
-        );
-        qDebug() << elementTrans.center.x << elementTrans.center.y;
-        decomposeTransform(transform, elementTrans.rotation, elementTrans.scale);
-        elementTrans.scale = glm::vec2(
-            bound.width() * 2 / screenSize.width(),
-            bound.height() * 2 / screenSize.height()
-        );
-        elementTrans.flip = glm::bvec2(
-            nowLayer->property.flipHorizontally,
-            nowLayer->property.flipVertically
-        );
-        qDebug() << elementTrans.scale.x << elementTrans.scale.y;
-        painting.addElement(element, elementTrans);*/
 		return nullptr;
 	}
 
 	FolderLayerWrapper* folderLayer = dynamic_cast<FolderLayerWrapper*>(nowLayer);
 	return folderLayer;
 }
-void PaintingUtil::decomposeTransform(QTransform trans, float& angle, glm::vec2& scale) {
-    //qDebug() << trans;
-    trans.setMatrix(
-        trans.m11(), trans.m12(), trans.m13(),
-        trans.m21(), trans.m22(), trans.m23(),
-        0, 0, 1);
-    //qDebug() << trans.dx() << trans.dy();
-    int count = 0;
-    double norm = 0, n = 0;
-    QTransform R = trans, Rit, Rnext;
-    do {
-        ++count;
-        Rit = R.transposed().inverted();
-        Rnext.setMatrix(
-            (R.m11() + Rit.m11()) / 2,
-            (R.m12() + Rit.m12()) / 2,
-            (R.m13() + Rit.m13()) / 2,
-            (R.m21() + Rit.m21()) / 2,
-            (R.m22() + Rit.m22()) / 2,
-            (R.m23() + Rit.m23()) / 2,
-            (R.m31() + Rit.m31()) / 2,
-            (R.m32() + Rit.m32()) / 2,
-            (R.m33() + Rit.m33()) / 2
-        );
-        norm = 0;
-        norm = max(norm,
-            fabs(R.m11() - Rnext.m11())
-            + fabs(R.m12() - Rnext.m12())
-                + fabs(R.m13() - Rnext.m13()));
-        norm = max(norm,
-            fabs(R.m21() - Rnext.m21())
-            + fabs(R.m22() - Rnext.m22())
-                + fabs(R.m23() - Rnext.m23()));
-        norm = max(norm,
-            fabs(R.m31() - Rnext.m31())
-            + fabs(R.m32() - Rnext.m32())
-                + fabs(R.m33() - Rnext.m33()));
-        R = Rnext;
-    } while (count < 100 && norm > 0.0001);
-    double cosValue = max(-1.0, min(R.m11(), 1.0));    
-    double sinValue = max(-1.0, min(R.m12(), 1.0));
-    angle = acos(cosValue) * 180 / pi;
-    if (sinValue < 0) {
-        angle = 360 - angle;
-    }
-    qDebug() << angle;
-    //R = R.inverted() * trans;
-    //scale = glm::vec2(R.m11(), R.m22());
-    //qDebug() << scale.x << scale.y;
-    return;
-}
-
-double PaintingUtil::getMaxLineWidth(LayerWrapper* root) {
-    double maxWidth = 0;
-    queue<LayerWrapper* > layerQueue;
-    layerQueue.push(root);
-    while (!layerQueue.empty()) {
-        auto layer = layerQueue.front();
-        layerQueue.pop();
-        FolderLayerWrapper* nextLayer = nullptr;
-        LeafLayerWrapper* leafLayer = dynamic_cast<LeafLayerWrapper*>(layer);
-        if (leafLayer != nullptr) {
-            GroupElement* wrapperElement = dynamic_cast<GroupElement*>(leafLayer->wrappedElement);
-            if (wrapperElement != nullptr) {
-                nextLayer = wrapperElement->sourceLayer;
-            }
-            else {
-                maxWidth = std::max(maxWidth, (double)leafLayer->styles.boundingBoxAffectValue());
-            }
-        }
-        else {
-            nextLayer = dynamic_cast<FolderLayerWrapper*>(layer);
-        }
-        if (nextLayer != nullptr) {
-            for (auto sonLayer : nextLayer->children) {
-                layerQueue.push(sonLayer.get());
-            }
-        }
-    }
-    return maxWidth;
-}

ArchitectureColoredPainting/src/Editor/util/PaintingUtil.h

@@ -7,11 +7,9 @@ class PaintingUtil
 private:
 	static const double pi;
 	static QJsonObject readJsonFile(QString jsonFilePath);
-	static FolderLayerWrapper* handleLayerWrapper(LayerWrapper* nowLayer, double& maxLineWidth, QTransform& transform, Renderer::Painting& painting);
+	static FolderLayerWrapper* handleLayerWrapper(LayerWrapper* nowLayer, QTransform& transform, Renderer::Painting& painting);
-	static double getMaxLineWidth(LayerWrapper* root);
+	//static double getMaxLineWidth(LayerWrapper* root);
 public:
 	static Renderer::Painting transfromToPainting(QString jsonFilePath);
-	static void decomposeTransform(QTransform trans, float& angle, glm::vec2& scale);
-	
 };
 

ArchitectureColoredPainting/src/FluentMenu.cpp

@@ -22,3 +22,8 @@ void ::FluentMenu::paintEvent(QPaintEvent* event)
 	}
 	QMenu::paintEvent(event);
 }
+
+QAction* FluentMenu::exec(const QPoint& pos, QAction* at)
+{
+	return QMenu::exec(parentWidget()->mapToGlobal(parentWidget()->mapFromGlobal(pos) + QPoint(-shadowRadius, -shadowRadius)), at);
+}

ArchitectureColoredPainting/src/FluentMenu.h

@@ -7,6 +7,7 @@ class FluentMenu : public QMenu
 public:
 	explicit FluentMenu(QWidget* parent = nullptr);
 	void paintEvent(QPaintEvent* event) override;
+	QAction* exec(const QPoint& pos, QAction* at = nullptr);
 	int shadowRadius = 16;
 	int borderRadius = 6;
 	int itemBorderRadius = 4;

ArchitectureColoredPainting/src/Renderer/Model.cpp

@@ -244,8 +244,9 @@ GLuint Renderer::Model::loadPainting(std::string path)
 		return iter->second;
 
 	Painting painting;
+	path = "../test.json";
 	if (auto file = QFileInfo(QString(path.c_str())); file.isFile())
-		painting = PaintingUtil::transfromToPainting(file.path());
+		painting = PaintingUtil::transfromToPainting(file.filePath());
 	else
 	{
 		qDebug() << path.c_str() << "Not Found, Using Default Painting";

ArchitectureColoredPainting/src/Renderer/Painting/BvhTree.cpp

@@ -20,8 +20,7 @@ QVector4D BvhTree::Union(QVector4D a, QVector4D b) {
 
 QVector4D BvhTree::merge(BvhPtr lp, BvhPtr rp) {
 	QVector4D a = lp->bound, b = rp->bound;
-	/*
+	/*if (lp->isLeaf) {
-	if (lp->isLeaf) {
 		a = BvhTreeData::boundWithRotation(a, lp->getRightSon());
 	}
 	if (rp->isLeaf) {

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;
 	};
 }

ArchitectureColoredPainting/src/Renderer/RendererWidget.cpp

@@ -29,7 +29,7 @@ Renderer::RendererWidget::RendererWidget(QWidget* parent)
 		ui.openButton->setChecked(false);
 	});
 	QObject::connect(ui.openButton, &QPushButton::clicked, [&, menu]() {
-		menu->exec(ui.openButton->mapToGlobal(QPoint(-menu->shadowRadius, ui.openButton->height() - menu->shadowRadius)));
+		menu->exec(ui.openButton->mapToGlobal(QPoint(0, ui.openButton->height())));
 	});
 
 	QObject::connect(ui.horizontalSlider, &QSlider::valueChanged,

ArchitectureColoredPainting/src/main.cpp

@@ -1,11 +1,11 @@
 #include "MainWindow.h"
+#include "ColorHelper.hpp"
 #include <QGuiApplication>
 #include <QtWidgets/QApplication>
 #include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <iostream>
 #include <format>
 #include "consoleapi2.h"
-#include <lib/qtmaterialstyle.h>
 
 extern "C"
 {
@@ -51,9 +51,7 @@ int main(int argc, char* argv[])
 	QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 	QApplication a(argc, argv);
 	Q_INIT_RESOURCE(resources);
-	QtMaterialTheme theme;
+	ColorHelper::instance();
-	theme.setColor("primary1", QColor(0, 90, 158));
-	QtMaterialStyle::instance().setTheme(&theme);
 	//FramelessHelper::Core::setApplicationOSThemeAware();
 	FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur);
 	//FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);

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<MaterialStyleFill>(std::make_shared<FillPlain>(Material(QColor(255,255,0))))) };
-							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

@@ -24,7 +24,7 @@
         }
     ],
     "height": 1080,
-    "project-name": "",
+    "project-name": "ÑùÀý1",
     "root-layer": {
         "children": [
             {
@@ -36,7 +36,7 @@
                         "styles": [
                             {
                                 "enableEachSideIndependent": false,
-                                "left": "AACgQAEAIZwAf///AAAA/w==",
+                                "left": "AAAAQAEAIZwAf///qqr//w==",
                                 "right": "AADgQAAACJw=",
                                 "type": "stroke"
                             }
@@ -52,6 +52,30 @@
                                 "y": 1
                             }
                         }
+                    },
+                    {
+                        "element": 0,
+                        "is-folder": false,
+                        "name": "Leaf2",
+                        "styles": [
+                            {
+                                "enableEachSideIndependent": true,
+                                "left": "AAAAQAEAIZwAf////1UA/w==",
+                                "right": "AADgQAAACJw=",
+                                "type": "stroke"
+                            }
+                        ],
+                        "transform": {
+                            "offset": {
+                                "x": 150,
+                                "y": 0
+                            },
+                            "rotation": 0,
+                            "scale": {
+                                "x": 1.5,
+                                "y": 1.5
+                            }
+                        }
                     }
                 ],
                 "is-folder": true,
@@ -68,6 +92,24 @@
                         "y": 1
                     }
                 }
+            },
+            {
+                "element": 1,
+                "is-folder": false,
+                "name": "ReferencingGroupLayer",
+                "styles": [
+                ],
+                "transform": {
+                    "offset": {
+                        "x": 100,
+                        "y": 0
+                    },
+                    "rotation": 45,
+                    "scale": {
+                        "x": 1,
+                        "y": 1
+                    }
+                }
             }
         ],
         "is-folder": true,