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

FIX: 修正文件路径逻辑

dev-wuyize
karlis 2023-03-20 22:26:38 +08:00
parent b944572204
commit 769effe49c
9 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp
View File

@ -3,6 +3,8 @@
#include "DataManager/ProjectDataManager.h"
#include <QTimer>
#include <QFileInfo>
#include <QFile>
#include <QDir>
EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(parent)
{
@ -66,7 +68,7 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
ProjectDataManager::Instance()->addProjectData(data);
// end test
QJsonObject source = jsonDoc.object();
elementManager = new ElementManager(source,Renderer::ElementRenderer::instance());
elementManager = new ElementManager(source, QFileInfo(filePath).absolutePath());
layerManager = new LayerManager(source, elementManager);
elementInfoDisplayWidget->setElementManager(elementManager);
treeWidget->elementManager = elementManager;
@ -125,6 +127,23 @@ void EditorWidgetItem::save() const
void EditorWidgetItem::saveAs(QString filePath) const
{
saveImpl(filePath);
QString srcHome = QFileInfo(this->filePath).absolutePath();
if (!QDir(QFileInfo(filePath).absolutePath() + "/svg").exists())
{
QDir().mkdir(QFileInfo(filePath).absolutePath() + "/svg");
}
for (auto& ele : elementManager->elements)
{
auto e = dynamic_cast<SimpleElement*>(ele);
if (e != nullptr)
{
QString fileName = e->jsonSource["data"].toObject()["include"].toString();
QString src = srcHome + fileName;
QString dst = QFileInfo(filePath).absolutePath() + fileName;
QFile::copy(src, dst);
}
}
}
void EditorWidgetItem::saveImpl(QString filePath) const

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

@ -1,16 +1,20 @@
#include "ElementManager.h"
ElementManager::ElementManager(QJsonObject source,Renderer::ElementRenderer* renderer)
#include <QFileInfo>
#include <QDir>
#include <QFile>
ElementManager::ElementManager(QJsonObject source, QString fileHome)
{
auto elementsJson = source.value("elements").toArray();
this->fileHome = fileHome;
int index = 0;
for (auto elementJson : elementsJson)
{
if (elementJson.toObject().value("type").toString() == "group")
elements.push_back(new GroupElement());
else
elements.push_back(new SimpleElement(elementJson.toObject()));
elements.push_back(new SimpleElement(elementJson.toObject(), fileHome));
(*elements.rbegin())->name = elementJson.toObject().value("name").toString();
(*elements.rbegin())->renderer = renderer;
}
for (auto element : elements)
element->index = index++;
@ -90,9 +94,11 @@ void ElementManager::createGroupElement(QString name, FolderLayerWrapper* source
void ElementManager::createSimpleElement(QString name, QString filePath) {
QJsonObject json;
QJsonObject data;
data.insert("include", filePath);
QFile fileSrc(filePath);
QFile::copy(filePath, QDir::cleanPath(fileHome + "/svg/" + QFileInfo(filePath).fileName()));
data.insert("include", "/svg/"+QFileInfo(filePath).fileName());
json.insert("data", data);
auto element = new SimpleElement(json);
auto element = new SimpleElement(json, fileHome);
element->name = name;
addElement(element);
}

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

@ -14,9 +14,10 @@ class ElementManager
{
public:
vector<GraphicElement *> elements;
QString fileHome;
public:
ElementManager(QJsonObject source,Renderer::ElementRenderer *renderer);
ElementManager(QJsonObject source, QString fileHome);
~ElementManager();
void addElement(GraphicElement *element);
void removeElement(GraphicElement *pElement);

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

@ -2,6 +2,8 @@
#include "util/SvgFileLoader.h"
#include <QGuiApplication>
#include <QScreen>
#include <QDir>
using namespace std;
PixelPath SimpleElement::getPaintObject() const
@ -23,13 +25,13 @@ void SimpleElement::loadSvgFile(const QString& filePath)
qDebug() << "load svg file success " << painterPath.elementCount() << (isClosed() ? "is" : "not") << "closed";
}
SimpleElement::SimpleElement(QJsonObject jsonSource) : jsonSource(jsonSource)
SimpleElement::SimpleElement(QJsonObject jsonSource, QString fileHome) : jsonSource(jsonSource)
{
painterPath.clear();
filePath = jsonSource["data"].toObject()["include"].toString();
//loadSvgFile("D:\\Projects\\BigC\\svg\\3.svg");
QFileInfo info(filePath);
loadSvgFile(filePath);
QFileInfo info(QDir::cleanPath(fileHome + "/" + filePath));
loadSvgFile(info.absoluteFilePath());
}
GroupElement::GroupElement(FolderLayerWrapper* sourceLayer)

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

@ -46,7 +46,7 @@ public:
public:
QJsonObject toJson() const override;
SimpleElement(QJsonObject jsonSource);
SimpleElement(QJsonObject jsonSource, QString fileHome);
SimpleElement(QString filePath);
~SimpleElement() = default;
PixelPath getPaintObject() const override;

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

@ -75,7 +75,7 @@ FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *element
}
LeafLayerWrapper::LeafLayerWrapper(QJsonObject json, ElementManager* elementManager, FolderLayerWrapper* parent)
: LayerWrapper(json, parent),
: LayerWrapper(json, parent, elementManager),
wrappedElement(elementManager->getElementById(json.value("element").toInt())),
styles(LayerStyleContainer::fromJson(wrappedElement->isClosed(), json.value("styles").toArray()))
{
@ -255,7 +255,8 @@ QJsonObject FolderLayerWrapper::toJson() const
QJsonObject json = LayerWrapper::toJson();
QJsonArray childrenJson;
for (auto& child : children)
childrenJson.push_back(child->toJson());
if(child != nullptr)
childrenJson.push_back(child->toJson());
json.insert("children", childrenJson);
json.insert("is-folder", true);
if(this->getReferencedBy() != -1)
@ -268,7 +269,7 @@ QJsonObject FolderLayerWrapper::toJson() const
QJsonObject LeafLayerWrapper::toJson() const
{
QJsonObject json = LayerWrapper::toJson();
json.insert("element", wrappedElement->index);
json.insert("element", elementManager->getElementIndex(wrappedElement));
json.insert("is-folder", false);
json.insert("styles", styles.toJson());
return json;

1
ArchitectureColoredPainting/src/Editor/RightBar/LayerTreeWidget.cpp
View File

@ -59,6 +59,7 @@ void LayerTreeWidget::popMenu(const QPoint &pos)
connect(dialog, &LayerCreateWidget::LayerInfoReturned, this, [this, layer](QJsonObject jsonObj) {
auto folderLayer = dynamic_cast<FolderLayerWrapper*>(layer);
LayerWrapper* newLayer;
qDebug() << this->elementManager;
if(jsonObj.value("is-folder").toBool())
newLayer = new FolderLayerWrapper(jsonObj, this->elementManager, folderLayer);
else

3
ArchitectureColoredPainting/src/Editor/util/PaintingUtil.cpp
View File

@ -3,6 +3,7 @@
#include <QJsondocument>
#include "PainterPathUtil.h"
#include <queue>
#include <QFileInfo>
using Renderer::Painting;
using Renderer::BaseElement;
@ -37,7 +38,7 @@ Painting PaintingUtil::transfromToPainting(QString jsonFilePath) {
glm::bvec2 flip(0, 0);
QJsonObject jsonObj = readJsonFile(jsonFilePath);
qDebug() << jsonObj;
shared_ptr<ElementManager> elementManager = make_shared<ElementManager>(jsonObj, Renderer::ElementRenderer::instance());
shared_ptr<ElementManager> elementManager = make_shared<ElementManager>(jsonObj, QFileInfo(jsonFilePath).absolutePath());
shared_ptr<LayerManager> layerManager = make_shared<LayerManager>(jsonObj, elementManager.get());
//qDebug() << elementManager->toJson();
//qDebug() << layerManager->toJson();

4
data.json
View File

@ -8,7 +8,7 @@
"name": "ababa",
"type": "svg-file",
"data": {
"include": "../svg/2.svg"
"include": "/svg/2.svg"
}
},
{
@ -22,7 +22,7 @@
"name": "ababa2",
"type": "svg-file",
"data": {
"include": "../svg/0.svg"
"include": "/svg/0.svg"
}
}
],