suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libarea: make CArea::Record skip open wires

Browse Source
This commit is contained in:
Zheng, Lei 2017-01-19 19:03:11 +08:00
parent 04888f6961
commit b58e45a04c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/Path/libarea/Area.cpp
View File

@ -92,9 +92,13 @@ void CArea::Reorder()
// returns 1, if the curves are overlapping // returns 1, if the curves are overlapping
CAreaOrderer ao; CAreaOrderer ao;
for(std::list<CCurve>::iterator It = m_curves.begin(); It != m_curves.end(); It++) std::list<CCurve>::iterator ItLast = m_curves.end();
for(std::list<CCurve>::iterator It = m_curves.begin(); It != m_curves.end(); ++It)
{ {
CCurve& curve = *It; CCurve& curve = *It;
if(!It->IsClosed())
continue;
ItLast = It;
ao.Insert(&curve); ao.Insert(&curve);
if(m_set_processing_length_in_split) if(m_set_processing_length_in_split)
{ {
@ -102,7 +106,19 @@ void CArea::Reorder()
} }
} }
*this = ao.ResultArea(); if(ItLast == m_curves.end())
return;
if(ao.m_top_level)
ao.m_top_level->GetArea(*this);
++ItLast;
for(std::list<CCurve>::iterator It=m_curves.begin(), ItNext=It; It!=ItLast; It=ItNext)
{
++ItNext;
if(It->IsClosed())
m_curves.erase(It);
}
} }
class ZigZag class ZigZag