Better structure for tools.

--HG--
branch : develop

src/libs/vtools/tools/drawTools/drawtools.h

@@ -29,30 +29,30 @@
 #ifndef DRAWTOOLS_H
 #define DRAWTOOLS_H
 
-#include "vtoolalongline.h"
-#include "vtoolarc.h"
-#include "vtoolarcwithlength.h"
-#include "vtoolbisector.h"
-#include "vtoolendline.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h"
+#include "toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h"
+#include "toolcurve/vtoolarc.h"
+#include "toolcurve/vtoolarcwithlength.h"
+#include "toolcurve/vtoolspline.h"
+#include "toolcurve/vtoolsplinepath.h"
 #include "vtoolline.h"
-#include "vtoollineintersect.h"
-#include "vtoolnormal.h"
-#include "vtoolpointofcontact.h"
-#include "vtoolshoulderpoint.h"
-#include "vtoolbasepoint.h"
-#include "vtoolspline.h"
-#include "vtoolsplinepath.h"
-#include "vtoolheight.h"
-#include "vtooltriangle.h"
-#include "vtoolpointofintersection.h"
-#include "vtoolpointofintersectionarcs.h"
-#include "vtoolpointofintersectioncircles.h"
-#include "vtoolcutspline.h"
-#include "vtoolcutsplinepath.h"
-#include "vtoolcutarc.h"
-#include "vtoollineintersectaxis.h"
-#include "vtoolcurveintersectaxis.h"
-#include "vtoolpointfromcircleandtangent.h"
-#include "vtoolpointfromarcandtangent.h"
+#include "toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
+#include "toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
+#include "toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
+#include "toolpoint/toolsinglepoint/vtoollineintersect.h"
+#include "toolpoint/toolsinglepoint/vtoolpointofcontact.h"
+#include "toolpoint/toolsinglepoint/vtoolbasepoint.h"
+#include "toolpoint/toolsinglepoint/vtooltriangle.h"
+#include "toolpoint/toolsinglepoint/vtoolpointofintersection.h"
+#include "toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h"
+#include "toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h"
+#include "toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
+#include "toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h"
 
 #endif // DRAWTOOLS_H

src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h

@@ -29,8 +29,8 @@
 #ifndef VABSTRACTSPLINE_H
 #define VABSTRACTSPLINE_H
 
-#include "vdrawtool.h"
-#include "../../../vwidgets/vcontrolpointspline.h"
+#include "../vdrawtool.h"
+#include "../vwidgets/vcontrolpointspline.h"
 
 #include <QGraphicsPathItem>
 

src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolarc.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogarc.h"
-#include "../../../vgeometry/varc.h"
-#include "../../../vpatterndb/vformula.h"
-#include "../../visualization/vistoolarc.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../dialogs/tools/dialogarc.h"
+#include "../vgeometry/varc.h"
+#include "../vpatterndb/vformula.h"
+#include "../../../visualization/vistoolarc.h"
 
 #include <QKeyEvent>
 

src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolarcwithlength.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogarcwithlength.h"
-#include "../../../vgeometry/varc.h"
-#include "../../../vpatterndb/vformula.h"
-#include "../../visualization/vistoolarcwithlength.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../dialogs/tools/dialogarcwithlength.h"
+#include "../vgeometry/varc.h"
+#include "../vpatterndb/vformula.h"
+#include "../../../visualization/vistoolarcwithlength.h"
 
 #include <QKeyEvent>
 

src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp

@@ -27,10 +27,10 @@
  *************************************************************************/
 
 #include "vtoolspline.h"
-#include "../../../vgeometry/vspline.h"
-#include "../../dialogs/tools/dialogspline.h"
-#include "../../undocommands/movespline.h"
-#include "../../visualization/vistoolspline.h"
+#include "../vgeometry/vspline.h"
+#include "../../../dialogs/tools/dialogspline.h"
+#include "../../../undocommands/movespline.h"
+#include "../../../visualization/vistoolspline.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../../libs/vmisc/vmath.h"

src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp

@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "vtoolsplinepath.h"
-#include "../../dialogs/tools/dialogsplinepath.h"
-#include "../../undocommands/movesplinepath.h"
-#include "../../visualization/vistoolsplinepath.h"
+#include "../../../dialogs/tools/dialogsplinepath.h"
+#include "../../../undocommands/movesplinepath.h"
+#include "../../../visualization/vistoolsplinepath.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
 #   include "../../libs/vmisc/vmath.h"

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h

@@ -29,9 +29,9 @@
 #ifndef VTOOLCUT_H
 #define VTOOLCUT_H
 
-#include "vtoolpoint.h"
-#include "../../../vwidgets/vsimplecurve.h"
-#include "vabstractspline.h"
+#include "../vtoolpoint.h"
+#include "../vwidgets/vsimplecurve.h"
+#include "../../../toolcurve/vabstractspline.h"
 
 class VFormula;
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolcutarc.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogcutarc.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vgeometry/varc.h"
-#include "../../visualization/vistoolcutarc.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogcutarc.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/varc.h"
+#include "../../../../../visualization/vistoolcutarc.h"
 
 const QString VToolCutArc::ToolType = QStringLiteral("cutArc");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolcutspline.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogcutspline.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolcutspline.h"
-#include "../../../vgeometry/vspline.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogcutspline.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolcutspline.h"
+#include "../vgeometry/vspline.h"
 
 const QString VToolCutSpline::ToolType   = QStringLiteral("cutSpline");
 const QString VToolCutSpline::AttrSpline = QStringLiteral("spline");

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolcutsplinepath.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogcutsplinepath.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolcutsplinepath.h"
-#include "../../../vgeometry/vsplinepath.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogcutsplinepath.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolcutsplinepath.h"
+#include "../vgeometry/vsplinepath.h"
 
 const QString VToolCutSplinePath::ToolType       = QStringLiteral("cutSplinePath");
 const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath");

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolalongline.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogalongline.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../../ifc/exception/vexceptionobjecterror.h"
-#include "../../visualization/vistoolalongline.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogalongline.h"
+#include "../vgeometry/vpointf.h"
+#include "../ifc/exception/vexceptionobjecterror.h"
+#include "../../../../../visualization/vistoolalongline.h"
 
 const QString VToolAlongLine::ToolType = QStringLiteral("alongLine");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp

@@ -27,11 +27,11 @@
  *************************************************************************/
 
 #include "vtoolbisector.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogbisector.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolbisector.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogbisector.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolbisector.h"
 
 const QString VToolBisector::ToolType = QStringLiteral("bisector");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp

@@ -27,13 +27,13 @@
  *************************************************************************/
 
 #include "vtoolcurveintersectaxis.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogcurveintersectaxis.h"
-#include "../../dialogs/support/dialogeditwrongformula.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolcurveintersectaxis.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogcurveintersectaxis.h"
+#include "../../../../../dialogs/support/dialogeditwrongformula.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolcurveintersectaxis.h"
 
 const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp

@@ -27,13 +27,13 @@
  *************************************************************************/
 
 #include "vtoolendline.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogendline.h"
-#include "../../dialogs/support/dialogeditwrongformula.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolendline.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogendline.h"
+#include "../../../../../dialogs/support/dialogeditwrongformula.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolendline.h"
 
 const QString VToolEndLine::ToolType = QStringLiteral("endLine");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp

@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "vtoolheight.h"
-#include "../../dialogs/tools/dialogheight.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../visualization/vistoolheight.h"
+#include "../../../../../dialogs/tools/dialogheight.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolheight.h"
 
 const QString VToolHeight::ToolType = QStringLiteral("height");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp

@@ -27,13 +27,13 @@
  *************************************************************************/
 
 #include "vtoollineintersectaxis.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialoglineintersectaxis.h"
-#include "../../dialogs/support/dialogeditwrongformula.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoollineintersectaxis.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialoglineintersectaxis.h"
+#include "../../../../../dialogs/support/dialogeditwrongformula.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoollineintersectaxis.h"
 
 const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h

@@ -29,8 +29,8 @@
 #ifndef VTOOLLINEPOINT_H
 #define VTOOLLINEPOINT_H
 
-#include "vtoolpoint.h"
-#include "../../../vpatterndb/vformula.h"
+#include "../vtoolpoint.h"
+#include "../vpatterndb/vformula.h"
 
 /**
  * @brief The VToolLinePoint class parent for all tools what create point with line.

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp

@@ -27,11 +27,11 @@
  *************************************************************************/
 
 #include "vtoolnormal.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialognormal.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolnormal.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialognormal.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolnormal.h"
 
 const QString VToolNormal::ToolType = QStringLiteral("normal");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp

@@ -27,11 +27,11 @@
  *************************************************************************/
 
 #include "vtoolshoulderpoint.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogshoulderpoint.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../visualization/vistoolshoulderpoint.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../../dialogs/tools/dialogshoulderpoint.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../../visualization/vistoolshoulderpoint.h"
 
 const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolbasepoint.h"
-#include "../../dialogs/tools/dialogsinglepoint.h"
-#include "../../../vwidgets/vgraphicssimpletextitem.h"
-#include "../../undocommands/movespoint.h"
-#include "../../undocommands/addpatternpiece.h"
-#include "../../undocommands/deletepatternpiece.h"
-#include "../../../vgeometry/vpointf.h"
+#include "../../../../dialogs/tools/dialogsinglepoint.h"
+#include "../vwidgets/vgraphicssimpletextitem.h"
+#include "../../../../undocommands/movespoint.h"
+#include "../../../../undocommands/addpatternpiece.h"
+#include "../../../../undocommands/deletepatternpiece.h"
+#include "../vgeometry/vpointf.h"
 
 #include <QMessageBox>
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp

@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "vtoollineintersect.h"
-#include "../../dialogs/tools/dialoglineintersect.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../visualization/vistoollineintersect.h"
+#include "../../../../dialogs/tools/dialoglineintersect.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../visualization/vistoollineintersect.h"
 
 const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpoint.cpp

@@ -28,9 +28,9 @@
 
 #include "vtoolpoint.h"
 #include "../vmisc/logging.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../libs/vwidgets/vgraphicssimpletextitem.h"
-#include "../../undocommands/movelabel.h"
+#include "../vgeometry/vpointf.h"
+#include "../vwidgets/vgraphicssimpletextitem.h"
+#include "../../../../undocommands/movelabel.h"
 
 #include <QKeyEvent>
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpoint.h

@@ -29,7 +29,7 @@
 #ifndef VTOOLPOINT_H
 #define VTOOLPOINT_H
 
-#include "vdrawtool.h"
+#include "../../vdrawtool.h"
 #include <QGraphicsEllipseItem>
 
 class VPointF;

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp

@@ -27,10 +27,10 @@
  *************************************************************************/
 
 #include "vtoolpointfromarcandtangent.h"
-#include "../../dialogs/tools/dialogpointfromarcandtangent.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../libs/vgeometry/varc.h"
-#include "../../visualization/vistoolpointfromarcandtangent.h"
+#include "../../../../dialogs/tools/dialogpointfromarcandtangent.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/varc.h"
+#include "../../../../visualization/vistoolpointfromarcandtangent.h"
 
 const QString VToolPointFromArcAndTangent::ToolType = QStringLiteral("pointFromArcAndTangent");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp

@@ -27,11 +27,11 @@
  *************************************************************************/
 
 #include "vtoolpointfromcircleandtangent.h"
-#include "../../dialogs/tools/dialogpointfromcircleandtangent.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../libs/vgeometry/varc.h"
-#include "../../visualization/vistoolpointfromcircleandtangent.h"
-#include "../../libs/vpatterndb/vformula.h"
+#include "../../../../dialogs/tools/dialogpointfromcircleandtangent.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/varc.h"
+#include "../../../../visualization/vistoolpointfromcircleandtangent.h"
+#include "../vpatterndb/vformula.h"
 
 const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "vtoolpointofcontact.h"
-#include "../../../vpatterndb/calculator.h"
-#include "../../../vpatterndb/vtranslatevars.h"
-#include "../../dialogs/tools/dialogpointofcontact.h"
-#include "../../../vgeometry/vpointf.h"
-#include "../../../vpatterndb/vformula.h"
-#include "../../visualization/vistoolpointofcontact.h"
+#include "../vpatterndb/calculator.h"
+#include "../vpatterndb/vtranslatevars.h"
+#include "../../../../dialogs/tools/dialogpointofcontact.h"
+#include "../vgeometry/vpointf.h"
+#include "../vpatterndb/vformula.h"
+#include "../../../../visualization/vistoolpointofcontact.h"
 #include <QtCore/qmath.h>
 
 const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact");

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp

@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "vtoolpointofintersection.h"
-#include "../../dialogs/tools/dialogpointofintersection.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../visualization/vistoolpointofintersection.h"
+#include "../../../../dialogs/tools/dialogpointofintersection.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../visualization/vistoolpointofintersection.h"
 
 const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp

@@ -27,10 +27,10 @@
  *************************************************************************/
 
 #include "vtoolpointofintersectionarcs.h"
-#include "../../dialogs/tools/dialogpointofintersectionarcs.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../libs/vgeometry/varc.h"
-#include "../../visualization/vistoolpointofintersectionarcs.h"
+#include "../../../../dialogs/tools/dialogpointofintersectionarcs.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/varc.h"
+#include "../../../../visualization/vistoolpointofintersectionarcs.h"
 
 const QString VToolPointOfIntersectionArcs::ToolType = QStringLiteral("pointOfIntersectionArcs");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp

@@ -27,11 +27,11 @@
  *************************************************************************/
 
 #include "vtoolpointofintersectioncircles.h"
-#include "../../dialogs/tools/dialogpointofintersectioncircles.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../libs/vgeometry/varc.h"
-#include "../../visualization/vistoolpointofintersectioncircles.h"
-#include "../../libs/vpatterndb/vformula.h"
+#include "../../../../dialogs/tools/dialogpointofintersectioncircles.h"
+#include "../vgeometry/vpointf.h"
+#include "../vgeometry/varc.h"
+#include "../../../../visualization/vistoolpointofintersectioncircles.h"
+#include "../vpatterndb/vformula.h"
 
 const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles");
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp

@@ -27,9 +27,9 @@
  *************************************************************************/
 
 #include "vtooltriangle.h"
-#include "../../dialogs/tools/dialogtriangle.h"
-#include "../../libs/vgeometry/vpointf.h"
-#include "../../visualization/vistooltriangle.h"
+#include "../../../../dialogs/tools/dialogtriangle.h"
+#include "../vgeometry/vpointf.h"
+#include "../../../../visualization/vistooltriangle.h"
 #include <QtCore/qmath.h>
 
 const QString VToolTriangle::ToolType = QStringLiteral("triangle");

src/libs/vtools/tools/tools.pri

@@ -6,23 +6,23 @@ HEADERS += \
     $$PWD/vdatatool.h \
     $$PWD/vabstracttool.h \
     $$PWD/tools.h \
-    $$PWD/drawTools/vtooltriangle.h \
-    $$PWD/drawTools/vtoolsplinepath.h \
-    $$PWD/drawTools/vtoolspline.h \
-    $$PWD/drawTools/vtoolbasepoint.h \
-    $$PWD/drawTools/vtoolshoulderpoint.h \
-    $$PWD/drawTools/vtoolpointofintersection.h \
-    $$PWD/drawTools/vtoolpointofcontact.h \
-    $$PWD/drawTools/vtoolpoint.h \
-    $$PWD/drawTools/vtoolnormal.h \
-    $$PWD/drawTools/vtoollinepoint.h \
-    $$PWD/drawTools/vtoollineintersect.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h \
+    $$PWD/drawTools/toolcurve/vtoolsplinepath.h \
+    $$PWD/drawTools/toolcurve/vtoolspline.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpoint.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h \
     $$PWD/drawTools/vtoolline.h \
-    $$PWD/drawTools/vtoolheight.h \
-    $$PWD/drawTools/vtoolendline.h \
-    $$PWD/drawTools/vtoolbisector.h \
-    $$PWD/drawTools/vtoolarc.h \
-    $$PWD/drawTools/vtoolalongline.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h \
+    $$PWD/drawTools/toolcurve/vtoolarc.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h \
     $$PWD/drawTools/vdrawtool.h \
     $$PWD/drawTools/drawtools.h \
     $$PWD/nodeDetails/vnodesplinepath.h \
@@ -31,57 +31,57 @@ HEADERS += \
     $$PWD/nodeDetails/vnodearc.h \
     $$PWD/nodeDetails/vabstractnode.h \
     $$PWD/nodeDetails/nodedetails.h \
-    $$PWD/drawTools/vtoolcutspline.h \
-    $$PWD/drawTools/vtoolcutsplinepath.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h \
     $$PWD/vtooluniondetails.h \
-    $$PWD/drawTools/vtoolcutarc.h \
-    $$PWD/drawTools/vabstractspline.h \
-    $$PWD/drawTools/vtoolcut.h \
-    $$PWD/drawTools/vtoollineintersectaxis.h \
-    $$PWD/drawTools/vtoolcurveintersectaxis.h \
-    $$PWD/drawTools/vtoolpointofintersectionarcs.h \
-    $$PWD/drawTools/vtoolpointofintersectioncircles.h \
-    $$PWD/drawTools/vtoolpointfromcircleandtangent.h \
-    $$PWD/drawTools/vtoolpointfromarcandtangent.h \
-    $$PWD/drawTools/vtoolarcwithlength.h
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h \
+    $$PWD/drawTools/toolcurve/vabstractspline.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h \
+    $$PWD/drawTools/toolcurve/vtoolarcwithlength.h
 
 SOURCES += \
     $$PWD/vtooldetail.cpp \
     $$PWD/vdatatool.cpp \
     $$PWD/vabstracttool.cpp \
-    $$PWD/drawTools/vtooltriangle.cpp \
-    $$PWD/drawTools/vtoolsplinepath.cpp \
-    $$PWD/drawTools/vtoolspline.cpp \
-    $$PWD/drawTools/vtoolbasepoint.cpp \
-    $$PWD/drawTools/vtoolshoulderpoint.cpp \
-    $$PWD/drawTools/vtoolpointofintersection.cpp \
-    $$PWD/drawTools/vtoolpointofcontact.cpp \
-    $$PWD/drawTools/vtoolpoint.cpp \
-    $$PWD/drawTools/vtoolnormal.cpp \
-    $$PWD/drawTools/vtoollinepoint.cpp \
-    $$PWD/drawTools/vtoollineintersect.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp \
+    $$PWD/drawTools/toolcurve/vtoolsplinepath.cpp \
+    $$PWD/drawTools/toolcurve/vtoolspline.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpoint.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp \
     $$PWD/drawTools/vtoolline.cpp \
-    $$PWD/drawTools/vtoolheight.cpp \
-    $$PWD/drawTools/vtoolendline.cpp \
-    $$PWD/drawTools/vtoolbisector.cpp \
-    $$PWD/drawTools/vtoolarc.cpp \
-    $$PWD/drawTools/vtoolalongline.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp \
+    $$PWD/drawTools/toolcurve/vtoolarc.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp \
     $$PWD/drawTools/vdrawtool.cpp \
     $$PWD/nodeDetails/vnodesplinepath.cpp \
     $$PWD/nodeDetails/vnodespline.cpp \
     $$PWD/nodeDetails/vnodepoint.cpp \
     $$PWD/nodeDetails/vnodearc.cpp \
     $$PWD/nodeDetails/vabstractnode.cpp \
-    $$PWD/drawTools/vtoolcutspline.cpp \
-    $$PWD/drawTools/vtoolcutsplinepath.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp \
     $$PWD/vtooluniondetails.cpp \
-    $$PWD/drawTools/vtoolcutarc.cpp \
-    $$PWD/drawTools/vabstractspline.cpp \
-    $$PWD/drawTools/vtoolcut.cpp \
-    $$PWD/drawTools/vtoollineintersectaxis.cpp \
-    $$PWD/drawTools/vtoolcurveintersectaxis.cpp \
-    $$PWD/drawTools/vtoolpointofintersectionarcs.cpp \
-    $$PWD/drawTools/vtoolpointofintersectioncircles.cpp \
-    $$PWD/drawTools/vtoolpointfromcircleandtangent.cpp \
-    $$PWD/drawTools/vtoolpointfromarcandtangent.cpp \
-    $$PWD/drawTools/vtoolarcwithlength.cpp
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp \
+    $$PWD/drawTools/toolcurve/vabstractspline.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp \
+    $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp \
+    $$PWD/drawTools/toolcurve/vtoolarcwithlength.cpp

src/libs/vtools/vtools.pro

@@ -51,6 +51,8 @@ $$enable_ccache()
 # Set precompiled headers. Function set_PCH() defined in Valentina.pri.
 $$set_PCH()
 
+INCLUDEPATH += $$PWD/../vpatterndb
+
 CONFIG(debug, debug|release){
     # Debug mode
     unix {