From 0325e0a4418af71f7fc42cac530156bb682d83d3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 24 Mar 2016 16:49:15 +0200 Subject: [PATCH] Changed code tree structure for visualization classes. --HG-- branch : develop --- .../vtools/dialogs/tools/dialogalongline.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogarc.cpp | 2 +- .../dialogs/tools/dialogarcwithlength.cpp | 2 +- .../vtools/dialogs/tools/dialogbisector.cpp | 2 +- .../dialogs/tools/dialogcubicbezier.cpp | 2 +- .../dialogs/tools/dialogcubicbezierpath.cpp | 2 +- .../tools/dialogcurveintersectaxis.cpp | 2 +- .../vtools/dialogs/tools/dialogcutarc.cpp | 2 +- .../vtools/dialogs/tools/dialogcutspline.cpp | 2 +- .../dialogs/tools/dialogcutsplinepath.cpp | 2 +- .../vtools/dialogs/tools/dialogendline.cpp | 2 +- .../vtools/dialogs/tools/dialogheight.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogline.cpp | 2 +- .../dialogs/tools/dialoglineintersect.cpp | 2 +- .../dialogs/tools/dialoglineintersectaxis.cpp | 2 +- .../vtools/dialogs/tools/dialognormal.cpp | 2 +- .../tools/dialogpointfromarcandtangent.cpp | 2 +- .../tools/dialogpointfromcircleandtangent.cpp | 2 +- .../dialogs/tools/dialogpointofcontact.cpp | 2 +- .../tools/dialogpointofintersection.cpp | 2 +- .../tools/dialogpointofintersectionarcs.cpp | 2 +- .../dialogpointofintersectioncircles.cpp | 2 +- .../tools/dialogpointofintersectioncurves.cpp | 2 +- .../dialogs/tools/dialogshoulderpoint.cpp | 2 +- .../vtools/dialogs/tools/dialogspline.cpp | 2 +- .../vtools/dialogs/tools/dialogsplinepath.cpp | 2 +- .../vtools/dialogs/tools/dialogtriangle.cpp | 2 +- .../vtools/dialogs/tools/dialogtruedarts.cpp | 2 +- .../tools/drawTools/toolcurve/vtoolarc.cpp | 2 +- .../toolcurve/vtoolarcwithlength.cpp | 2 +- .../drawTools/toolcurve/vtoolcubicbezier.cpp | 2 +- .../toolcurve/vtoolcubicbezierpath.cpp | 2 +- .../tools/drawTools/toolcurve/vtoolspline.cpp | 2 +- .../drawTools/toolcurve/vtoolsplinepath.cpp | 2 +- .../tooldoublepoint/vtooltruedarts.cpp | 2 +- .../toolsinglepoint/toolcut/vtoolcutarc.cpp | 2 +- .../toolcut/vtoolcutspline.cpp | 2 +- .../toolcut/vtoolcutsplinepath.cpp | 2 +- .../toollinepoint/vtoolalongline.cpp | 2 +- .../toollinepoint/vtoolbisector.cpp | 2 +- .../toollinepoint/vtoolcurveintersectaxis.cpp | 2 +- .../toollinepoint/vtoolendline.cpp | 2 +- .../toollinepoint/vtoolheight.cpp | 2 +- .../toollinepoint/vtoollineintersectaxis.cpp | 2 +- .../toollinepoint/vtoolnormal.cpp | 2 +- .../toollinepoint/vtoolshoulderpoint.cpp | 2 +- .../toolsinglepoint/vtoollineintersect.cpp | 2 +- .../vtoolpointfromarcandtangent.cpp | 2 +- .../vtoolpointfromcircleandtangent.cpp | 2 +- .../toolsinglepoint/vtoolpointofcontact.cpp | 2 +- .../vtoolpointofintersection.cpp | 2 +- .../vtoolpointofintersectionarcs.cpp | 2 +- .../vtoolpointofintersectioncircles.cpp | 2 +- .../vtoolpointofintersectioncurves.cpp | 2 +- .../toolsinglepoint/vtooltriangle.cpp | 2 +- src/libs/vtools/tools/drawTools/vtoolline.cpp | 2 +- .../visualization/{ => line}/visline.cpp | 2 +- .../vtools/visualization/{ => line}/visline.h | 2 +- .../{ => line}/vistoolalongline.cpp | 4 +- .../{ => line}/vistoolalongline.h | 0 .../{ => line}/vistoolbisector.cpp | 2 +- .../{ => line}/vistoolbisector.h | 0 .../{ => line}/vistoolcurveintersectaxis.cpp | 2 +- .../{ => line}/vistoolcurveintersectaxis.h | 0 .../{ => line}/vistoolendline.cpp | 6 +- .../visualization/{ => line}/vistoolendline.h | 0 .../{ => line}/vistoolheight.cpp | 2 +- .../visualization/{ => line}/vistoolheight.h | 0 .../visualization/{ => line}/vistoolline.cpp | 6 +- .../visualization/{ => line}/vistoolline.h | 0 .../{ => line}/vistoollineintersect.cpp | 4 +- .../{ => line}/vistoollineintersect.h | 0 .../{ => line}/vistoollineintersectaxis.cpp | 2 +- .../{ => line}/vistoollineintersectaxis.h | 0 .../{ => line}/vistoolnormal.cpp | 2 +- .../visualization/{ => line}/vistoolnormal.h | 0 .../vistoolpointfromarcandtangent.cpp | 2 +- .../vistoolpointfromarcandtangent.h | 0 .../vistoolpointfromcircleandtangent.cpp | 2 +- .../vistoolpointfromcircleandtangent.h | 0 .../{ => line}/vistoolpointofcontact.cpp | 2 +- .../{ => line}/vistoolpointofcontact.h | 0 .../{ => line}/vistoolpointofintersection.cpp | 4 +- .../{ => line}/vistoolpointofintersection.h | 0 .../vistoolpointofintersectionarcs.cpp | 2 +- .../vistoolpointofintersectionarcs.h | 0 .../vistoolpointofintersectioncircles.cpp | 2 +- .../vistoolpointofintersectioncircles.h | 0 .../{ => line}/vistoolshoulderpoint.cpp | 2 +- .../{ => line}/vistoolshoulderpoint.h | 0 .../{ => line}/vistooltriangle.cpp | 6 +- .../{ => line}/vistooltriangle.h | 0 .../{ => line}/vistooltruedarts.cpp | 2 +- .../{ => line}/vistooltruedarts.h | 0 .../visualization/{ => path}/vispath.cpp | 0 .../vtools/visualization/{ => path}/vispath.h | 2 +- .../visualization/{ => path}/vistoolarc.cpp | 6 +- .../visualization/{ => path}/vistoolarc.h | 0 .../{ => path}/vistoolarcwithlength.cpp | 6 +- .../{ => path}/vistoolarcwithlength.h | 0 .../{ => path}/vistoolcubicbezier.cpp | 0 .../{ => path}/vistoolcubicbezier.h | 0 .../{ => path}/vistoolcubicbezierpath.cpp | 0 .../{ => path}/vistoolcubicbezierpath.h | 0 .../{ => path}/vistoolcutarc.cpp | 4 +- .../visualization/{ => path}/vistoolcutarc.h | 0 .../{ => path}/vistoolcutspline.cpp | 4 +- .../{ => path}/vistoolcutspline.h | 0 .../{ => path}/vistoolcutsplinepath.cpp | 2 +- .../{ => path}/vistoolcutsplinepath.h | 0 .../vistoolpointofintersectioncurves.cpp | 2 +- .../vistoolpointofintersectioncurves.h | 0 .../{ => path}/vistoolspline.cpp | 6 +- .../visualization/{ => path}/vistoolspline.h | 0 .../{ => path}/vistoolsplinepath.cpp | 0 .../{ => path}/vistoolsplinepath.h | 2 +- .../vtools/visualization/visualization.pri | 120 +++++++++--------- 117 files changed, 162 insertions(+), 162 deletions(-) rename src/libs/vtools/visualization/{ => line}/visline.cpp (99%) rename src/libs/vtools/visualization/{ => line}/visline.h (98%) rename src/libs/vtools/visualization/{ => line}/vistoolalongline.cpp (97%) rename src/libs/vtools/visualization/{ => line}/vistoolalongline.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolbisector.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolbisector.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolcurveintersectaxis.cpp (97%) rename src/libs/vtools/visualization/{ => line}/vistoolcurveintersectaxis.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolendline.cpp (97%) rename src/libs/vtools/visualization/{ => line}/vistoolendline.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolheight.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolheight.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolline.cpp (96%) rename src/libs/vtools/visualization/{ => line}/vistoolline.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoollineintersect.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoollineintersect.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoollineintersectaxis.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoollineintersectaxis.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolnormal.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolnormal.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolpointfromarcandtangent.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolpointfromarcandtangent.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolpointfromcircleandtangent.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolpointfromcircleandtangent.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofcontact.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofcontact.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofintersection.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofintersection.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofintersectionarcs.cpp (97%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofintersectionarcs.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofintersectioncircles.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolpointofintersectioncircles.h (100%) rename src/libs/vtools/visualization/{ => line}/vistoolshoulderpoint.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistoolshoulderpoint.h (100%) rename src/libs/vtools/visualization/{ => line}/vistooltriangle.cpp (97%) rename src/libs/vtools/visualization/{ => line}/vistooltriangle.h (100%) rename src/libs/vtools/visualization/{ => line}/vistooltruedarts.cpp (98%) rename src/libs/vtools/visualization/{ => line}/vistooltruedarts.h (100%) rename src/libs/vtools/visualization/{ => path}/vispath.cpp (100%) rename src/libs/vtools/visualization/{ => path}/vispath.h (98%) rename src/libs/vtools/visualization/{ => path}/vistoolarc.cpp (96%) rename src/libs/vtools/visualization/{ => path}/vistoolarc.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolarcwithlength.cpp (96%) rename src/libs/vtools/visualization/{ => path}/vistoolarcwithlength.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcubicbezier.cpp (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcubicbezier.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcubicbezierpath.cpp (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcubicbezierpath.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcutarc.cpp (97%) rename src/libs/vtools/visualization/{ => path}/vistoolcutarc.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcutspline.cpp (97%) rename src/libs/vtools/visualization/{ => path}/vistoolcutspline.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolcutsplinepath.cpp (97%) rename src/libs/vtools/visualization/{ => path}/vistoolcutsplinepath.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolpointofintersectioncurves.cpp (97%) rename src/libs/vtools/visualization/{ => path}/vistoolpointofintersectioncurves.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolspline.cpp (98%) rename src/libs/vtools/visualization/{ => path}/vistoolspline.h (100%) rename src/libs/vtools/visualization/{ => path}/vistoolsplinepath.cpp (100%) rename src/libs/vtools/visualization/{ => path}/vistoolsplinepath.h (98%) diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index c93ded462..df24ce40b 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -28,7 +28,7 @@ #include "dialogalongline.h" #include "ui_dialogalongline.h" -#include "../../visualization/vistoolalongline.h" +#include "../../visualization/line/vistoolalongline.h" #include "../../tools/vabstracttool.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../../vpatterndb/vtranslatevars.h" diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp index 81d0eeaac..a70112f81 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp @@ -36,7 +36,7 @@ #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" #include "../../../ifc/xml/vdomdocument.h" -#include "../../visualization/vistoolarc.h" +#include "../../visualization/path/vistoolarc.h" #include "../support/dialogeditwrongformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp index 80f68fcc6..198b168c0 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp @@ -36,7 +36,7 @@ #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" #include "../../../ifc/xml/vdomdocument.h" -#include "../../visualization/vistoolarcwithlength.h" +#include "../../visualization/path/vistoolarcwithlength.h" #include "../support/dialogeditwrongformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index f3da1f948..1ef8cba74 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -32,7 +32,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolbisector.h" +#include "../../visualization/line/vistoolbisector.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index 1f33beb96..ae71ca539 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -28,7 +28,7 @@ #include "dialogcubicbezier.h" #include "ui_dialogcubicbezier.h" -#include "../../visualization/vistoolcubicbezier.h" +#include "../../visualization/path/vistoolcubicbezier.h" //--------------------------------------------------------------------------------------------------------------------- DialogCubicBezier::DialogCubicBezier(const VContainer *data, const quint32 &toolId, QWidget *parent) diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index bfa063f76..24ffff2b6 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -28,7 +28,7 @@ #include "dialogcubicbezierpath.h" #include "ui_dialogcubicbezierpath.h" -#include "../../visualization/vistoolcubicbezierpath.h" +#include "../../visualization/path/vistoolcubicbezierpath.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) # include "../vmisc/vmath.h" diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index ed364444b..202076550 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolcurveintersectaxis.h" +#include "../../visualization/line/vistoolcurveintersectaxis.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index cbb1db51c..ee2af8f9e 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/varc.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolcutarc.h" +#include "../../visualization/path/vistoolcutarc.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index f73db268a..38bbb53e5 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vspline.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolcutspline.h" +#include "../../visualization/path/vistoolcutspline.h" #include "../support/dialogeditwrongformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index 4529b5b6b..2237dc6a7 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vsplinepath.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolcutsplinepath.h" +#include "../../visualization/path/vistoolcutsplinepath.h" #include "../support/dialogeditwrongformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index e8bbd3346..b8012f2d2 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolendline.h" +#include "../../visualization/line/vistoolendline.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index f90b44d92..da43253d1 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -32,7 +32,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../../tools/vabstracttool.h" -#include "../../visualization/vistoolheight.h" +#include "../../visualization/line/vistoolheight.h" #include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 1c0da0f3e..10a908252 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -31,7 +31,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" -#include "../../visualization/vistoolline.h" +#include "../../visualization/line/vistoolline.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 6896c5acf..e4b284e51 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -31,7 +31,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "../../visualization/vistoollineintersect.h" +#include "../../visualization/line/vistoollineintersect.h" #include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index 1009c4799..a11d378fb 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoollineintersectaxis.h" +#include "../../visualization/line/vistoollineintersectaxis.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 97afbc813..be1b08099 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -28,7 +28,7 @@ #include "dialognormal.h" #include "ui_dialognormal.h" -#include "../../visualization/vistoolnormal.h" +#include "../../visualization/line/vistoolnormal.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 6df287a61..70899b26b 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -31,7 +31,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "../../visualization/vistoolpointfromarcandtangent.h" +#include "../../visualization/line/vistoolpointfromarcandtangent.h" #include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index 9f4be7dfe..f7334a079 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolpointfromcircleandtangent.h" +#include "../../visualization/line/vistoolpointfromcircleandtangent.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index cbcb03a63..29da1303f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -31,7 +31,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolpointofcontact.h" +#include "../../visualization/line/vistoolpointofcontact.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 2e954801c..dc62a0b03 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -31,7 +31,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" -#include "../../visualization/vistoolpointofintersection.h" +#include "../../visualization/line/vistoolpointofintersection.h" #include "../../../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 193e55781..08e2d66a9 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -31,7 +31,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "../../visualization/vistoolpointofintersectionarcs.h" +#include "../../visualization/line/vistoolpointofintersectionarcs.h" #include "../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index e6ded34c8..e2822784f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolpointofintersectioncircles.h" +#include "../../visualization/line/vistoolpointofintersectioncircles.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp index 63fca7842..c6c09102c 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp @@ -28,7 +28,7 @@ #include "dialogpointofintersectioncurves.h" #include "ui_dialogpointofintersectioncurves.h" -#include "../../visualization/vistoolpointofintersectioncurves.h" +#include "../../visualization/path/vistoolpointofintersectioncurves.h" //--------------------------------------------------------------------------------------------------------------------- DialogPointOfIntersectionCurves::DialogPointOfIntersectionCurves(const VContainer *data, const quint32 &toolId, diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index 39ae1b628..3ff86611b 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -32,7 +32,7 @@ #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" #include "../../../vpatterndb/vtranslatevars.h" -#include "../../visualization/vistoolshoulderpoint.h" +#include "../../visualization/line/vistoolshoulderpoint.h" #include "../../../vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 8ea1f05e6..fdc42c3e1 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -32,7 +32,7 @@ #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vpatterndb/vcontainer.h" -#include "../../visualization/vistoolspline.h" +#include "../../visualization/path/vistoolspline.h" #include "../support/dialogeditwrongformula.h" #include diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index d9dd6e457..abf519d32 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -30,7 +30,7 @@ #include "ui_dialogsplinepath.h" #include "../vgeometry/vsplinepoint.h" #include "../vpatterndb/vcontainer.h" -#include "../../visualization/vistoolsplinepath.h" +#include "../../visualization/path/vistoolsplinepath.h" #include "../support/dialogeditwrongformula.h" #include "../qmuparser/qmuparsererror.h" diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 99bb0941a..4076937cf 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -30,7 +30,7 @@ #include "ui_dialogtriangle.h" #include "../../../vgeometry/vpointf.h" #include "../../../vpatterndb/vcontainer.h" -#include "../../visualization/vistooltriangle.h" +#include "../../visualization/line/vistooltriangle.h" #include "../../../vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index 259043ff5..ba909e210 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -30,7 +30,7 @@ #include "ui_dialogtruedarts.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "../../visualization/vistooltruedarts.h" +#include "../../visualization/line/vistooltruedarts.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../qmuparser/qmudef.h" diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index 69ab52c63..c0f8ec410 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -32,7 +32,7 @@ #include "../../../dialogs/tools/dialogarc.h" #include "../vgeometry/varc.h" #include "../vpatterndb/vformula.h" -#include "../../../visualization/vistoolarc.h" +#include "../../../visualization/path/vistoolarc.h" #include diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 804413fa7..4da3643c7 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -32,7 +32,7 @@ #include "../../../dialogs/tools/dialogarcwithlength.h" #include "../vgeometry/varc.h" #include "../vpatterndb/vformula.h" -#include "../../../visualization/vistoolarcwithlength.h" +#include "../../../visualization/path/vistoolarcwithlength.h" #include diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp index b60338dfa..322523468 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp @@ -30,7 +30,7 @@ #include "../vgeometry/vcubicbezier.h" #include "../../../dialogs/tools/dialogcubicbezier.h" #include "../../../undocommands/movespline.h" -#include "../../../visualization/vistoolcubicbezier.h" +#include "../../../visualization/path/vistoolcubicbezier.h" const QString VToolCubicBezier::ToolType = QStringLiteral("cubicBezier"); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp index fd07b2304..3ef93ebae 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp @@ -28,7 +28,7 @@ #include "vtoolcubicbezierpath.h" #include "../../../dialogs/tools/dialogcubicbezierpath.h" -#include "../../../visualization/vistoolcubicbezierpath.h" +#include "../../../visualization/path/vistoolcubicbezierpath.h" const QString VToolCubicBezierPath::ToolType = QStringLiteral("cubicBezierPath"); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index d6c0b7c8d..8cced0338 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -30,7 +30,7 @@ #include "../vgeometry/vspline.h" #include "../../../dialogs/tools/dialogspline.h" #include "../../../undocommands/movespline.h" -#include "../../../visualization/vistoolspline.h" +#include "../../../visualization/path/vistoolspline.h" #include "../vwidgets/vcontrolpointspline.h" #include "../qmuparser/qmutokenparser.h" diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index b88c12e7a..caefaa68f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -29,7 +29,7 @@ #include "vtoolsplinepath.h" #include "../../../dialogs/tools/dialogsplinepath.h" #include "../../../undocommands/movesplinepath.h" -#include "../../../visualization/vistoolsplinepath.h" +#include "../../../visualization/path/vistoolsplinepath.h" #include "../vwidgets/vcontrolpointspline.h" #include "../qmuparser/qmutokenparser.h" diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index 69f8037ed..9f17876fa 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -29,7 +29,7 @@ #include "vtooltruedarts.h" #include "../../../../dialogs/tools/dialogtruedarts.h" #include "../vgeometry/vpointf.h" -#include "../../../../visualization/vistooltruedarts.h" +#include "../../../../visualization/line/vistooltruedarts.h" const QString VToolTrueDarts::ToolType = QStringLiteral("trueDarts"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index b6c0e75b3..57bb058ee 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -32,7 +32,7 @@ #include "../../../../../dialogs/tools/dialogcutarc.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/varc.h" -#include "../../../../../visualization/vistoolcutarc.h" +#include "../../../../../visualization/path/vistoolcutarc.h" const QString VToolCutArc::ToolType = QStringLiteral("cutArc"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index d7d7c0de2..f28f9eb47 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -31,7 +31,7 @@ #include "../vpatterndb/vtranslatevars.h" #include "../../../../../dialogs/tools/dialogcutspline.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolcutspline.h" +#include "../../../../../visualization/path/vistoolcutspline.h" #include "../vgeometry/vspline.h" const QString VToolCutSpline::ToolType = QStringLiteral("cutSpline"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index d432dafe4..bc9b1ac86 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -31,7 +31,7 @@ #include "../vpatterndb/vtranslatevars.h" #include "../../../../../dialogs/tools/dialogcutsplinepath.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolcutsplinepath.h" +#include "../../../../../visualization/path/vistoolcutsplinepath.h" #include "../vgeometry/vsplinepath.h" const QString VToolCutSplinePath::ToolType = QStringLiteral("cutSplinePath"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index 0644513a0..a98c91ce3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -32,7 +32,7 @@ #include "../../../../../dialogs/tools/dialogalongline.h" #include "../vgeometry/vpointf.h" #include "../ifc/exception/vexceptionobjecterror.h" -#include "../../../../../visualization/vistoolalongline.h" +#include "../../../../../visualization/line/vistoolalongline.h" const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 8c8c9cdda..28dc1dfc8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -31,7 +31,7 @@ #include "../vpatterndb/vtranslatevars.h" #include "../../../../../dialogs/tools/dialogbisector.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolbisector.h" +#include "../../../../../visualization/line/vistoolbisector.h" const QString VToolBisector::ToolType = QStringLiteral("bisector"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index f23e29834..ce812b298 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -33,7 +33,7 @@ #include "../../../../../dialogs/tools/dialogcurveintersectaxis.h" #include "../../../../../dialogs/support/dialogeditwrongformula.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolcurveintersectaxis.h" +#include "../../../../../visualization/line/vistoolcurveintersectaxis.h" const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 8feb3ee53..478ae02ea 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -33,7 +33,7 @@ #include "../../../../../dialogs/tools/dialogendline.h" #include "../../../../../dialogs/support/dialogeditwrongformula.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolendline.h" +#include "../../../../../visualization/line/vistoolendline.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 1967646bb..19646a1b2 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -29,7 +29,7 @@ #include "vtoolheight.h" #include "../../../../../dialogs/tools/dialogheight.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolheight.h" +#include "../../../../../visualization/line/vistoolheight.h" const QString VToolHeight::ToolType = QStringLiteral("height"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 88edf5c94..8a93e6404 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -33,7 +33,7 @@ #include "../../../../../dialogs/tools/dialoglineintersectaxis.h" #include "../../../../../dialogs/support/dialogeditwrongformula.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoollineintersectaxis.h" +#include "../../../../../visualization/line/vistoollineintersectaxis.h" const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index da105dc30..9f1ee7e2f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -31,7 +31,7 @@ #include "../vpatterndb/vtranslatevars.h" #include "../../../../../dialogs/tools/dialognormal.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolnormal.h" +#include "../../../../../visualization/line/vistoolnormal.h" const QString VToolNormal::ToolType = QStringLiteral("normal"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 576ee48b2..ea5696638 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -31,7 +31,7 @@ #include "../vpatterndb/vtranslatevars.h" #include "../../../../../dialogs/tools/dialogshoulderpoint.h" #include "../vgeometry/vpointf.h" -#include "../../../../../visualization/vistoolshoulderpoint.h" +#include "../../../../../visualization/line/vistoolshoulderpoint.h" const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 28ba6dd4e..cee5b97af 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -29,7 +29,7 @@ #include "vtoollineintersect.h" #include "../../../../dialogs/tools/dialoglineintersect.h" #include "../vgeometry/vpointf.h" -#include "../../../../visualization/vistoollineintersect.h" +#include "../../../../visualization/line/vistoollineintersect.h" const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 622320e59..6ed292e99 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -30,7 +30,7 @@ #include "../../../../dialogs/tools/dialogpointfromarcandtangent.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/varc.h" -#include "../../../../visualization/vistoolpointfromarcandtangent.h" +#include "../../../../visualization/line/vistoolpointfromarcandtangent.h" const QString VToolPointFromArcAndTangent::ToolType = QStringLiteral("pointFromArcAndTangent"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index bf3be5e5c..0cca3b160 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -30,7 +30,7 @@ #include "../../../../dialogs/tools/dialogpointfromcircleandtangent.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/varc.h" -#include "../../../../visualization/vistoolpointfromcircleandtangent.h" +#include "../../../../visualization/line/vistoolpointfromcircleandtangent.h" #include "../vpatterndb/vformula.h" const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index 731cdae21..bb2607ff0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -32,7 +32,7 @@ #include "../../../../dialogs/tools/dialogpointofcontact.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vformula.h" -#include "../../../../visualization/vistoolpointofcontact.h" +#include "../../../../visualization/line/vistoolpointofcontact.h" #include const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index b8d2cd187..bd97a73f0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -29,7 +29,7 @@ #include "vtoolpointofintersection.h" #include "../../../../dialogs/tools/dialogpointofintersection.h" #include "../vgeometry/vpointf.h" -#include "../../../../visualization/vistoolpointofintersection.h" +#include "../../../../visualization/line/vistoolpointofintersection.h" const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index b04c5b07f..3520a0ab2 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -30,7 +30,7 @@ #include "../../../../dialogs/tools/dialogpointofintersectionarcs.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/varc.h" -#include "../../../../visualization/vistoolpointofintersectionarcs.h" +#include "../../../../visualization/line/vistoolpointofintersectionarcs.h" const QString VToolPointOfIntersectionArcs::ToolType = QStringLiteral("pointOfIntersectionArcs"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index 5a1bae163..d0b1518e6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -30,7 +30,7 @@ #include "../../../../dialogs/tools/dialogpointofintersectioncircles.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/varc.h" -#include "../../../../visualization/vistoolpointofintersectioncircles.h" +#include "../../../../visualization/line/vistoolpointofintersectioncircles.h" #include "../vpatterndb/vformula.h" const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp index 080c553ce..3f92442f4 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp @@ -28,7 +28,7 @@ #include "vtoolpointofintersectioncurves.h" #include "../../../../dialogs/tools/dialogpointofintersectioncurves.h" -#include "../../../../visualization/vistoolpointofintersectioncurves.h" +#include "../../../../visualization/path/vistoolpointofintersectioncurves.h" const QString VToolPointOfIntersectionCurves::ToolType = QStringLiteral("pointOfIntersectionCurves"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index b4b0411df..d118082f9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -29,7 +29,7 @@ #include "vtooltriangle.h" #include "../../../../dialogs/tools/dialogtriangle.h" #include "../vgeometry/vpointf.h" -#include "../../../../visualization/vistooltriangle.h" +#include "../../../../visualization/line/vistooltriangle.h" #include const QString VToolTriangle::ToolType = QStringLiteral("triangle"); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 83266b6af..dfbb8da34 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -31,7 +31,7 @@ #include #include "../vgeometry/vpointf.h" #include "../../dialogs/tools/dialogline.h" -#include "../../visualization/vistoolline.h" +#include "../../visualization/line/vistoolline.h" const QString VToolLine::TagName = QStringLiteral("line"); diff --git a/src/libs/vtools/visualization/visline.cpp b/src/libs/vtools/visualization/line/visline.cpp similarity index 99% rename from src/libs/vtools/visualization/visline.cpp rename to src/libs/vtools/visualization/line/visline.cpp index a98f60b6c..f8ccb91ce 100644 --- a/src/libs/vtools/visualization/visline.cpp +++ b/src/libs/vtools/visualization/line/visline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "visline.h" -#include "../tools/drawTools/vdrawtool.h" +#include "../../tools/drawTools/vdrawtool.h" #include //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/visline.h b/src/libs/vtools/visualization/line/visline.h similarity index 98% rename from src/libs/vtools/visualization/visline.h rename to src/libs/vtools/visualization/line/visline.h index fcfed96c0..75c4783d6 100644 --- a/src/libs/vtools/visualization/visline.h +++ b/src/libs/vtools/visualization/line/visline.h @@ -29,7 +29,7 @@ #ifndef VISLINE_H #define VISLINE_H -#include "visualization.h" +#include "../visualization.h" #include #include diff --git a/src/libs/vtools/visualization/vistoolalongline.cpp b/src/libs/vtools/visualization/line/vistoolalongline.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolalongline.cpp rename to src/libs/vtools/visualization/line/vistoolalongline.cpp index b5361ca73..b08f6d393 100644 --- a/src/libs/vtools/visualization/vistoolalongline.cpp +++ b/src/libs/vtools/visualization/line/vistoolalongline.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoolalongline.h" -#include "../../vpatterndb/vcontainer.h" -#include "../../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- VisToolAlongLine::VisToolAlongLine(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolalongline.h b/src/libs/vtools/visualization/line/vistoolalongline.h similarity index 100% rename from src/libs/vtools/visualization/vistoolalongline.h rename to src/libs/vtools/visualization/line/vistoolalongline.h diff --git a/src/libs/vtools/visualization/vistoolbisector.cpp b/src/libs/vtools/visualization/line/vistoolbisector.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolbisector.cpp rename to src/libs/vtools/visualization/line/vistoolbisector.cpp index f7672b926..d78f931c3 100644 --- a/src/libs/vtools/visualization/vistoolbisector.cpp +++ b/src/libs/vtools/visualization/line/vistoolbisector.cpp @@ -29,7 +29,7 @@ #include "vistoolbisector.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h" //--------------------------------------------------------------------------------------------------------------------- VisToolBisector::VisToolBisector(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolbisector.h b/src/libs/vtools/visualization/line/vistoolbisector.h similarity index 100% rename from src/libs/vtools/visualization/vistoolbisector.h rename to src/libs/vtools/visualization/line/vistoolbisector.h diff --git a/src/libs/vtools/visualization/vistoolcurveintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolcurveintersectaxis.cpp rename to src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp index fca148d86..2de41114c 100644 --- a/src/libs/vtools/visualization/vistoolcurveintersectaxis.cpp +++ b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.cpp @@ -29,7 +29,7 @@ #include "vistoolcurveintersectaxis.h" #include "../vpatterndb/vcontainer.h" #include "../vgeometry/vpointf.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCurveIntersectAxis::VisToolCurveIntersectAxis(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolcurveintersectaxis.h b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h similarity index 100% rename from src/libs/vtools/visualization/vistoolcurveintersectaxis.h rename to src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h diff --git a/src/libs/vtools/visualization/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolendline.cpp rename to src/libs/vtools/visualization/line/vistoolendline.cpp index 5e5c7c01c..b61cc006a 100644 --- a/src/libs/vtools/visualization/vistoolendline.cpp +++ b/src/libs/vtools/visualization/line/vistoolendline.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "vistoolendline.h" -#include "../../vgeometry/vpointf.h" -#include "../../vpatterndb/vcontainer.h" -#include "../tools/vabstracttool.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" +#include "../../tools/vabstracttool.h" #include diff --git a/src/libs/vtools/visualization/vistoolendline.h b/src/libs/vtools/visualization/line/vistoolendline.h similarity index 100% rename from src/libs/vtools/visualization/vistoolendline.h rename to src/libs/vtools/visualization/line/vistoolendline.h diff --git a/src/libs/vtools/visualization/vistoolheight.cpp b/src/libs/vtools/visualization/line/vistoolheight.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolheight.cpp rename to src/libs/vtools/visualization/line/vistoolheight.cpp index aeb9da892..641dbb218 100644 --- a/src/libs/vtools/visualization/vistoolheight.cpp +++ b/src/libs/vtools/visualization/line/vistoolheight.cpp @@ -28,7 +28,7 @@ #include "vistoolheight.h" #include "../vgeometry/vpointf.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h" //--------------------------------------------------------------------------------------------------------------------- VisToolHeight::VisToolHeight(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolheight.h b/src/libs/vtools/visualization/line/vistoolheight.h similarity index 100% rename from src/libs/vtools/visualization/vistoolheight.h rename to src/libs/vtools/visualization/line/vistoolheight.h diff --git a/src/libs/vtools/visualization/vistoolline.cpp b/src/libs/vtools/visualization/line/vistoolline.cpp similarity index 96% rename from src/libs/vtools/visualization/vistoolline.cpp rename to src/libs/vtools/visualization/line/vistoolline.cpp index 9a5264087..7de8599a7 100644 --- a/src/libs/vtools/visualization/vistoolline.cpp +++ b/src/libs/vtools/visualization/line/vistoolline.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "vistoolline.h" -#include "../../vpatterndb/vcontainer.h" -#include "../../vgeometry/vpointf.h" -#include "../tools/drawTools/vdrawtool.h" +#include "../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../../tools/drawTools/vdrawtool.h" //--------------------------------------------------------------------------------------------------------------------- VisToolLine::VisToolLine(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolline.h b/src/libs/vtools/visualization/line/vistoolline.h similarity index 100% rename from src/libs/vtools/visualization/vistoolline.h rename to src/libs/vtools/visualization/line/vistoolline.h diff --git a/src/libs/vtools/visualization/vistoollineintersect.cpp b/src/libs/vtools/visualization/line/vistoollineintersect.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoollineintersect.cpp rename to src/libs/vtools/visualization/line/vistoollineintersect.cpp index 251455191..9a648de77 100644 --- a/src/libs/vtools/visualization/vistoollineintersect.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersect.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoollineintersect.h" -#include "../../vgeometry/vpointf.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolLineIntersect::VisToolLineIntersect(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoollineintersect.h b/src/libs/vtools/visualization/line/vistoollineintersect.h similarity index 100% rename from src/libs/vtools/visualization/vistoollineintersect.h rename to src/libs/vtools/visualization/line/vistoollineintersect.h diff --git a/src/libs/vtools/visualization/vistoollineintersectaxis.cpp b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoollineintersectaxis.cpp rename to src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp index 4d7946732..94096a188 100644 --- a/src/libs/vtools/visualization/vistoollineintersectaxis.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.cpp @@ -29,7 +29,7 @@ #include "vistoollineintersectaxis.h" #include "../vpatterndb/vcontainer.h" #include "../vgeometry/vpointf.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h" //--------------------------------------------------------------------------------------------------------------------- VisToolLineIntersectAxis::VisToolLineIntersectAxis(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoollineintersectaxis.h b/src/libs/vtools/visualization/line/vistoollineintersectaxis.h similarity index 100% rename from src/libs/vtools/visualization/vistoollineintersectaxis.h rename to src/libs/vtools/visualization/line/vistoollineintersectaxis.h diff --git a/src/libs/vtools/visualization/vistoolnormal.cpp b/src/libs/vtools/visualization/line/vistoolnormal.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolnormal.cpp rename to src/libs/vtools/visualization/line/vistoolnormal.cpp index 6145e9ce7..1b30f924e 100644 --- a/src/libs/vtools/visualization/vistoolnormal.cpp +++ b/src/libs/vtools/visualization/line/vistoolnormal.cpp @@ -28,7 +28,7 @@ #include "vistoolnormal.h" #include "../vgeometry/vpointf.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h" //--------------------------------------------------------------------------------------------------------------------- VisToolNormal::VisToolNormal(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolnormal.h b/src/libs/vtools/visualization/line/vistoolnormal.h similarity index 100% rename from src/libs/vtools/visualization/vistoolnormal.h rename to src/libs/vtools/visualization/line/vistoolnormal.h diff --git a/src/libs/vtools/visualization/vistoolpointfromarcandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolpointfromarcandtangent.cpp rename to src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp index 162b672e5..c71f832b3 100644 --- a/src/libs/vtools/visualization/vistoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.cpp @@ -28,7 +28,7 @@ #include "vistoolpointfromarcandtangent.h" #include "../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h" #include "../vgeometry/vpointf.h" #include "../vgeometry/varc.h" diff --git a/src/libs/vtools/visualization/vistoolpointfromarcandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointfromarcandtangent.h rename to src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h diff --git a/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolpointfromcircleandtangent.cpp rename to src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp index 171223b1a..cca09507b 100644 --- a/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp @@ -28,7 +28,7 @@ #include "vistoolpointfromcircleandtangent.h" #include "../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h" #include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointfromcircleandtangent.h rename to src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h diff --git a/src/libs/vtools/visualization/vistoolpointofcontact.cpp b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolpointofcontact.cpp rename to src/libs/vtools/visualization/line/vistoolpointofcontact.cpp index a7a2e670b..926b4921c 100644 --- a/src/libs/vtools/visualization/vistoolpointofcontact.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp @@ -28,7 +28,7 @@ #include "vistoolpointofcontact.h" #include "../vgeometry/vpointf.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolpointofcontact.h b/src/libs/vtools/visualization/line/vistoolpointofcontact.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointofcontact.h rename to src/libs/vtools/visualization/line/vistoolpointofcontact.h diff --git a/src/libs/vtools/visualization/vistoolpointofintersection.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolpointofintersection.cpp rename to src/libs/vtools/visualization/line/vistoolpointofintersection.cpp index 565919b9b..7f3afe0a3 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersection.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersection.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoolpointofintersection.h" -#include "../../vgeometry/vpointf.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfIntersection::VisToolPointOfIntersection(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolpointofintersection.h b/src/libs/vtools/visualization/line/vistoolpointofintersection.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointofintersection.h rename to src/libs/vtools/visualization/line/vistoolpointofintersection.h diff --git a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp rename to src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp index c50770838..faf126d5a 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp @@ -29,7 +29,7 @@ #include "vistoolpointofintersectionarcs.h" #include "../vgeometry/varc.h" #include "../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfIntersectionArcs::VisToolPointOfIntersectionArcs(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.h b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointofintersectionarcs.h rename to src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp rename to src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp index 74dbc45fb..b211311bf 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp @@ -28,7 +28,7 @@ #include "vistoolpointofintersectioncircles.h" #include "../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h" #include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.h b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointofintersectioncircles.h rename to src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h diff --git a/src/libs/vtools/visualization/vistoolshoulderpoint.cpp b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolshoulderpoint.cpp rename to src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp index 06c138c5f..e9f1de60e 100644 --- a/src/libs/vtools/visualization/vistoolshoulderpoint.cpp +++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolshoulderpoint.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h" #include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/vistoolshoulderpoint.h b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h similarity index 100% rename from src/libs/vtools/visualization/vistoolshoulderpoint.h rename to src/libs/vtools/visualization/line/vistoolshoulderpoint.h diff --git a/src/libs/vtools/visualization/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp similarity index 97% rename from src/libs/vtools/visualization/vistooltriangle.cpp rename to src/libs/vtools/visualization/line/vistooltriangle.cpp index 7f84f8e41..de7e96352 100644 --- a/src/libs/vtools/visualization/vistooltriangle.cpp +++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "vistooltriangle.h" -#include "../../vgeometry/vpointf.h" -#include "../../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h" +#include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h" #include //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/vistooltriangle.h b/src/libs/vtools/visualization/line/vistooltriangle.h similarity index 100% rename from src/libs/vtools/visualization/vistooltriangle.h rename to src/libs/vtools/visualization/line/vistooltriangle.h diff --git a/src/libs/vtools/visualization/vistooltruedarts.cpp b/src/libs/vtools/visualization/line/vistooltruedarts.cpp similarity index 98% rename from src/libs/vtools/visualization/vistooltruedarts.cpp rename to src/libs/vtools/visualization/line/vistooltruedarts.cpp index f0072ad3c..4b4a53163 100644 --- a/src/libs/vtools/visualization/vistooltruedarts.cpp +++ b/src/libs/vtools/visualization/line/vistooltruedarts.cpp @@ -29,7 +29,7 @@ #include "vistooltruedarts.h" #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" -#include "../tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h" +#include "../../tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h" //--------------------------------------------------------------------------------------------------------------------- VisToolTrueDarts::VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistooltruedarts.h b/src/libs/vtools/visualization/line/vistooltruedarts.h similarity index 100% rename from src/libs/vtools/visualization/vistooltruedarts.h rename to src/libs/vtools/visualization/line/vistooltruedarts.h diff --git a/src/libs/vtools/visualization/vispath.cpp b/src/libs/vtools/visualization/path/vispath.cpp similarity index 100% rename from src/libs/vtools/visualization/vispath.cpp rename to src/libs/vtools/visualization/path/vispath.cpp diff --git a/src/libs/vtools/visualization/vispath.h b/src/libs/vtools/visualization/path/vispath.h similarity index 98% rename from src/libs/vtools/visualization/vispath.h rename to src/libs/vtools/visualization/path/vispath.h index 106155629..d72ff6b1f 100644 --- a/src/libs/vtools/visualization/vispath.h +++ b/src/libs/vtools/visualization/path/vispath.h @@ -29,7 +29,7 @@ #ifndef VISPATH_H #define VISPATH_H -#include "visualization.h" +#include "../visualization.h" #include class VisPath : public Visualization, public QGraphicsPathItem diff --git a/src/libs/vtools/visualization/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp similarity index 96% rename from src/libs/vtools/visualization/vistoolarc.cpp rename to src/libs/vtools/visualization/path/vistoolarc.cpp index 2e3899919..9dac04450 100644 --- a/src/libs/vtools/visualization/vistoolarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolarc.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "vistoolarc.h" -#include "../../vgeometry/vpointf.h" -#include "../../vgeometry/varc.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vgeometry/varc.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolArc::VisToolArc(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolarc.h b/src/libs/vtools/visualization/path/vistoolarc.h similarity index 100% rename from src/libs/vtools/visualization/vistoolarc.h rename to src/libs/vtools/visualization/path/vistoolarc.h diff --git a/src/libs/vtools/visualization/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp similarity index 96% rename from src/libs/vtools/visualization/vistoolarcwithlength.cpp rename to src/libs/vtools/visualization/path/vistoolarcwithlength.cpp index 78b593b46..4edb00767 100644 --- a/src/libs/vtools/visualization/vistoolarcwithlength.cpp +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "vistoolarcwithlength.h" -#include "../../vgeometry/vpointf.h" -#include "../../vgeometry/varc.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vgeometry/varc.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolArcWithLength::VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolarcwithlength.h b/src/libs/vtools/visualization/path/vistoolarcwithlength.h similarity index 100% rename from src/libs/vtools/visualization/vistoolarcwithlength.h rename to src/libs/vtools/visualization/path/vistoolarcwithlength.h diff --git a/src/libs/vtools/visualization/vistoolcubicbezier.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp similarity index 100% rename from src/libs/vtools/visualization/vistoolcubicbezier.cpp rename to src/libs/vtools/visualization/path/vistoolcubicbezier.cpp diff --git a/src/libs/vtools/visualization/vistoolcubicbezier.h b/src/libs/vtools/visualization/path/vistoolcubicbezier.h similarity index 100% rename from src/libs/vtools/visualization/vistoolcubicbezier.h rename to src/libs/vtools/visualization/path/vistoolcubicbezier.h diff --git a/src/libs/vtools/visualization/vistoolcubicbezierpath.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp similarity index 100% rename from src/libs/vtools/visualization/vistoolcubicbezierpath.cpp rename to src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp diff --git a/src/libs/vtools/visualization/vistoolcubicbezierpath.h b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h similarity index 100% rename from src/libs/vtools/visualization/vistoolcubicbezierpath.h rename to src/libs/vtools/visualization/path/vistoolcubicbezierpath.h diff --git a/src/libs/vtools/visualization/vistoolcutarc.cpp b/src/libs/vtools/visualization/path/vistoolcutarc.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolcutarc.cpp rename to src/libs/vtools/visualization/path/vistoolcutarc.cpp index dac213cfe..05aff6f1f 100644 --- a/src/libs/vtools/visualization/vistoolcutarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutarc.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoolcutarc.h" -#include "../../vgeometry/varc.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/varc.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutArc::VisToolCutArc(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolcutarc.h b/src/libs/vtools/visualization/path/vistoolcutarc.h similarity index 100% rename from src/libs/vtools/visualization/vistoolcutarc.h rename to src/libs/vtools/visualization/path/vistoolcutarc.h diff --git a/src/libs/vtools/visualization/vistoolcutspline.cpp b/src/libs/vtools/visualization/path/vistoolcutspline.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolcutspline.cpp rename to src/libs/vtools/visualization/path/vistoolcutspline.cpp index 48da1306b..ecff53cf7 100644 --- a/src/libs/vtools/visualization/vistoolcutspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutspline.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoolcutspline.h" -#include "../../vgeometry/vspline.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/vspline.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutSpline::VisToolCutSpline(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolcutspline.h b/src/libs/vtools/visualization/path/vistoolcutspline.h similarity index 100% rename from src/libs/vtools/visualization/vistoolcutspline.h rename to src/libs/vtools/visualization/path/vistoolcutspline.h diff --git a/src/libs/vtools/visualization/vistoolcutsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolcutsplinepath.cpp rename to src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp index f0e39f76a..14bc0a3ca 100644 --- a/src/libs/vtools/visualization/vistoolcutsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp @@ -29,7 +29,7 @@ #include "vistoolcutsplinepath.h" #include "../vpatterndb/vcontainer.h" #include "../vgeometry/vsplinepath.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutSplinePath::VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolcutsplinepath.h b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h similarity index 100% rename from src/libs/vtools/visualization/vistoolcutsplinepath.h rename to src/libs/vtools/visualization/path/vistoolcutsplinepath.h diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp similarity index 97% rename from src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp rename to src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp index cb62b75bd..eb0e56266 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolpointofintersectioncurves.h" -#include "../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h" +#include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPointOfIntersectionCurves::VisToolPointOfIntersectionCurves(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncurves.h b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h similarity index 100% rename from src/libs/vtools/visualization/vistoolpointofintersectioncurves.h rename to src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h diff --git a/src/libs/vtools/visualization/vistoolspline.cpp b/src/libs/vtools/visualization/path/vistoolspline.cpp similarity index 98% rename from src/libs/vtools/visualization/vistoolspline.cpp rename to src/libs/vtools/visualization/path/vistoolspline.cpp index 8629882aa..58abcd50b 100644 --- a/src/libs/vtools/visualization/vistoolspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolspline.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "vistoolspline.h" -#include "../../vgeometry/vpointf.h" -#include "../../vgeometry/vspline.h" -#include "../../vpatterndb/vcontainer.h" +#include "../vgeometry/vpointf.h" +#include "../vgeometry/vspline.h" +#include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" const int EMPTY_ANGLE = -1; diff --git a/src/libs/vtools/visualization/vistoolspline.h b/src/libs/vtools/visualization/path/vistoolspline.h similarity index 100% rename from src/libs/vtools/visualization/vistoolspline.h rename to src/libs/vtools/visualization/path/vistoolspline.h diff --git a/src/libs/vtools/visualization/vistoolsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp similarity index 100% rename from src/libs/vtools/visualization/vistoolsplinepath.cpp rename to src/libs/vtools/visualization/path/vistoolsplinepath.cpp diff --git a/src/libs/vtools/visualization/vistoolsplinepath.h b/src/libs/vtools/visualization/path/vistoolsplinepath.h similarity index 98% rename from src/libs/vtools/visualization/vistoolsplinepath.h rename to src/libs/vtools/visualization/path/vistoolsplinepath.h index 8707463ac..93a9fe26a 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/path/vistoolsplinepath.h @@ -30,7 +30,7 @@ #define VISTOOLSPLINEPATH_H #include "vispath.h" -#include "../../vgeometry/vsplinepath.h" +#include "../vgeometry/vsplinepath.h" class VControlPointSpline; diff --git a/src/libs/vtools/visualization/visualization.pri b/src/libs/vtools/visualization/visualization.pri index ffd124876..1f47f42be 100644 --- a/src/libs/vtools/visualization/visualization.pri +++ b/src/libs/vtools/visualization/visualization.pri @@ -2,67 +2,67 @@ # This need for corect working file translations.pro HEADERS += \ - $$PWD/visline.h \ - $$PWD/vistoolline.h \ - $$PWD/vistoolendline.h \ - $$PWD/vistoolalongline.h \ - $$PWD/vistoolbisector.h \ - $$PWD/vistoolshoulderpoint.h \ - $$PWD/vistoolnormal.h \ - $$PWD/vistoolheight.h \ - $$PWD/vistoolpointofintersection.h \ - $$PWD/vistooltriangle.h \ - $$PWD/vistoolpointofcontact.h \ - $$PWD/vistoollineintersect.h \ $$PWD/visualization.h \ - $$PWD/vistoolarc.h \ - $$PWD/vispath.h \ - $$PWD/vistoolcutarc.h \ - $$PWD/vistoolspline.h \ - $$PWD/vistoolcutspline.h \ - $$PWD/vistoolsplinepath.h \ - $$PWD/vistoolcutsplinepath.h \ - $$PWD/vistoollineintersectaxis.h \ - $$PWD/vistoolcurveintersectaxis.h \ - $$PWD/vistoolpointofintersectionarcs.h \ - $$PWD/vistoolpointofintersectioncircles.h \ - $$PWD/vistoolpointfromcircleandtangent.h \ - $$PWD/vistoolpointfromarcandtangent.h \ - $$PWD/vistoolarcwithlength.h \ - $$PWD/vistooltruedarts.h \ - $$PWD/vistoolpointofintersectioncurves.h \ - $$PWD/vistoolcubicbezier.h \ - $$PWD/vistoolcubicbezierpath.h + $$PWD/line/visline.h \ + $$PWD/line/vistoolline.h \ + $$PWD/line/vistoolendline.h \ + $$PWD/line/vistoolalongline.h \ + $$PWD/line/vistoolbisector.h \ + $$PWD/line/vistoolshoulderpoint.h \ + $$PWD/line/vistoolnormal.h \ + $$PWD/line/vistoolheight.h \ + $$PWD/line/vistoolpointofintersection.h \ + $$PWD/line/vistooltriangle.h \ + $$PWD/line/vistoolpointofcontact.h \ + $$PWD/line/vistoollineintersect.h \ + $$PWD/line/vistoollineintersectaxis.h \ + $$PWD/line/vistooltruedarts.h \ + $$PWD/line/vistoolcurveintersectaxis.h \ + $$PWD/line/vistoolpointofintersectionarcs.h \ + $$PWD/line/vistoolpointofintersectioncircles.h \ + $$PWD/line/vistoolpointfromcircleandtangent.h \ + $$PWD/line/vistoolpointfromarcandtangent.h \ + $$PWD/path/vispath.h \ + $$PWD/path/vistoolarc.h \ + $$PWD/path/vistoolcutarc.h \ + $$PWD/path/vistoolspline.h \ + $$PWD/path/vistoolcutspline.h \ + $$PWD/path/vistoolsplinepath.h \ + $$PWD/path/vistoolcutsplinepath.h \ + $$PWD/path/vistoolarcwithlength.h \ + $$PWD/path/vistoolpointofintersectioncurves.h \ + $$PWD/path/vistoolcubicbezier.h \ + $$PWD/path/vistoolcubicbezierpath.h SOURCES += \ - $$PWD/visline.cpp \ - $$PWD/vistoolline.cpp \ - $$PWD/vistoolendline.cpp \ - $$PWD/vistoolalongline.cpp \ - $$PWD/vistoolbisector.cpp \ - $$PWD/vistoolshoulderpoint.cpp \ - $$PWD/vistoolnormal.cpp \ - $$PWD/vistoolheight.cpp \ - $$PWD/vistoolpointofintersection.cpp \ - $$PWD/vistooltriangle.cpp \ - $$PWD/vistoolpointofcontact.cpp \ - $$PWD/vistoollineintersect.cpp \ $$PWD/visualization.cpp \ - $$PWD/vistoolarc.cpp \ - $$PWD/vispath.cpp \ - $$PWD/vistoolcutarc.cpp \ - $$PWD/vistoolspline.cpp \ - $$PWD/vistoolcutspline.cpp \ - $$PWD/vistoolsplinepath.cpp \ - $$PWD/vistoolcutsplinepath.cpp \ - $$PWD/vistoollineintersectaxis.cpp \ - $$PWD/vistoolcurveintersectaxis.cpp \ - $$PWD/vistoolpointofintersectionarcs.cpp \ - $$PWD/vistoolpointofintersectioncircles.cpp \ - $$PWD/vistoolpointfromcircleandtangent.cpp \ - $$PWD/vistoolpointfromarcandtangent.cpp \ - $$PWD/vistoolarcwithlength.cpp \ - $$PWD/vistooltruedarts.cpp \ - $$PWD/vistoolpointofintersectioncurves.cpp \ - $$PWD/vistoolcubicbezier.cpp \ - $$PWD/vistoolcubicbezierpath.cpp + $$PWD/line/visline.cpp \ + $$PWD/line/vistoolline.cpp \ + $$PWD/line/vistoolendline.cpp \ + $$PWD/line/vistoolalongline.cpp \ + $$PWD/line/vistoolbisector.cpp \ + $$PWD/line/vistoolshoulderpoint.cpp \ + $$PWD/line/vistoolnormal.cpp \ + $$PWD/line/vistoolheight.cpp \ + $$PWD/line/vistoolpointofintersection.cpp \ + $$PWD/line/vistooltriangle.cpp \ + $$PWD/line/vistoolpointofcontact.cpp \ + $$PWD/line/vistoollineintersect.cpp \ + $$PWD/line/vistoollineintersectaxis.cpp \ + $$PWD/line/vistooltruedarts.cpp \ + $$PWD/line/vistoolcurveintersectaxis.cpp \ + $$PWD/line/vistoolpointofintersectionarcs.cpp \ + $$PWD/line/vistoolpointofintersectioncircles.cpp \ + $$PWD/line/vistoolpointfromcircleandtangent.cpp \ + $$PWD/line/vistoolpointfromarcandtangent.cpp \ + $$PWD/path/vispath.cpp \ + $$PWD/path/vistoolarc.cpp \ + $$PWD/path/vistoolcutarc.cpp \ + $$PWD/path/vistoolspline.cpp \ + $$PWD/path/vistoolcutspline.cpp \ + $$PWD/path/vistoolsplinepath.cpp \ + $$PWD/path/vistoolcutsplinepath.cpp \ + $$PWD/path/vistoolarcwithlength.cpp \ + $$PWD/path/vistoolpointofintersectioncurves.cpp \ + $$PWD/path/vistoolcubicbezier.cpp \ + $$PWD/path/vistoolcubicbezierpath.cpp