From a99c3ce54a35d4b3fe280c98fb860c7f66bf6110 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Jun 2015 17:17:31 +0300 Subject: [PATCH] Better structure for tools. --HG-- branch : develop --- src/libs/vtools/tools/drawTools/drawtools.h | 48 ++++---- .../{ => toolcurve}/vabstractspline.cpp | 0 .../{ => toolcurve}/vabstractspline.h | 4 +- .../drawTools/{ => toolcurve}/vtoolarc.cpp | 12 +- .../drawTools/{ => toolcurve}/vtoolarc.h | 0 .../{ => toolcurve}/vtoolarcwithlength.cpp | 12 +- .../{ => toolcurve}/vtoolarcwithlength.h | 0 .../drawTools/{ => toolcurve}/vtoolspline.cpp | 8 +- .../drawTools/{ => toolcurve}/vtoolspline.h | 0 .../{ => toolcurve}/vtoolsplinepath.cpp | 6 +- .../{ => toolcurve}/vtoolsplinepath.h | 0 .../toolsinglepoint/toolcut}/vtoolcut.cpp | 0 .../toolsinglepoint/toolcut}/vtoolcut.h | 6 +- .../toolsinglepoint/toolcut}/vtoolcutarc.cpp | 12 +- .../toolsinglepoint/toolcut}/vtoolcutarc.h | 0 .../toolcut}/vtoolcutspline.cpp | 12 +- .../toolsinglepoint/toolcut}/vtoolcutspline.h | 0 .../toolcut}/vtoolcutsplinepath.cpp | 12 +- .../toolcut}/vtoolcutsplinepath.h | 0 .../toollinepoint}/vtoolalongline.cpp | 12 +- .../toollinepoint}/vtoolalongline.h | 0 .../toollinepoint}/vtoolbisector.cpp | 10 +- .../toollinepoint}/vtoolbisector.h | 0 .../vtoolcurveintersectaxis.cpp | 14 +-- .../toollinepoint}/vtoolcurveintersectaxis.h | 0 .../toollinepoint}/vtoolendline.cpp | 14 +-- .../toollinepoint}/vtoolendline.h | 0 .../toollinepoint}/vtoolheight.cpp | 6 +- .../toollinepoint}/vtoolheight.h | 0 .../toollinepoint}/vtoollineintersectaxis.cpp | 14 +-- .../toollinepoint}/vtoollineintersectaxis.h | 0 .../toollinepoint}/vtoollinepoint.cpp | 0 .../toollinepoint}/vtoollinepoint.h | 4 +- .../toollinepoint}/vtoolnormal.cpp | 10 +- .../toollinepoint}/vtoolnormal.h | 0 .../toollinepoint}/vtoolshoulderpoint.cpp | 10 +- .../toollinepoint}/vtoolshoulderpoint.h | 0 .../toolsinglepoint}/vtoolbasepoint.cpp | 12 +- .../toolsinglepoint}/vtoolbasepoint.h | 0 .../toolsinglepoint}/vtoollineintersect.cpp | 6 +- .../toolsinglepoint}/vtoollineintersect.h | 0 .../toolsinglepoint}/vtoolpoint.cpp | 6 +- .../toolsinglepoint}/vtoolpoint.h | 2 +- .../vtoolpointfromarcandtangent.cpp | 8 +- .../vtoolpointfromarcandtangent.h | 0 .../vtoolpointfromcircleandtangent.cpp | 10 +- .../vtoolpointfromcircleandtangent.h | 0 .../toolsinglepoint}/vtoolpointofcontact.cpp | 12 +- .../toolsinglepoint}/vtoolpointofcontact.h | 0 .../vtoolpointofintersection.cpp | 6 +- .../vtoolpointofintersection.h | 0 .../vtoolpointofintersectionarcs.cpp | 8 +- .../vtoolpointofintersectionarcs.h | 0 .../vtoolpointofintersectioncircles.cpp | 10 +- .../vtoolpointofintersectioncircles.h | 0 .../toolsinglepoint}/vtooltriangle.cpp | 6 +- .../toolsinglepoint}/vtooltriangle.h | 0 src/libs/vtools/tools/tools.pri | 112 +++++++++--------- src/libs/vtools/vtools.pro | 2 + 59 files changed, 214 insertions(+), 212 deletions(-) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vabstractspline.cpp (100%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vabstractspline.h (98%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolarc.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolarc.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolarcwithlength.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolarcwithlength.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolspline.cpp (99%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolspline.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolsplinepath.cpp (99%) rename src/libs/vtools/tools/drawTools/{ => toolcurve}/vtoolsplinepath.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcut.cpp (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcut.h (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcutarc.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcutarc.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcutspline.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcutspline.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcutsplinepath.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toolcut}/vtoolcutsplinepath.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolalongline.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolalongline.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolbisector.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolbisector.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolcurveintersectaxis.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolcurveintersectaxis.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolendline.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolendline.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolheight.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolheight.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoollineintersectaxis.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoollineintersectaxis.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoollinepoint.cpp (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoollinepoint.h (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolnormal.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolnormal.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolshoulderpoint.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint/toollinepoint}/vtoolshoulderpoint.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolbasepoint.cpp (97%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolbasepoint.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoollineintersect.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoollineintersect.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpoint.cpp (99%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpoint.h (99%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointfromarcandtangent.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointfromarcandtangent.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointfromcircleandtangent.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointfromcircleandtangent.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofcontact.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofcontact.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofintersection.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofintersection.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofintersectionarcs.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofintersectionarcs.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofintersectioncircles.cpp (98%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtoolpointofintersectioncircles.h (100%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtooltriangle.cpp (99%) rename src/libs/vtools/tools/drawTools/{ => toolpoint/toolsinglepoint}/vtooltriangle.h (100%) diff --git a/src/libs/vtools/tools/drawTools/drawtools.h b/src/libs/vtools/tools/drawTools/drawtools.h index 2b2e1eccc..e3dc2079e 100644 --- a/src/libs/vtools/tools/drawTools/drawtools.h +++ b/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 diff --git a/src/libs/vtools/tools/drawTools/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp similarity index 100% rename from src/libs/vtools/tools/drawTools/vabstractspline.cpp rename to src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp diff --git a/src/libs/vtools/tools/drawTools/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h similarity index 98% rename from src/libs/vtools/tools/drawTools/vabstractspline.h rename to src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 23e4d6160..a653820a6 100644 --- a/src/libs/vtools/tools/drawTools/vabstractspline.h +++ b/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 diff --git a/src/libs/vtools/tools/drawTools/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolarc.cpp rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index 0fd4073e3..9d6a0498c 100644 --- a/src/libs/vtools/tools/drawTools/vtoolarc.cpp +++ b/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 diff --git a/src/libs/vtools/tools/drawTools/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolarc.h rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h diff --git a/src/libs/vtools/tools/drawTools/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolarcwithlength.cpp rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 1f9b25054..f2a0ad436 100644 --- a/src/libs/vtools/tools/drawTools/vtoolarcwithlength.cpp +++ b/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 diff --git a/src/libs/vtools/tools/drawTools/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolarcwithlength.h rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h diff --git a/src/libs/vtools/tools/drawTools/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp similarity index 99% rename from src/libs/vtools/tools/drawTools/vtoolspline.cpp rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index a14bcd301..b0d355301 100644 --- a/src/libs/vtools/tools/drawTools/vtoolspline.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolspline.h rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h diff --git a/src/libs/vtools/tools/drawTools/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp similarity index 99% rename from src/libs/vtools/tools/drawTools/vtoolsplinepath.cpp rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 9c54a5201..c5c47e968 100644 --- a/src/libs/vtools/tools/drawTools/vtoolsplinepath.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolsplinepath.h rename to src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h diff --git a/src/libs/vtools/tools/drawTools/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolcut.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp diff --git a/src/libs/vtools/tools/drawTools/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolcut.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h index a5073b0c5..8449494ce 100644 --- a/src/libs/vtools/tools/drawTools/vtoolcut.h +++ b/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; diff --git a/src/libs/vtools/tools/drawTools/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolcutarc.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index bf779a791..7c9f0e9d9 100644 --- a/src/libs/vtools/tools/drawTools/vtoolcutarc.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolcutarc.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolcutarc.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h diff --git a/src/libs/vtools/tools/drawTools/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolcutspline.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index ce3b01beb..4b2dc8d1d 100644 --- a/src/libs/vtools/tools/drawTools/vtoolcutspline.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolcutspline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolcutspline.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h diff --git a/src/libs/vtools/tools/drawTools/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolcutsplinepath.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index 724ca3571..3cc1c2dbf 100644 --- a/src/libs/vtools/tools/drawTools/vtoolcutsplinepath.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolcutsplinepath.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolcutsplinepath.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h diff --git a/src/libs/vtools/tools/drawTools/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolalongline.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index e14c2a0b8..6ca72a68c 100644 --- a/src/libs/vtools/tools/drawTools/vtoolalongline.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolalongline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolalongline.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h diff --git a/src/libs/vtools/tools/drawTools/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolbisector.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index eb7f32f6a..439ec0814 100644 --- a/src/libs/vtools/tools/drawTools/vtoolbisector.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolbisector.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolbisector.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h diff --git a/src/libs/vtools/tools/drawTools/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolcurveintersectaxis.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index 1b3df0490..24f4a6506 100644 --- a/src/libs/vtools/tools/drawTools/vtoolcurveintersectaxis.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolcurveintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolcurveintersectaxis.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h diff --git a/src/libs/vtools/tools/drawTools/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolendline.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 24c9f027e..1c5b9a172 100644 --- a/src/libs/vtools/tools/drawTools/vtoolendline.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolendline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolendline.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h diff --git a/src/libs/vtools/tools/drawTools/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolheight.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index cc229400b..43628d5eb 100644 --- a/src/libs/vtools/tools/drawTools/vtoolheight.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolheight.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolheight.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h diff --git a/src/libs/vtools/tools/drawTools/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoollineintersectaxis.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index a6a2928cd..9af836584 100644 --- a/src/libs/vtools/tools/drawTools/vtoollineintersectaxis.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoollineintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoollineintersectaxis.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h diff --git a/src/libs/vtools/tools/drawTools/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoollinepoint.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp diff --git a/src/libs/vtools/tools/drawTools/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoollinepoint.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h index 5820aba05..b72fc24ff 100644 --- a/src/libs/vtools/tools/drawTools/vtoollinepoint.h +++ b/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. diff --git a/src/libs/vtools/tools/drawTools/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolnormal.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index c4b0a3349..5781d181f 100644 --- a/src/libs/vtools/tools/drawTools/vtoolnormal.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolnormal.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolnormal.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h diff --git a/src/libs/vtools/tools/drawTools/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolshoulderpoint.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index e690b8512..ec05a8467 100644 --- a/src/libs/vtools/tools/drawTools/vtoolshoulderpoint.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolshoulderpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolshoulderpoint.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h diff --git a/src/libs/vtools/tools/drawTools/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp similarity index 97% rename from src/libs/vtools/tools/drawTools/vtoolbasepoint.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index f30831f23..2ae2991c0 100644 --- a/src/libs/vtools/tools/drawTools/vtoolbasepoint.cpp +++ b/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 diff --git a/src/libs/vtools/tools/drawTools/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolbasepoint.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h diff --git a/src/libs/vtools/tools/drawTools/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoollineintersect.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 6d0c640c4..e2a5e812a 100644 --- a/src/libs/vtools/tools/drawTools/vtoollineintersect.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoollineintersect.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoollineintersect.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h diff --git a/src/libs/vtools/tools/drawTools/vtoolpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpoint.cpp similarity index 99% rename from src/libs/vtools/tools/drawTools/vtoolpoint.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpoint.cpp index b96c82240..ea9f06714 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpoint.cpp +++ b/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 diff --git a/src/libs/vtools/tools/drawTools/vtoolpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpoint.h similarity index 99% rename from src/libs/vtools/tools/drawTools/vtoolpoint.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpoint.h index 7817b134b..5f52463f0 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpoint.h +++ b/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 class VPointF; diff --git a/src/libs/vtools/tools/drawTools/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolpointfromarcandtangent.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 47f6b1a0b..2a6b35e26 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpointfromarcandtangent.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolpointfromarcandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolpointfromarcandtangent.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h diff --git a/src/libs/vtools/tools/drawTools/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolpointfromcircleandtangent.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index f14ddaffe..6db0d0f37 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpointfromcircleandtangent.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolpointfromcircleandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolpointfromcircleandtangent.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolpointofcontact.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index c36b29287..9c9ec6923 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpointofcontact.cpp +++ b/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 const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofcontact.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolpointofcontact.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolpointofintersection.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index 1f0c789d9..7014885b7 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpointofintersection.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofintersection.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolpointofintersection.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolpointofintersectionarcs.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index c9dbc6f7e..086790b9e 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpointofintersectionarcs.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofintersectionarcs.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolpointofintersectionarcs.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp similarity index 98% rename from src/libs/vtools/tools/drawTools/vtoolpointofintersectioncircles.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index a61aa7e31..b8ac3ed6b 100644 --- a/src/libs/vtools/tools/drawTools/vtoolpointofintersectioncircles.cpp +++ b/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"); diff --git a/src/libs/vtools/tools/drawTools/vtoolpointofintersectioncircles.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtoolpointofintersectioncircles.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h diff --git a/src/libs/vtools/tools/drawTools/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp similarity index 99% rename from src/libs/vtools/tools/drawTools/vtooltriangle.cpp rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index 776f9023d..a4a012e48 100644 --- a/src/libs/vtools/tools/drawTools/vtooltriangle.cpp +++ b/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 const QString VToolTriangle::ToolType = QStringLiteral("triangle"); diff --git a/src/libs/vtools/tools/drawTools/vtooltriangle.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h similarity index 100% rename from src/libs/vtools/tools/drawTools/vtooltriangle.h rename to src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h diff --git a/src/libs/vtools/tools/tools.pri b/src/libs/vtools/tools/tools.pri index e7e62ad63..7599cd74f 100644 --- a/src/libs/vtools/tools/tools.pri +++ b/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 diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index daad44c23..08af56da6 100644 --- a/src/libs/vtools/vtools.pro +++ b/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 {