mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 15:24:03 +02:00
Compare commits
No commits in common. "113b685c9ca3dbdabe311b31e8baf80aba32a12b" and "54fdcf3caecb4162a46f3982f5846ba04f1b00dc" have entirely different histories.
113b685c9c
...
54fdcf3cae
|
@ -191,7 +191,7 @@ noRunPath{ # For enable run qmake with CONFIG+=noRunPath
|
|||
#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
|
||||
#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
|
||||
|
||||
# VLayout static library (depend on VGeometry, VFormat, VWidgets)
|
||||
# VLayout static library (depend on VGeometry, VFormat)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vlayout
|
||||
|
@ -200,15 +200,6 @@ 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
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# VFormat static library (depend on VPatternDB, IFC)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
|
||||
|
||||
|
@ -245,6 +236,15 @@ DEPENDPATH += $$PWD/../../libs/ifc
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
#VMisc static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR}/ -lvmisc
|
||||
|
||||
|
|
|
@ -336,6 +336,15 @@ DEPENDPATH += $$PWD/../../libs/vtools
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# VFormat static library (depend on VPatternDB, IFC)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
|
||||
|
||||
|
@ -354,7 +363,7 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
|
||||
|
||||
# VLayout static library (depend on IFC, VGeometry, VWidgets)
|
||||
# VLayout static library (depend on IFC, VGeometry)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vlayout
|
||||
|
@ -363,15 +372,6 @@ 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
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# Fervor static library (depend on VMisc, IFC)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/fervor/$${DESTDIR}/ -lfervor
|
||||
|
||||
|
|
|
@ -594,7 +594,7 @@ DEPENDPATH += $$PWD/../../libs/vtools
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
|
||||
|
||||
# VLayout static library (depend on IFC, VGeometry, VWidgets)
|
||||
# VLayout static library (depend on IFC, VGeometry)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vlayout
|
||||
|
|
|
@ -280,7 +280,7 @@ Q_DECL_RELAXED_CONSTEXPR inline auto VSAPoint::PassmarkLength(qreal width) const
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
Q_DECL_CONSTEXPR inline auto VSAPoint::IsPassmarkClockwiseOpening() const -> bool
|
||||
Q_DECL_RELAXED_CONSTEXPR inline bool VSAPoint::IsPassmarkClockwiseOpening() const
|
||||
{
|
||||
return m_passmarkClockwiseOpening;
|
||||
}
|
||||
|
|
|
@ -531,7 +531,7 @@ auto CreateCheckMarkPassmark(const VPiecePassmarkData &passmarkData, const QLine
|
|||
const QVector<QPointF> &seamAllowance) -> QVector<QLineF>
|
||||
{
|
||||
constexpr qreal defAngle = 45;
|
||||
qreal defWidth = qAbs(line.length() * qTan(qDegreesToRadians(defAngle)));
|
||||
qreal defWidth = line.length() * qTan(qDegreesToRadians(defAngle));
|
||||
|
||||
if (not passmarkData.passmarkSAPoint.IsPassmarkClockwiseOpening())
|
||||
{
|
||||
|
@ -544,14 +544,14 @@ auto CreateCheckMarkPassmark(const VPiecePassmarkData &passmarkData, const QLine
|
|||
if (width > 0)
|
||||
{ // clockwise
|
||||
QLineF l1(line.p2(), line.p1());
|
||||
l1.setAngle(l1.angle() - angle);
|
||||
l1.setAngle(l1.angle() + angle);
|
||||
l1 = VPassmark::FindIntersection(l1, seamAllowance);
|
||||
|
||||
return {{l1.p2(), l1.p1()}, {line.p2(), line.p1()}};
|
||||
}
|
||||
|
||||
QLineF l2(line.p2(), line.p1());
|
||||
l2.setAngle(l2.angle() + angle);
|
||||
l2.setAngle(l2.angle() - angle);
|
||||
l2 = VPassmark::FindIntersection(l2, seamAllowance);
|
||||
|
||||
return {line, l2};
|
||||
|
|
|
@ -3525,7 +3525,7 @@ void DialogSeamAllowance::InitGrainlineTab()
|
|||
static_cast<int>(GrainlineArrowDirection::twoWaysUpLeft));
|
||||
uiTabGrainline->comboBoxArrow->addItem(tr("Two ways (Up/Right)", "grainline direction"),
|
||||
static_cast<int>(GrainlineArrowDirection::twoWaysUpRight));
|
||||
uiTabGrainline->comboBoxArrow->addItem(tr("Two ways (Down/Left)", "grainline direction"),
|
||||
uiTabGrainline->comboBoxArrow->addItem(tr("Two ways (Down/Right)", "grainline direction"),
|
||||
static_cast<int>(GrainlineArrowDirection::twoWaysDownLeft));
|
||||
uiTabGrainline->comboBoxArrow->addItem(tr("Two ways (Down/Right)", "grainline direction"),
|
||||
static_cast<int>(GrainlineArrowDirection::twoWaysDownRight));
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "../dialogtool.h"
|
||||
#include "../vpatterndb/vpiece.h"
|
||||
#include "../vpatterndb/vpiecepath.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
|
|
@ -108,6 +108,15 @@ DEPENDPATH += $$PWD/../../libs/vtools
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# VFormat static library (depend on VPatternDB, IFC)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
|
||||
|
||||
|
@ -126,7 +135,7 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
|
||||
|
||||
# VLayout static library (depend on IFC, VGeometry, VWidgets)
|
||||
# VLayout static library (depend on IFC, VGeometry)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vlayout
|
||||
|
@ -135,15 +144,6 @@ 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
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# VGeometry static library (depend on ifc)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
|
||||
|
||||
# VLayout static library (depend on IFC, VGeometry, VWidgets)
|
||||
# VLayout static library (depend on IFC, VGeometry)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vlayout
|
||||
|
@ -129,15 +129,6 @@ 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
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
## VGeometry static library (depend on ifc)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
|
||||
|
||||
|
|
|
@ -152,6 +152,15 @@ DEPENDPATH += $$PWD/../../libs/vtools
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# VFormat static library (depend on VPatternDB, IFC)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
|
||||
|
||||
|
@ -170,7 +179,7 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb
|
|||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
|
||||
|
||||
# VLayout static library (depend on IFC, VGeometry, VWidgets)
|
||||
# VLayout static library (depend on IFC, VGeometry)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vlayout
|
||||
|
@ -179,15 +188,6 @@ 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
|
||||
|
||||
#VWidgets static library
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
|
||||
|
||||
INCLUDEPATH += $$PWD/../../libs/vwidgets
|
||||
DEPENDPATH += $$PWD/../../libs/vwidgets
|
||||
|
||||
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
|
||||
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
|
||||
|
||||
# VGeometry static library (depend on ifc, VMisc)
|
||||
unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
|
||||
|
||||
|
|
Loading…
Reference in a new issue