ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/StrokeStyleWidget.cpp

@@ -3,9 +3,7 @@
 #include "../ColorHelper.hpp"
 #include <qtmaterialraisedbutton.h>
 #include <limits>
-#include <array>
 #include <ranges>
-#include <utility>
 
 constexpr int COLUMN_WIDTH = 0;
 constexpr int COLUMN_COLOR = 1;
@@ -18,13 +16,8 @@ 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(
-	const std::shared_ptr<MaterialStyleStroke>& stroke,
+	std::shared_ptr<MaterialStyleStroke> stroke,
 	QWidget* parent
 ) : QWidget(parent), stroke(stroke)
 {
@@ -44,10 +37,7 @@ StrokeStyleWidget::StrokeStyleWidget(
 
 	strokeProperties->setLayout(strokePropertiesLayout);
 	strokePropertiesLayout->addWidget(enableGradual);
-	if (!isClosedStroke(stroke))
+	strokePropertiesLayout->addWidget(endTypeBox);
-	{
-		strokePropertiesLayout->addWidget(endTypeBox);
-	}
 
 	viewLayout->addWidget(strokeProperties);
 	viewLayout->addWidget(widthField);
@@ -70,23 +60,30 @@ void StrokeStyleWidget::initStrokeSettings()
 		radialStroke(this->stroke)->gradual = checked;
 		});
 
-	if (!isClosedStroke(stroke))
+#define endTypeBoxLabel(start, end)	QStringLiteral(start##" -> "##end)
-	{
+	this->endTypeBox = new QComboBox(this);
-		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(endTypeBoxLabel("ƽͷ", "ƽͷ"));  // kFlat
+	endTypeBox->setCurrentIndex(static_cast<int>(this->stroke->endType));
+	connect(endTypeBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
+		switch (index)
 		{
-			endTypeBox->addItem(displayName);
+		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;
 		}
-		endTypeBox->setCurrentIndex(static_cast<int>(this->stroke->endType));
+		});
-		connect(endTypeBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
-			const auto& [displayName, endType] = MaterialStyleStroke::strokeEndTypeNames[index];
-			this->stroke->endType = endType;
-			});
-	}
-	else
-	{
-		this->endTypeBox = nullptr;
-	}
 
 	this->widthField = new QtMaterialTextField(this);
 	widthField->setLabel(QStringLiteral("±¾²àÃè±ß¿í¶È"));
@@ -102,7 +99,7 @@ void StrokeStyleWidget::initStrokeSettings()
 		});
 }
 
-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);
@@ -135,22 +132,22 @@ void StrokeStyleWidget::initAddButton()
 	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;
-		if (materialMap.empty())
+		if (materialMap->empty())
 		{
 			newWidth = 1.f;
 		}
 		else
 		{
-			const auto firstPair = materialMap.begin();
+			const auto firstPair = materialMap->begin();
 			newWidth = firstPair->first / 2;
 		}
 		const Renderer::Material newMaterial(ColorHelper::instance().getPrimary1());
-		materialMap[newWidth] = newMaterial;
+		(*materialMap)[newWidth] = newMaterial;
-		const int newRow = this->strokeTable->rowCount();
+		int newRow = this->strokeTable->rowCount();
 		this->strokeTable->insertRow(newRow);
-		setTableRow(newRow, newWidth, materialMap[newWidth]);
+		setTableRow(newRow, newWidth, (*materialMap)[newWidth]);
 		this->strokeTable->update();
 		handlingRowInsert = false;
 		});
@@ -169,7 +166,7 @@ void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& ma
 	auto* colorPicker = new ColorPicker(*colorPtr, strokeTable);
 	strokeTable->setCellWidget(row, COLUMN_COLOR, colorPicker);
 	connect(colorPicker, &ColorPicker::colorChanged, [this, colorPtr](QColor color) {
-		*colorPtr = std::move(color);
+		*colorPtr = color;
 		this->strokeTable->update();
 		});
 
@@ -194,7 +191,7 @@ void StrokeStyleWidget::setTableRow(int row, float width, Renderer::Material& ma
 void StrokeStyleWidget::onCurrentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous)
 {
 	if (!current) return;
-	const int column = current->column();
+	int column = current->column();
 	if (column != COLUMN_COLOR && column != COLUMN_OPERATIONS)
 	{
 		this->currentItemValue = current->data(Qt::EditRole);
@@ -204,14 +201,14 @@ void StrokeStyleWidget::onCurrentItemChanged(QTableWidgetItem* current, QTableWi
 void StrokeStyleWidget::onCellChanged(int row, int column)
 {
 	if (handlingRowInsert) return;
-	const auto changedItem = strokeTable->item(row, column);
+	auto changedItem = strokeTable->item(row, column);
-	const auto changedItemValue = changedItem->text().toFloat();
+	auto changedItemValue = changedItem->text().toFloat();
 	if (changedItemValue < 0 || 1 < changedItemValue)
 	{
 		changedItem->setData(Qt::EditRole, this->currentItemValue.toFloat());
 		return;
 	}
-	const auto changedWidth = strokeTable->item(row, COLUMN_WIDTH)->data(Qt::EditRole).toFloat();
+	auto changedWidth = strokeTable->item(row, COLUMN_WIDTH)->data(Qt::EditRole).toFloat();
 	switch (column)
 	{
 	case COLUMN_WIDTH:

ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/StrokeStyleWidget.h

@@ -21,12 +21,12 @@ private:
 	bool handlingRowInsert = false;
 
 	void initStrokeSettings();
-	void initTable(const std::shared_ptr<Renderer::StrokeRadialGradient>& materialStroke);
+	void initTable(std::shared_ptr<Renderer::StrokeRadialGradient> materialStroke);
 	void initAddButton();
 	void setTableRow(int row, float width, Renderer::Material& material);
 
 public:
-	StrokeStyleWidget(const std::shared_ptr<MaterialStyleStroke>& stroke, QWidget* parent = nullptr);
+	StrokeStyleWidget(std::shared_ptr<MaterialStyleStroke> stroke, QWidget* parent = nullptr);
 	std::shared_ptr<MaterialStyleStroke> stroke;
 
 protected slots:

ArchitectureColoredPainting/src/Editor/LayerStyle.cpp

@@ -78,7 +78,7 @@ QWidget* StrokeElementLayerStyle::getListDisplayWidget() const
 void LayerStyleContainer::computeNewHash()
 {
     hash = 0;
-    for (auto& f : styles
+    for (auto& f : styles 
         | std::views::values
         | std::views::transform(&LayerStyle::toBaseStyles)
         | std::views::join
@@ -248,18 +248,18 @@ std::unique_ptr<StrokeElementLayerStyle> StrokeElementLayerStyle::fromJson(const
     return ptr;
 }
 
-StrokeElementLayerStyle::StrokeElementLayerStyle(bool isClosed)
+StrokeElementLayerStyle::StrokeElementLayerStyle()
 {
     const auto materialMap = std::map<float, Renderer::Material>();
     this->strokePair.first = std::make_shared<MaterialStyleStroke>(
         7,
-        Renderer::StrokeType::kLeftSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
+        Renderer::StrokeType::kLeftSide, Renderer::StrokeEndType::kFlat,
         std::make_shared<Renderer::StrokeRadialGradient>(materialMap, false)
         );
 
     this->strokePair.second = std::make_shared<MaterialStyleStroke>(
 	    7,
-	    Renderer::StrokeType::kRightSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
+	    Renderer::StrokeType::kRightSide, Renderer::StrokeEndType::kFlat,
         std::make_shared<Renderer::StrokeRadialGradient>(materialMap, false)
     );
     

ArchitectureColoredPainting/src/Editor/LayerStyle.h

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