实现通过json文件构造Painting

ArchitectureColoredPainting/src/Editor/LayerStyle.cpp

@@ -206,11 +206,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;

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 glm::bvec2;
 using std::max;
@@ -19,11 +19,11 @@ const double PaintingUtil::pi = acos(-1);
 struct LayerNode {
 	LayerWrapper* nowLayer;
 	QTransform transfrom;
-    bvec2 flip;
 };
 
 QJsonObject PaintingUtil::readJsonFile(QString jsonFilePath) {
 	QFile jsonFile(jsonFilePath);
+	qDebug() << jsonFilePath;
 	jsonFile.open(QFile::ReadOnly);
 	QByteArray fileContent = jsonFile.readAll().trimmed();
 	jsonFile.close();
@@ -43,17 +43,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();
-    layerQueue.push({ root, root->property.transform, flip });
+	//double maxLineWidth = getMaxLineWidth(root);
+	layerQueue.push({ root, root->property.transform });
 	while (!layerQueue.empty()) {
 		auto layerNode = layerQueue.front();
 		layerQueue.pop();
-        FolderLayerWrapper* nowLayer = handleLayerWrapper(layerNode.nowLayer, layerNode.transfrom, layerNode.flip, painting);
+		FolderLayerWrapper* nowLayer = handleLayerWrapper(layerNode.nowLayer, layerNode.transfrom, painting);
 		if (nowLayer != nullptr) {
 			for (auto sonLayer : nowLayer->children) {
-                layerQueue.push({ sonLayer.get(), layerNode.transfrom, layerNode.flip});
+				layerQueue.push({ sonLayer.get(), layerNode.transfrom });
 			}
 		}
 	}
@@ -61,9 +66,8 @@ Painting PaintingUtil::transfromToPainting(QString jsonFilePath) {
 	return painting;
 }
 
-FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTransform& transform, bvec2& flip, Painting& painting) {
+FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTransform& transform, Painting& painting) {
 	LeafLayerWrapper* leafLayer = dynamic_cast<LeafLayerWrapper*>(nowLayer);
-    flip ^= bvec2(nowLayer->property.flipHorizontally, nowLayer->property.flipVertically);
 
 	transform = nowLayer->property.transform * transform;
 
@@ -80,98 +84,57 @@ FolderLayerWrapper* PaintingUtil::handleLayerWrapper(LayerWrapper* nowLayer, QTr
 		QRectF bound = painterPath.boundingRect();
 		//qDebug() << leafLayer<<"------" << painterPath;
 		//qDebug() << transform;
-        Element element;
-        ElementTransform elementTrans;
-        element.ratio = bound.width() / bound.height();
 		// transform to initial painterPath
 		// transfrom to -1£¬ 1
 		QTransform trans;
-        trans.scale(1 / bound.width(), 1 / bound.height());
+		double maxLen = std::max(bound.width(), bound.height());
+		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);
-        element.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);
 
+		ElementTransform elementTransform;
+		transform = trans.inverted() * transform * QTransform::fromScale(2. / screenSize.width(), 2. / screenSize.height()) * QTransform::fromTranslate(-1, -1) * QTransform::fromScale(1, -1);
 
-        painterPath = transform.map(painterPath);
+		auto baseStyles = leafLayer->styles.toBaseStyles();
-        qDebug() << painterPath;
+		Renderer::BaseElement element;
-        bound = painterPath.boundingRect();
+		element.contour = contour;
-        qDebug() << bound;
+		for (auto baseStyle : baseStyles) {
-
+			double lineWidth = 0;
-        // TODO ¸ÄÓþØÕó
+			if (baseStyle.material->type() == Renderer::MaterialStyleType::kStroke) {
-
+				auto material = dynamic_cast<MaterialStyleStroke*>(baseStyle.material.get());
-      /*  elementTrans.center = glm::vec2(
+				material->halfWidth = material->halfWidth / maxLen;
-            (2 * bound.center().x() - screenSize.width()) / screenSize.width(),
+				lineWidth = material->halfWidth;
-            (2 * bound.center().y() - screenSize.height()) / screenSize.height()
+				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();
+			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() << elementTrans.center.x << elementTrans.center.y;
+			qDebug() << transform;
-        decomposeTransform(transform, elementTrans.rotation, elementTrans.scale);
+			elementTransform.zIndex = 0;
-        elementTrans.scale = glm::vec2(
+
-            bound.width() * 2 / screenSize.width(),
+			element.style = baseStyle.material;
-            bound.height() * 2 / screenSize.height()
+			painting.addElement(element, elementTransform);
-        );
+		}
-        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;
-}

ArchitectureColoredPainting/src/Editor/util/PaintingUtil.h

@@ -7,10 +7,9 @@ class PaintingUtil
 private:
 	static const double pi;
 	static QJsonObject readJsonFile(QString jsonFilePath);
-	static FolderLayerWrapper* handleLayerWrapper(LayerWrapper* nowLayer, QTransform& transform, glm::bvec2& flip, Renderer::Painting& painting);
+	static FolderLayerWrapper* handleLayerWrapper(LayerWrapper* nowLayer, QTransform& transform, Renderer::Painting& painting);
+	//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,12 +20,12 @@ 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) {
 		b = BvhTreeData::boundWithRotation(b, rp->getRightSon());
-	}
+	}*/
 	return Union(a, b);
 }
 

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,

test.json

@@ -0,0 +1,131 @@
+{
+    "background-color": "#ffffff",
+    "elements": [
+        {
+            "data": {
+                "include": "../svg/2.svg"
+            },
+            "name": "ababa",
+            "type": "svg-file"
+        },
+        {
+            "data": {
+                "reference-layer": "0.0"
+            },
+            "name": "ababa-group",
+            "type": "group"
+        },
+        {
+            "data": {
+                "include": "../svg/0.svg"
+            },
+            "name": "ababa2",
+            "type": "svg-file"
+        }
+    ],
+    "height": 1080,
+    "project-name": "样例1",
+    "root-layer": {
+        "children": [
+            {
+                "children": [
+                    {
+                        "element": 0,
+                        "is-folder": false,
+                        "name": "Leaf1",
+                        "styles": [
+                            {
+                                "enableEachSideIndependent": false,
+                                "left": "AAAAQAEAIZwAf///qqr//w==",
+                                "right": "AADgQAAACJw=",
+                                "type": "stroke"
+                            }
+                        ],
+                        "transform": {
+                            "offset": {
+                                "x": 0,
+                                "y": 0
+                            },
+                            "rotation": 0,
+                            "scale": {
+                                "x": 1,
+                                "y": 1
+                            }
+                        }
+                    },
+                    {
+                        "element": 0,
+                        "is-folder": false,
+                        "name": "Leaf2",
+                        "styles": [
+                            {
+                                "enableEachSideIndependent": false,
+                                "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,
+                "name": "GroupFolderExample",
+                "referenced-by": 1,
+                "transform": {
+                    "offset": {
+                        "x": 50,
+                        "y": 50
+                    },
+                    "rotation": 0,
+                    "scale": {
+                        "x": 1,
+                        "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,
+        "name": "root",
+        "referenced-by": null,
+        "transform": {
+            "offset": {
+                "x": 0,
+                "y": 0
+            },
+            "rotation": 0,
+            "scale": {
+                "x": 1,
+                "y": 1
+            }
+        }
+    },
+    "width": 1080
+}