From 8c9eec2448f7bfa426b12d16dd3b25fb3807c5e8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 25 Feb 2020 08:44:13 +0200 Subject: [PATCH] Option Pattern Piece -> Show main path doesn't show second passmarks on main path. --- src/libs/vlayout/vlayoutpiece.cpp | 2 +- src/libs/vpatterndb/vpassmark.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp index 89e20cd4c..1f8dfa8a1 100644 --- a/src/libs/vlayout/vlayoutpiece.cpp +++ b/src/libs/vlayout/vlayoutpiece.cpp @@ -354,7 +354,7 @@ QVector ConvertPassmarks(const VPiece &piece, const VContainer } if (qApp->Settings()->IsDoublePassmark() - && not piece.IsHideMainPath() + && (qApp->Settings()->IsPieceShowMainPath() || not piece.IsHideMainPath()) && pData.isMainPathNode && pData.passmarkAngleType != PassmarkAngleType::Intersection && pData.passmarkAngleType != PassmarkAngleType::IntersectionOnlyLeft diff --git a/src/libs/vpatterndb/vpassmark.cpp b/src/libs/vpatterndb/vpassmark.cpp index 825e9f05e..8db56a243 100644 --- a/src/libs/vpatterndb/vpassmark.cpp +++ b/src/libs/vpatterndb/vpassmark.cpp @@ -660,7 +660,7 @@ QVector VPassmark::FullPassmark(const VPiece &piece, const VContainer *d QVector lines; lines += SAPassmark(piece, data, PassmarkSide::All); if (qApp->Settings()->IsDoublePassmark() - && not piece.IsHideMainPath() + && (qApp->Settings()->IsPieceShowMainPath() || not piece.IsHideMainPath()) && m_data.isMainPathNode && m_data.passmarkAngleType != PassmarkAngleType::Intersection && m_data.passmarkAngleType != PassmarkAngleType::IntersectionOnlyLeft