diff --git a/options.h b/options.h index 4aa46b7aa..d2620f3dd 100644 --- a/options.h +++ b/options.h @@ -58,8 +58,12 @@ enum Tool {ArrowTool, NodeSplinePath }; Q_DECLARE_FLAGS(Tools, Tool) + +enum Source { FromGui, FromFile }; +Q_DECLARE_FLAGS(Sources, Source) } Q_DECLARE_OPERATORS_FOR_FLAGS( Tool::Tools ) +Q_DECLARE_OPERATORS_FOR_FLAGS( Tool::Sources ) namespace Draw { enum Draw { Calculation, Modeling }; diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index eb6efcb53..02c278b73 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -27,7 +27,7 @@ VToolAlongLine::VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const QString &typeLine, Tool::Enum typeCreation, + const QString &typeLine, Tool::Sources typeCreation, QGraphicsItem *parent): VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), dialogAlongLine(QSharedPointer()){ @@ -117,7 +117,7 @@ void VToolAlongLine::Create(QSharedPointer &dialog, VMainGraphi void VToolAlongLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); QLineF line = QLineF(firstPoint.toQPointF(), secondPoint.toQPointF()); diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index c21b36431..cbc88828d 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -31,14 +31,14 @@ class VToolAlongLine : public VToolLinePoint public: VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Enum typeCreation, QGraphicsItem * parent = 0); + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index ae57a8e20..1f7350973 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -23,7 +23,7 @@ #include #include "container/calculator.h" -VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, +VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()){ VArc arc = data->GetArc(id); @@ -62,7 +62,7 @@ void VToolArc::Create(QSharedPointer &dialog, VMainGraphicsScene *sce void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; Calculator cal(data); diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index fdd47b500..43c6ae195 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -33,14 +33,14 @@ class VToolArc :public VDrawTool, public QGraphicsPathItem { Q_OBJECT public: - VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, + VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index dced9cbec..ccad2a3b2 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -24,7 +24,7 @@ VToolBisector::VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Enum typeCreation, + const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem *parent): VToolLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), thirdPointId(0), dialogBisector(QSharedPointer()){ @@ -78,7 +78,7 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation){ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); VPointF thirdPoint = data->GetPoint(thirdPointId); diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 2d6e1ad79..c9b23323e 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -31,7 +31,7 @@ class VToolBisector : public VToolLinePoint public: VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Enum typeCreation, + const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); @@ -42,7 +42,7 @@ public: const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index ee1348b0d..5b27d4888 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -26,7 +26,7 @@ VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, - Tool::Enum typeCreation, QGraphicsItem *parent): + Tool::Sources typeCreation, QGraphicsItem *parent): VToolLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()){ @@ -61,7 +61,7 @@ void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsSc void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VPointF basePoint = data->GetPoint(basePointId); QLineF line = QLineF(basePoint.toQPointF(), QPointF(basePoint.x()+100, basePoint.y())); diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index eff270cfb..d2656ed6d 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -32,7 +32,7 @@ class VToolEndLine : public VToolLinePoint public: VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, - const qint64 &basePointId, Tool::Enum typeCreation, + const qint64 &basePointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, @@ -40,7 +40,7 @@ public: static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation); + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 7320ec4a3..6eca70621 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -24,7 +24,7 @@ #include VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, - Tool::Enum typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), + Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), dialogLine(QSharedPointer()){ //Лінія @@ -54,7 +54,7 @@ void VToolLine::Create(QSharedPointer &dialog, VMainGraphicsScene *s void VToolLine::Create(const qint64 &id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ Q_CHECK_PTR(scene); Q_CHECK_PTR(doc); Q_CHECK_PTR(data); diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index ee14cb88b..e39493385 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -31,13 +31,13 @@ class VToolLine: public VDrawTool, public QGraphicsLineItem Q_OBJECT public: VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Enum typeCreation, QGraphicsItem * parent = 0); + qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 &id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation); + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void ChangedActivDraw(const QString newName); diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index eecbbbf55..9e642db4b 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -24,7 +24,7 @@ VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Enum typeCreation, QGraphicsItem *parent): + const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent): VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ if(typeCreation == Tool::FromGui){ @@ -58,7 +58,7 @@ void VToolLineIntersect::Create(QSharedPointer &dialog, VMa void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VPointF p1Line1 = data->GetPoint(p1Line1Id); VPointF p2Line1 = data->GetPoint(p2Line1Id); VPointF p1Line2 = data->GetPoint(p1Line2Id); diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 61716bdc6..272cf81cb 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -33,7 +33,7 @@ public: const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Enum typeCreation, + const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, @@ -41,7 +41,7 @@ public: static void Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 70cf295ac..c699b4e30 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -25,7 +25,7 @@ VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Enum typeCreation, QGraphicsItem *parent): + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent): VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), secondPointId(secondPointId), dialogNormal(QSharedPointer()){ @@ -63,7 +63,7 @@ void VToolNormal::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); Calculator cal(data); diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 9f6bdf613..4b258f882 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -33,7 +33,7 @@ public: VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Enum typeCreation, + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, @@ -41,7 +41,7 @@ public: static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, const qreal &angle = 0); public slots: diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 84b813c5c..2649502e4 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -24,7 +24,7 @@ VToolPointOfContact::VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Enum typeCreation, QGraphicsItem *parent) + Tool::Sources typeCreation, QGraphicsItem *parent) : VToolPoint(doc, data, id, parent), radius(radius), center(center), firstPointId(firstPointId), secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()){ @@ -82,7 +82,7 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation){ VPointF centerP = data->GetPoint(center); VPointF firstP = data->GetPoint(firstPointId); VPointF secondP = data->GetPoint(secondPointId); diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index 7c5a881a7..8da8368ea 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -30,7 +30,7 @@ class VToolPointOfContact : public VToolPoint public: VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Enum typeCreation, QGraphicsItem * parent = 0); + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, const QPointF &secondPoint); @@ -39,7 +39,7 @@ public: static void Create(const qint64 _id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 647ea1cff..a3737c402 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -25,7 +25,7 @@ VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Enum typeCreation, + const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, QGraphicsItem * parent): VToolLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder), dialogShoulderPoint(QSharedPointer()){ @@ -86,7 +86,7 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation){ VPointF firstPoint = data->GetPoint(p1Line); VPointF secondPoint = data->GetPoint(p2Line); VPointF shoulderPoint = data->GetPoint(pShoulder); diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index d604db328..82fc40057 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -30,7 +30,7 @@ class VToolShoulderPoint : public VToolLinePoint public: VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Enum typeCreation, + const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, @@ -40,7 +40,7 @@ public: static void Create(const qint64 _id, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index ee19716e8..46e2c9dcc 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -30,7 +30,7 @@ #include "options.h" #include "container/vpointf.h" -VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, +VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent ):VToolPoint(doc, data, id, parent), dialogSinglePoint(QSharedPointer()){ this->setFlag(QGraphicsItem::ItemIsMovable, true); diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 74756cf3a..ae12a1b7f 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -32,7 +32,7 @@ class VToolSinglePoint : public VToolPoint Q_OBJECT public: VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); + Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index f1b3cf82a..a657f78a5 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -26,7 +26,7 @@ VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, + Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()){ @@ -90,7 +90,7 @@ void VToolSpline::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VSpline spline = VSpline(data->DataPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); qint64 id = _id; if(typeCreation == Tool::FromGui){ diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index 39411fe88..79580a0fd 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -35,14 +35,14 @@ class VToolSpline:public VDrawTool, public QGraphicsPathItem Q_OBJECT public: VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); + Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); signals: void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint ); diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index dee695678..e33e21678 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -23,7 +23,7 @@ #include VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, + Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()){ @@ -75,7 +75,7 @@ void VToolSplinePath::Create(QSharedPointer &dialog, VMainGrap void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddSplinePath(path); diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index 598684d6d..b96e78105 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -34,13 +34,13 @@ class VToolSplinePath:public VDrawTool, public QGraphicsPathItem Q_OBJECT public: VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); signals: void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, const QPointF &splinePoint); diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index c57b31478..ee4049c6b 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -28,7 +28,7 @@ VModelingAlongLine::VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Enum typeCreation, QGraphicsItem *parent): + Tool::Sources typeCreation, QGraphicsItem *parent): VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), dialogAlongLine(QSharedPointer()){ @@ -114,7 +114,7 @@ VModelingAlongLine *VModelingAlongLine::Create(const qint64 _id, const QString & const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VModelingAlongLine *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); VPointF secondPoint = data->GetModelingPoint(secondPointId); diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index b8e649770..421594b60 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -31,7 +31,7 @@ class VModelingAlongLine : public VModelingLinePoint public: VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Enum typeCreation, QGraphicsItem * parent = 0); + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingAlongLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); @@ -39,7 +39,7 @@ public: const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index a8df5f65c..8dba9111b 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -23,7 +23,7 @@ #include #include "container/calculator.h" -VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, +VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()){ VArc arc = data->GetModelingArc(id); @@ -61,7 +61,7 @@ VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocume VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VModelingArc *toolArc = 0; qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index 12fe60a44..fc077b526 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -33,13 +33,13 @@ class VModelingArc :public VModelingTool, public QGraphicsPathItem { Q_OBJECT public: - VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, + VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingArc* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingArc* Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation); + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index ca424180b..835b6ff7a 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -24,7 +24,7 @@ VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Enum typeCreation, + const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), thirdPointId(0), dialogBisector(QSharedPointer()){ @@ -79,7 +79,7 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VModelingBisector *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); VPointF secondPoint = data->GetModelingPoint(secondPointId); diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index e272bc66e..74901745c 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -32,7 +32,7 @@ class VModelingBisector : public VModelingLinePoint public: VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Enum typeCreation, + const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); @@ -43,7 +43,7 @@ public: const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation); + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index 514769e83..9ed074c6f 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -26,7 +26,7 @@ VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, - Tool::Enum typeCreation, QGraphicsItem *parent): + Tool::Sources typeCreation, QGraphicsItem *parent): VModelingLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()){ @@ -62,7 +62,7 @@ VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &poin const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation){ VModelingEndLine *point = 0; VPointF basePoint = data->GetModelingPoint(basePointId); QLineF line = QLineF(basePoint.toQPointF(), QPointF(basePoint.x()+100, basePoint.y())); diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index a3b2b2fa0..27ea0c8c5 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -32,7 +32,7 @@ class VModelingEndLine : public VModelingLinePoint public: VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, - const qint64 &basePointId, Tool::Enum typeCreation, + const qint64 &basePointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingEndLine* Create(QSharedPointer &dialog, VDomDocument *doc, @@ -40,7 +40,7 @@ public: static VModelingEndLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation); + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index 6e614ba2a..958048248 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -24,7 +24,7 @@ #include VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Enum typeCreation, QGraphicsItem *parent): + qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), dialogLine(QSharedPointer()){ //Лінія @@ -54,7 +54,7 @@ VModelingLine *VModelingLine::Create(QSharedPointer &dialog, VDomDoc VModelingLine *VModelingLine::Create(const qint64 &id, const qint64 &firstPoint, const qint64 &secondPoint, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VModelingLine *line = 0; Q_CHECK_PTR(doc); Q_CHECK_PTR(data); diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 023535fcf..30fdf0024 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -31,12 +31,12 @@ class VModelingLine: public VModelingTool, public QGraphicsLineItem Q_OBJECT public: VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Enum typeCreation, QGraphicsItem * parent = 0); + qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingLine* Create(const qint64 &id, const qint64 &firstPoint, const qint64 &secondPoint, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index ba920e6ad..971a0b205 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -24,7 +24,7 @@ VModelingLineIntersect::VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Enum typeCreation, QGraphicsItem *parent): + const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ if(typeCreation == Tool::FromGui){ @@ -60,7 +60,7 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VModelingLineIntersect *point = 0; VPointF p1Line1 = data->GetModelingPoint(p1Line1Id); VPointF p2Line1 = data->GetModelingPoint(p2Line1Id); diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index e69c04532..599f0cdd7 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -33,7 +33,7 @@ public: const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Enum typeCreation, + const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLineIntersect* Create(QSharedPointer &dialog, @@ -42,7 +42,7 @@ public: const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index f914305ab..e2c1a9164 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -25,7 +25,7 @@ VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Enum typeCreation, QGraphicsItem *parent): + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), secondPointId(secondPointId), dialogNormal(QSharedPointer()){ @@ -65,7 +65,7 @@ VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formul const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VModelingNormal *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); VPointF secondPoint = data->GetModelingPoint(secondPointId); diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 614c59e6d..a16d0435e 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -33,7 +33,7 @@ public: VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Enum typeCreation, + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingNormal* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); @@ -41,7 +41,7 @@ public: const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, const qreal &angle = 0); public slots: diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 73b294df9..02aaacef1 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -24,7 +24,7 @@ VModelingPointOfContact::VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Enum typeCreation, QGraphicsItem *parent) + Tool::Sources typeCreation, QGraphicsItem *parent) : VModelingPoint(doc, data, id, parent), radius(radius), center(center), firstPointId(firstPointId), secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()){ @@ -84,7 +84,7 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VModelingPointOfContact *point = 0; VPointF centerP = data->GetModelingPoint(center); VPointF firstP = data->GetModelingPoint(firstPointId); diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 4cecbb6e0..63fcb02ef 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -31,7 +31,7 @@ class VModelingPointOfContact : public VModelingPoint public: VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Enum typeCreation, QGraphicsItem * parent = 0); + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, const QPointF &secondPoint); @@ -41,7 +41,7 @@ public: const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Enum typeCreation); + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index 70d539656..01e9d3cd8 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -25,7 +25,7 @@ VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Enum typeCreation, + const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, QGraphicsItem * parent): VModelingLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder), dialogShoulderPoint(QSharedPointer()){ @@ -87,7 +87,7 @@ VModelingShoulderPoint *VModelingShoulderPoint::Create(const qint64 _id, const Q const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation){ VModelingShoulderPoint *point = 0; VPointF firstPoint = data->GetModelingPoint(p1Line); VPointF secondPoint = data->GetModelingPoint(p2Line); diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index f6c2d0a75..165146775 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -31,7 +31,7 @@ class VModelingShoulderPoint : public VModelingLinePoint public: VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Enum typeCreation, + const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, @@ -42,7 +42,7 @@ public: const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingsinglepoint.cpp b/tools/modelingTools/vmodelingsinglepoint.cpp index 702f713e3..df9b1f0f5 100644 --- a/tools/modelingTools/vmodelingsinglepoint.cpp +++ b/tools/modelingTools/vmodelingsinglepoint.cpp @@ -9,7 +9,7 @@ #include "options.h" #include "container/vpointf.h" -VModelingSinglePoint::VModelingSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, +VModelingSinglePoint::VModelingSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent ):VModelingPoint(doc, data, id, parent), dialogSinglePoint(QSharedPointer()){ this->setFlag(QGraphicsItem::ItemIsMovable, true); diff --git a/tools/modelingTools/vmodelingsinglepoint.h b/tools/modelingTools/vmodelingsinglepoint.h index 95ab9e29a..0695becb3 100644 --- a/tools/modelingTools/vmodelingsinglepoint.h +++ b/tools/modelingTools/vmodelingsinglepoint.h @@ -11,7 +11,7 @@ class VModelingSinglePoint : public VModelingPoint Q_OBJECT public: VModelingSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); + Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 30ec59df2..27c3f043b 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -26,7 +26,7 @@ VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, + Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()){ @@ -90,7 +90,7 @@ VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, V VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VModelingSpline *spl = 0; VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); qint64 id = _id; diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 094043e53..cb0ab88b6 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -35,14 +35,14 @@ class VModelingSpline:public VModelingTool, public QGraphicsPathItem Q_OBJECT public: VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); + Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static VModelingSpline* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Enum typeCreation); + const Document::Documents &parse, Tool::Sources typeCreation); signals: void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint ); diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 3e80ef419..765e57010 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -23,7 +23,7 @@ #include VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, + Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()){ @@ -75,7 +75,7 @@ VModelingSplinePath *VModelingSplinePath::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); signals: void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, const QPointF &splinePoint); diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index 1efae076b..e35e9f910 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -22,7 +22,7 @@ #include "vnodearc.h" VNodeArc::VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, - Tool::Enum typeCreation, QGraphicsItem * parent) : + Tool::Sources typeCreation, QGraphicsItem * parent) : VAbstractNode(doc, data, id, idArc, typeobject), QGraphicsPathItem(parent){ RefreshGeometry(); this->setPen(QPen(baseColor, widthHairLine)); @@ -35,7 +35,7 @@ VNodeArc::VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, } VNodeArc *VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation){ + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ VNodeArc *arc = 0; if(parse == Document::FullParse){ arc = new VNodeArc(doc, data, id, idArc, typeobject, typeCreation); diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index e62db9c0e..f82c3d776 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -30,9 +30,9 @@ class VNodeArc :public VAbstractNode, public QGraphicsPathItem Q_OBJECT public: VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, - Tool::Enum typeCreation, QGraphicsItem * parent = 0); + Tool::Sources typeCreation, QGraphicsItem * parent = 0); static VNodeArc *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation); + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); protected: diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index 5f2230a1e..b43431789 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -22,7 +22,7 @@ #include "vnodepoint.h" VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, Tool::Enum typeCreation, QGraphicsItem *parent) + Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem *parent) :VAbstractNode(doc, data, id, idPoint, typeobject), QGraphicsEllipseItem(parent), radius(toPixel(1.5)), namePoint(0), lineName(0){ namePoint = new VGraphicsSimpleTextItem(this); @@ -40,7 +40,7 @@ VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 id } VNodePoint *VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation){ + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ VNodePoint *point = 0; if(parse == Document::FullParse){ point = new VNodePoint(doc, data, id, idPoint, typeobject, typeCreation); diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index 568442feb..336333053 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -30,9 +30,9 @@ class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem Q_OBJECT public: VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, - Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); + Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); static VNodePoint *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation); + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); void NameChangePosition(const QPointF pos); diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index eb9d6fe34..00a7ffe91 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -22,7 +22,7 @@ #include "vnodespline.h" VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Enum typeCreation, QGraphicsItem * parent) : + Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) : VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent){ RefreshGeometry(); this->setPen(QPen(baseColor, widthHairLine)); @@ -35,7 +35,7 @@ VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 } VNodeSpline *VNodeSpline::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation){ + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ VNodeSpline *spl = 0; if(parse == Document::FullParse){ spl = new VNodeSpline(doc, data, id, idSpline, typeobject, typeCreation); diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index d0a430d88..5e076f9ec 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -30,9 +30,9 @@ class VNodeSpline:public VAbstractNode, public QGraphicsPathItem Q_OBJECT public: VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - Tool::Enum typeCreation, QGraphicsItem * parent = 0); + Tool::Sources typeCreation, QGraphicsItem * parent = 0); static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation); + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile (); protected: diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index ac7ea617c..aa0d4b87c 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -22,7 +22,7 @@ #include "vnodesplinepath.h" VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Enum typeCreation, + Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) : VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent){ RefreshGeometry(); @@ -37,7 +37,7 @@ VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, VNodeSplinePath *VNodeSplinePath::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Document::Documents &parse, - Tool::Enum typeCreation){ + Tool::Sources typeCreation){ VNodeSplinePath *splPath = 0; if(parse == Document::FullParse){ splPath = new VNodeSplinePath(doc, data, id, idSpline, typeobject, typeCreation); diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index fafecb5c0..542eae3d9 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -30,9 +30,9 @@ class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem Q_OBJECT public: VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Enum typeCreation, QGraphicsItem * parent = 0); + Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent = 0); static VNodeSplinePath *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Enum typeCreation); + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); protected: diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 390c717fd..e9a32167f 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -26,14 +26,6 @@ #include "vdatatool.h" #include "container/vcontainer.h" -namespace Tool{ - enum Enum - { - FromGui, - FromFile - }; -} - class VAbstractTool:public VDataTool{ Q_OBJECT public: diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 22cf34aa7..ff1a6466a 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -26,7 +26,7 @@ #include "modelingTools/modelingtools.h" VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, VDetail &oldDetail, - Tool::Enum typeCreation, const Document::Documents &parse, + Tool::Sources typeCreation, const Document::Documents &parse, VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), sceneDetails(scene){ @@ -241,7 +241,7 @@ void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolDetail::Create(const qint64 _id, VDetail &newDetail, VDetail &oldDetail, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddDetail(newDetail); diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index 593517e78..d275996cf 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -31,14 +31,14 @@ class VToolDetail: public VAbstractTool, public QGraphicsPathItem Q_OBJECT public: VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, VDetail &oldDetail, - Tool::Enum typeCreation, const Document::Documents &parse, VMainGraphicsScene *scene, + Tool::Sources typeCreation, const Document::Documents &parse, VMainGraphicsScene *scene, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, VDetail &newDetail, VDetail &oldDetail, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Enum typeCreation); + VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); template void AddTool(T *tool, const qint64 &id, Tool::Tools typeTool){ tool->setParentItem(this);