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

Documentation for VAbstractTool class.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-01-24 14:54:29 +02:00
parent 3ab1509bb9
commit ccb5f38537
32 changed files with 235 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/drawTools/vdrawtool.h
View File

@ -44,9 +44,9 @@ public:
/** /**
* @brief VDrawTool * @brief VDrawTool
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param parent * @param parent parent object
*/ */
VDrawTool(VDomDocument *doc, VContainer *data, qint64 id); VDrawTool(VDomDocument *doc, VContainer *data, qint64 id);
virtual ~VDrawTool() {} virtual ~VDrawTool() {}
@ -62,7 +62,7 @@ public:
public slots: public slots:
/** /**
* @brief ShowTool * @brief ShowTool
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */
@ -170,7 +170,7 @@ protected:
/** /**
* @brief ShowItem * @brief ShowItem
* @param item * @param item
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */

12
src/tools/drawTools/vtoolalongline.h
View File

@ -42,14 +42,14 @@ public:
/** /**
* @brief VToolAlongLine * @brief VToolAlongLine
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param formula * @param formula
* @param firstPointId * @param firstPointId
* @param secondPointId * @param secondPointId
* @param typeLine * @param typeLine
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula,
const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine,
@ -63,7 +63,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogAlongLine> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogAlongLine> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -79,7 +79,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -93,7 +93,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

14
src/tools/drawTools/vtoolarc.h
View File

@ -44,10 +44,10 @@ public:
/** /**
* @brief VToolArc * @brief VToolArc
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolArc(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, VToolArc(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation,
QGraphicsItem * parent = 0); QGraphicsItem * parent = 0);
@ -60,7 +60,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogArc> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogArc> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -73,7 +73,7 @@ public:
* @param f2 * @param f2
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -90,7 +90,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**
@ -105,7 +105,7 @@ public slots:
virtual void ChangedActivDraw(const QString &newName); virtual void ChangedActivDraw(const QString &newName);
/** /**
* @brief ShowTool * @brief ShowTool
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */

12
src/tools/drawTools/vtoolbisector.h
View File

@ -41,15 +41,15 @@ public:
/** /**
* @brief VToolBisector * @brief VToolBisector
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeLine * @param typeLine
* @param formula * @param formula
* @param firstPointId * @param firstPointId
* @param secondPointId * @param secondPointId
* @param thirdPointId * @param thirdPointId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId,
@ -74,7 +74,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogBisector> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogBisector> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -91,7 +91,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -106,7 +106,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

4
src/tools/drawTools/vtoolcutarc.h
View File

@ -56,7 +56,7 @@ public:
static const QString AttrArc; static const QString AttrArc;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**
@ -66,7 +66,7 @@ public slots:
virtual void FullUpdateFromGui(int result); virtual void FullUpdateFromGui(int result);
/** /**
* @brief ArcChoosed * @brief ArcChoosed
* @param id * @param id object id in container
*/ */
void ArcChoosed(qint64 id); void ArcChoosed(qint64 id);
/** /**

14
src/tools/drawTools/vtoolcutspline.h
View File

@ -43,12 +43,12 @@ public:
/** /**
* @brief VToolCutSpline * @brief VToolCutSpline
* @param doc * @param doc
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param formula * @param formula
* @param splineId * @param splineId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolCutSpline(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &formula, VToolCutSpline(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &formula,
const qint64 &splineId, const qint64 &spl1id, const qint64 &spl2id, const qint64 &splineId, const qint64 &spl1id, const qint64 &spl2id,
@ -62,7 +62,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogCutSpline> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogCutSpline> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -76,7 +76,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -91,7 +91,7 @@ public:
static const QString AttrSpline; static const QString AttrSpline;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**
@ -101,7 +101,7 @@ public slots:
virtual void FullUpdateFromGui(int result); virtual void FullUpdateFromGui(int result);
/** /**
* @brief SplineChoosed * @brief SplineChoosed
* @param id * @param id object id in container
*/ */
void SplineChoosed(qint64 id); void SplineChoosed(qint64 id);
/** /**

8
src/tools/drawTools/vtoolcutsplinepath.h
View File

@ -52,7 +52,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogCutSplinePath> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogCutSplinePath> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -66,7 +66,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -81,7 +81,7 @@ public:
static const QString AttrSplinePath; static const QString AttrSplinePath;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**
@ -91,7 +91,7 @@ public slots:
virtual void FullUpdateFromGui(int result); virtual void FullUpdateFromGui(int result);
/** /**
* @brief SplineChoosed * @brief SplineChoosed
* @param id * @param id object id in container
*/ */
void SplineChoosed(qint64 id); void SplineChoosed(qint64 id);
/** /**

12
src/tools/drawTools/vtoolendline.h
View File

@ -42,14 +42,14 @@ public:
/** /**
* @brief VToolEndLine * @brief VToolEndLine
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeLine * @param typeLine
* @param formula * @param formula
* @param angle * @param angle
* @param basePointId * @param basePointId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qreal &angle, const qint64 &basePointId, const QString &formula, const qreal &angle, const qint64 &basePointId,
@ -63,7 +63,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogEndLine> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogEndLine> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -79,7 +79,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -93,7 +93,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

12
src/tools/drawTools/vtoolheight.h
View File

@ -42,14 +42,14 @@ public:
/** /**
* @brief VToolHeight * @brief VToolHeight
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeLine * @param typeLine
* @param basePointId * @param basePointId
* @param p1LineId * @param p1LineId
* @param p2LineId * @param p2LineId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId,
@ -63,7 +63,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogHeight> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogHeight> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -79,7 +79,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -100,7 +100,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

14
src/tools/drawTools/vtoolline.h
View File

@ -43,12 +43,12 @@ public:
/** /**
* @brief VToolLine * @brief VToolLine
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param firstPoint * @param firstPoint
* @param secondPoint * @param secondPoint
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint,
qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0);
@ -61,7 +61,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogLine> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogLine> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -72,7 +72,7 @@ public:
* @param secondPoint * @param secondPoint
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -85,7 +85,7 @@ public:
static const QString TagName; static const QString TagName;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**
@ -100,7 +100,7 @@ public slots:
virtual void FullUpdateFromGui(int result); virtual void FullUpdateFromGui(int result);
/** /**
* @brief ShowTool * @brief ShowTool
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */

12
src/tools/drawTools/vtoollineintersect.h
View File

@ -42,14 +42,14 @@ public:
/** /**
* @brief VToolLineIntersect * @brief VToolLineIntersect
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param p1Line1 * @param p1Line1
* @param p2Line1 * @param p2Line1
* @param p1Line2 * @param p1Line2
* @param p2Line2 * @param p2Line2
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1,
const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2,
@ -63,7 +63,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogLineIntersect> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogLineIntersect> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -79,7 +79,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -93,7 +93,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

6
src/tools/drawTools/vtoollinepoint.h
View File

@ -41,13 +41,13 @@ public:
/** /**
* @brief VToolLinePoint * @brief VToolLinePoint
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeLine * @param typeLine
* @param formula * @param formula
* @param basePointId * @param basePointId
* @param angle * @param angle
* @param parent * @param parent parent object
*/ */
VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qint64 &basePointId, const qreal &angle, const QString &formula, const qint64 &basePointId, const qreal &angle,

12
src/tools/drawTools/vtoolnormal.h
View File

@ -42,15 +42,15 @@ public:
/** /**
* @brief VToolNormal * @brief VToolNormal
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeLine * @param typeLine
* @param formula * @param formula
* @param angle * @param angle
* @param firstPointId * @param firstPointId
* @param secondPointId * @param secondPointId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qreal &angle, const qint64 &firstPointId, const QString &formula, const qreal &angle, const qint64 &firstPointId,
@ -65,7 +65,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogNormal> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogNormal> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -82,7 +82,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -107,7 +107,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

8
src/tools/drawTools/vtoolpoint.h
View File

@ -42,9 +42,9 @@ public:
/** /**
* @brief VToolPoint * @brief VToolPoint
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param parent * @param parent parent object
*/ */
VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0);
virtual ~VToolPoint(){} virtual ~VToolPoint(){}
@ -70,7 +70,7 @@ public slots:
virtual void FullUpdateFromGui(int result) = 0; virtual void FullUpdateFromGui(int result) = 0;
/** /**
* @brief ShowTool * @brief ShowTool
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */

12
src/tools/drawTools/vtoolpointofcontact.h
View File

@ -41,14 +41,14 @@ public:
/** /**
* @brief VToolPointOfContact * @brief VToolPointOfContact
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param radius * @param radius
* @param center * @param center
* @param firstPointId * @param firstPointId
* @param secondPointId * @param secondPointId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id,
const QString &radius, const qint64 &center, const QString &radius, const qint64 &center,
@ -73,7 +73,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogPointOfContact> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogPointOfContact> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -89,7 +89,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -103,7 +103,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

12
src/tools/drawTools/vtoolpointofintersection.h
View File

@ -42,12 +42,12 @@ public:
/** /**
* @brief VToolPointOfIntersection * @brief VToolPointOfIntersection
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param firstPointId * @param firstPointId
* @param secondPointId * @param secondPointId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id,
const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &firstPointId, const qint64 &secondPointId,
@ -61,7 +61,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogPointOfIntersection> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogPointOfIntersection> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -75,7 +75,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -89,7 +89,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

12
src/tools/drawTools/vtoolshoulderpoint.h
View File

@ -41,15 +41,15 @@ public:
/** /**
* @brief VToolShoulderPoint * @brief VToolShoulderPoint
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeLine * @param typeLine
* @param formula * @param formula
* @param p1Line * @param p1Line
* @param p2Line * @param p2Line
* @param pShoulder * @param pShoulder
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const QString &formula, const qint64 &p1Line, const qint64 &p2Line,
@ -74,7 +74,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogShoulderPoint> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogShoulderPoint> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -91,7 +91,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -105,7 +105,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

8
src/tools/drawTools/vtoolsinglepoint.h
View File

@ -42,10 +42,10 @@ public:
/** /**
* @brief VToolSinglePoint * @brief VToolSinglePoint
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation,
QGraphicsItem * parent = 0 ); QGraphicsItem * parent = 0 );
@ -59,7 +59,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

14
src/tools/drawTools/vtoolspline.h
View File

@ -45,10 +45,10 @@ public:
/** /**
* @brief VToolSpline * @brief VToolSpline
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation,
QGraphicsItem * parent = 0 ); QGraphicsItem * parent = 0 );
@ -61,7 +61,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogSpline> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogSpline> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -77,7 +77,7 @@ public:
* @param kCurve * @param kCurve
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -110,7 +110,7 @@ signals:
void setEnabledPoint ( bool enable ); void setEnabledPoint ( bool enable );
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile (); virtual void FullUpdateFromFile ();
/** /**
@ -133,7 +133,7 @@ public slots:
virtual void ChangedActivDraw ( const QString &newName ); virtual void ChangedActivDraw ( const QString &newName );
/** /**
* @brief ShowTool * @brief ShowTool
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */

14
src/tools/drawTools/vtoolsplinepath.h
View File

@ -44,10 +44,10 @@ public:
/** /**
* @brief VToolSplinePath * @brief VToolSplinePath
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation,
QGraphicsItem * parent = 0); QGraphicsItem * parent = 0);
@ -60,7 +60,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogSplinePath> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogSplinePath> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -70,7 +70,7 @@ public:
* @param path * @param path
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -102,7 +102,7 @@ signals:
void setEnabledPoint(bool enable); void setEnabledPoint(bool enable);
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**
@ -125,7 +125,7 @@ public slots:
virtual void ChangedActivDraw(const QString &newName); virtual void ChangedActivDraw(const QString &newName);
/** /**
* @brief ShowTool * @brief ShowTool
* @param id * @param id object id in container
* @param color * @param color
* @param enable * @param enable
*/ */

12
src/tools/drawTools/vtooltriangle.h
View File

@ -42,14 +42,14 @@ public:
/** /**
* @brief VToolTriangle * @brief VToolTriangle
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param axisP1Id * @param axisP1Id
* @param axisP2Id * @param axisP2Id
* @param firstPointId * @param firstPointId
* @param secondPointId * @param secondPointId
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id,
const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId,
@ -63,7 +63,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogTriangle> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogTriangle> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -79,7 +79,7 @@ public:
* @param my * @param my
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -103,7 +103,7 @@ public:
static const QString ToolType; static const QString ToolType;
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

8
src/tools/nodeDetails/vabstractnode.h
View File

@ -41,10 +41,10 @@ public:
/** /**
* @brief VAbstractNode * @brief VAbstractNode
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idNode * @param id object id in containerNode
* @param parent * @param parent parent object
*/ */
VAbstractNode(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &idNode, VAbstractNode(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &idNode,
const qint64 &idTool, QObject *parent = 0); const qint64 &idTool, QObject *parent = 0);

16
src/tools/nodeDetails/vnodearc.h
View File

@ -42,11 +42,11 @@ public:
/** /**
* @brief VNodeArc * @brief VNodeArc
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idArc * @param id object id in containerArc
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc,
const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0, const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0,
@ -54,9 +54,9 @@ public:
/** /**
* @brief Create * @brief Create
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idArc * @param id object id in containerArc
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -73,7 +73,7 @@ public:
virtual void DeleteNode(); virtual void DeleteNode();
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
protected: protected:

16
src/tools/nodeDetails/vnodepoint.h
View File

@ -42,11 +42,11 @@ public:
/** /**
* @brief VNodePoint * @brief VNodePoint
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idPoint * @param id object id in containerPoint
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint,
const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0, const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0,
@ -54,9 +54,9 @@ public:
/** /**
* @brief Create * @brief Create
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idPoint * @param id object id in containerPoint
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -74,7 +74,7 @@ public:
virtual void DeleteNode(); virtual void DeleteNode();
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
/** /**

16
src/tools/nodeDetails/vnodespline.h
View File

@ -42,11 +42,11 @@ public:
/** /**
* @brief VNodeSpline * @brief VNodeSpline
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idSpline * @param id object id in containerSpline
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline,
const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0, const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0,
@ -54,9 +54,9 @@ public:
/** /**
* @brief Create * @brief Create
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idSpline * @param id object id in containerSpline
* @param parse * @param parse
* @param typeCreation * @param typeCreation
* @return * @return
@ -75,7 +75,7 @@ public:
virtual void DeleteNode(); virtual void DeleteNode();
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile (); virtual void FullUpdateFromFile ();
protected: protected:

16
src/tools/nodeDetails/vnodesplinepath.h
View File

@ -42,11 +42,11 @@ public:
/** /**
* @brief VNodeSplinePath * @brief VNodeSplinePath
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idSpline * @param id object id in containerSpline
* @param typeCreation * @param typeCreation
* @param parent * @param parent parent object
*/ */
VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline,
const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0, const Tool::Sources &typeCreation, const qint64 &idTool = 0, QObject *qoParent = 0,
@ -54,9 +54,9 @@ public:
/** /**
* @brief Create * @brief Create
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param idSpline * @param id object id in containerSpline
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -74,7 +74,7 @@ public:
virtual void DeleteNode(); virtual void DeleteNode();
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();
protected: protected:

6
src/tools/vabstracttool.cpp
View File

@ -170,9 +170,13 @@ qint32 VAbstractTool::LineIntersectCircle(const QPointF &center, qreal radius, c
QPointF VAbstractTool::ClosestPoint(const QLineF &line, const QPointF &p) QPointF VAbstractTool::ClosestPoint(const QLineF &line, const QPointF &p)
{ {
QLineF lineP2pointFrom = QLineF(line.p2(), p); QLineF lineP2pointFrom = QLineF(line.p2(), p);
qreal angle = 180-line.angleTo(lineP2pointFrom)-90; //right triangle always have one angle with 90 degree
//Now we want find angle between projection and line from p.
qreal angle = 180-(line.angleTo(lineP2pointFrom)-90);
//Swap first and last points line. Need for rotation.
QLineF pointFromlineP2 = QLineF(p, line.p2()); QLineF pointFromlineP2 = QLineF(p, line.p2());
pointFromlineP2.setAngle(pointFromlineP2.angle()+angle); pointFromlineP2.setAngle(pointFromlineP2.angle()+angle);
//After rotation we will have two intersect lines. Left just find intersect point.
QPointF point; QPointF point;
QLineF::IntersectType type = pointFromlineP2.intersect(line, &point); QLineF::IntersectType type = pointFromlineP2.intersect(line, &point);
if ( type == QLineF::BoundedIntersection ) if ( type == QLineF::BoundedIntersection )

217
src/tools/vabstracttool.h
View File

@ -33,45 +33,50 @@
#include "../xml/vdomdocument.h" #include "../xml/vdomdocument.h"
/** /**
* @brief The VAbstractTool class * @brief The VAbstractTool abstract class for all tools.
*/ */
class VAbstractTool: public VDataTool class VAbstractTool: public VDataTool
{ {
Q_OBJECT Q_OBJECT
public: public:
/** /**
* @brief VAbstractTool * @brief VAbstractTool container.
* @param doc dom document container * @param doc dom document container.
* @param data * @param data container with data.
* @param id * @param id object id in container.
* @param parent * @param parent parent object.
*/ */
VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0);
virtual ~VAbstractTool() {} virtual ~VAbstractTool() {}
/**
* @brief NewSceneRect calculate scene rect what contains all items and doesn't less that size of scene view.
* @param sc scene.
* @param view view.
*/
static void NewSceneRect(QGraphicsScene *sc, QGraphicsView *view); static void NewSceneRect(QGraphicsScene *sc, QGraphicsView *view);
/** /**
* @brief LineIntersectRect * @brief LineIntersectRect find point intersection line and rect.
* @param rec * @param rec rect.
* @param line * @param line line.
* @return * @return point intersection.
*/ */
static QPointF LineIntersectRect(QRectF rec, QLineF line); static QPointF LineIntersectRect(QRectF rec, QLineF line);
/** /**
* @brief LineIntersectCircle * @brief LineIntersectCircle find point intersection line and circle.
* @param center * @param center arc center.
* @param radius * @param radius arc radius.
* @param line * @param line line
* @param p1 * @param p1 first intersection point.
* @param p2 * @param p2 second intersection point.
* @return * @return 0 - intersection doesn't exist, 1 - one intersection point, 2 - two intersection points.
*/ */
static qint32 LineIntersectCircle(const QPointF &center, qreal radius, const QLineF &line, QPointF &p1, static qint32 LineIntersectCircle(const QPointF &center, qreal radius, const QLineF &line, QPointF &p1,
QPointF &p2); QPointF &p2);
/** /**
* @brief ClosestPoint * @brief ClosestPoint find point projection of point onto line.
* @param line * @param line line.
* @param p * @param p point.
* @return * @return point on line or extended line if origin size too small.
*/ */
static QPointF ClosestPoint(const QLineF &line, const QPointF &p); static QPointF ClosestPoint(const QLineF &line, const QPointF &p);
/** /**
@ -84,187 +89,79 @@ public:
*/ */
static QPointF addVector (const QPointF &p, const QPointF &p1, const QPointF &p2, qreal k); static QPointF addVector (const QPointF &p, const QPointF &p1, const QPointF &p2, qreal k);
/** /**
* @brief getId * @brief getId return object id.
* @return * @return id.
*/ */
inline qint64 getId() const {return id;} inline qint64 getId() const {return id;}
/** /**
* @brief LineCoefficients * @brief LineCoefficients coefficient for equation of segment. Segment equestion ax+by+c=0.
* @param line * @param line line
* @param a * @param a a value
* @param b * @param b b value
* @param c * @param c c value
*/ */
static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c); static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c);
/**
* @brief AttrId
*/
static const QString AttrId; static const QString AttrId;
/**
* @brief AttrType
*/
static const QString AttrType; static const QString AttrType;
/**
* @brief AttrMx
*/
static const QString AttrMx; static const QString AttrMx;
/**
* @brief AttrMy
*/
static const QString AttrMy; static const QString AttrMy;
/**
* @brief AttrName
*/
static const QString AttrName; static const QString AttrName;
/**
* @brief AttrX
*/
static const QString AttrX; static const QString AttrX;
/**
* @brief AttrY
*/
static const QString AttrY; static const QString AttrY;
/**
* @brief AttrTypeLine
*/
static const QString AttrTypeLine; static const QString AttrTypeLine;
/**
* @brief AttrLength
*/
static const QString AttrLength; static const QString AttrLength;
/**
* @brief AttrBasePoint
*/
static const QString AttrBasePoint; static const QString AttrBasePoint;
/**
* @brief AttrFirstPoint
*/
static const QString AttrFirstPoint; static const QString AttrFirstPoint;
/**
* @brief AttrSecondPoint
*/
static const QString AttrSecondPoint; static const QString AttrSecondPoint;
/**
* @brief AttrThirdPoint
*/
static const QString AttrThirdPoint; static const QString AttrThirdPoint;
/**
* @brief AttrCenter
*/
static const QString AttrCenter; static const QString AttrCenter;
/**
* @brief AttrRadius
*/
static const QString AttrRadius; static const QString AttrRadius;
/**
* @brief AttrAngle
*/
static const QString AttrAngle; static const QString AttrAngle;
/**
* @brief AttrAngle1
*/
static const QString AttrAngle1; static const QString AttrAngle1;
/**
* @brief AttrAngle2
*/
static const QString AttrAngle2; static const QString AttrAngle2;
/**
* @brief AttrP1Line
*/
static const QString AttrP1Line; static const QString AttrP1Line;
/**
* @brief AttrP2Line
*/
static const QString AttrP2Line; static const QString AttrP2Line;
/**
* @brief AttrP1Line1
*/
static const QString AttrP1Line1; static const QString AttrP1Line1;
/**
* @brief AttrP2Line1
*/
static const QString AttrP2Line1; static const QString AttrP2Line1;
/**
* @brief AttrP1Line2
*/
static const QString AttrP1Line2; static const QString AttrP1Line2;
/**
* @brief AttrP2Line2
*/
static const QString AttrP2Line2; static const QString AttrP2Line2;
/**
* @brief AttrPShoulder
*/
static const QString AttrPShoulder; static const QString AttrPShoulder;
/**
* @brief AttrPoint1
*/
static const QString AttrPoint1; static const QString AttrPoint1;
/**
* @brief AttrPoint4
*/
static const QString AttrPoint4; static const QString AttrPoint4;
/**
* @brief AttrKAsm1
*/
static const QString AttrKAsm1; static const QString AttrKAsm1;
/**
* @brief AttrKAsm2
*/
static const QString AttrKAsm2; static const QString AttrKAsm2;
/**
* @brief AttrKCurve
*/
static const QString AttrKCurve; static const QString AttrKCurve;
/**
* @brief AttrPathPoint
*/
static const QString AttrPathPoint; static const QString AttrPathPoint;
/**
* @brief AttrPSpline
*/
static const QString AttrPSpline; static const QString AttrPSpline;
/**
* @brief AttrAxisP1
*/
static const QString AttrAxisP1; static const QString AttrAxisP1;
/**
* @brief AttrAxisP2
*/
static const QString AttrAxisP2; static const QString AttrAxisP2;
/**
* @brief TypeLineNone
*/
static const QString TypeLineNone; static const QString TypeLineNone;
/**
* @brief TypeLineLine
*/
static const QString TypeLineLine; static const QString TypeLineLine;
/** /**
* @brief AddRecord * @brief AddRecord add record about tool in history.
* @param id * @param id object id in container
* @param toolType * @param toolType tool type
* @param doc dom document container * @param doc dom document container
*/ */
static void AddRecord(const qint64 id, const Tool::Tools &toolType, VDomDocument *doc); static void AddRecord(const qint64 id, const Tool::Tools &toolType, VDomDocument *doc);
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile()=0; virtual void FullUpdateFromFile()=0;
signals: signals:
/** /**
* @brief toolhaveChange * @brief toolhaveChange emit if tool create change that need save.
*/ */
void toolhaveChange(); void toolhaveChange();
/** /**
* @brief ChoosedTool * @brief ChoosedTool emit if object was clicked.
* @param id * @param id object id in container.
* @param type * @param type type of scene object.
*/ */
void ChoosedTool(qint64 id, Scene::Scenes type); void ChoosedTool(qint64 id, Scene::Scenes type);
/** /**
* @brief FullUpdateTree * @brief FullUpdateTree emit if need reparse pattern file.
*/ */
void FullUpdateTree(); void FullUpdateTree();
protected: protected:
@ -273,19 +170,19 @@ protected:
*/ */
VDomDocument *doc; VDomDocument *doc;
/** /**
* @brief id * @brief id object id.
*/ */
const qint64 id; const qint64 id;
/** /**
* @brief baseColor * @brief baseColor base color for tool.
*/ */
Qt::GlobalColor baseColor; Qt::GlobalColor baseColor;
/** /**
* @brief currentColor * @brief currentColor current tool color.
*/ */
Qt::GlobalColor currentColor; Qt::GlobalColor currentColor;
/** /**
* @brief AddToFile * @brief AddToFile add tag with informations about tool into file.
*/ */
virtual void AddToFile()=0; virtual void AddToFile()=0;
/** /**
@ -293,26 +190,30 @@ protected:
*/ */
virtual void RefreshDataInFile()=0; virtual void RefreshDataInFile()=0;
/** /**
* @brief getData * @brief getData return data container.
* @return * @return container.
*/ */
inline const VContainer *getData() const {return &data;} inline const VContainer *getData() const {return &data;}
/** /**
* @brief RemoveReferens * @brief RemoveReferens decrement value of reference.
*/ */
virtual void RemoveReferens(){} virtual void RemoveReferens(){}
/** /**
* @brief RemoveAllChild * @brief RemoveAllChild remove all child from file.
* @param domElement * @param domElement tag in xml tree.
*/ */
void RemoveAllChild(QDomElement &domElement); void RemoveAllChild(QDomElement &domElement);
/**
* @brief DeleteTool full delete object form scene and file.
* @param tool tool
*/
virtual void DeleteTool(QGraphicsItem *tool); virtual void DeleteTool(QGraphicsItem *tool);
template <typename T> template <typename T>
/** /**
* @brief AddAttribute * @brief SetAttribute set attribute in pattern file. Replace "," by ".".
* @param domElement * @param domElement element in xml tree.
* @param name * @param name name of attribute.
* @param value * @param value value of attribute.
*/ */
void SetAttribute(QDomElement &domElement, const QString &name, const T &value) void SetAttribute(QDomElement &domElement, const QString &name, const T &value)
{ {

4
src/tools/vdatatool.h
View File

@ -41,8 +41,8 @@ class VDataTool : public QObject
public: public:
/** /**
* @brief VDataTool * @brief VDataTool
* @param data * @param data container with variables
* @param parent * @param parent parent object
*/ */
VDataTool(VContainer *data, QObject *parent = 0); VDataTool(VContainer *data, QObject *parent = 0);
virtual ~VDataTool(){} virtual ~VDataTool(){}

14
src/tools/vtooldetail.h
View File

@ -43,11 +43,11 @@ public:
/** /**
* @brief VToolDetail * @brief VToolDetail
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param id * @param id object id in container
* @param typeCreation * @param typeCreation
* @param scene * @param scene
* @param parent * @param parent parent object
*/ */
VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id,
const Tool::Sources &typeCreation, VMainGraphicsScene *scene, const Tool::Sources &typeCreation, VMainGraphicsScene *scene,
@ -70,7 +70,7 @@ public:
* @param dialog * @param dialog
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogDetail> &dialog, VMainGraphicsScene *scene, static void Create(QSharedPointer<DialogDetail> &dialog, VMainGraphicsScene *scene,
VDomDocument *doc, VContainer *data); VDomDocument *doc, VContainer *data);
@ -80,7 +80,7 @@ public:
* @param newDetail * @param newDetail
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -91,7 +91,7 @@ public:
/** /**
* @brief AddTool * @brief AddTool
* @param tool * @param tool
* @param id * @param id object id in container
* @param typeTool * @param typeTool
*/ */
void AddTool(T *tool, const qint64 &id, Tool::Tools typeTool) void AddTool(T *tool, const qint64 &id, Tool::Tools typeTool)
@ -147,7 +147,7 @@ public:
void Remove(); void Remove();
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile (); virtual void FullUpdateFromFile ();
/** /**

6
src/tools/vtooluniondetails.h
View File

@ -44,7 +44,7 @@ public:
* @brief Create * @brief Create
* @param dialog * @param dialog
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
*/ */
static void Create(QSharedPointer<DialogUnionDetails> &dialog, VMainGraphicsScene *scene, VDomDocument *doc, static void Create(QSharedPointer<DialogUnionDetails> &dialog, VMainGraphicsScene *scene, VDomDocument *doc,
VContainer *data); VContainer *data);
@ -54,7 +54,7 @@ public:
* @param newDetail * @param newDetail
* @param scene * @param scene
* @param doc dom document container * @param doc dom document container
* @param data * @param data container with variables
* @param parse * @param parse
* @param typeCreation * @param typeCreation
*/ */
@ -87,7 +87,7 @@ public:
const qreal angle); const qreal angle);
public slots: public slots:
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
virtual void FullUpdateFromFile (){} virtual void FullUpdateFromFile (){}
protected: protected:

10
src/xml/vdomdocument.h
View File

@ -62,7 +62,7 @@ class VDomDocument : public QObject, public QDomDocument
public: public:
/** /**
* @brief VDomDocument * @brief VDomDocument
* @param data * @param data container with variables
* @param comboBoxDraws * @param comboBoxDraws
* @param mode * @param mode
*/ */
@ -70,7 +70,7 @@ public:
/** /**
* @brief VDomDocument * @brief VDomDocument
* @param name * @param name
* @param data * @param data container with variables
* @param comboBoxDraws * @param comboBoxDraws
* @param mode * @param mode
*/ */
@ -79,7 +79,7 @@ public:
/** /**
* @brief VDomDocument * @brief VDomDocument
* @param doc dom document containertype * @param doc dom document containertype
* @param data * @param data container with variables
* @param comboBoxDraws * @param comboBoxDraws
* @param mode * @param mode
*/ */
@ -186,7 +186,7 @@ public:
/** /**
* @brief UpdateToolData * @brief UpdateToolData
* @param id * @param id
* @param data * @param data container with variables
*/ */
void UpdateToolData(const qint64 &id, VContainer *data); void UpdateToolData(const qint64 &id, VContainer *data);
/** /**
@ -239,7 +239,7 @@ signals:
*/ */
void ChangedNameDraw(const QString &oldName, const QString &newName); void ChangedNameDraw(const QString &oldName, const QString &newName);
/** /**
* @brief FullUpdateFromFile * @brief FullUpdateFromFile update tool data form file.
*/ */
void FullUpdateFromFile(); void FullUpdateFromFile();
/** /**