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

Fix updating notches.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-05-13 19:34:11 +03:00
parent 6dfa13ec9a
commit ee705768e9
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -270,35 +270,35 @@ auto RenderSeamAllowancePath(const VPiece &detail, bool combineTogether, const V
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
auto RenderPassmarks(const VPiece &detail, const VContainer *data) -> QPainterPath auto RenderPassmarks(const VPiece &detail, const VContainer *data) -> QPainterPath
{ {
const QLineF mirrorLine = detail.SeamMirrorLine(data); if (const QLineF mirrorLine = detail.SeamMirrorLine(data); !mirrorLine.isNull() && detail.IsShowFullPiece())
if (!mirrorLine.isNull() && detail.IsShowFullPiece())
{ {
QPainterPath path; if (!detail.IsSeamAllowance())
if (detail.IsSeamAllowance())
{ {
const QTransform matrix = VGObject::FlippingMatrix(mirrorLine); return {};
const QVector<VLayoutPassmark> passmarks = VLayoutPiece::ConvertPassmarks(detail, data); }
for (const auto &passmark : passmarks)
QPainterPath path;
const QTransform matrix = VGObject::FlippingMatrix(mirrorLine);
const QVector<VLayoutPassmark> passmarks = VLayoutPiece::ConvertPassmarks(detail, data);
for (const auto &passmark : passmarks)
{
QPainterPath passmaksPath;
for (const auto &line : passmark.lines)
{ {
QPainterPath passmaksPath; passmaksPath.moveTo(line.p1());
passmaksPath.lineTo(line.p2());
}
path.addPath(passmaksPath);
if (!VGObject::IsPointOnLineviaPDP(passmark.baseLine.p1(), mirrorLine.p1(), mirrorLine.p2()))
{
QPainterPath mirroredPassmaksPath;
for (const auto &line : passmark.lines) for (const auto &line : passmark.lines)
{ {
passmaksPath.moveTo(line.p1()); mirroredPassmaksPath.moveTo(line.p1());
passmaksPath.lineTo(line.p2()); mirroredPassmaksPath.lineTo(line.p2());
}
path.addPath(passmaksPath);
if (!VGObject::IsPointOnLineviaPDP(passmark.baseLine.p1(), mirrorLine.p1(), mirrorLine.p2()))
{
QPainterPath mirroredPassmaksPath;
for (const auto &line : passmark.lines)
{
mirroredPassmaksPath.moveTo(line.p1());
mirroredPassmaksPath.lineTo(line.p2());
}
path.addPath(matrix.map(mirroredPassmaksPath));
} }
path.addPath(matrix.map(mirroredPassmaksPath));
} }
} }
@ -1093,7 +1093,7 @@ void VToolSeamAllowance::UpdatePatternInfo()
void VToolSeamAllowance::UpdatePassmarks() void VToolSeamAllowance::UpdatePassmarks()
{ {
const VPiece detail = VAbstractTool::data.GetPiece(m_id); const VPiece detail = VAbstractTool::data.GetPiece(m_id);
m_passmarks->setPath(detail.PassmarksPath(getData())); m_passmarks->setPath(RenderPassmarks(detail, getData()));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------