--HG--
branch : develop
This commit is contained in:
dismine 2013-10-29 19:46:58 +02:00
parent beddcb69b8
commit 3c6212b7e1
4 changed files with 1169 additions and 522 deletions

View File

@ -21,42 +21,42 @@
#include "vabstracttool.h" #include "vabstracttool.h"
const QString VAbstractTool::AttrId = QStringLiteral("id"); const QString VAbstractTool::AttrId = QStringLiteral("id");
const QString VAbstractTool::AttrType = QStringLiteral("type"); const QString VAbstractTool::AttrType = QStringLiteral("type");
const QString VAbstractTool::AttrMx = QStringLiteral("mx"); const QString VAbstractTool::AttrMx = QStringLiteral("mx");
const QString VAbstractTool::AttrMy = QStringLiteral("my"); const QString VAbstractTool::AttrMy = QStringLiteral("my");
const QString VAbstractTool::AttrName = QStringLiteral("name"); const QString VAbstractTool::AttrName = QStringLiteral("name");
const QString VAbstractTool::AttrX = QStringLiteral("x"); const QString VAbstractTool::AttrX = QStringLiteral("x");
const QString VAbstractTool::AttrY = QStringLiteral("y"); const QString VAbstractTool::AttrY = QStringLiteral("y");
const QString VAbstractTool::AttrTypeLine = QStringLiteral("typeLine"); const QString VAbstractTool::AttrTypeLine = QStringLiteral("typeLine");
const QString VAbstractTool::AttrLength = QStringLiteral("length"); const QString VAbstractTool::AttrLength = QStringLiteral("length");
const QString VAbstractTool::AttrBasePoint = QStringLiteral("basePoint"); const QString VAbstractTool::AttrBasePoint = QStringLiteral("basePoint");
const QString VAbstractTool::AttrFirstPoint = QStringLiteral("firstPoint"); const QString VAbstractTool::AttrFirstPoint = QStringLiteral("firstPoint");
const QString VAbstractTool::AttrSecondPoint = QStringLiteral("secondPoint"); const QString VAbstractTool::AttrSecondPoint = QStringLiteral("secondPoint");
const QString VAbstractTool::AttrThirdPoint = QStringLiteral("thirdPoint"); const QString VAbstractTool::AttrThirdPoint = QStringLiteral("thirdPoint");
const QString VAbstractTool::AttrCenter = QStringLiteral("center"); const QString VAbstractTool::AttrCenter = QStringLiteral("center");
const QString VAbstractTool::AttrRadius = QStringLiteral("radius"); const QString VAbstractTool::AttrRadius = QStringLiteral("radius");
const QString VAbstractTool::AttrAngle = QStringLiteral("angle"); const QString VAbstractTool::AttrAngle = QStringLiteral("angle");
const QString VAbstractTool::AttrAngle1 = QStringLiteral("angle1"); const QString VAbstractTool::AttrAngle1 = QStringLiteral("angle1");
const QString VAbstractTool::AttrAngle2 = QStringLiteral("angle2"); const QString VAbstractTool::AttrAngle2 = QStringLiteral("angle2");
const QString VAbstractTool::AttrP1Line = QStringLiteral("p1Line"); const QString VAbstractTool::AttrP1Line = QStringLiteral("p1Line");
const QString VAbstractTool::AttrP2Line = QStringLiteral("p2Line"); const QString VAbstractTool::AttrP2Line = QStringLiteral("p2Line");
const QString VAbstractTool::AttrP1Line1 = QStringLiteral("p1Line1"); const QString VAbstractTool::AttrP1Line1 = QStringLiteral("p1Line1");
const QString VAbstractTool::AttrP2Line1 = QStringLiteral("p2Line1"); const QString VAbstractTool::AttrP2Line1 = QStringLiteral("p2Line1");
const QString VAbstractTool::AttrP1Line2 = QStringLiteral("p1Line2"); const QString VAbstractTool::AttrP1Line2 = QStringLiteral("p1Line2");
const QString VAbstractTool::AttrP2Line2 = QStringLiteral("p2Line2"); const QString VAbstractTool::AttrP2Line2 = QStringLiteral("p2Line2");
const QString VAbstractTool::AttrPShoulder = QStringLiteral("pShoulder"); const QString VAbstractTool::AttrPShoulder = QStringLiteral("pShoulder");
const QString VAbstractTool::AttrPoint1 = QStringLiteral("point1"); const QString VAbstractTool::AttrPoint1 = QStringLiteral("point1");
const QString VAbstractTool::AttrPoint4 = QStringLiteral("point4"); const QString VAbstractTool::AttrPoint4 = QStringLiteral("point4");
const QString VAbstractTool::AttrKAsm1 = QStringLiteral("kAsm1"); const QString VAbstractTool::AttrKAsm1 = QStringLiteral("kAsm1");
const QString VAbstractTool::AttrKAsm2 = QStringLiteral("kAsm2"); const QString VAbstractTool::AttrKAsm2 = QStringLiteral("kAsm2");
const QString VAbstractTool::AttrKCurve = QStringLiteral("kCurve"); const QString VAbstractTool::AttrKCurve = QStringLiteral("kCurve");
const QString VAbstractTool::AttrPathPoint = QStringLiteral("pathPoint"); const QString VAbstractTool::AttrPathPoint = QStringLiteral("pathPoint");
const QString VAbstractTool::AttrPSpline = QStringLiteral("pSpline"); const QString VAbstractTool::AttrPSpline = QStringLiteral("pSpline");
const QString VAbstractTool::AttrAxisP1 = QStringLiteral("axisP1"); const QString VAbstractTool::AttrAxisP1 = QStringLiteral("axisP1");
const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2"); const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2");
const QString VAbstractTool::TypeLineNone = QStringLiteral("none"); const QString VAbstractTool::TypeLineNone = QStringLiteral("none");
const QString VAbstractTool::TypeLineLine = QStringLiteral("hair"); const QString VAbstractTool::TypeLineLine = QStringLiteral("hair");
VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent):
VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black){ VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black){

View File

@ -24,14 +24,14 @@
#include "modelingTools/vmodelingtool.h" #include "modelingTools/vmodelingtool.h"
#include "modelingTools/modelingtools.h" #include "modelingTools/modelingtools.h"
const QString VToolDetail::TagName = QStringLiteral("detail"); const QString VToolDetail::TagName = QStringLiteral("detail");
const QString VToolDetail::TagNode = QStringLiteral("node"); const QString VToolDetail::TagNode = QStringLiteral("node");
const QString VToolDetail::AttrSupplement = QStringLiteral("supplement"); const QString VToolDetail::AttrSupplement = QStringLiteral("supplement");
const QString VToolDetail::AttrClosed = QStringLiteral("closed"); const QString VToolDetail::AttrClosed = QStringLiteral("closed");
const QString VToolDetail::AttrWidth = QStringLiteral("width"); const QString VToolDetail::AttrWidth = QStringLiteral("width");
const QString VToolDetail::AttrIdObject = QStringLiteral("idObject"); const QString VToolDetail::AttrIdObject = QStringLiteral("idObject");
const QString VToolDetail::AttrNodeType = QStringLiteral("nodeType"); const QString VToolDetail::AttrNodeType = QStringLiteral("nodeType");
const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour"); const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour");
const QString VToolDetail::NodeTypeModeling = QStringLiteral("Modeling"); const QString VToolDetail::NodeTypeModeling = QStringLiteral("Modeling");
VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, Tool::Sources typeCreation, VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, Tool::Sources typeCreation,
@ -40,50 +40,39 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id,
VDetail detail = data->GetDetail(id); VDetail detail = data->GetDetail(id);
for(qint32 i = 0; i< detail.CountNode(); ++i){ for(qint32 i = 0; i< detail.CountNode(); ++i){
switch(detail[i].getTypeTool()){ switch(detail[i].getTypeTool()){
case(Tool::NodePoint):{ case(Tool::NodePoint):
InitTool<VNodePoint>(scene, detail[i]); InitTool<VNodePoint>(scene, detail[i]);
break; break;
} case(Tool::NodeArc):
case(Tool::NodeArc):{
InitTool<VNodeArc>(scene, detail[i]); InitTool<VNodeArc>(scene, detail[i]);
break; break;
} case(Tool::NodeSpline):
case(Tool::NodeSpline):{
InitTool<VNodeSpline>(scene, detail[i]); InitTool<VNodeSpline>(scene, detail[i]);
break; break;
} case(Tool::NodeSplinePath):
case(Tool::NodeSplinePath):{
InitTool<VNodeSplinePath>(scene, detail[i]); InitTool<VNodeSplinePath>(scene, detail[i]);
break; break;
} case(Tool::AlongLineTool):
case(Tool::AlongLineTool):{
InitTool<VModelingAlongLine>(scene, detail[i]); InitTool<VModelingAlongLine>(scene, detail[i]);
break; break;
} case(Tool::ArcTool):
case(Tool::ArcTool):{
InitTool<VModelingArc>(scene, detail[i]); InitTool<VModelingArc>(scene, detail[i]);
break; break;
} case(Tool::BisectorTool):
case(Tool::BisectorTool):{
InitTool<VModelingBisector>(scene, detail[i]); InitTool<VModelingBisector>(scene, detail[i]);
break; break;
} case(Tool::EndLineTool):
case(Tool::EndLineTool):{
InitTool<VModelingEndLine>(scene, detail[i]); InitTool<VModelingEndLine>(scene, detail[i]);
break; break;
} case(Tool::LineIntersectTool):
case(Tool::LineIntersectTool):{
InitTool<VModelingLineIntersect>(scene, detail[i]); InitTool<VModelingLineIntersect>(scene, detail[i]);
break; break;
} case(Tool::LineTool):
case(Tool::LineTool):{
InitTool<VModelingLine>(scene, detail[i]); InitTool<VModelingLine>(scene, detail[i]);
break; break;
} case(Tool::NormalTool):
case(Tool::NormalTool):{
InitTool<VModelingNormal>(scene, detail[i]); InitTool<VModelingNormal>(scene, detail[i]);
break; break;
}
case(Tool::PointOfContact): case(Tool::PointOfContact):
InitTool<VModelingPointOfContact>(scene, detail[i]); InitTool<VModelingPointOfContact>(scene, detail[i]);
break; break;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff