From af2e0fb509f0970757cd2b76cb41d47ee7572eff Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 7 May 2015 15:31:53 +0300 Subject: [PATCH] New static libray VGeomerty. Need for unit testing. --HG-- branch : develop --- share/translations.pro | 4 +- src/app/app.pro | 9 +- src/app/container/variables/varclength.cpp | 2 +- src/app/container/variables/vcurvelength.cpp | 2 +- src/app/container/variables/vlineangle.cpp | 2 +- src/app/container/variables/vlinelength.cpp | 2 +- src/app/container/variables/vsplinelength.cpp | 2 +- src/app/container/vcontainer.cpp | 4 +- src/app/container/vcontainer.h | 4 +- src/app/dialogs/app/dialoghistory.cpp | 6 +- src/app/dialogs/tools/dialogarc.cpp | 2 +- src/app/dialogs/tools/dialogbisector.cpp | 2 +- .../tools/dialogcurveintersectaxis.cpp | 2 +- src/app/dialogs/tools/dialogcutarc.cpp | 2 +- src/app/dialogs/tools/dialogcutspline.cpp | 2 +- src/app/dialogs/tools/dialogcutsplinepath.cpp | 2 +- src/app/dialogs/tools/dialogdetail.cpp | 6 +- src/app/dialogs/tools/dialogendline.cpp | 2 +- src/app/dialogs/tools/dialogheight.cpp | 2 +- src/app/dialogs/tools/dialogline.cpp | 2 +- src/app/dialogs/tools/dialoglineintersect.cpp | 2 +- .../dialogs/tools/dialoglineintersectaxis.cpp | 2 +- .../dialogs/tools/dialogpointofcontact.cpp | 2 +- .../tools/dialogpointofintersection.cpp | 2 +- src/app/dialogs/tools/dialogshoulderpoint.cpp | 2 +- src/app/dialogs/tools/dialogspline.cpp | 2 +- src/app/dialogs/tools/dialogsplinepath.cpp | 2 +- src/app/dialogs/tools/dialogsplinepath.h | 2 +- src/app/dialogs/tools/dialogtool.cpp | 6 +- src/app/dialogs/tools/dialogtriangle.cpp | 2 +- src/app/geometry/geometry.pri | 24 +---- src/app/mainwindow.cpp | 2 +- src/app/options.cpp | 3 - src/app/options.h | 7 +- src/app/tools/drawTools/vtoolalongline.cpp | 2 +- src/app/tools/drawTools/vtoolarc.cpp | 8 +- src/app/tools/drawTools/vtoolbisector.cpp | 2 +- .../drawTools/vtoolcurveintersectaxis.cpp | 2 +- src/app/tools/drawTools/vtoolcut.cpp | 2 +- src/app/tools/drawTools/vtoolcutarc.cpp | 4 +- src/app/tools/drawTools/vtoolcutspline.cpp | 4 +- .../tools/drawTools/vtoolcutsplinepath.cpp | 5 +- src/app/tools/drawTools/vtoolendline.cpp | 2 +- src/app/tools/drawTools/vtoolheight.cpp | 2 +- src/app/tools/drawTools/vtoolline.cpp | 2 +- .../tools/drawTools/vtoollineintersect.cpp | 2 +- .../drawTools/vtoollineintersectaxis.cpp | 2 +- src/app/tools/drawTools/vtoollinepoint.cpp | 2 +- src/app/tools/drawTools/vtoolnormal.cpp | 2 +- src/app/tools/drawTools/vtoolpoint.cpp | 2 +- .../tools/drawTools/vtoolpointofcontact.cpp | 2 +- .../drawTools/vtoolpointofintersection.cpp | 2 +- .../tools/drawTools/vtoolshoulderpoint.cpp | 2 +- src/app/tools/drawTools/vtoolsinglepoint.cpp | 2 +- src/app/tools/drawTools/vtoolspline.cpp | 2 +- src/app/tools/drawTools/vtooltriangle.cpp | 2 +- src/app/tools/nodeDetails/vnodearc.cpp | 2 +- src/app/tools/nodeDetails/vnodepoint.cpp | 2 +- src/app/tools/nodeDetails/vnodespline.cpp | 2 +- src/app/tools/nodeDetails/vnodesplinepath.cpp | 2 +- src/app/tools/vabstracttool.cpp | 2 +- src/app/tools/vtooldetail.cpp | 4 +- src/app/tools/vtooluniondetails.cpp | 6 +- src/app/undocommands/movespline.h | 2 +- src/app/undocommands/movesplinepath.h | 2 +- src/app/visualization/vcontrolpointspline.h | 3 +- src/app/visualization/vistoolalongline.cpp | 2 +- src/app/visualization/vistoolarc.cpp | 4 +- src/app/visualization/vistoolbisector.cpp | 2 +- .../vistoolcurveintersectaxis.cpp | 2 +- src/app/visualization/vistoolcutarc.cpp | 2 +- src/app/visualization/vistoolcutspline.cpp | 2 +- .../visualization/vistoolcutsplinepath.cpp | 2 +- src/app/visualization/vistoolendline.cpp | 2 +- src/app/visualization/vistoolheight.cpp | 2 +- src/app/visualization/vistoolline.cpp | 2 +- .../visualization/vistoollineintersect.cpp | 2 +- .../vistoollineintersectaxis.cpp | 2 +- src/app/visualization/vistoolnormal.cpp | 2 +- .../visualization/vistoolpointofcontact.cpp | 2 +- .../vistoolpointofintersection.cpp | 2 +- .../visualization/vistoolshoulderpoint.cpp | 2 +- src/app/visualization/vistoolspline.cpp | 4 +- src/app/visualization/vistoolsplinepath.h | 2 +- src/app/visualization/vistooltriangle.cpp | 2 +- src/app/visualization/vsimplecurve.h | 3 +- src/app/xml/vpattern.cpp | 2 +- src/libs/libs.pro | 3 +- src/libs/vgeometry/stable.cpp | 30 ++++++ src/libs/vgeometry/stable.h | 52 ++++++++++ .../vgeometry}/vabstractcurve.cpp | 0 .../vgeometry}/vabstractcurve.h | 1 + src/{app/geometry => libs/vgeometry}/varc.cpp | 21 ++-- src/{app/geometry => libs/vgeometry}/varc.h | 7 +- src/{app/geometry => libs/vgeometry}/varc_p.h | 2 +- src/libs/vgeometry/vgeometry.pri | 30 ++++++ src/libs/vgeometry/vgeometry.pro | 97 +++++++++++++++++++ src/libs/vgeometry/vgeometrydef.cpp | 34 +++++++ src/libs/vgeometry/vgeometrydef.h | 43 ++++++++ .../geometry => libs/vgeometry}/vgobject.cpp | 0 .../geometry => libs/vgeometry}/vgobject.h | 2 +- .../geometry => libs/vgeometry}/vgobject_p.h | 3 +- .../geometry => libs/vgeometry}/vpointf.cpp | 0 .../geometry => libs/vgeometry}/vpointf.h | 0 .../geometry => libs/vgeometry}/vpointf_p.h | 2 +- .../geometry => libs/vgeometry}/vspline.cpp | 0 .../geometry => libs/vgeometry}/vspline.h | 0 .../geometry => libs/vgeometry}/vspline_p.h | 1 - .../vgeometry}/vsplinepath.cpp | 2 +- .../geometry => libs/vgeometry}/vsplinepath.h | 0 .../vgeometry}/vsplinepath_p.h | 1 - .../vgeometry}/vsplinepoint.cpp | 0 .../vgeometry}/vsplinepoint.h | 0 .../vgeometry}/vsplinepoint_p.h | 1 - 114 files changed, 423 insertions(+), 161 deletions(-) create mode 100644 src/libs/vgeometry/stable.cpp create mode 100644 src/libs/vgeometry/stable.h rename src/{app/geometry => libs/vgeometry}/vabstractcurve.cpp (100%) rename src/{app/geometry => libs/vgeometry}/vabstractcurve.h (98%) rename src/{app/geometry => libs/vgeometry}/varc.cpp (95%) rename src/{app/geometry => libs/vgeometry}/varc.h (92%) rename src/{app/geometry => libs/vgeometry}/varc_p.h (99%) create mode 100644 src/libs/vgeometry/vgeometry.pri create mode 100644 src/libs/vgeometry/vgeometry.pro create mode 100644 src/libs/vgeometry/vgeometrydef.cpp create mode 100644 src/libs/vgeometry/vgeometrydef.h rename src/{app/geometry => libs/vgeometry}/vgobject.cpp (100%) rename src/{app/geometry => libs/vgeometry}/vgobject.h (99%) rename src/{app/geometry => libs/vgeometry}/vgobject_p.h (97%) rename src/{app/geometry => libs/vgeometry}/vpointf.cpp (100%) rename src/{app/geometry => libs/vgeometry}/vpointf.h (100%) rename src/{app/geometry => libs/vgeometry}/vpointf_p.h (98%) rename src/{app/geometry => libs/vgeometry}/vspline.cpp (100%) rename src/{app/geometry => libs/vgeometry}/vspline.h (100%) rename src/{app/geometry => libs/vgeometry}/vspline_p.h (99%) rename src/{app/geometry => libs/vgeometry}/vsplinepath.cpp (99%) rename src/{app/geometry => libs/vgeometry}/vsplinepath.h (100%) rename src/{app/geometry => libs/vgeometry}/vsplinepath_p.h (98%) rename src/{app/geometry => libs/vgeometry}/vsplinepoint.cpp (100%) rename src/{app/geometry => libs/vgeometry}/vsplinepoint.h (100%) rename src/{app/geometry => libs/vgeometry}/vsplinepoint_p.h (99%) diff --git a/share/translations.pro b/share/translations.pro index 20f555fd4..007a76f3f 100644 --- a/share/translations.pro +++ b/share/translations.pro @@ -13,7 +13,8 @@ DEPENDPATH += \ ../src/libs/vpropertyexplorer \ ../src/libs/ifc \ ../src/libs/vobj \ - ../src/libs/vlayout + ../src/libs/vlayout \ + ../src/libs/vgeometry include(../src/app/app.pri) include(../src/libs/qmuparser/qmuparser.pri) @@ -21,6 +22,7 @@ include(../src/libs/vpropertyexplorer/vpropertyexplorer.pri) include(../src/libs/ifc/ifc.pri) include(../src/libs/vobj/vobj.pri) include(../src/libs/vlayout/vlayout.pri) +include(../src/libs/vgeometry/vgeometry.pri) # Add here path to new translation file with name "valentina_*_*.ts" if you want to add new language. # Same paths in variable INSTALL_TRANSLATIONS (app.pro). diff --git a/src/app/app.pro b/src/app/app.pro index 59524e7b1..9bb7703a1 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -572,9 +572,14 @@ DEPENDPATH += $$PWD/../libs/vlayout win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/vlayout.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vlayout/$${DESTDIR}/libvlayout.a -# For build qt backport code -win32: LIBS+= libole32 libuuid +# VGeometry static library +unix|win32: LIBS += -L$$OUT_PWD/../libs/vgeometry/$${DESTDIR}/ -lvgeometry +INCLUDEPATH += $$PWD/../libs/vgeometry +DEPENDPATH += $$PWD/../libs/vgeometry + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vgeometry/$${DESTDIR}/vgeometry.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vgeometry/$${DESTDIR}/libvgeometry.a # Strip after you link all libaries. CONFIG(release, debug|release){ diff --git a/src/app/container/variables/varclength.cpp b/src/app/container/variables/varclength.cpp index b094dc34f..c0af0170f 100644 --- a/src/app/container/variables/varclength.cpp +++ b/src/app/container/variables/varclength.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "varclength.h" -#include "../geometry/vabstractcurve.h" +#include "../libs/vgeometry/vabstractcurve.h" #include "../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/container/variables/vcurvelength.cpp b/src/app/container/variables/vcurvelength.cpp index b099ae5fc..fa0afb16d 100644 --- a/src/app/container/variables/vcurvelength.cpp +++ b/src/app/container/variables/vcurvelength.cpp @@ -29,7 +29,7 @@ #include "vcurvelength.h" #include "vcurvelength_p.h" #include "../core/vapplication.h" -#include "../geometry/vabstractcurve.h" +#include "../libs/vgeometry/vabstractcurve.h" //--------------------------------------------------------------------------------------------------------------------- VCurveLength::VCurveLength() diff --git a/src/app/container/variables/vlineangle.cpp b/src/app/container/variables/vlineangle.cpp index aafa86560..7d514539a 100644 --- a/src/app/container/variables/vlineangle.cpp +++ b/src/app/container/variables/vlineangle.cpp @@ -28,7 +28,7 @@ #include "vlineangle.h" #include "vlineangle_p.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../core/vapplication.h" #include diff --git a/src/app/container/variables/vlinelength.cpp b/src/app/container/variables/vlinelength.cpp index 4f569af41..281586dd9 100644 --- a/src/app/container/variables/vlinelength.cpp +++ b/src/app/container/variables/vlinelength.cpp @@ -28,7 +28,7 @@ #include "vlinelength.h" #include "vlinelength_p.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../core/vapplication.h" #include diff --git a/src/app/container/variables/vsplinelength.cpp b/src/app/container/variables/vsplinelength.cpp index 327e21466..0d3537de5 100644 --- a/src/app/container/variables/vsplinelength.cpp +++ b/src/app/container/variables/vsplinelength.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vsplinelength.h" -#include "../geometry/vabstractcurve.h" +#include "../libs/vgeometry/vabstractcurve.h" #include "../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/container/vcontainer.cpp b/src/app/container/vcontainer.cpp index 68dd0c301..9a910543d 100644 --- a/src/app/container/vcontainer.cpp +++ b/src/app/container/vcontainer.cpp @@ -28,8 +28,8 @@ #include "vcontainer.h" #include "../core/vapplication.h" -#include "../geometry/varc.h" -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/varc.h" +#include "../libs/vgeometry/vsplinepath.h" #include "../../utils/logging.h" #include diff --git a/src/app/container/vcontainer.h b/src/app/container/vcontainer.h index 37c043171..e96151708 100644 --- a/src/app/container/vcontainer.h +++ b/src/app/container/vcontainer.h @@ -31,9 +31,9 @@ #include "variables.h" #include "../geometry/vdetail.h" -#include "../geometry/vgobject.h" +#include "../libs/vgeometry/vgobject.h" #include "../libs/ifc/exception/vexceptionbadid.h" -#include "../geometry/vabstractcurve.h" +#include "../libs/vgeometry/vabstractcurve.h" #include #include diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp index adb6238d7..7e80e91b6 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/app/dialoghistory.cpp @@ -28,9 +28,9 @@ #include "dialoghistory.h" #include "ui_dialoghistory.h" -#include "../../geometry/varc.h" -#include "../../geometry/vsplinepath.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/varc.h" +#include "../../libs/vgeometry/vsplinepath.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../tools/vabstracttool.h" #include "../../tools/drawTools/vtoolcutspline.h" #include "../../tools/drawTools/vtoolcutsplinepath.h" diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index e58e11a9b..4edc42a66 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -32,7 +32,7 @@ #include #include -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../libs/ifc/xml/vdomdocument.h" #include "../../visualization/vistoolarc.h" diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index c6bca1bca..4d3136c2c 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -29,7 +29,7 @@ #include "dialogbisector.h" #include "ui_dialogbisector.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolbisector.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index 7467df612..d240d3d23 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -29,7 +29,7 @@ #include "dialogcurveintersectaxis.h" #include "ui_dialogcurveintersectaxis.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolcurveintersectaxis.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index a59819920..437831a70 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -29,7 +29,7 @@ #include "dialogcutarc.h" #include "ui_dialogcutarc.h" -#include "../../geometry/varc.h" +#include "../../libs/vgeometry/varc.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolcutarc.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 273ec7e54..62e72c46d 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -29,7 +29,7 @@ #include "dialogcutspline.h" #include "ui_dialogcutspline.h" -#include "../../geometry/vspline.h" +#include "../../libs/vgeometry/vspline.h" #include "../../container/vcontainer.h" #include "../../xml/vpattern.h" #include "../../visualization/vistoolcutspline.h" diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 84dac8632..46affdf82 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -29,7 +29,7 @@ #include "dialogcutsplinepath.h" #include "ui_dialogcutsplinepath.h" -#include "../../geometry/vsplinepath.h" +#include "../../libs/vgeometry/vsplinepath.h" #include "../../container/vcontainer.h" #include "../../xml/vpattern.h" #include "../../visualization/vistoolcutsplinepath.h" diff --git a/src/app/dialogs/tools/dialogdetail.cpp b/src/app/dialogs/tools/dialogdetail.cpp index 5db75df26..38e320216 100644 --- a/src/app/dialogs/tools/dialogdetail.cpp +++ b/src/app/dialogs/tools/dialogdetail.cpp @@ -30,9 +30,9 @@ #include -#include "../../geometry/varc.h" -#include "../../geometry/vpointf.h" -#include "../../geometry/vsplinepath.h" +#include "../../libs/vgeometry/varc.h" +#include "../../libs/vgeometry/vpointf.h" +#include "../../libs/vgeometry/vsplinepath.h" #include "../../container/vcontainer.h" #include "../../libs/ifc/xml/vdomdocument.h" #include "../../xml/vabstractmeasurements.h" diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 5bff42f5e..43553a0b0 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -29,7 +29,7 @@ #include "dialogendline.h" #include "ui_dialogendline.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolendline.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 68d26e5df..971e86f5f 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -29,7 +29,7 @@ #include "dialogheight.h" #include "ui_dialogheight.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../tools/vabstracttool.h" #include "../visualization/vistoolheight.h" diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 5bf1f6f45..3f358cb83 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -29,7 +29,7 @@ #include "dialogline.h" #include "ui_dialogline.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolline.h" #include "../../core/vapplication.h" diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 1356f8798..48ab1b952 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -29,7 +29,7 @@ #include "dialoglineintersect.h" #include "ui_dialoglineintersect.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoollineintersect.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index ed6ef5a94..f54198ae5 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -29,7 +29,7 @@ #include "dialoglineintersectaxis.h" #include "ui_dialoglineintersectaxis.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoollineintersectaxis.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 16ea78527..5f5e3f336 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -28,7 +28,7 @@ #include "dialogpointofcontact.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolpointofcontact.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 1dce53cbd..3c03d60e5 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -29,7 +29,7 @@ #include "dialogpointofintersection.h" #include "ui_dialogpointofintersection.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolpointofintersection.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 6e14f08d8..16619b558 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -29,7 +29,7 @@ #include "dialogshoulderpoint.h" #include "ui_dialogshoulderpoint.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolshoulderpoint.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index bae4cea4c..e6cdcc807 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -29,7 +29,7 @@ #include "dialogspline.h" #include "ui_dialogspline.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolspline.h" #include diff --git a/src/app/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp index 6f7f1954b..d9b3dc968 100644 --- a/src/app/dialogs/tools/dialogsplinepath.cpp +++ b/src/app/dialogs/tools/dialogsplinepath.cpp @@ -28,7 +28,7 @@ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" -#include "../../geometry/vsplinepoint.h" +#include "../../libs/vgeometry/vsplinepoint.h" #include "../../container/vcontainer.h" #include "../../visualization/vistoolsplinepath.h" diff --git a/src/app/dialogs/tools/dialogsplinepath.h b/src/app/dialogs/tools/dialogsplinepath.h index 2fc167716..eae77a031 100644 --- a/src/app/dialogs/tools/dialogsplinepath.h +++ b/src/app/dialogs/tools/dialogsplinepath.h @@ -30,7 +30,7 @@ #define DIALOGSPLINEPATH_H #include "dialogtool.h" -#include "../../geometry/vsplinepath.h" +#include "../../libs/vgeometry/vsplinepath.h" namespace Ui { diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index 64e305016..0e1e87243 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -29,9 +29,9 @@ #include "dialogtool.h" #include "../../container/calculator.h" #include "../../container/vcontainer.h" -#include "../../geometry/varc.h" -#include "../../geometry/vpointf.h" -#include "../../geometry/vsplinepath.h" +#include "../../libs/vgeometry/varc.h" +#include "../../libs/vgeometry/vpointf.h" +#include "../../libs/vgeometry/vsplinepath.h" #include "../../tools/vabstracttool.h" #include "../../../libs/qmuparser/qmuparsererror.h" #include "../../libs/ifc/xml/vdomdocument.h" diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index 62191096c..d35d9e68e 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -28,7 +28,7 @@ #include "dialogtriangle.h" #include "ui_dialogtriangle.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vcontainer.h" #include "../../visualization/vistooltriangle.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/src/app/geometry/geometry.pri b/src/app/geometry/geometry.pri index 9c8bf58c9..8a2022c78 100644 --- a/src/app/geometry/geometry.pri +++ b/src/app/geometry/geometry.pri @@ -2,31 +2,11 @@ # This need for corect working file translations.pro HEADERS += \ - $$PWD/vsplinepoint.h \ - $$PWD/vsplinepath.h \ - $$PWD/vspline.h \ $$PWD/vnodedetail.h \ $$PWD/vdetail.h \ - $$PWD/varc.h \ - $$PWD/vgobject.h \ - $$PWD/vpointf.h \ - $$PWD/vabstractcurve.h \ $$PWD/vnodedetail_p.h \ - $$PWD/vdetail_p.h \ - $$PWD/vgobject_p.h \ - $$PWD/varc_p.h \ - $$PWD/vspline_p.h \ - $$PWD/vsplinepoint_p.h \ - $$PWD/vsplinepath_p.h \ - $$PWD/vpointf_p.h + $$PWD/vdetail_p.h SOURCES += \ - $$PWD/vsplinepoint.cpp \ - $$PWD/vsplinepath.cpp \ - $$PWD/vspline.cpp \ $$PWD/vnodedetail.cpp \ - $$PWD/vdetail.cpp \ - $$PWD/varc.cpp \ - $$PWD/vgobject.cpp \ - $$PWD/vpointf.cpp \ - $$PWD/vabstractcurve.cpp + $$PWD/vdetail.cpp diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index d6be89bd8..95687119f 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -28,7 +28,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include "geometry/vspline.h" +#include "../libs/vgeometry/vspline.h" #include "exception/vexceptionobjecterror.h" #include "exception/vexceptionconversionerror.h" #include "exception/vexceptionemptyparameter.h" diff --git a/src/app/options.cpp b/src/app/options.cpp index d4703df93..85b9221ed 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -189,9 +189,6 @@ const QString depthWaistSecond_M = QStringLiteral("depth_waist_ //variables const QString line_ = QStringLiteral("Line_"); const QString angleLine_ = QStringLiteral("AngleLine_"); -const QString arc_ = QStringLiteral("Arc_"); -const QString spl_ = QStringLiteral("Spl_"); -const QString splPath = QStringLiteral("SplPath"); //functions const QString sin_F = QStringLiteral("sin"); diff --git a/src/app/options.h b/src/app/options.h index 9ea81af9c..e7ff07983 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -30,6 +30,7 @@ #define OPTIONS_H #include "../libs/ifc/ifcdef.h" +#include "../libs/vgeometry/vgeometrydef.h" #include "../../utils/def.h" #ifdef Q_OS_WIN32 @@ -119,11 +120,8 @@ enum class Vis : unsigned char }; enum class Source : char { FromGui, FromFile, FromTool }; -enum class Draw : char { Calculation, Modeling }; enum class NodeDetail : char { Contour, Modeling }; enum class Contour : char { OpenContour, CloseContour }; -enum class GOType : char { Point, Arc, Spline, SplinePath, Unknown }; -enum class SplinePointPosition : char { FirstPoint, LastPoint }; enum class VarType : char { Measurement, Increment, LineLength, SplineLength, ArcLength, LineAngle, Unknown }; enum class GHeights : unsigned char { ALL, @@ -281,9 +279,6 @@ extern const QString depthWaistSecond_M; // variables name extern const QString line_; extern const QString angleLine_; -extern const QString arc_; -extern const QString spl_; -extern const QString splPath; // functions extern const QString sin_F; diff --git a/src/app/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp index 75b8a1fb0..616567143 100644 --- a/src/app/tools/drawTools/vtoolalongline.cpp +++ b/src/app/tools/drawTools/vtoolalongline.cpp @@ -29,7 +29,7 @@ #include "vtoolalongline.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogalongline.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../libs/ifc/exception/vexceptionobjecterror.h" #include "../../visualization/vistoolalongline.h" diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index 4ec731a5a..9fe94e448 100644 --- a/src/app/tools/drawTools/vtoolarc.cpp +++ b/src/app/tools/drawTools/vtoolarc.cpp @@ -29,7 +29,7 @@ #include "vtoolarc.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogarc.h" -#include "../../geometry/varc.h" +#include "../../libs/vgeometry/varc.h" #include "../container/vformula.h" #include "../../visualization/vistoolarc.h" @@ -222,7 +222,7 @@ void VToolArc::SetFormulaRadius(const VFormula &value) { QSharedPointer obj = VAbstractTool::data.GetGObject(id); QSharedPointer arc = qSharedPointerDynamicCast(obj); - arc->SetFormulaRadius(value); + arc->SetFormulaRadius(value.GetFormula(FormulaType::FromUser), value.getDoubleValue()); SaveOption(obj); } } @@ -251,7 +251,7 @@ void VToolArc::SetFormulaF1(const VFormula &value) if (qFuzzyCompare(value.getDoubleValue() + 1, arc->GetF2() + 1)==false)// Angles can't be equal { - arc->SetFormulaF1(value); + arc->SetFormulaF1(value.GetFormula(FormulaType::FromUser), value.getDoubleValue()); SaveOption(obj); } } @@ -279,7 +279,7 @@ void VToolArc::SetFormulaF2(const VFormula &value) QSharedPointer arc = qSharedPointerDynamicCast(obj); if (qFuzzyCompare(value.getDoubleValue() + 1, arc->GetF1() + 1)==false)// Angles can't be equal { - arc->SetFormulaF2(value); + arc->SetFormulaF2(value.GetFormula(FormulaType::FromUser), value.getDoubleValue()); SaveOption(obj); } } diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 44f42301b..025adcf0a 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/src/app/tools/drawTools/vtoolbisector.cpp @@ -29,7 +29,7 @@ #include "vtoolbisector.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogbisector.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolbisector.h" const QString VToolBisector::ToolType = QStringLiteral("bisector"); diff --git a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp index 408686d62..eb81c8a01 100644 --- a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp @@ -31,7 +31,7 @@ #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcurveintersectaxis.h" #include "../../dialogs/tools/dialogeditwrongformula.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "./../visualization/vistoolcurveintersectaxis.h" const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis"); diff --git a/src/app/tools/drawTools/vtoolcut.cpp b/src/app/tools/drawTools/vtoolcut.cpp index d24265028..b99f46859 100644 --- a/src/app/tools/drawTools/vtoolcut.cpp +++ b/src/app/tools/drawTools/vtoolcut.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolcut.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index d3aea3129..c2eacbccb 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -29,8 +29,8 @@ #include "vtoolcutarc.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcutarc.h" -#include "../../geometry/vpointf.h" -#include "../../geometry/varc.h" +#include "../../libs/vgeometry/vpointf.h" +#include "../../libs/vgeometry/varc.h" #include "../../visualization/vistoolcutarc.h" const QString VToolCutArc::ToolType = QStringLiteral("cutArc"); diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index 985a377f0..6690f2737 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -29,10 +29,10 @@ #include "vtoolcutspline.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcutspline.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolcutspline.h" #include "vabstractspline.h" -#include "../../geometry/vspline.h" +#include "../../libs/vgeometry/vspline.h" const QString VToolCutSpline::ToolType = QStringLiteral("cutSpline"); const QString VToolCutSpline::AttrSpline = QStringLiteral("spline"); diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index 7cf9b7e43..f160d41ef 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -29,11 +29,10 @@ #include "vtoolcutsplinepath.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogcutsplinepath.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolcutsplinepath.h" #include "vabstractspline.h" - -#include "../../geometry/vsplinepath.h" +#include "../../libs/vgeometry/vsplinepath.h" const QString VToolCutSplinePath::ToolType = QStringLiteral("cutSplinePath"); const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath"); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 6b1101b29..bc23fc022 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -31,7 +31,7 @@ #include "../../container/calculator.h" #include "../../dialogs/tools/dialogendline.h" #include "../../dialogs/tools/dialogeditwrongformula.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "./../visualization/vistoolendline.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index c40bbd6f4..fc021dc66 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/src/app/tools/drawTools/vtoolheight.cpp @@ -28,7 +28,7 @@ #include "vtoolheight.h" #include "../../dialogs/tools/dialogheight.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolheight.h" const QString VToolHeight::ToolType = QStringLiteral("height"); diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index 640730468..d440acef4 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -29,7 +29,7 @@ #include "vtoolline.h" #include "../../dialogs/tools/dialogline.h" #include -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../dialogs/tools/dialogline.h" #include "../../visualization/vistoolline.h" diff --git a/src/app/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp index ac3b19a00..050a7d044 100644 --- a/src/app/tools/drawTools/vtoollineintersect.cpp +++ b/src/app/tools/drawTools/vtoollineintersect.cpp @@ -28,7 +28,7 @@ #include "vtoollineintersect.h" #include "../../dialogs/tools/dialoglineintersect.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoollineintersect.h" const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); diff --git a/src/app/tools/drawTools/vtoollineintersectaxis.cpp b/src/app/tools/drawTools/vtoollineintersectaxis.cpp index 7d7cf2296..eadae8e6d 100644 --- a/src/app/tools/drawTools/vtoollineintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoollineintersectaxis.cpp @@ -31,7 +31,7 @@ #include "../../container/calculator.h" #include "../../dialogs/tools/dialoglineintersectaxis.h" #include "../../dialogs/tools/dialogeditwrongformula.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "./../visualization/vistoollineintersectaxis.h" const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis"); diff --git a/src/app/tools/drawTools/vtoollinepoint.cpp b/src/app/tools/drawTools/vtoollinepoint.cpp index ba52aad1b..7da5fbb3b 100644 --- a/src/app/tools/drawTools/vtoollinepoint.cpp +++ b/src/app/tools/drawTools/vtoollinepoint.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoollinepoint.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index 5cec77114..d5aef5670 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/src/app/tools/drawTools/vtoolnormal.cpp @@ -29,7 +29,7 @@ #include "vtoolnormal.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialognormal.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolnormal.h" const QString VToolNormal::ToolType = QStringLiteral("normal"); diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index 90a2660c3..c76b17157 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -28,7 +28,7 @@ #include "vtoolpoint.h" #include "../../utils/logging.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vgraphicssimpletextitem.h" #include "../../undocommands/movelabel.h" diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 28a980220..360d8a4b0 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -29,7 +29,7 @@ #include "vtoolpointofcontact.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogpointofcontact.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../container/vformula.h" #include "../../visualization/vistoolpointofcontact.h" #include diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index 7888c27de..7908fa150 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersection.cpp @@ -28,7 +28,7 @@ #include "vtoolpointofintersection.h" #include "../../dialogs/tools/dialogpointofintersection.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolpointofintersection.h" const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index f140b5705..fbfa389bf 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -29,7 +29,7 @@ #include "vtoolshoulderpoint.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogshoulderpoint.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistoolshoulderpoint.h" const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index f2885fde1..5a716cdaf 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -32,7 +32,7 @@ #include "../../undocommands/movespoint.h" #include "../../undocommands/addpatternpiece.h" #include "../../undocommands/deletepatternpiece.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../options.h" #include diff --git a/src/app/tools/drawTools/vtoolspline.cpp b/src/app/tools/drawTools/vtoolspline.cpp index 7579a2935..897ecfc6a 100644 --- a/src/app/tools/drawTools/vtoolspline.cpp +++ b/src/app/tools/drawTools/vtoolspline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolspline.h" -#include "../../geometry/vspline.h" +#include "../../libs/vgeometry/vspline.h" #include "../../dialogs/tools/dialogspline.h" #include "../../undocommands/movespline.h" #include "../../visualization/vistoolspline.h" diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index 2b2f7b7b2..b3071bbba 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/src/app/tools/drawTools/vtooltriangle.cpp @@ -28,7 +28,7 @@ #include "vtooltriangle.h" #include "../../dialogs/tools/dialogtriangle.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vistooltriangle.h" #include diff --git a/src/app/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp index aafcda4ea..1cd77c329 100644 --- a/src/app/tools/nodeDetails/vnodearc.cpp +++ b/src/app/tools/nodeDetails/vnodearc.cpp @@ -29,7 +29,7 @@ #include "vnodearc.h" #include "../../core/vapplication.h" -#include "../../geometry/varc.h" +#include "../../libs/vgeometry/varc.h" #include #include diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index ee5566ae4..84e5dd07d 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -29,7 +29,7 @@ #include "vnodepoint.h" #include "../../core/vapplication.h" -#include "../../geometry/vpointf.h" +#include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vgraphicssimpletextitem.h" #include #include diff --git a/src/app/tools/nodeDetails/vnodespline.cpp b/src/app/tools/nodeDetails/vnodespline.cpp index ade8c26fd..69f0de630 100644 --- a/src/app/tools/nodeDetails/vnodespline.cpp +++ b/src/app/tools/nodeDetails/vnodespline.cpp @@ -29,7 +29,7 @@ #include "vnodespline.h" #include "../../core/vapplication.h" -#include "../../geometry/vspline.h" +#include "../../libs/vgeometry/vspline.h" #include #include diff --git a/src/app/tools/nodeDetails/vnodesplinepath.cpp b/src/app/tools/nodeDetails/vnodesplinepath.cpp index c7adf9479..87c9c91e8 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/app/tools/nodeDetails/vnodesplinepath.cpp @@ -29,7 +29,7 @@ #include "vnodesplinepath.h" #include "../../core/vapplication.h" -#include "../../geometry/vsplinepath.h" +#include "../../libs/vgeometry/vsplinepath.h" #include #include diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 0949560c3..3451ac7b8 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -35,7 +35,7 @@ #include "../../libs/vpropertyexplorer/checkablemessagebox.h" #include "../undocommands/deltool.h" #include "../core/vapplication.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../undocommands/savetooloptions.h" #include "../widgets/vmaingraphicsview.h" #include "../core/vsettings.h" diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index 5cfb1cbd2..859eb562c 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -28,8 +28,8 @@ #include "vtooldetail.h" #include "nodeDetails/nodedetails.h" -#include "../geometry/varc.h" -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/varc.h" +#include "../libs/vgeometry/vsplinepath.h" #include "../widgets/vmaingraphicsscene.h" #include "../dialogs/tools/dialogtool.h" #include "../dialogs/tools/dialogdetail.h" diff --git a/src/app/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp index 6181e3fc3..e1f6796ad 100644 --- a/src/app/tools/vtooluniondetails.cpp +++ b/src/app/tools/vtooluniondetails.cpp @@ -29,9 +29,9 @@ #include "vtooluniondetails.h" #include "nodeDetails/nodedetails.h" #include "vtooldetail.h" -#include "../geometry/vpointf.h" -#include "../geometry/varc.h" -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/vpointf.h" +#include "../libs/vgeometry/varc.h" +#include "../libs/vgeometry/vsplinepath.h" #include "../dialogs/tools/dialoguniondetails.h" #include "../undocommands/adduniondetails.h" diff --git a/src/app/undocommands/movespline.h b/src/app/undocommands/movespline.h index ff81965ec..b9f369be4 100644 --- a/src/app/undocommands/movespline.h +++ b/src/app/undocommands/movespline.h @@ -30,7 +30,7 @@ #define MOVESPLINE_H #include "vundocommand.h" -#include "../geometry/vspline.h" +#include "../libs/vgeometry/vspline.h" class QGraphicsScene; diff --git a/src/app/undocommands/movesplinepath.h b/src/app/undocommands/movesplinepath.h index 16f3e276a..3f05c84e7 100644 --- a/src/app/undocommands/movesplinepath.h +++ b/src/app/undocommands/movesplinepath.h @@ -30,7 +30,7 @@ #define MOVESPLINEPATH_H #include "vundocommand.h" -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/vsplinepath.h" class QGraphicsScene; diff --git a/src/app/visualization/vcontrolpointspline.h b/src/app/visualization/vcontrolpointspline.h index 759965e65..1b5c99ded 100644 --- a/src/app/visualization/vcontrolpointspline.h +++ b/src/app/visualization/vcontrolpointspline.h @@ -31,7 +31,8 @@ #include #include -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/vsplinepath.h" +#include "../options.h" /** * @brief The VControlPointSpline class control spline point. diff --git a/src/app/visualization/vistoolalongline.cpp b/src/app/visualization/vistoolalongline.cpp index da845493f..6565818d6 100644 --- a/src/app/visualization/vistoolalongline.cpp +++ b/src/app/visualization/vistoolalongline.cpp @@ -28,7 +28,7 @@ #include "vistoolalongline.h" #include "../container/vcontainer.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- VisToolAlongLine::VisToolAlongLine(const VContainer *data, QGraphicsItem *parent) diff --git a/src/app/visualization/vistoolarc.cpp b/src/app/visualization/vistoolarc.cpp index e4cad9c18..ce540f435 100644 --- a/src/app/visualization/vistoolarc.cpp +++ b/src/app/visualization/vistoolarc.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoolarc.h" -#include "../geometry/vpointf.h" -#include "../geometry/varc.h" +#include "../libs/vgeometry/vpointf.h" +#include "../libs/vgeometry/varc.h" #include "../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolbisector.cpp b/src/app/visualization/vistoolbisector.cpp index d778bd151..d70e7ba1b 100644 --- a/src/app/visualization/vistoolbisector.cpp +++ b/src/app/visualization/vistoolbisector.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolbisector.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../container/vcontainer.h" #include "../tools/drawTools/vtoolbisector.h" diff --git a/src/app/visualization/vistoolcurveintersectaxis.cpp b/src/app/visualization/vistoolcurveintersectaxis.cpp index 62a222822..ac862d011 100644 --- a/src/app/visualization/vistoolcurveintersectaxis.cpp +++ b/src/app/visualization/vistoolcurveintersectaxis.cpp @@ -28,7 +28,7 @@ #include "vistoolcurveintersectaxis.h" #include "../container/vcontainer.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../tools/drawTools/vtoolcurveintersectaxis.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolcutarc.cpp b/src/app/visualization/vistoolcutarc.cpp index 68b66c872..617153ddf 100644 --- a/src/app/visualization/vistoolcutarc.cpp +++ b/src/app/visualization/vistoolcutarc.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolcutarc.h" -#include "../geometry/varc.h" +#include "../libs/vgeometry/varc.h" #include "../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolcutspline.cpp b/src/app/visualization/vistoolcutspline.cpp index c120ed622..d1ae453a5 100644 --- a/src/app/visualization/vistoolcutspline.cpp +++ b/src/app/visualization/vistoolcutspline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolcutspline.h" -#include "../geometry/vspline.h" +#include "../libs/vgeometry/vspline.h" #include "../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolcutsplinepath.cpp b/src/app/visualization/vistoolcutsplinepath.cpp index 5ef52c37d..414722232 100644 --- a/src/app/visualization/vistoolcutsplinepath.cpp +++ b/src/app/visualization/vistoolcutsplinepath.cpp @@ -28,7 +28,7 @@ #include "vistoolcutsplinepath.h" #include "../container/vcontainer.h" -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/vsplinepath.h" //--------------------------------------------------------------------------------------------------------------------- VisToolCutSplinePath::VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent) diff --git a/src/app/visualization/vistoolendline.cpp b/src/app/visualization/vistoolendline.cpp index d9148150a..ff517ffac 100644 --- a/src/app/visualization/vistoolendline.cpp +++ b/src/app/visualization/vistoolendline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolendline.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../container/vcontainer.h" #include "../tools/vabstracttool.h" diff --git a/src/app/visualization/vistoolheight.cpp b/src/app/visualization/vistoolheight.cpp index 87044c8b3..bac8acc4d 100644 --- a/src/app/visualization/vistoolheight.cpp +++ b/src/app/visualization/vistoolheight.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolheight.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../tools/drawTools/vtoolheight.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolline.cpp b/src/app/visualization/vistoolline.cpp index b90c9e84c..e3759efd2 100644 --- a/src/app/visualization/vistoolline.cpp +++ b/src/app/visualization/vistoolline.cpp @@ -28,7 +28,7 @@ #include "vistoolline.h" #include "../container/vcontainer.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../tools/drawTools/vdrawtool.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoollineintersect.cpp b/src/app/visualization/vistoollineintersect.cpp index 72d858f4e..2c2dfdeb9 100644 --- a/src/app/visualization/vistoollineintersect.cpp +++ b/src/app/visualization/vistoollineintersect.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoollineintersect.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoollineintersectaxis.cpp b/src/app/visualization/vistoollineintersectaxis.cpp index 8305d679f..6e4ac5140 100644 --- a/src/app/visualization/vistoollineintersectaxis.cpp +++ b/src/app/visualization/vistoollineintersectaxis.cpp @@ -28,7 +28,7 @@ #include "vistoollineintersectaxis.h" #include "../container/vcontainer.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../tools/drawTools/vtoollineintersectaxis.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolnormal.cpp b/src/app/visualization/vistoolnormal.cpp index 344232972..17026fd0d 100644 --- a/src/app/visualization/vistoolnormal.cpp +++ b/src/app/visualization/vistoolnormal.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolnormal.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../tools/drawTools/vtoolnormal.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolpointofcontact.cpp b/src/app/visualization/vistoolpointofcontact.cpp index 290623ec4..1a2116960 100644 --- a/src/app/visualization/vistoolpointofcontact.cpp +++ b/src/app/visualization/vistoolpointofcontact.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolpointofcontact.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../tools/drawTools/vtoolpointofcontact.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolpointofintersection.cpp b/src/app/visualization/vistoolpointofintersection.cpp index a33ed5175..a6a51e58a 100644 --- a/src/app/visualization/vistoolpointofintersection.cpp +++ b/src/app/visualization/vistoolpointofintersection.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistoolpointofintersection.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../container/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/visualization/vistoolshoulderpoint.cpp b/src/app/visualization/vistoolshoulderpoint.cpp index e107c13d0..19b87bff2 100644 --- a/src/app/visualization/vistoolshoulderpoint.cpp +++ b/src/app/visualization/vistoolshoulderpoint.cpp @@ -28,7 +28,7 @@ #include "vistoolshoulderpoint.h" #include "../tools/drawTools/vtoolshoulderpoint.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- VisToolShoulderPoint::VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent) diff --git a/src/app/visualization/vistoolspline.cpp b/src/app/visualization/vistoolspline.cpp index c56708c71..0bd65ad58 100644 --- a/src/app/visualization/vistoolspline.cpp +++ b/src/app/visualization/vistoolspline.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vistoolspline.h" -#include "../geometry/vpointf.h" -#include "../geometry/vspline.h" +#include "../libs/vgeometry/vpointf.h" +#include "../libs/vgeometry/vspline.h" #include "../container/vcontainer.h" const int EMPTY_ANGLE = -1; diff --git a/src/app/visualization/vistoolsplinepath.h b/src/app/visualization/vistoolsplinepath.h index 8817805cf..e30fdfa41 100644 --- a/src/app/visualization/vistoolsplinepath.h +++ b/src/app/visualization/vistoolsplinepath.h @@ -30,7 +30,7 @@ #define VISTOOLSPLINEPATH_H #include "vispath.h" -#include "../geometry/vsplinepath.h" +#include "../libs/vgeometry/vsplinepath.h" enum class Mode : char {Creation, Show}; diff --git a/src/app/visualization/vistooltriangle.cpp b/src/app/visualization/vistooltriangle.cpp index 373705bc7..106920620 100644 --- a/src/app/visualization/vistooltriangle.cpp +++ b/src/app/visualization/vistooltriangle.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vistooltriangle.h" -#include "../geometry/vpointf.h" +#include "../libs/vgeometry/vpointf.h" #include "../container/vcontainer.h" #include "../tools/drawTools/vtooltriangle.h" #include diff --git a/src/app/visualization/vsimplecurve.h b/src/app/visualization/vsimplecurve.h index 1c33c6990..78279336c 100644 --- a/src/app/visualization/vsimplecurve.h +++ b/src/app/visualization/vsimplecurve.h @@ -30,7 +30,8 @@ #define VSIMPLECURVE_H #include -#include "../geometry/vabstractcurve.h" +#include "../libs/vgeometry/vabstractcurve.h" +#include "../options.h" enum class SimpleCurvePoint : char { FirstPoint, ForthPoint }; diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 1bd0a0f1c..c82cf8ecb 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -43,7 +43,7 @@ #include "vstandardmeasurements.h" #include "vindividualmeasurements.h" #include "../../libs/qmuparser/qmuparsererror.h" -#include "../geometry/varc.h" +#include "../libs/vgeometry/varc.h" #include #include diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 508095bbf..52a4fb199 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -4,4 +4,5 @@ SUBDIRS = qmuparser \ vpropertyexplorer \ ifc \ vobj \ - vlayout + vlayout \ + vgeometry diff --git a/src/libs/vgeometry/stable.cpp b/src/libs/vgeometry/stable.cpp new file mode 100644 index 000000000..a42d3fd7c --- /dev/null +++ b/src/libs/vgeometry/stable.cpp @@ -0,0 +1,30 @@ +/************************************************************************ + ** + ** @file stable.cpp + ** @author Roman Telezhynskyi + ** @date 10 12, 2014 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +// Build the precompiled headers. +#include "stable.h" diff --git a/src/libs/vgeometry/stable.h b/src/libs/vgeometry/stable.h new file mode 100644 index 000000000..1925cc882 --- /dev/null +++ b/src/libs/vgeometry/stable.h @@ -0,0 +1,52 @@ +/************************************************************************ + ** + ** @file stable.h + ** @author Roman Telezhynskyi + ** @date 10 12, 2014 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +#ifndef STABLE_H +#define STABLE_H + +/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */ +#ifndef __clang__ +#pragma message("Compiling precompiled headers for VGeometry library.\n") +#endif + +/* Add C includes here */ + +#if defined __cplusplus +/* Add C++ includes here */ + +#ifdef QT_CORE_LIB +#include +#endif + +#ifdef QT_GUI_LIB +# include +#endif + +#endif/*__cplusplus*/ + +#endif // STABLE_H diff --git a/src/app/geometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp similarity index 100% rename from src/app/geometry/vabstractcurve.cpp rename to src/libs/vgeometry/vabstractcurve.cpp diff --git a/src/app/geometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h similarity index 98% rename from src/app/geometry/vabstractcurve.h rename to src/libs/vgeometry/vabstractcurve.h index c894cee10..e6198a25a 100644 --- a/src/app/geometry/vabstractcurve.h +++ b/src/libs/vgeometry/vabstractcurve.h @@ -30,6 +30,7 @@ #define VABSTRACTCURVE_H #include "vgobject.h" +#include "../ifc/ifcdef.h" #include enum class PathDirection : char { Hide, Show }; diff --git a/src/app/geometry/varc.cpp b/src/libs/vgeometry/varc.cpp similarity index 95% rename from src/app/geometry/varc.cpp rename to src/libs/vgeometry/varc.cpp index 570eaa5d0..29db2e96f 100644 --- a/src/app/geometry/varc.cpp +++ b/src/libs/vgeometry/varc.cpp @@ -34,9 +34,6 @@ #include #include -#include "../container/vformula.h" - - //--------------------------------------------------------------------------------------------------------------------- /** * @brief VArc default constructor. @@ -253,10 +250,10 @@ QString VArc::GetFormulaF1() const } //--------------------------------------------------------------------------------------------------------------------- -void VArc::SetFormulaF1(const VFormula &value) +void VArc::SetFormulaF1(const QString &formula, qreal value) { - d->formulaF1 = value.GetFormula(FormulaType::FromUser); - d->f1 = value.getDoubleValue(); + d->formulaF1 = formula; + d->f1 = value; } //--------------------------------------------------------------------------------------------------------------------- @@ -280,10 +277,10 @@ QString VArc::GetFormulaF2() const } //--------------------------------------------------------------------------------------------------------------------- -void VArc::SetFormulaF2(const VFormula &value) +void VArc::SetFormulaF2(const QString &formula, qreal value) { - d->formulaF2 = value.GetFormula(FormulaType::FromUser); - d->f2 = value.getDoubleValue(); + d->formulaF2 = formula; + d->f2 = value; } //--------------------------------------------------------------------------------------------------------------------- @@ -307,10 +304,10 @@ QString VArc::GetFormulaRadius() const } //--------------------------------------------------------------------------------------------------------------------- -void VArc::SetFormulaRadius(const VFormula &value) +void VArc::SetFormulaRadius(const QString &formula, qreal value) { - d->formulaRadius = value.GetFormula(FormulaType::FromUser); - d->radius = value.getDoubleValue(); + d->formulaRadius = formula; + d->radius = value; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/geometry/varc.h b/src/libs/vgeometry/varc.h similarity index 92% rename from src/app/geometry/varc.h rename to src/libs/vgeometry/varc.h index 6f017e7da..af367910a 100644 --- a/src/app/geometry/varc.h +++ b/src/libs/vgeometry/varc.h @@ -35,7 +35,6 @@ class QPainterPath; class VArcData; -class VFormula; /** * @brief VArc class for anticlockwise arc. @@ -53,15 +52,15 @@ public: virtual ~VArc(); QString GetFormulaF1 () const; - void SetFormulaF1 (const VFormula &value); + void SetFormulaF1 (const QString &formula, qreal value); qreal GetF1 () const; QString GetFormulaF2 () const; - void SetFormulaF2 (const VFormula &value); + void SetFormulaF2 (const QString &formula, qreal value); qreal GetF2 () const; QString GetFormulaRadius () const; - void SetFormulaRadius (const VFormula &value); + void SetFormulaRadius (const QString &formula, qreal value); qreal GetRadius () const; VPointF GetCenter () const; diff --git a/src/app/geometry/varc_p.h b/src/libs/vgeometry/varc_p.h similarity index 99% rename from src/app/geometry/varc_p.h rename to src/libs/vgeometry/varc_p.h index 887bef20b..3b406a58d 100644 --- a/src/app/geometry/varc_p.h +++ b/src/libs/vgeometry/varc_p.h @@ -30,7 +30,7 @@ #define VARC_P_H #include -#include "../options.h" +#include "vgeometrydef.h" #include "vpointf.h" #ifdef Q_CC_GNU diff --git a/src/libs/vgeometry/vgeometry.pri b/src/libs/vgeometry/vgeometry.pri new file mode 100644 index 000000000..267cad448 --- /dev/null +++ b/src/libs/vgeometry/vgeometry.pri @@ -0,0 +1,30 @@ +# ADD TO EACH PATH $$PWD VARIABLE!!!!!! +# This need for corect working file translations.pro + +SOURCES += \ + $$PWD/stable.cpp \ + $$PWD/vgobject.cpp \ + $$PWD/vabstractcurve.cpp \ + $$PWD/varc.cpp \ + $$PWD/vpointf.cpp \ + $$PWD/vspline.cpp \ + $$PWD/vsplinepath.cpp \ + $$PWD/vsplinepoint.cpp \ + $$PWD/vgeometrydef.cpp + +HEADERS += \ + $$PWD/stable.h \ + $$PWD/vgobject.h \ + $$PWD/vgobject_p.h \ + $$PWD/vabstractcurve.h \ + $$PWD/varc.h \ + $$PWD/varc_p.h \ + $$PWD/vpointf.h \ + $$PWD/vpointf_p.h \ + $$PWD/vspline.h \ + $$PWD/vspline_p.h \ + $$PWD/vsplinepath.h \ + $$PWD/vsplinepath_p.h \ + $$PWD/vsplinepoint.h \ + $$PWD/vsplinepoint_p.h \ + $$PWD/vgeometrydef.h diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro new file mode 100644 index 000000000..51e305e48 --- /dev/null +++ b/src/libs/vgeometry/vgeometry.pro @@ -0,0 +1,97 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-05-07T13:42:04 +# +#------------------------------------------------- + +# File with common stuff for whole project +include(../../../Valentina.pri) + +# Name of library +TARGET = vgeometry + +# We want create a library +TEMPLATE = lib + +CONFIG += \ + staticlib \# Making static library + c++11 # We use C++11 standard + +# Use out-of-source builds (shadow builds) +CONFIG -= debug_and_release debug_and_release_target + +# Since Qt 5.4.0 the source code location is recorded only in debug builds. +# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. +DEFINES += QT_MESSAGELOGCONTEXT + +include(vgeometry.pri) +include(../../utils/utils.pri) + +# This is static library so no need in "make install" + +# directory for executable file +DESTDIR = bin + +# files created moc +MOC_DIR = moc + +# objecs files +OBJECTS_DIR = obj + +# Set using ccache. Function enable_ccache() defined in Valentina.pri. +$$enable_ccache() + +# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +$$set_PCH() + +CONFIG(debug, debug|release){ + # Debug mode + unix { + #Turn on compilers warnings. + *-g++{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS+=-fsanitize=address + } + clang*{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + } + } else { + *-g++{ + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + } + } + +}else{ + # Release mode + + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + + !macx:!win32-msvc*{ + # Turn on debug symbols in release mode on Unix systems. + # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. + QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_LFLAGS_RELEASE = + } +} + +# IFC static library +unix|win32: LIBS += -L$$OUT_PWD/../ifc/$${DESTDIR}/ -lifc + +INCLUDEPATH += $$PWD/../ifc +DEPENDPATH += $$PWD/../ifc + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../ifc/$${DESTDIR}/ifc.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../ifc/$${DESTDIR}/libifc.a diff --git a/src/libs/vgeometry/vgeometrydef.cpp b/src/libs/vgeometry/vgeometrydef.cpp new file mode 100644 index 000000000..760ef60f5 --- /dev/null +++ b/src/libs/vgeometry/vgeometrydef.cpp @@ -0,0 +1,34 @@ +/************************************************************************ + ** + ** @file vgeometrydef.cpp + ** @author Roman Telezhynskyi + ** @date 7 5, 2015 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +#include "vgeometrydef.h" + +//variables +const QString spl_ = QStringLiteral("Spl_"); +const QString arc_ = QStringLiteral("Arc_"); +const QString splPath = QStringLiteral("SplPath"); diff --git a/src/libs/vgeometry/vgeometrydef.h b/src/libs/vgeometry/vgeometrydef.h new file mode 100644 index 000000000..85edf189d --- /dev/null +++ b/src/libs/vgeometry/vgeometrydef.h @@ -0,0 +1,43 @@ +/************************************************************************ + ** + ** @file vgeometrydef.h + ** @author Roman Telezhynskyi + ** @date 7 5, 2015 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +#ifndef VGEOMETRYDEF_H +#define VGEOMETRYDEF_H + +#include + +enum class Draw : char { Calculation, Modeling }; +enum class GOType : char { Point, Arc, Spline, SplinePath, Unknown }; +enum class SplinePointPosition : char { FirstPoint, LastPoint }; + +// variables name +extern const QString arc_; +extern const QString spl_; +extern const QString splPath; + +#endif // VGEOMETRYDEF_H diff --git a/src/app/geometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp similarity index 100% rename from src/app/geometry/vgobject.cpp rename to src/libs/vgeometry/vgobject.cpp diff --git a/src/app/geometry/vgobject.h b/src/libs/vgeometry/vgobject.h similarity index 99% rename from src/app/geometry/vgobject.h rename to src/libs/vgeometry/vgobject.h index ba302d687..5ad5d0b7c 100644 --- a/src/app/geometry/vgobject.h +++ b/src/libs/vgeometry/vgobject.h @@ -29,7 +29,7 @@ #ifndef VGOBJECT_H #define VGOBJECT_H -#include "../options.h" +#include "vgeometrydef.h" #include #include #include diff --git a/src/app/geometry/vgobject_p.h b/src/libs/vgeometry/vgobject_p.h similarity index 97% rename from src/app/geometry/vgobject_p.h rename to src/libs/vgeometry/vgobject_p.h index 525cdbdd6..7c8a2b409 100644 --- a/src/app/geometry/vgobject_p.h +++ b/src/libs/vgeometry/vgobject_p.h @@ -30,7 +30,8 @@ #define VGOBJECT_P_H #include -#include "../options.h" +#include "vgeometrydef.h" +#include "../ifc/ifcdef.h" #ifdef Q_CC_GNU #pragma GCC diagnostic push diff --git a/src/app/geometry/vpointf.cpp b/src/libs/vgeometry/vpointf.cpp similarity index 100% rename from src/app/geometry/vpointf.cpp rename to src/libs/vgeometry/vpointf.cpp diff --git a/src/app/geometry/vpointf.h b/src/libs/vgeometry/vpointf.h similarity index 100% rename from src/app/geometry/vpointf.h rename to src/libs/vgeometry/vpointf.h diff --git a/src/app/geometry/vpointf_p.h b/src/libs/vgeometry/vpointf_p.h similarity index 98% rename from src/app/geometry/vpointf_p.h rename to src/libs/vgeometry/vpointf_p.h index 82979c7a6..cc7e35801 100644 --- a/src/app/geometry/vpointf_p.h +++ b/src/libs/vgeometry/vpointf_p.h @@ -30,7 +30,7 @@ #define VPOINTF_P_H #include -#include "../options.h" +#include "vgeometrydef.h" #include #ifdef Q_CC_GNU diff --git a/src/app/geometry/vspline.cpp b/src/libs/vgeometry/vspline.cpp similarity index 100% rename from src/app/geometry/vspline.cpp rename to src/libs/vgeometry/vspline.cpp diff --git a/src/app/geometry/vspline.h b/src/libs/vgeometry/vspline.h similarity index 100% rename from src/app/geometry/vspline.h rename to src/libs/vgeometry/vspline.h diff --git a/src/app/geometry/vspline_p.h b/src/libs/vgeometry/vspline_p.h similarity index 99% rename from src/app/geometry/vspline_p.h rename to src/libs/vgeometry/vspline_p.h index f63470486..4cdacc03c 100644 --- a/src/app/geometry/vspline_p.h +++ b/src/libs/vgeometry/vspline_p.h @@ -30,7 +30,6 @@ #define VSPLINE_P_H #include -#include "../options.h" #include "vpointf.h" #include #include diff --git a/src/app/geometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp similarity index 99% rename from src/app/geometry/vsplinepath.cpp rename to src/libs/vgeometry/vsplinepath.cpp index b25047197..ebc8c1050 100644 --- a/src/app/geometry/vsplinepath.cpp +++ b/src/libs/vgeometry/vsplinepath.cpp @@ -28,7 +28,7 @@ #include "vsplinepath.h" #include "vsplinepath_p.h" -#include "../libs/ifc/exception/vexception.h" +#include "../ifc/exception/vexception.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) # include "../../utils/vmath.h" diff --git a/src/app/geometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h similarity index 100% rename from src/app/geometry/vsplinepath.h rename to src/libs/vgeometry/vsplinepath.h diff --git a/src/app/geometry/vsplinepath_p.h b/src/libs/vgeometry/vsplinepath_p.h similarity index 98% rename from src/app/geometry/vsplinepath_p.h rename to src/libs/vgeometry/vsplinepath_p.h index 1108bd527..627bbeaee 100644 --- a/src/app/geometry/vsplinepath_p.h +++ b/src/libs/vgeometry/vsplinepath_p.h @@ -30,7 +30,6 @@ #define VSPLINEPATH_P_H #include -#include "../options.h" #include "vsplinepoint.h" #ifdef Q_CC_GNU diff --git a/src/app/geometry/vsplinepoint.cpp b/src/libs/vgeometry/vsplinepoint.cpp similarity index 100% rename from src/app/geometry/vsplinepoint.cpp rename to src/libs/vgeometry/vsplinepoint.cpp diff --git a/src/app/geometry/vsplinepoint.h b/src/libs/vgeometry/vsplinepoint.h similarity index 100% rename from src/app/geometry/vsplinepoint.h rename to src/libs/vgeometry/vsplinepoint.h diff --git a/src/app/geometry/vsplinepoint_p.h b/src/libs/vgeometry/vsplinepoint_p.h similarity index 99% rename from src/app/geometry/vsplinepoint_p.h rename to src/libs/vgeometry/vsplinepoint_p.h index 99e1491a7..8af4af3c2 100644 --- a/src/app/geometry/vsplinepoint_p.h +++ b/src/libs/vgeometry/vsplinepoint_p.h @@ -30,7 +30,6 @@ #define VSPLINEPOINT_P_H #include -#include "../options.h" #include "vpointf.h" #include