aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set default value for attributes in pattern's file.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2013-12-23 21:50:30 +02:00
parent 60224819e4
commit 5ac6302130
2 changed files with 161 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
src/xml/vdomdocument.cpp
View File

@ -384,11 +384,11 @@ void VDomDocument::ParseIncrementsElement(const QDomNode &node)
if (domElement.tagName() == "increment") if (domElement.tagName() == "increment")
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, "name", "");
qreal base = GetParametrDouble(domElement, "base"); qreal base = GetParametrDouble(domElement, "base", "0");
qreal ksize = GetParametrDouble(domElement, "ksize"); qreal ksize = GetParametrDouble(domElement, "ksize", "0");
qreal kgrowth = GetParametrDouble(domElement, "kgrowth"); qreal kgrowth = GetParametrDouble(domElement, "kgrowth", "0");
QString desc = GetParametrString(domElement, "description"); QString desc = GetParametrString(domElement, "description", "Description");
data->UpdateId(id); data->UpdateId(id);
data->AddIncrementTableRow(name, data->AddIncrementTableRow(name,
VIncrementTableRow(id, base, ksize, kgrowth, desc)); VIncrementTableRow(id, base, ksize, kgrowth, desc));
@ -402,7 +402,7 @@ void VDomDocument::ParseIncrementsElement(const QDomNode &node)
qint64 VDomDocument::GetParametrId(const QDomElement &domElement) const qint64 VDomDocument::GetParametrId(const QDomElement &domElement) const
{ {
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
qint64 id = GetParametrLongLong(domElement, "id"); qint64 id = GetParametrLongLong(domElement, "id", "0");
if (id <= 0) if (id <= 0)
{ {
throw VExceptionWrongParameterId(tr("Got wrong parameter id. Need only id > 0."), domElement); throw VExceptionWrongParameterId(tr("Got wrong parameter id. Need only id > 0."), domElement);
@ -410,12 +410,13 @@ qint64 VDomDocument::GetParametrId(const QDomElement &domElement) const
return id; return id;
} }
qint64 VDomDocument::GetParametrLongLong(const QDomElement &domElement, const QString &name) const qint64 VDomDocument::GetParametrLongLong(const QDomElement &domElement, const QString &name,
const QString &defValue) const
{ {
Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty"); Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty");
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
bool ok = false; bool ok = false;
QString parametr = GetParametrString(domElement, name); QString parametr = GetParametrString(domElement, name, defValue);
qint64 id = parametr.toLongLong(&ok); qint64 id = parametr.toLongLong(&ok);
if (ok == false) if (ok == false)
{ {
@ -424,11 +425,12 @@ qint64 VDomDocument::GetParametrLongLong(const QDomElement &domElement, const QS
return id; return id;
} }
QString VDomDocument::GetParametrString(const QDomElement &domElement, const QString &name) const QString VDomDocument::GetParametrString(const QDomElement &domElement, const QString &name,
const QString &defValue) const
{ {
Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty"); Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty");
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
QString parameter = domElement.attribute(name, ""); QString parameter = domElement.attribute(name, defValue);
if (parameter.isEmpty()) if (parameter.isEmpty())
{ {
throw VExceptionEmptyParameter(tr("Got empty parameter"), name, domElement); throw VExceptionEmptyParameter(tr("Got empty parameter"), name, domElement);
@ -436,12 +438,12 @@ QString VDomDocument::GetParametrString(const QDomElement &domElement, const QSt
return parameter; return parameter;
} }
qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QString &name) const qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QString &name, const QString &defValue) const
{ {
Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty"); Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty");
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
bool ok = false; bool ok = false;
QString parametr = GetParametrString(domElement, name); QString parametr = GetParametrString(domElement, name, defValue);
qreal param = parametr.replace(",", ".").toDouble(&ok); qreal param = parametr.replace(",", ".").toDouble(&ok);
if (ok == false) if (ok == false)
{ {
@ -563,12 +565,12 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo
VDetail detail; VDetail detail;
VDetail oldDetail; VDetail oldDetail;
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
detail.setName(GetParametrString(domElement, "name")); detail.setName(GetParametrString(domElement, VAbstractTool::AttrName, ""));
detail.setMx(toPixel(GetParametrDouble(domElement, "mx"))); detail.setMx(toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "0.0")));
detail.setMy(toPixel(GetParametrDouble(domElement, "my"))); detail.setMy(toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "0.0")));
detail.setSupplement(GetParametrLongLong(domElement, "supplement")); detail.setSupplement(GetParametrLongLong(domElement, VToolDetail::AttrSupplement, "1"));
detail.setWidth(GetParametrDouble(domElement, "width")); detail.setWidth(GetParametrDouble(domElement, VToolDetail::AttrWidth, "10.0"));
detail.setClosed(GetParametrLongLong(domElement, "closed")); detail.setClosed(GetParametrLongLong(domElement, VToolDetail::AttrClosed, "1"));
QDomNodeList nodeList = domElement.childNodes(); QDomNodeList nodeList = domElement.childNodes();
qint32 num = nodeList.size(); qint32 num = nodeList.size();
@ -577,14 +579,14 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo
QDomElement element = nodeList.at(i).toElement(); QDomElement element = nodeList.at(i).toElement();
if (element.isNull() == false) if (element.isNull() == false)
{ {
if (element.tagName() == "node") if (element.tagName() == VToolDetail::TagNode)
{ {
qint64 id = GetParametrLongLong(element, "idObject"); qint64 id = GetParametrLongLong(element, VToolDetail::AttrIdObject, "0");
qreal mx = toPixel(GetParametrDouble(element, "mx")); qreal mx = toPixel(GetParametrDouble(element, VAbstractTool::AttrMx, "0.0"));
qreal my = toPixel(GetParametrDouble(element, "my")); qreal my = toPixel(GetParametrDouble(element, VAbstractTool::AttrMy, "0.0"));
Tool::Tools tool; Tool::Tools tool;
NodeDetail::NodeDetails nodeType = NodeDetail::Contour; NodeDetail::NodeDetails nodeType = NodeDetail::Contour;
QString t = GetParametrString(element, "type"); QString t = GetParametrString(element, "type", "NodePoint");
if (t == "NodePoint") if (t == "NodePoint")
{ {
tool = Tool::NodePoint; tool = Tool::NodePoint;
@ -636,7 +638,7 @@ void VDomDocument::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomEleme
QDomElement domElement = domNode.toElement(); QDomElement domElement = domNode.toElement();
if (domElement.isNull() == false) if (domElement.isNull() == false)
{ {
if (domElement.tagName() == "detail") if (domElement.tagName() == VToolDetail::TagName)
{ {
ParseDetailElement(sceneDetail, domElement, parse); ParseDetailElement(sceneDetail, domElement, parse);
} }
@ -652,16 +654,16 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
Q_ASSERT(scene != 0); Q_ASSERT(scene != 0);
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of point is empty"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of point is empty");
if (type == "single") if (type == VToolSinglePoint::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "A");
qreal x = toPixel(GetParametrDouble(domElement, "x")); qreal x = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrX, "10.0"));
qreal y = toPixel(GetParametrDouble(domElement, "y")); qreal y = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrY, "10.0"));
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
data->UpdatePoint(id, VPointF(x, y, name, mx, my)); data->UpdatePoint(id, VPointF(x, y, name, mx, my));
VDrawTool::AddRecord(id, Tool::SinglePointTool, this); VDrawTool::AddRecord(id, Tool::SinglePointTool, this);
@ -687,18 +689,18 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "endLine") if (type == VToolEndLine::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString typeLine = GetParametrString(domElement, "typeLine"); QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine);
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0");
qint64 basePointId = GetParametrLongLong(domElement, "basePoint"); qint64 basePointId = GetParametrLongLong(domElement, VAbstractTool::AttrBasePoint, "0");
qreal angle = GetParametrDouble(domElement, "angle"); qreal angle = GetParametrDouble(domElement, VAbstractTool::AttrAngle, "0.0");
VToolEndLine::Create(id, name, typeLine, formula, angle, basePointId, mx, my, scene, this, data, parse, VToolEndLine::Create(id, name, typeLine, formula, angle, basePointId, mx, my, scene, this, data, parse,
Tool::FromFile); Tool::FromFile);
@ -711,18 +713,18 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "alongLine") if (type == VToolAlongLine::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString typeLine = GetParametrString(domElement, "typeLine"); QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine);
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0");
qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPointId = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPointId = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
VToolAlongLine::Create(id, name, typeLine, formula, firstPointId, secondPointId, mx, my, scene, this, data, VToolAlongLine::Create(id, name, typeLine, formula, firstPointId, secondPointId, mx, my, scene, this, data,
parse, Tool::FromFile); parse, Tool::FromFile);
@ -735,19 +737,19 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "shoulder") if (type == VToolShoulderPoint::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString typeLine = GetParametrString(domElement, "typeLine"); QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine);
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0");
qint64 p1Line = GetParametrLongLong(domElement, "p1Line"); qint64 p1Line = GetParametrLongLong(domElement, VAbstractTool::AttrP1Line, "0");
qint64 p2Line = GetParametrLongLong(domElement, "p2Line"); qint64 p2Line = GetParametrLongLong(domElement, VAbstractTool::AttrP2Line, "0");
qint64 pShoulder = GetParametrLongLong(domElement, "pShoulder"); qint64 pShoulder = GetParametrLongLong(domElement, VAbstractTool::AttrPShoulder, "0");
VToolShoulderPoint::Create(id, formula, p1Line, p2Line, pShoulder, typeLine, name, mx, my, scene, this, VToolShoulderPoint::Create(id, formula, p1Line, p2Line, pShoulder, typeLine, name, mx, my, scene, this,
data, parse, Tool::FromFile); data, parse, Tool::FromFile);
@ -760,19 +762,19 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "normal") if (type == VToolNormal::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString typeLine = GetParametrString(domElement, "typeLine"); QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine);
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0");
qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPointId = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPointId = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
qreal angle = GetParametrDouble(domElement, "angle"); qreal angle = GetParametrDouble(domElement, VAbstractTool::AttrAngle, "0.0");
VToolNormal::Create(id, formula, firstPointId, secondPointId, typeLine, name, angle, mx, my, scene, this, VToolNormal::Create(id, formula, firstPointId, secondPointId, typeLine, name, angle, mx, my, scene, this,
data, parse, Tool::FromFile); data, parse, Tool::FromFile);
@ -785,19 +787,19 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "bisector") if (type == VToolBisector::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString typeLine = GetParametrString(domElement, "typeLine"); QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine);
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0");
qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPointId = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPointId = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
qint64 thirdPointId = GetParametrLongLong(domElement, "thirdPoint"); qint64 thirdPointId = GetParametrLongLong(domElement, VAbstractTool::AttrThirdPoint, "0");
VToolBisector::Create(id, formula, firstPointId, secondPointId, thirdPointId, typeLine, name, mx, my, scene, VToolBisector::Create(id, formula, firstPointId, secondPointId, thirdPointId, typeLine, name, mx, my, scene,
this, data, parse, Tool::FromFile); this, data, parse, Tool::FromFile);
@ -810,18 +812,18 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "lineIntersect") if (type == VToolLineIntersect::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
qint64 p1Line1Id = GetParametrLongLong(domElement, "p1Line1"); qint64 p1Line1Id = GetParametrLongLong(domElement, VAbstractTool::AttrP1Line1, "0");
qint64 p2Line1Id = GetParametrLongLong(domElement, "p2Line1"); qint64 p2Line1Id = GetParametrLongLong(domElement, VAbstractTool::AttrP2Line1, "0");
qint64 p1Line2Id = GetParametrLongLong(domElement, "p1Line2"); qint64 p1Line2Id = GetParametrLongLong(domElement, VAbstractTool::AttrP1Line2, "0");
qint64 p2Line2Id = GetParametrLongLong(domElement, "p2Line2"); qint64 p2Line2Id = GetParametrLongLong(domElement, VAbstractTool::AttrP2Line2, "0");
VToolLineIntersect::Create(id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, name, mx, my, scene, this, data, VToolLineIntersect::Create(id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, name, mx, my, scene, this, data,
parse, Tool::FromFile); parse, Tool::FromFile);
@ -834,18 +836,18 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "pointOfContact") if (type == VToolPointOfContact::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString radius = GetParametrString(domElement, "radius"); QString radius = GetParametrString(domElement, VAbstractTool::AttrRadius, "0");
qint64 center = GetParametrLongLong(domElement, "center"); qint64 center = GetParametrLongLong(domElement, VAbstractTool::AttrCenter, "0");
qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPointId = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPointId = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
VToolPointOfContact::Create(id, radius, center, firstPointId, secondPointId, name, mx, my, scene, this, VToolPointOfContact::Create(id, radius, center, firstPointId, secondPointId, name, mx, my, scene, this,
data, parse, Tool::FromFile); data, parse, Tool::FromFile);
@ -858,15 +860,15 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "modeling") if (type == VNodePoint::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 idObject = GetParametrLongLong(domElement, "idObject"); qint64 idObject = GetParametrLongLong(domElement, VAbstractNode::AttrIdObject, "0");
VPointF point = data->GetPoint(idObject ); VPointF point = data->GetPoint(idObject );
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
data->UpdatePoint(id, VPointF(point.x(), point.y(), point.name(), mx, my, idObject )); data->UpdatePoint(id, VPointF(point.x(), point.y(), point.name(), mx, my, idObject ));
VNodePoint::Create(this, data, id, idObject, parse, Tool::FromFile); VNodePoint::Create(this, data, id, idObject, parse, Tool::FromFile);
return; return;
@ -878,18 +880,18 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "height") if (type == VToolHeight::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString typeLine = GetParametrString(domElement, "typeLine"); QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine);
qint64 basePointId = GetParametrLongLong(domElement, "basePoint"); qint64 basePointId = GetParametrLongLong(domElement, VAbstractTool::AttrBasePoint, "0");
qint64 p1LineId = GetParametrLongLong(domElement, "p1Line"); qint64 p1LineId = GetParametrLongLong(domElement, VAbstractTool::AttrP1Line, "0");
qint64 p2LineId = GetParametrLongLong(domElement, "p2Line"); qint64 p2LineId = GetParametrLongLong(domElement, VAbstractTool::AttrP2Line, "0");
VToolHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, scene, this, data, parse, VToolHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, scene, this, data, parse,
Tool::FromFile); Tool::FromFile);
@ -902,18 +904,18 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "triangle") if (type == VToolTriangle::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
qint64 axisP1Id = GetParametrLongLong(domElement, "axisP1"); qint64 axisP1Id = GetParametrLongLong(domElement, VAbstractTool::AttrAxisP1, "0");
qint64 axisP2Id = GetParametrLongLong(domElement, "axisP2"); qint64 axisP2Id = GetParametrLongLong(domElement, VAbstractTool::AttrAxisP2, "0");
qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPointId = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPointId = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
VToolTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, scene, this, data, VToolTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, scene, this, data,
parse, Tool::FromFile); parse, Tool::FromFile);
@ -926,16 +928,16 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "pointOfIntersection") if (type == VToolPointOfIntersection::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPointId = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPointId = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
VToolPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, scene, this, data, parse, VToolPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, scene, this, data, parse,
Tool::FromFile); Tool::FromFile);
@ -948,16 +950,16 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "cutSpline") if (type == VToolCutSpline::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "0");
qint64 splineId = GetParametrLongLong(domElement, "spline"); qint64 splineId = GetParametrLongLong(domElement, VToolCutSpline::AttrSpline, "0");
VToolCutSpline::Create(id, name, formula, splineId, mx, my, scene, this, data, parse, Tool::FromFile); VToolCutSpline::Create(id, name, formula, splineId, mx, my, scene, this, data, parse, Tool::FromFile);
return; return;
@ -969,16 +971,16 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen
throw excep; throw excep;
} }
} }
if (type == "cutSplinePath") if (type == VToolCutSplinePath::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
QString name = GetParametrString(domElement, "name"); QString name = GetParametrString(domElement, VAbstractTool::AttrName, "");
qreal mx = toPixel(GetParametrDouble(domElement, "mx")); qreal mx = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0"));
qreal my = toPixel(GetParametrDouble(domElement, "my")); qreal my = toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0"));
QString formula = GetParametrString(domElement, "length"); QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "0");
qint64 splinePathId = GetParametrLongLong(domElement, "splinePath"); qint64 splinePathId = GetParametrLongLong(domElement, VToolCutSplinePath::AttrSplinePath, "0");
VToolCutSplinePath::Create(id, name, formula, splinePathId, mx, my, scene, this, data, parse, VToolCutSplinePath::Create(id, name, formula, splinePathId, mx, my, scene, this, data, parse,
Tool::FromFile); Tool::FromFile);
@ -1001,8 +1003,8 @@ void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 firstPoint = GetParametrLongLong(domElement, "firstPoint"); qint64 firstPoint = GetParametrLongLong(domElement, VAbstractTool::AttrFirstPoint, "0");
qint64 secondPoint = GetParametrLongLong(domElement, "secondPoint"); qint64 secondPoint = GetParametrLongLong(domElement, VAbstractTool::AttrSecondPoint, "0");
VToolLine::Create(id, firstPoint, secondPoint, scene, this, data, parse, Tool::FromFile); VToolLine::Create(id, firstPoint, secondPoint, scene, this, data, parse, Tool::FromFile);
} }
@ -1020,18 +1022,18 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme
Q_ASSERT(scene != 0); Q_ASSERT(scene != 0);
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty");
if (type == "simple") if (type == VToolSpline::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 point1 = GetParametrLongLong(domElement, "point1"); qint64 point1 = GetParametrLongLong(domElement, VAbstractTool::AttrPoint1, "0");
qint64 point4 = GetParametrLongLong(domElement, "point4"); qint64 point4 = GetParametrLongLong(domElement, VAbstractTool::AttrPoint4, "0");
qreal angle1 = GetParametrDouble(domElement, "angle1"); qreal angle1 = GetParametrDouble(domElement, VAbstractTool::AttrAngle1, "270.0");
qreal angle2 = GetParametrDouble(domElement, "angle2"); qreal angle2 = GetParametrDouble(domElement, VAbstractTool::AttrAngle2, "90.0");
qreal kAsm1 = GetParametrDouble(domElement, "kAsm1"); qreal kAsm1 = GetParametrDouble(domElement, VAbstractTool::AttrKAsm1, "1.0");
qreal kAsm2 = GetParametrDouble(domElement, "kAsm2"); qreal kAsm2 = GetParametrDouble(domElement, VAbstractTool::AttrKAsm2, "1.0");
qreal kCurve = GetParametrDouble(domElement, "kCurve"); qreal kCurve = GetParametrDouble(domElement, VAbstractTool::AttrKCurve, "1.0");
VToolSpline::Create(id, point1, point4, kAsm1, kAsm2, angle1, angle2, kCurve, scene, this, data, parse, VToolSpline::Create(id, point1, point4, kAsm1, kAsm2, angle1, angle2, kCurve, scene, this, data, parse,
Tool::FromFile); Tool::FromFile);
@ -1044,12 +1046,12 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme
throw excep; throw excep;
} }
} }
if (type == "path") if (type == VToolSplinePath::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qreal kCurve = GetParametrDouble(domElement, "kCurve"); qreal kCurve = GetParametrDouble(domElement, VAbstractTool::AttrKCurve, "1.0");
VSplinePath path(data->DataPoints(), kCurve); VSplinePath path(data->DataPoints(), kCurve);
QDomNodeList nodeList = domElement.childNodes(); QDomNodeList nodeList = domElement.childNodes();
@ -1059,12 +1061,12 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme
QDomElement element = nodeList.at(i).toElement(); QDomElement element = nodeList.at(i).toElement();
if (element.isNull() == false) if (element.isNull() == false)
{ {
if (element.tagName() == "pathPoint") if (element.tagName() == VAbstractTool::AttrPathPoint)
{ {
qreal kAsm1 = GetParametrDouble(element, "kAsm1"); qreal kAsm1 = GetParametrDouble(element, VAbstractTool::AttrKAsm1, "1.0");
qreal angle = GetParametrDouble(element, "angle"); qreal angle = GetParametrDouble(element, VAbstractTool::AttrAngle, "0");
qreal kAsm2 = GetParametrDouble(element, "kAsm2"); qreal kAsm2 = GetParametrDouble(element, VAbstractTool::AttrKAsm2, "1.0");
qint64 pSpline = GetParametrLongLong(element, "pSpline"); qint64 pSpline = GetParametrLongLong(element, VAbstractTool::AttrPSpline, "0");
VSplinePoint splPoint(pSpline, kAsm1, angle, kAsm2); VSplinePoint splPoint(pSpline, kAsm1, angle, kAsm2);
path.append(splPoint); path.append(splPoint);
if (parse == Document::FullParse) if (parse == Document::FullParse)
@ -1085,12 +1087,12 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme
throw excep; throw excep;
} }
} }
if (type == "modelingSpline") if (type == VNodeSpline::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 idObject = GetParametrLongLong(domElement, "idObject"); qint64 idObject = GetParametrLongLong(domElement, VAbstractNode::AttrIdObject, "0");
VSpline spl = data->GetSpline(idObject); VSpline spl = data->GetSpline(idObject);
spl.setIdObject(idObject); spl.setIdObject(idObject);
data->UpdateSpline(id, spl); data->UpdateSpline(id, spl);
@ -1104,12 +1106,12 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme
throw excep; throw excep;
} }
} }
if (type == "modelingPath") if (type == VNodeSplinePath::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 idObject = GetParametrLongLong(domElement, "idObject"); qint64 idObject = GetParametrLongLong(domElement, VAbstractNode::AttrIdObject, "0");
VSplinePath path = data->GetSplinePath(idObject); VSplinePath path = data->GetSplinePath(idObject);
path.setIdObject(idObject); path.setIdObject(idObject);
data->UpdateSplinePath(id, path); data->UpdateSplinePath(id, path);
@ -1131,15 +1133,15 @@ void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement
Q_ASSERT(scene != 0); Q_ASSERT(scene != 0);
Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty");
if (type == "simple") if (type == VToolArc::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 center = GetParametrLongLong(domElement, "center"); qint64 center = GetParametrLongLong(domElement, VAbstractTool::AttrCenter, "0");
QString radius = GetParametrString(domElement, "radius"); QString radius = GetParametrString(domElement, VAbstractTool::AttrRadius, "10");
QString f1 = GetParametrString(domElement, "angle1"); QString f1 = GetParametrString(domElement, VAbstractTool::AttrAngle1, "180");
QString f2 = GetParametrString(domElement, "angle2"); QString f2 = GetParametrString(domElement, VAbstractTool::AttrAngle2, "270");
VToolArc::Create(id, center, radius, f1, f2, scene, this, data, parse, Tool::FromFile); VToolArc::Create(id, center, radius, f1, f2, scene, this, data, parse, Tool::FromFile);
@ -1152,12 +1154,12 @@ void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement
throw excep; throw excep;
} }
} }
if (type == "modeling") if (type == VNodeArc::ToolType)
{ {
try try
{ {
qint64 id = GetParametrId(domElement); qint64 id = GetParametrId(domElement);
qint64 idObject = GetParametrLongLong(domElement, "idObject"); qint64 idObject = GetParametrLongLong(domElement, VAbstractNode::AttrIdObject, "0");
VArc arc = data->GetArc(idObject); VArc arc = data->GetArc(idObject);
arc.setIdObject(idObject); arc.setIdObject(idObject);
data->UpdateArc(id, arc); data->UpdateArc(id, arc);

7
src/xml/vdomdocument.h
View File

@ -398,21 +398,22 @@ private:
* @param name * @param name
* @return * @return
*/ */
qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const; qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name,
const QString &defValue) const;
/** /**
* @brief GetParametrString * @brief GetParametrString
* @param domElement * @param domElement
* @param name * @param name
* @return * @return
*/ */
QString GetParametrString(const QDomElement& domElement, const QString &name) const; QString GetParametrString(const QDomElement& domElement, const QString &name, const QString &defValue) const;
/** /**
* @brief GetParametrDouble * @brief GetParametrDouble
* @param domElement * @param domElement
* @param name * @param name
* @return * @return
*/ */
qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; qreal GetParametrDouble(const QDomElement& domElement, const QString &name, const QString &defValue) const;
/** /**
* @brief CollectId * @brief CollectId
* @param node * @param node