From 89bf3cc005eb954a8f10adfe3f63d71f976054ce Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 26 Apr 2017 08:07:07 +0300 Subject: [PATCH] Revert previos changes. ref #668. Do not ignore nodes if a passmark is part of main path. --HG-- branch : release --- src/libs/vpatterndb/vpiecepath.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/libs/vpatterndb/vpiecepath.cpp b/src/libs/vpatterndb/vpiecepath.cpp index b9a2b6c8e..46fff2fab 100644 --- a/src/libs/vpatterndb/vpiecepath.cpp +++ b/src/libs/vpatterndb/vpiecepath.cpp @@ -791,13 +791,7 @@ int VPiecePath::FindInLoopNotExcludedUp(int start, const QVector &no bool found = false; do { - if (not nodes.at(i).IsExcluded() - && (not nodes.at(start).IsMainPathNode() - || (nodes.at(start).IsMainPathNode() - && nodes.at(start).GetPassmarkAngleType() != PassmarkAngleType::Intersection) - || (nodes.at(start).IsMainPathNode() - && nodes.at(start).GetPassmarkAngleType() == PassmarkAngleType::Intersection - && nodes.at(i).IsMainPathNode()))) + if (not nodes.at(i).IsExcluded()) { found = true; break; @@ -833,13 +827,7 @@ int VPiecePath::FindInLoopNotExcludedDown(int start, const QVector & bool found = false; do { - if (not nodes.at(i).IsExcluded() - && (not nodes.at(start).IsMainPathNode() - || (nodes.at(start).IsMainPathNode() - && nodes.at(start).GetPassmarkAngleType() != PassmarkAngleType::Intersection) - || (nodes.at(start).IsMainPathNode() - && nodes.at(start).GetPassmarkAngleType() == PassmarkAngleType::Intersection - && nodes.at(i).IsMainPathNode()))) + if (not nodes.at(i).IsExcluded()) { found = true; break;