From 29138a63c8005b50b3ae7df4cd28f6101b8702cf Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Tue, 21 Mar 2023 14:19:28 +0100
Subject: [PATCH] =?UTF-8?q?EgtGeomKernel=202.5c2=20:=20-=20nella=20creazio?=
 =?UTF-8?q?ne=20delle=20regioni=20si=20tiene=20conto=20delle=20propriet?=
 =?UTF-8?q?=C3=A0=20delle=20curve=20di=20contorno=20nell'unirle.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AdjustLoops.cpp    |   4 ++--
 AdjustLoops.h      |   2 +-
 EgtGeomKernel.rc   | Bin 11710 -> 11710 bytes
 SfrCreate.cpp      |   2 +-
 SurfFlatRegion.cpp |   4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AdjustLoops.cpp b/AdjustLoops.cpp
index df4d6f5..af1df8c 100644
--- a/AdjustLoops.cpp
+++ b/AdjustLoops.cpp
@@ -278,7 +278,7 @@ MyAdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
 
 //----------------------------------------------------------------------------
 bool
-AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
+AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst, bool bNeedSameProp)
 {
   // elimino eventuali sovrapposizioni e accostamenti
    if ( ! MyAdjustLoops( pCurve, CrvLst))
@@ -291,7 +291,7 @@ AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
         // elimino eventuali Spikes e Small Z
          pCrvCo->RemoveSmallDefects( 2 * LIN_TOL_MIN, ANG_TOL_STD_DEG, true) ;
         // unisco eventuali tratti allineati
-         pCrvCo->MergeCurves( LIN_TOL_MIN, ANG_TOL_STD_DEG) ;
+         pCrvCo->MergeCurves( LIN_TOL_MIN, ANG_TOL_STD_DEG, true, bNeedSameProp) ;
       }
    }
 
diff --git a/AdjustLoops.h b/AdjustLoops.h
index 78f30c5..463ab93 100644
--- a/AdjustLoops.h
+++ b/AdjustLoops.h
@@ -17,4 +17,4 @@
 
 
 //----------------------------------------------------------------------------
-bool AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst) ;
+bool AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst, bool bNeedSameProp) ;
diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index a0bf9fe8b4150a9a0b9f5d4d9744da79559a37a4..bd9bfb8aa64455234d2ec9b51756e0ee04b0eaca 100644
GIT binary patch
delta 94
zcmdlNy)SyhFE&P_&A-_cnHh~HD{|{@_Trkr0u;H;XNwSVW8B;$>;>dw2zN+>g;Df-
LFmBFL4&ed-Vf-5U

delta 94
zcmdlNy)SyhFE&QQ&A-_cnHdcyD{|{@_Trkr0u;H;XNwSVW8B;$>;>dw2zN+>g;Df-
LFmBFL4&ed-U|t&X

diff --git a/SfrCreate.cpp b/SfrCreate.cpp
index 5e7beaf..c3daeb9 100644
--- a/SfrCreate.cpp
+++ b/SfrCreate.cpp
@@ -436,7 +436,7 @@ SurfFlatRegionByContours::AddCurve( ICurve* pCrv)
    pMyCrv->SetThickness( 0) ;
   // rimuovo eventuali sovrapposizioni (calcolate nel suo piano)
    ICURVEPLIST CrvLst ;
-   if ( ! AdjustLoops( Release( pMyCrv), CrvLst))
+   if ( ! AdjustLoops( Release( pMyCrv), CrvLst, true))
       return false ;
   // la/le inserisco nel vettore delle curve
    for ( auto& pSingCrv : CrvLst)
diff --git a/SurfFlatRegion.cpp b/SurfFlatRegion.cpp
index d2bd04a..0fdb481 100644
--- a/SurfFlatRegion.cpp
+++ b/SurfFlatRegion.cpp
@@ -103,7 +103,7 @@ SurfFlatRegion::AddExtLoop( ICurve* pCrv)
    pMyCrv->SetThickness( 0) ;
   // rimuovo eventuali sovrapposizioni (calcolate nel suo piano)
    ICURVEPLIST CrvLst ;
-   if ( ! AdjustLoops( Release( pMyCrv), CrvLst))
+   if ( ! AdjustLoops( Release( pMyCrv), CrvLst, true))
       return false ;
   // aggiungo le singole curve
    bool bOk = true ;
@@ -247,7 +247,7 @@ SurfFlatRegion::AddIntLoop( ICurve* pCrv)
    pMyCrv->SetThickness( 0) ;
   // rimuovo eventuali sovrapposizioni (calcolate nel suo piano)
    ICURVEPLIST CrvLst ;
-   if ( ! AdjustLoops( Release( pMyCrv), CrvLst))
+   if ( ! AdjustLoops( Release( pMyCrv), CrvLst, true))
       return false ;
   // aggiungo le singole curve
    bool bOk = true ;