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

Revert previos changes. ref #668.

Browse Source 
Do not ignore nodes if a passmark is part of main path.

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2017-04-26 08:07:07 +03:00
parent 585213412c
commit 89bf3cc005
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/vpatterndb/vpiecepath.cpp
View File

@ -791,13 +791,7 @@ int VPiecePath::FindInLoopNotExcludedUp(int start, const QVector<VPieceNode> &no
bool found = false; bool found = false;
do do
{ {
if (not nodes.at(i).IsExcluded() 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())))
{ {
found = true; found = true;
break; break;
@ -833,13 +827,7 @@ int VPiecePath::FindInLoopNotExcludedDown(int start, const QVector<VPieceNode> &
bool found = false; bool found = false;
do do
{ {
if (not nodes.at(i).IsExcluded() 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())))
{ {
found = true; found = true;
break; break;