aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New static libray VGeomerty. Need for unit testing.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-05-07 15:31:53 +03:00
parent 5abac4a384
commit af2e0fb509
114 changed files with 423 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/translations.pro
View File

@ -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).

9
src/app/app.pro
View File

@ -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){

2
src/app/container/variables/varclength.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "varclength.h"
#include "../geometry/vabstractcurve.h"
#include "../libs/vgeometry/vabstractcurve.h"
#include "../core/vapplication.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/container/variables/vcurvelength.cpp
View File

@ -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()

2
src/app/container/variables/vlineangle.cpp
View File

@ -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 <QLineF>

2
src/app/container/variables/vlinelength.cpp
View File

@ -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 <QLineF>

2
src/app/container/variables/vsplinelength.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vsplinelength.h"
#include "../geometry/vabstractcurve.h"
#include "../libs/vgeometry/vabstractcurve.h"
#include "../core/vapplication.h"
//---------------------------------------------------------------------------------------------------------------------

4
src/app/container/vcontainer.cpp
View File

@ -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 <QLineF>

4
src/app/container/vcontainer.h
View File

@ -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 <QCoreApplication>
#include <QHash>

6
src/app/dialogs/app/dialoghistory.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogarc.cpp
View File

@ -32,7 +32,7 @@
#include <QPushButton>
#include <QTimer>
#include "../../geometry/vpointf.h"
#include "../../libs/vgeometry/vpointf.h"
#include "../../container/vcontainer.h"
#include "../../libs/ifc/xml/vdomdocument.h"
#include "../../visualization/vistoolarc.h"

2
src/app/dialogs/tools/dialogbisector.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogcutarc.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogcutspline.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -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"

6
src/app/dialogs/tools/dialogdetail.cpp
View File

@ -30,9 +30,9 @@
#include <QDebug>
#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"

2
src/app/dialogs/tools/dialogendline.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogheight.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogline.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialoglineintersect.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogpointofcontact.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogpointofintersection.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogspline.cpp
View File

@ -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 <QDebug>

2
src/app/dialogs/tools/dialogsplinepath.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogsplinepath.h
View File

@ -30,7 +30,7 @@
#define DIALOGSPLINEPATH_H
#include "dialogtool.h"
#include "../../geometry/vsplinepath.h"
#include "../../libs/vgeometry/vsplinepath.h"
namespace Ui
{

6
src/app/dialogs/tools/dialogtool.cpp
View File

@ -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"

2
src/app/dialogs/tools/dialogtriangle.cpp
View File

@ -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"

24
src/app/geometry/geometry.pri
View File

@ -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

2
src/app/mainwindow.cpp
View File

@ -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"

3
src/app/options.cpp
View File

@ -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");

7
src/app/options.h
View File

@ -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;

2
src/app/tools/drawTools/vtoolalongline.cpp
View File

@ -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"

8
src/app/tools/drawTools/vtoolarc.cpp
View File

@ -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<VGObject> obj = VAbstractTool::data.GetGObject(id);
QSharedPointer<VArc> arc = qSharedPointerDynamicCast<VArc>(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<VArc> arc = qSharedPointerDynamicCast<VArc>(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);
}
}

2
src/app/tools/drawTools/vtoolbisector.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolcurveintersectaxis.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolcut.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vtoolcut.h"
#include "../../geometry/vpointf.h"
#include "../../libs/vgeometry/vpointf.h"
#include "../../container/vformula.h"
//---------------------------------------------------------------------------------------------------------------------

4
src/app/tools/drawTools/vtoolcutarc.cpp
View File

@ -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");

4
src/app/tools/drawTools/vtoolcutspline.cpp
View File

@ -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");

5
src/app/tools/drawTools/vtoolcutsplinepath.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolendline.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolheight.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolline.cpp
View File

@ -29,7 +29,7 @@
#include "vtoolline.h"
#include "../../dialogs/tools/dialogline.h"
#include <QKeyEvent>
#include "../../geometry/vpointf.h"
#include "../../libs/vgeometry/vpointf.h"
#include "../../dialogs/tools/dialogline.h"
#include "../../visualization/vistoolline.h"

2
src/app/tools/drawTools/vtoollineintersect.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoollineintersectaxis.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoollinepoint.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vtoollinepoint.h"
#include "../../geometry/vpointf.h"
#include "../../libs/vgeometry/vpointf.h"
//---------------------------------------------------------------------------------------------------------------------
/**

2
src/app/tools/drawTools/vtoolnormal.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolpoint.cpp
View File

@ -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"

2
src/app/tools/drawTools/vtoolpointofcontact.cpp
View File

@ -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 <QtCore/qmath.h>

2
src/app/tools/drawTools/vtoolpointofintersection.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolshoulderpoint.cpp
View File

@ -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");

2
src/app/tools/drawTools/vtoolsinglepoint.cpp
View File

@ -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 <QMessageBox>

2
src/app/tools/drawTools/vtoolspline.cpp
View File

@ -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"

2
src/app/tools/drawTools/vtooltriangle.cpp
View File

@ -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 <QtCore/qmath.h>

2
src/app/tools/nodeDetails/vnodearc.cpp
View File

@ -29,7 +29,7 @@
#include "vnodearc.h"
#include "../../core/vapplication.h"
#include "../../geometry/varc.h"
#include "../../libs/vgeometry/varc.h"
#include <QGraphicsSceneMouseEvent>
#include <QPen>

2
src/app/tools/nodeDetails/vnodepoint.cpp
View File

@ -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 <QPen>
#include <QBrush>

2
src/app/tools/nodeDetails/vnodespline.cpp
View File

@ -29,7 +29,7 @@
#include "vnodespline.h"
#include "../../core/vapplication.h"
#include "../../geometry/vspline.h"
#include "../../libs/vgeometry/vspline.h"
#include <QGraphicsSceneMouseEvent>
#include <QPen>

2
src/app/tools/nodeDetails/vnodesplinepath.cpp
View File

@ -29,7 +29,7 @@
#include "vnodesplinepath.h"
#include "../../core/vapplication.h"
#include "../../geometry/vsplinepath.h"
#include "../../libs/vgeometry/vsplinepath.h"
#include <QGraphicsSceneMouseEvent>
#include <QPen>

2
src/app/tools/vabstracttool.cpp
View File

@ -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"

4
src/app/tools/vtooldetail.cpp
View File

@ -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"

6
src/app/tools/vtooluniondetails.cpp
View File

@ -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"

2
src/app/undocommands/movespline.h
View File

@ -30,7 +30,7 @@
#define MOVESPLINE_H
#include "vundocommand.h"
#include "../geometry/vspline.h"
#include "../libs/vgeometry/vspline.h"
class QGraphicsScene;

2
src/app/undocommands/movesplinepath.h
View File

@ -30,7 +30,7 @@
#define MOVESPLINEPATH_H
#include "vundocommand.h"
#include "../geometry/vsplinepath.h"
#include "../libs/vgeometry/vsplinepath.h"
class QGraphicsScene;

3
src/app/visualization/vcontrolpointspline.h
View File

@ -31,7 +31,8 @@
#include <QGraphicsEllipseItem>
#include <QObject>
#include "../geometry/vsplinepath.h"
#include "../libs/vgeometry/vsplinepath.h"
#include "../options.h"
/**
* @brief The VControlPointSpline class control spline point.

2
src/app/visualization/vistoolalongline.cpp
View File

@ -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)

4
src/app/visualization/vistoolarc.cpp
View File

@ -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"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolbisector.cpp
View File

@ -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"

2
src/app/visualization/vistoolcurveintersectaxis.cpp
View File

@ -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"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolcutarc.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolcutarc.h"
#include "../geometry/varc.h"
#include "../libs/vgeometry/varc.h"
#include "../container/vcontainer.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolcutspline.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolcutspline.h"
#include "../geometry/vspline.h"
#include "../libs/vgeometry/vspline.h"
#include "../container/vcontainer.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolcutsplinepath.cpp
View File

@ -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)

2
src/app/visualization/vistoolendline.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolendline.h"
#include "../geometry/vpointf.h"
#include "../libs/vgeometry/vpointf.h"
#include "../container/vcontainer.h"
#include "../tools/vabstracttool.h"

2
src/app/visualization/vistoolheight.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolheight.h"
#include "../geometry/vpointf.h"
#include "../libs/vgeometry/vpointf.h"
#include "../tools/drawTools/vtoolheight.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolline.cpp
View File

@ -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"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoollineintersect.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoollineintersect.h"
#include "../geometry/vpointf.h"
#include "../libs/vgeometry/vpointf.h"
#include "../container/vcontainer.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoollineintersectaxis.cpp
View File

@ -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"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolnormal.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolnormal.h"
#include "../geometry/vpointf.h"
#include "../libs/vgeometry/vpointf.h"
#include "../tools/drawTools/vtoolnormal.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolpointofcontact.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolpointofcontact.h"
#include "../geometry/vpointf.h"
#include "../libs/vgeometry/vpointf.h"
#include "../tools/drawTools/vtoolpointofcontact.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolpointofintersection.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/
#include "vistoolpointofintersection.h"
#include "../geometry/vpointf.h"
#include "../libs/vgeometry/vpointf.h"
#include "../container/vcontainer.h"
//---------------------------------------------------------------------------------------------------------------------

2
src/app/visualization/vistoolshoulderpoint.cpp
View File

@ -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)

4
src/app/visualization/vistoolspline.cpp
View File

@ -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;

2
src/app/visualization/vistoolsplinepath.h
View File

@ -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};

2
src/app/visualization/vistooltriangle.cpp
View File

@ -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 <QtCore/qmath.h>

3
src/app/visualization/vsimplecurve.h
View File

@ -30,7 +30,8 @@
#define VSIMPLECURVE_H
#include <QGraphicsPathItem>
#include "../geometry/vabstractcurve.h"
#include "../libs/vgeometry/vabstractcurve.h"
#include "../options.h"
enum class SimpleCurvePoint : char { FirstPoint, ForthPoint };

2
src/app/xml/vpattern.cpp
View File

@ -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 <QMessageBox>
#include <QUndoStack>

3
src/libs/libs.pro
View File

@ -4,4 +4,5 @@ SUBDIRS = qmuparser \
vpropertyexplorer \
ifc \
vobj \
vlayout
vlayout \
vgeometry

30
src/libs/vgeometry/stable.cpp Normal file
View File

@ -0,0 +1,30 @@
/************************************************************************
**
** @file stable.cpp
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @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
** <https://bitbucket.org/dismine/valentina> 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 <http://www.gnu.org/licenses/>.
**
*************************************************************************/
// Build the precompiled headers.
#include "stable.h"

52
src/libs/vgeometry/stable.h Normal file
View File

@ -0,0 +1,52 @@
/************************************************************************
**
** @file stable.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @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
** <https://bitbucket.org/dismine/valentina> 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 <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#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 <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#endif/*__cplusplus*/
#endif // STABLE_H

0
src/app/geometry/vabstractcurve.cpp → src/libs/vgeometry/vabstractcurve.cpp
View File

1
src/app/geometry/vabstractcurve.h → src/libs/vgeometry/vabstractcurve.h
View File

@ -30,6 +30,7 @@
#define VABSTRACTCURVE_H
#include "vgobject.h"
#include "../ifc/ifcdef.h"
#include <QPointF>
enum class PathDirection : char { Hide, Show };

21
src/app/geometry/varc.cpp → src/libs/vgeometry/varc.cpp
View File

@ -34,9 +34,6 @@
#include <QPointF>
#include <QtCore/qmath.h>
#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;
}
//---------------------------------------------------------------------------------------------------------------------

7
src/app/geometry/varc.h → src/libs/vgeometry/varc.h
View File

@ -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;

2
src/app/geometry/varc_p.h → src/libs/vgeometry/varc_p.h
View File

@ -30,7 +30,7 @@
#define VARC_P_H
#include <QSharedData>
#include "../options.h"
#include "vgeometrydef.h"
#include "vpointf.h"
#ifdef Q_CC_GNU

30
src/libs/vgeometry/vgeometry.pri Normal file
View File

@ -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

97
src/libs/vgeometry/vgeometry.pro Normal file
View File

@ -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

34
src/libs/vgeometry/vgeometrydef.cpp Normal file
View File

@ -0,0 +1,34 @@
/************************************************************************
**
** @file vgeometrydef.cpp
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @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
** <https://bitbucket.org/dismine/valentina> 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 <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#include "vgeometrydef.h"
//variables
const QString spl_ = QStringLiteral("Spl_");
const QString arc_ = QStringLiteral("Arc_");
const QString splPath = QStringLiteral("SplPath");

43
src/libs/vgeometry/vgeometrydef.h Normal file
View File

@ -0,0 +1,43 @@
/************************************************************************
**
** @file vgeometrydef.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @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
** <https://bitbucket.org/dismine/valentina> 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 <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef VGEOMETRYDEF_H
#define VGEOMETRYDEF_H
#include <QString>
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

0
src/app/geometry/vgobject.cpp → src/libs/vgeometry/vgobject.cpp
View File

Some files were not shown because too many files have changed in this diff Show More