From d88de3576d90171869ead1ad97ce50cd9f03d5cc Mon Sep 17 00:00:00 2001
From: Daniele Bariletti <daniele.bariletti@egalware.comm>
Date: Tue, 23 Jan 2024 09:20:00 +0100
Subject: [PATCH] EgtGeomKernel : - correzione del merge.

---
 Tree.cpp | 47 -----------------------------------------------
 Tree.h   |  9 +++++++--
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/Tree.cpp b/Tree.cpp
index ac2f39f..9536a8d 100644
--- a/Tree.cpp
+++ b/Tree.cpp
@@ -33,53 +33,6 @@
 
 using namespace std ;
 
-//----------------------------------------------------------------------------
-Cell::Cell( void)
-   : m_nId( -1),m_nTop ( -2), m_nBottom( -2), m_nLeft( -2), m_nRight ( -2), m_nParent( -2), m_nDepth( 0),
-   m_nChild1( -2), m_nChild2( -2), m_nFlag( -1), m_nFlag2( 0), m_nRightEdgeIn( -1), m_bOnLeftEdge( false), m_bOnTopEdge( false),
-   m_ptPbl( ORIG), m_ptPtr(), m_bProcessed( false), m_bSplitVert( true)
-{
-   Point3d ptTr ( 1 * SBZ_TREG_COEFF, 1 * SBZ_TREG_COEFF) ;
-   m_ptPtr = ptTr ;
-}
-
-
-//----------------------------------------------------------------------------
-Cell::Cell( const Point3d& ptBL, const Point3d& ptTR)
-   : m_nId( -1),m_nTop ( -2), m_nBottom( -2), m_nLeft( -2), m_nRight ( -2), m_nParent( -2), m_nDepth( 0),
-     m_nChild1( -2), m_nChild2( -2), m_nFlag( -1), m_nFlag2( 0), m_nRightEdgeIn( -1), m_bOnLeftEdge( false), m_bOnTopEdge( false),
-     m_ptPbl( ptBL), m_ptPtr( ptTR), m_bProcessed( false), m_bSplitVert( true)
-{}
-
-
-//----------------------------------------------------------------------------
-Cell::~Cell( void)
-{
-}
-
-//----------------------------------------------------------------------------
-inline bool
-Cell::IsSame( const Cell& cOtherCell) const
-{
-   if ( m_nId == cOtherCell.m_nId)
-      return true ;
-   else
-      return false ;
-}
-
-//----------------------------------------------------------------------------
-bool
-Cell::IsLeaf ( void) const
-{
-   if( m_nChild1 == -2  &&  m_nChild2 == -2)
-      return true ;
-   else 
-      return false ;
-}
-#include <algorithm>
-
-using namespace std ;
-
 //----------------------------------------------------------------------------
 Tree::Tree( void)
    : m_pSrfBz( nullptr), m_bTrimmed( false), m_bBilinear( false), m_bMulti( false), m_bClosedU( false), m_bClosedV( false), m_bSplitPatches( true)
diff --git a/Tree.h b/Tree.h
index 2c76a0a..83f279e 100644
--- a/Tree.h
+++ b/Tree.h
@@ -89,11 +89,16 @@ class Cell
    //                 |_________________|
    //   Edge 5 ( SW)     Edge 2 (Bottom)     Edge 6 ( SE)
    public :
+      ~Cell( void) {}
       Cell( void)
          : m_nId( -1),m_nTop ( -2), m_nBottom( -2), m_nLeft( -2), m_nRight ( -2), m_nParent( -2), m_nDepth( 0),
            m_nChild1( -2), m_nChild2( -2), m_nFlag( -1), m_nFlag2( 0), m_nRightEdgeIn( -1), m_bOnLeftEdge( false), m_bOnTopEdge( false),
-           m_ptPbl( ORIG), m_ptPtr( SBZ_TREG_COEFF, SBZ_TREG_COEFF, 0), m_bProcessed( false), m_bSplitVert( true) {}
-      Cell( const Point3d& ptBL, const Point3d& ptTR)
+           m_ptPbl( ORIG), m_ptPtr( SBZ_TREG_COEFF, SBZ_TREG_COEFF, 0), m_bProcessed( false), m_bSplitVert( true)
+         {
+            Point3d ptTr ( 1 * SBZ_TREG_COEFF, 1 * SBZ_TREG_COEFF) ;
+            m_ptPtr = ptTr ;
+         }
+      Cell( const Point3d& ptBL, const Point3d& ptTR) 
          : m_nId( -1),m_nTop ( -2), m_nBottom( -2), m_nLeft( -2), m_nRight ( -2), m_nParent( -2), m_nDepth( 0),
            m_nChild1( -2), m_nChild2( -2), m_nFlag( -1), m_nFlag2( 0), m_nRightEdgeIn( -1), m_bOnLeftEdge( false), m_bOnTopEdge( false),
            m_ptPbl( ptBL), m_ptPtr( ptTR), m_bProcessed( false), m_bSplitVert( true) {}