添加构建样例 [无paint动作]

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj

@@ -137,6 +137,7 @@
     <QtUic Include="RendererWidget.ui" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\data.json" />
     <None Include="darkstyle.qss" />
     <None Include="lightstyle.qss" />
     <None Include="Shaders\depth_init.comp" />

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters

@@ -232,6 +232,7 @@
     <None Include="lightstyle.qss">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\data.json" />
   </ItemGroup>
   <ItemGroup>
     <QtUic Include="EditorWidget.ui">

ArchitectureColoredPainting/src/Editor/EditorWidget.cpp

@@ -4,7 +4,17 @@ EditorWidget::EditorWidget(QWidget *parent) : QWidget(parent)
 {
     ui.setupUi(this);
     previewWindow = ui.Preview;
-    QJsonObject source;
+    // test
+    QFile settingFile;
+    settingFile.setFileName("../data.json");
+    settingFile.open(QFile::ReadOnly);
+    QByteArray setting = settingFile.readAll().trimmed();
+    QJsonParseError jError;
+    QJsonDocument jsonDoc(QJsonDocument::fromJson(setting,&jError));
+    qDebug() << jsonDoc.object().value("height").toDouble();
+    qDebug() << jError.errorString();
+    // end test
+    QJsonObject source=jsonDoc.object();
     elementManager = new ElementManager(source);
     layerManager = new LayerManager(source, elementManager);
     previewWindow->initialize(layerManager);

ArchitectureColoredPainting/src/Editor/ElementManager.cpp

@@ -2,6 +2,7 @@
 ElementManager::ElementManager(QJsonObject source)
 {
     auto elementsJson = source.value("elements").toArray();
+    qDebug() << elementsJson.size();
     for (auto elementJson : elementsJson)
     {
         if (elementJson.toObject().value("type") == "group")

ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp

@@ -30,6 +30,7 @@ LayerWrapper::LayerWrapper(QJsonObject json, LayerWrapper *parent)
 FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *elementManager, LayerWrapper *parent)
     : LayerWrapper(json, parent)
 {
+    qDebug() << json.value("name").toString();
     QJsonArray childrenJson = json.value("children").toArray();
     QJsonValue referencedJson = json.value("referenced-by");
     if (!referencedJson.isNull())
@@ -52,6 +53,7 @@ FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *element
 LeafLayerWrapper::LeafLayerWrapper(QJsonObject json, ElementManager *elementManager, LayerWrapper *parent)
     : LayerWrapper(json, parent)
 {
+    qDebug() << json.value("name").toString();
     int elementIndex = json.value("element").toInt();
     wrappedElement = elementManager->getElementById(elementIndex);
 }

ArchitectureColoredPainting/src/Editor/data.json

@@ -1,26 +0,0 @@
-{
-"elements":[
-	{
-		"type":"polygon",
-		"data":{
-			"points":[{"x":20,"y":30},{"x":20,"y":50},{"x":50,"y":100},{"x":20,"y":30}]
-		}
-	},
-	{
-		"type":"polygon",
-		"data":{
-			"points":[{"x":100,"y":100},{"x":100,"y":500},{"x":500,"y":500},{"x":100,"y":100}]
-		}
-	},
-	{
-		"type":"round",
-		"data":{
-			"x-axis":500,
-			"y-axis":500,
-			"angle":360
-		}
-	}
-]
-
-
-}

data.json

@@ -1,26 +1,302 @@
 {
+	"height": 1080,
+	"width": 1080,
 	"elements": [
 		{
-		"type":"polygon",
+			"type": "path",
 			"data": {
-			"points":[{"x":20,"y":30},{"x":20,"y":50},{"x":50,"y":100},{"x":20,"y":30}]
+				"operations": [
+					{
+						"type": "line",
+						"data": {
+							"target": {
+								"x": 15,
+								"y": 20
+							}
+						}
+					},
+					{
+						"type": "cubic",
+						"data": {
+							"target": {
+								"x": 18,
+								"y": 21
+							},
+							"control": {
+								"start": {
+									"x": 17,
+									"y": 22
+								},
+								"end": {
+									"x": 20,
+									"y": 23
+								}
+							}
+						}
+					},
+					{
+						"type": "cubic-smooth",
+						"data": {
+							"target": {
+								"x": 18,
+								"y": 21
+							},
+							"control": {
+								"x": 18,
+								"y": 21
+							}
+						}
+					},
+					{
+						"type": "quadratic",
+						"data": {
+							"target": {
+								"x": 18,
+								"y": 21
+							},
+							"control": {
+								"x": 18,
+								"y": 21
+							}
+						}
+					},
+					{
+						"type": "quadratic-smooth",
+						"data": {
+							"target": {
+								"x": 18,
+								"y": 21
+							}
+						}
+					},
+					{
+						"type": "arc",
+						"data": {
+							"center": {
+								"x": 18,
+								"y": 21
+							},
+							"x-axis": 40,
+							"y-axis": 50,
+							"angle": 60
+						}
+					},
+					{
+						"type": "zeal"
+					}
+				]
 			}
 		},
 		{
 			"type": "polygon",
 			"data": {
-			"points":[{"x":100,"y":100},{"x":100,"y":500},{"x":500,"y":500},{"x":100,"y":100}]
+				"points": [
+					{
+						"x": 10,
+						"y": 20
+					},
+					{
+						"x": 10,
+						"y": 20
+					},
+					{
+						"x": 10,
+						"y": 20
+					},
+					{
+						"x": 10,
+						"y": 20
+					},
+					{
+						"x": 10,
+						"y": 20
+					}
+				]
 			}
 		},
 		{
 			"type": "round",
 			"data": {
-			"x-axis":500,
+				"x-axis": 30,
-			"y-axis":500,
+				"y-axis": 40
-			"angle":360
+			}
+		},
+		{
+			"type": "group",
+			"data": {
+				"reference-layer": "0.0"
+			}
+		}
+	],
+	"root-layer": {
+		"name": "root",
+		"offset": {
+			"x": 0,
+			"y": 0
+		},
+		"transformation": [
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		],
+		"effects": [],
+		"is-folder": true,
+		"referenced-by": null,
+		"children": [
+			{
+				"name": "GroupFolderExample",
+				"offset": {
+					"x": 5,
+					"y": 10
+				},
+				"transformation": [
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"effects": [
+					{
+						"type": "iterate",
+						"data": {
+							"time": 5,
+							"operations": [
+								{
+									"type": "move",
+									"data": {
+										"offset": {
+											"x": 5,
+											"y": 6
+										}
+									}
+								},
+								{
+									"type": "rotate",
+									"data": {
+										"center-offset": {
+											"x": 0,
+											"y": 0
+										},
+										"angle": 60
+									}
+								},
+								{
+									"type": "zoom",
+									"data": {
+										"zoom": 1.5
+									}
+								},
+								{
+									"type": "flip",
+									"data": {
+										"k": 1.2,
+										"b": 3
 									}
 								}
 							]
-
+						}
-
+					}
+				],
+				"is-folder": true,
+				"referenced-by": 3,
+				"children": [
+					{
+						"name": "GroupedLayer1",
+						"offset": {
+							"x": 10,
+							"y": 20
+						},
+						"transformation": [
+							5,
+							0,
+							0,
+							0,
+							6,
+							0,
+							0,
+							0,
+							0
+						],
+						"effects": [],
+						"is-folder": false,
+						"element": 0
+					},
+					{
+						"name": "GroupedLayer2",
+						"offset": {
+							"x": 15,
+							"y": 25
+						},
+						"transformation": [
+							5,
+							0,
+							0,
+							0,
+							6,
+							0,
+							0,
+							0,
+							0
+						],
+						"effects": [],
+						"is-folder": false,
+						"element": 1
+					}
+				]
+			},
+			{
+				"name": "ReferencingGroupLayer",
+				"offset": {
+					"x": 10,
+					"y": 20
+				},
+				"transformation": [
+					5,
+					0,
+					0,
+					0,
+					6,
+					0,
+					0,
+					0,
+					0
+				],
+				"effects": [],
+				"is-folder": false,
+				"element": 3
+			},
+			{
+				"name": "Layer1",
+				"offset": {
+					"x": 10,
+					"y": 20
+				},
+				"transformation": [
+					5,
+					0,
+					0,
+					0,
+					6,
+					0,
+					0,
+					0,
+					0
+				],
+				"effects": [],
+				"is-folder": false,
+				"element": 3
+			}
+		]
+	}
 }