BigC
/
ArchitectureColoredPainting
4
2
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity

添加了序列化的接口和基本实现

TaoZhang-Branch
karlis 2023-03-06 19:43:01 +08:00
parent 6188d6a413
commit c1ad6a61f0
10 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ArchitectureColoredPainting/src/Editor/EditorWidget.cpp
View File

@ -31,6 +31,7 @@ EditorWidget::EditorWidget(QWidget *parent) : QWidget(parent)
QJsonObject source = jsonDoc.object();
elementManager = new ElementManager(source,previewWindow->getRenderer());
layerManager = new LayerManager(source, elementManager);
qDebug() << layerManager->toJson();
previewWindow->initialize(layerManager,QSize(jsonDoc.object().value("width").toDouble(),jsonDoc.object().value("height").toDouble()));
if (layerManager->getRoot() != nullptr)
{

13
ArchitectureColoredPainting/src/Editor/ElementManager.cpp
View File

@ -3,6 +3,7 @@ ElementManager::ElementManager(QJsonObject source,Renderer::ElementRenderer* ren
{
auto elementsJson = source.value("elements").toArray();
qDebug() << elementsJson.size();
int index = 0;
for (auto elementJson : elementsJson)
{
if (elementJson.toObject().value("type").toString() == "group")
@ -12,6 +13,8 @@ ElementManager::ElementManager(QJsonObject source,Renderer::ElementRenderer* ren
(*elements.rbegin())->renderer = renderer;
}
for (auto element : elements)
element->index = index++;
}
void ElementManager::addElement(GraphicElement *element)
@ -33,3 +36,13 @@ GraphicElement *ElementManager::getElementById(int index)
ElementManager::~ElementManager()
{
}
QJsonObject ElementManager::toJson() const
{
QJsonArray elementsJson;
for (auto element : elements)
elementsJson.push_back(element->toJson());
QJsonObject result;
result.insert("elements", elementsJson);
return result;
}

1
ArchitectureColoredPainting/src/Editor/ElementManager.h
View File

@ -19,6 +19,7 @@ class ElementManager
~ElementManager();
void addElement(GraphicElement *element);
void removeElement(GraphicElement *pElement);
QJsonObject toJson()const;
/**
* only used in initialization
*/

7
ArchitectureColoredPainting/src/Editor/GraphicElement.cpp
View File

@ -76,3 +76,10 @@ PixelPath GroupElement::getPaintObject(std::vector<Renderer::ElementStyleStrokeD
// rawPath.addPath(path);
// }
//}
//TODO : Ìí¼Óϸ½Ú
QJsonObject GraphicElement::toJson() const
{
QJsonObject result;
result.insert("name", name);
return result;
}

2
ArchitectureColoredPainting/src/Editor/GraphicElement.h
View File

@ -22,7 +22,9 @@ class GraphicElement
public:
Renderer::ElementRenderer *renderer;
QString name = "";
int index;
// TODO: ¸ÄΪBitmapPath
virtual QJsonObject toJson() const;
virtual PixelPath getPaintObject() const = 0;
virtual PixelPath getPaintObject(std::vector<Renderer::ElementStyleStrokeDemo>) const = 0;
};

9
ArchitectureColoredPainting/src/Editor/LayerManager.cpp
View File

@ -62,11 +62,20 @@ bool LayerManager::changeParent(FolderLayerWrapper *newParent) const
selectedLayers[0]->setParent(newParent);
return true;
}
void LayerManager::addLayer(LayerWrapper *layer)
{
layerSet.insert(layer);
}
void LayerManager::removeLayer(LayerWrapper *layer)
{
layerSet.erase(layer);
}
QJsonObject LayerManager::toJson() const
{
QJsonObject result;
result.insert("root-layer", root->toJson());
return result;
}

1
ArchitectureColoredPainting/src/Editor/LayerManager.h
View File

@ -31,6 +31,7 @@ class LayerManager
LayerWrapper *getRoot() const;
LayerManager() = default;
LayerManager(QJsonObject source, ElementManager* elementManager);
QJsonObject toJson() const;
void paint(QPainter *painter, QSize size) const;
bool rename(QString newName) const;
bool combine() const;

38
ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp
View File

@ -53,6 +53,7 @@ FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *element
auto p = reinterpret_cast<GroupElement *>(elementManager->getElementById(referencedJson.toInt()));
if (p != nullptr)
p->setSourceLayer(this);
this->referencedBy = referencedJson.toInt();
}
for (auto childJson : childrenJson)
{
@ -181,3 +182,40 @@ QTreeWidgetItem* FolderLayerWrapper::getQTreeItem()
}
return LayerWrapper::getQTreeItem();
}
//TODO: add effects
QJsonObject LayerWrapper::toJson() const
{
QJsonObject json;
json.insert("name", property.name);
QJsonObject transformJson;
transformJson.insert("offset", QJsonObject({ {"x", property.offset.x()}, {"y", property.offset.y()} }));
transformJson.insert("scale", QJsonObject({ {"x", property.scale.x()}, {"y", property.scale.y()} }));
transformJson.insert("rotation", property.rotation);
json.insert("transform", transformJson);
return json;
}
QJsonObject FolderLayerWrapper::toJson() const
{
QJsonObject json = LayerWrapper::toJson();
QJsonArray childrenJson;
for (auto& child : children)
childrenJson.push_back(child->toJson());
json.insert("children", childrenJson);
json.insert("is-folder", true);
if(this->referencedBy != -1)
json.insert("referenced-by", this->referencedBy);
else
json.insert("referenced-by", QJsonValue());
return json;
}
QJsonObject LeafLayerWrapper::toJson() const
{
QJsonObject json = LayerWrapper::toJson();
json.insert("element", wrappedElement->index);
json.insert("is-folder", false);
return json;
}

5
ArchitectureColoredPainting/src/Editor/LayerWrapper.h
View File

@ -60,13 +60,16 @@ class LayerWrapper
// virtual void deleteAll() const = 0;
virtual void del();
virtual void delSelf();
virtual QJsonObject toJson() const;
~LayerWrapper() = default;
};
class FolderLayerWrapper : public LayerWrapper
{
public:
vector<shared_ptr<LayerWrapper>> children;
int referencedBy = -1;
public:
@ -80,6 +83,7 @@ class FolderLayerWrapper : public LayerWrapper
void del() override;
void delSelf() override;
QTreeWidgetItem* getQTreeItem() override;
QJsonObject toJson() const override;
};
class LeafLayerWrapper : public LayerWrapper
@ -93,6 +97,7 @@ class LeafLayerWrapper : public LayerWrapper
void refresh() override;
LeafLayerWrapper() = default;
LeafLayerWrapper(QJsonObject json, ElementManager *elementManager, FolderLayerWrapper*parent);
QJsonObject toJson() const override;
};
Q_DECLARE_METATYPE(LayerWrapper *)

2
data.json
View File

@ -34,6 +34,7 @@
"is-folder": true,
"referenced-by": null,
"children": [
{
"name": "GroupFolderExample",
"transform": {
@ -87,6 +88,7 @@
}
]
},
{
"name": "ReferencingGroupLayer",
"transform": {