mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "0b6abc6bbbda280289b94fdc2415872fbbe940ec" and "5a46ca0a48686c7ad0c3f33fdd8bc9a7bea00981" have entirely different histories.
0b6abc6bbb
...
5a46ca0a48
|
@ -257,7 +257,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- qbs --version
|
- qbs --version
|
||||||
# Patch Qbs. Remove after Qbs 2.2.1+.
|
# Patch Qbs. Remove after Qbs 2.2.1+.
|
||||||
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
||||||
- patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
- patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
||||||
- rm $HOME/qbs-pkg-config-probe.patch
|
- rm $HOME/qbs-pkg-config-probe.patch
|
||||||
build_script:
|
build_script:
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
|
|
|
@ -187,7 +187,7 @@ environment:
|
||||||
BUILD_SYSTEM: "qbs"
|
BUILD_SYSTEM: "qbs"
|
||||||
QMAKE: qmake.exe
|
QMAKE: qmake.exe
|
||||||
ENABLE_PCH: true
|
ENABLE_PCH: true
|
||||||
MSVC_PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.38.33130\\bin\\Hostx64\\x64"
|
MSVC_PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.37.32822\\bin\\Hostx64\\x64"
|
||||||
VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
|
VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
|
||||||
ARCH: x64
|
ARCH: x64
|
||||||
PYTHON: "C:\\Python311-x64"
|
PYTHON: "C:\\Python311-x64"
|
||||||
|
@ -728,7 +728,7 @@ for:
|
||||||
- qbs --version
|
- qbs --version
|
||||||
# Patch Qbs. Remove after Qbs 2.2.1+.
|
# Patch Qbs. Remove after Qbs 2.2.1+.
|
||||||
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
||||||
- patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
- patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
||||||
- rm $HOME/qbs-pkg-config-probe.patch
|
- rm $HOME/qbs-pkg-config-probe.patch
|
||||||
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
||||||
|
@ -911,7 +911,7 @@ for:
|
||||||
- qbs --version
|
- qbs --version
|
||||||
# Patch Qbs. Remove after Qbs 2.2.1+.
|
# Patch Qbs. Remove after Qbs 2.2.1+.
|
||||||
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
||||||
- patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
- patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
||||||
- rm $HOME/qbs-pkg-config-probe.patch
|
- rm $HOME/qbs-pkg-config-probe.patch
|
||||||
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
||||||
|
|
|
@ -17,9 +17,6 @@
|
||||||
#include "drw_header.h"
|
#include "drw_header.h"
|
||||||
#include "drw_interface.h"
|
#include "drw_interface.h"
|
||||||
#include "drw_objects.h"
|
#include "drw_objects.h"
|
||||||
#include "intern/dxfreader.h"
|
|
||||||
#include "intern/dxfwriter.h"
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
|
@ -28,6 +25,9 @@
|
||||||
#include <ciso646> // and, not, or
|
#include <ciso646> // and, not, or
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
class dxfReader;
|
||||||
|
class dxfWriter;
|
||||||
|
|
||||||
class dxfRW
|
class dxfRW
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -507,7 +507,7 @@ auto VFoldLine::TrueCenter(const QLineF &base, qreal width) const -> QPointF
|
||||||
|
|
||||||
if (VFuzzyComparePossibleNulls(base.length(), width) || qFuzzyIsNull(width))
|
if (VFuzzyComparePossibleNulls(base.length(), width) || qFuzzyIsNull(width))
|
||||||
{
|
{
|
||||||
return LineCenter(base);
|
return base.center();
|
||||||
}
|
}
|
||||||
|
|
||||||
QLineF seg1 = base;
|
QLineF seg1 = base;
|
||||||
|
|
|
@ -1680,8 +1680,8 @@ auto VPiece::SeamAllowanceMirrorLine(const VContainer *data) const -> QLineF
|
||||||
QRectF rec = QRectF(0, 0, INT_MAX, INT_MAX);
|
QRectF rec = QRectF(0, 0, INT_MAX, INT_MAX);
|
||||||
rec.translate(-INT_MAX / 2.0, -INT_MAX / 2.0);
|
rec.translate(-INT_MAX / 2.0, -INT_MAX / 2.0);
|
||||||
|
|
||||||
QLineF axis = QLineF(LineCenter(seamMirrorLine),
|
QLineF axis =
|
||||||
VGObject::BuildRay(LineCenter(seamMirrorLine), seamMirrorLine.angle() + 180, rec));
|
QLineF(seamMirrorLine.center(), VGObject::BuildRay(seamMirrorLine.center(), seamMirrorLine.angle() + 180, rec));
|
||||||
|
|
||||||
QVector<QPointF> points;
|
QVector<QPointF> points;
|
||||||
CastTo(SeamAllowancePoints(data), points);
|
CastTo(SeamAllowancePoints(data), points);
|
||||||
|
@ -1695,8 +1695,7 @@ auto VPiece::SeamAllowanceMirrorLine(const VContainer *data) const -> QLineF
|
||||||
const QPointF startPoint = intersections.constFirst();
|
const QPointF startPoint = intersections.constFirst();
|
||||||
|
|
||||||
std::reverse(points.begin(), points.end());
|
std::reverse(points.begin(), points.end());
|
||||||
axis =
|
axis = QLineF(seamMirrorLine.center(), VGObject::BuildRay(seamMirrorLine.center(), seamMirrorLine.angle(), rec));
|
||||||
QLineF(LineCenter(seamMirrorLine), VGObject::BuildRay(LineCenter(seamMirrorLine), seamMirrorLine.angle(), rec));
|
|
||||||
intersections = VAbstractCurve::CurveIntersectLine(points, axis);
|
intersections = VAbstractCurve::CurveIntersectLine(points, axis);
|
||||||
if (intersections.isEmpty())
|
if (intersections.isEmpty())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue