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

Option Pattern Piece -> Show main path doesn't show second passmarks on main path.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-02-25 08:44:13 +02:00
parent 06c09b63ba
commit 8c9eec2448
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vlayout/vlayoutpiece.cpp
View File

@ -354,7 +354,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
} }
if (qApp->Settings()->IsDoublePassmark() if (qApp->Settings()->IsDoublePassmark()
&& not piece.IsHideMainPath() && (qApp->Settings()->IsPieceShowMainPath() || not piece.IsHideMainPath())
&& pData.isMainPathNode && pData.isMainPathNode
&& pData.passmarkAngleType != PassmarkAngleType::Intersection && pData.passmarkAngleType != PassmarkAngleType::Intersection
&& pData.passmarkAngleType != PassmarkAngleType::IntersectionOnlyLeft && pData.passmarkAngleType != PassmarkAngleType::IntersectionOnlyLeft

2
src/libs/vpatterndb/vpassmark.cpp
View File

@ -660,7 +660,7 @@ QVector<QLineF> VPassmark::FullPassmark(const VPiece &piece, const VContainer *d
QVector<QLineF> lines; QVector<QLineF> lines;
lines += SAPassmark(piece, data, PassmarkSide::All); lines += SAPassmark(piece, data, PassmarkSide::All);
if (qApp->Settings()->IsDoublePassmark() if (qApp->Settings()->IsDoublePassmark()
&& not piece.IsHideMainPath() && (qApp->Settings()->IsPieceShowMainPath() || not piece.IsHideMainPath())
&& m_data.isMainPathNode && m_data.isMainPathNode
&& m_data.passmarkAngleType != PassmarkAngleType::Intersection && m_data.passmarkAngleType != PassmarkAngleType::Intersection
&& m_data.passmarkAngleType != PassmarkAngleType::IntersectionOnlyLeft && m_data.passmarkAngleType != PassmarkAngleType::IntersectionOnlyLeft