Better structure for tools.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-06-19 17:17:31 +03:00
parent dfd717fb24
commit a99c3ce54a
59 changed files with 214 additions and 212 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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