feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AssetExport: Fix metadata schema

Browse Source 
Task-number: QDS-1556
Change-Id: I13aef8af5094cf6a5c3f53f92643fd23492922d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Vikas Pachdha
2020-07-14 11:14:36 +02:00
parent 42d0c2b9f4
commit f1d5e56f09
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h
View File

@@ -50,7 +50,7 @@ const char YPosTag[] = "y";
const char WidthTag[] = "width"; const char WidthTag[] = "width";
const char HeightTag[] = "height"; const char HeightTag[] = "height";
const char MetadataTag[] = "metadata";
const char QmlIdTag[] = "qmlId"; const char QmlIdTag[] = "qmlId";
const char ExportTypeTag[] = "exportType"; const char ExportTypeTag[] = "exportType";
const char QmlPropertiesTag[] = "qmlProperties"; const char QmlPropertiesTag[] = "qmlProperties";

5
src/plugins/qmldesigner/assetexporterplugin/parsers/assetnodeparser.cpp
View File

@@ -58,7 +58,10 @@ QJsonObject AssetNodeParser::json(Component &component) const
Utils::FilePath assetPath = component.exporter().exportAsset(objectNode(), uuid()); Utils::FilePath assetPath = component.exporter().exportAsset(objectNode(), uuid());
QJsonObject assetData; QJsonObject assetData;
assetData.insert(AssetPathTag, assetPath.toString()); assetData.insert(AssetPathTag, assetPath.toString());
jsonObject.insert(AssetDataTag, assetData);
QJsonObject metadata = jsonObject.value(MetadataTag).toObject();
metadata.insert(AssetDataTag, assetData);
jsonObject.insert(MetadataTag, metadata);
return jsonObject; return jsonObject;
} }
} }

14
src/plugins/qmldesigner/assetexporterplugin/parsers/modelitemnodeparser.cpp
View File

@@ -47,10 +47,9 @@ QJsonObject QmlDesigner::ItemNodeParser::json(QmlDesigner::Component &component)
Q_UNUSED(component); Q_UNUSED(component);
const QmlObjectNode &qmlObjectNode = objectNode(); const QmlObjectNode &qmlObjectNode = objectNode();
QJsonObject jsonObject; QJsonObject jsonObject;
jsonObject.insert(QmlIdTag, qmlObjectNode.id());
QmlItemNode itemNode = qmlObjectNode.toQmlItemNode();
// Position relative to parent // Position relative to parent
QmlItemNode itemNode = qmlObjectNode.toQmlItemNode();
QPointF pos = itemNode.instancePosition(); QPointF pos = itemNode.instancePosition();
jsonObject.insert(XPosTag, pos.x()); jsonObject.insert(XPosTag, pos.x());
jsonObject.insert(YPosTag, pos.y()); jsonObject.insert(YPosTag, pos.y());
@@ -60,10 +59,13 @@ QJsonObject QmlDesigner::ItemNodeParser::json(QmlDesigner::Component &component)
jsonObject.insert(WidthTag, size.width()); jsonObject.insert(WidthTag, size.width());
jsonObject.insert(HeightTag, size.height()); jsonObject.insert(HeightTag, size.height());
jsonObject.insert(UuidTag, uuid()); QJsonObject metadata;
jsonObject.insert(ExportTypeTag, "child"); metadata.insert(QmlIdTag, qmlObjectNode.id());
jsonObject.insert(TypeNameTag, QString::fromLatin1(m_node.type())); metadata.insert(UuidTag, uuid());
metadata.insert(ExportTypeTag, "child");
metadata.insert(TypeNameTag, QString::fromLatin1(m_node.type()));
return jsonObject; jsonObject.insert(MetadataTag, metadata);
return jsonObject;
} }
} }

4
src/plugins/qmldesigner/assetexporterplugin/parsers/textnodeparser.cpp
View File

@@ -81,7 +81,9 @@ QJsonObject TextNodeParser::json(Component &component) const
textDetails.insert(IsMultilineTag, propertyValue("wrapMode").toString().compare("NoWrap") != 0); textDetails.insert(IsMultilineTag, propertyValue("wrapMode").toString().compare("NoWrap") != 0);
jsonObject.insert(TextDetailsTag, textDetails); QJsonObject metadata = jsonObject.value(MetadataTag).toObject();
metadata.insert(TextDetailsTag, textDetails);
jsonObject.insert(MetadataTag, metadata);
return jsonObject; return jsonObject;
} }
} }