Recuperato da branch LorenzoM file VolZmap + tool

VolZmap.cpp

@@ -35,7 +35,7 @@ GEOOBJ_REGISTER( VOL_ZMAP, NGE_V_ZMP, VolZmap) ;
 //----------------------------------------------------------------------------
 VolZmap::VolZmap(void)
    : m_nStatus( TO_VERIFY), m_dStep( 10.0), m_nMapNum( 0), m_nShape( GENERIC), m_nVoxNumPerBlock( N_VOXBLOCK),
-     m_nDexVoxRatio( 1), m_nNumBlock( 0), m_nConnectedCompoCount( 0), m_Tool( true)
+     m_nDexVoxRatio( 1), m_nNumBlock( 0), m_nConnectedCompoCount( 0), m_nCurrTool( - 1)/*, m_Tool( true)*/
 {
    for ( int i = 0 ; i < N_MAPS ; ++ i) {
       m_nNx[i] = 0 ;
@@ -47,7 +47,7 @@ VolZmap::VolZmap(void)
    }
    m_nTempProp[0] = 0 ;
    m_nTempProp[1] = 0 ;
-   m_Tool.SetTolerances( LIN_TOL_STD, ANG_TOL_APPROX_DEG) ;
+   //m_Tool.SetTolerances( LIN_TOL_STD, ANG_TOL_APPROX_DEG) ;
 }
 
 //----------------------------------------------------------------------------
@@ -76,7 +76,7 @@ VolZmap::Clear( void)
    m_dStep = EPS_SMALL ;
    m_nTempProp[0] = 0 ;
    m_nTempProp[1] = 0 ;
-   m_Tool.Clear() ;
+   ResetAllTools() ;
   // imposto ricalcolo della grafica
    m_OGrMgr.Reset() ;
 
@@ -1680,8 +1680,10 @@ VolZmap::Cut( const Plane3d& plPlane)
    Plane3d plMyPlane = plPlane ;
    plMyPlane.ToLoc( m_MapFrame) ;
   // Imposto numero fittizio di utensile per avere il colore di sezione opportuno
-   int nToolNumOld = m_Tool.GetCurrentToolNum() ;
-   m_Tool.SetToolNum( 1) ;
+   if ( m_nCurrTool < 0)
+      return false ;
+   int nToolNumOld = m_vTool[m_nCurrTool].GetCurrentToolNum() ;
+   m_vTool[m_nCurrTool].SetToolNum( 1) ;
   // Interseco lo Zmap col piano, ciclando sulle griglie
    bool bModified = false ;
    for ( int nMap = 0 ; nMap < int( m_nMapNum) ; ++ nMap) {
@@ -1735,7 +1737,7 @@ VolZmap::Cut( const Plane3d& plPlane)
    }
 
   // Ripristino numero utensile
-   m_Tool.SetToolNum( nToolNumOld) ;
+   m_vTool[m_nCurrTool].SetToolNum( nToolNumOld) ;
 
    if ( bModified == true) {
      // Imposto forma generica
@@ -1970,14 +1972,18 @@ VolZmap::CalcBlockNum( void)
 bool 
 VolZmap::SetToolTolerances( double dLinTol, double dAngTolDeg) 
 {
-   return m_Tool.SetTolerances( dLinTol, dAngTolDeg) ;
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetTolerances( dLinTol, dAngTolDeg) ;
 }
 
 //----------------------------------------------------------------------------
 bool
 VolZmap::SetStdTool( const string& sToolName, double dH, double dR, double dCornR, double dCutterH, int nFlag) 
 {
-   return m_Tool.SetStdTool( sToolName, dH, dR, dCornR, dCutterH, nFlag) ;
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetStdTool( sToolName, dH, dR, dCornR, dCutterH, nFlag) ;
 }
 
 //----------------------------------------------------------------------------
@@ -1985,7 +1991,9 @@ bool
 VolZmap::SetAdvTool( const string& sToolName, 
                      double dH, double dR, double dTipH, double dTipR, double dCornR, double dCutterH, int nFlag)
 {
-   return m_Tool.SetAdvTool( sToolName, dH, dR, dTipH, dTipR, dCornR, dCutterH, nFlag) ;
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetAdvTool( sToolName, dH, dR, dTipH, dTipR, dCornR, dCutterH, nFlag) ;
 }
 
 //----------------------------------------------------------------------------
@@ -1993,33 +2001,90 @@ bool
 VolZmap::SetSawTool( const string& sToolName,
                      double dH, double dR, double dThick, double dStemR, double dCornR, int nFlag)
 {
-   return m_Tool.SetSawTool( sToolName, dH, dR, dThick, dStemR, dCornR, nFlag) ;
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetSawTool( sToolName, dH, dR, dThick, dStemR, dCornR, nFlag) ;
 }
 
 //----------------------------------------------------------------------------
 bool 
 VolZmap::SetGenTool( const string& sToolName, const ICurveComposite* pToolOutline, int nFlag)
 {
-   return m_Tool.SetGenTool( sToolName, pToolOutline, nFlag) ; 
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetGenTool( sToolName, pToolOutline, nFlag) ; 
 }
 
 //----------------------------------------------------------------------------
 bool 
 VolZmap::SetMortiserTool( const string& sToolName, double dH, double dW, double dTh, double dRc, int nFlag)
 {
-   return m_Tool.SetMortiserTool( sToolName, dH, dW, dTh, dRc, nFlag) ;
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetMortiserTool( sToolName, dH, dW, dTh, dRc, nFlag) ;
 }
 
 //----------------------------------------------------------------------------
 bool 
 VolZmap::SetChiselTool( const string& sToolName, double dH, double dW, double dTh, int nFlag)
 {
-   return m_Tool.SetChiselTool( sToolName, dH, dW, dTh, nFlag) ; 
+   if ( m_nCurrTool < 0)
+      return false ;
+   return m_vTool[m_nCurrTool].SetChiselTool( sToolName, dH, dW, dTh, nFlag) ; 
+}
+
+//----------------------------------------------------------------------------
+bool
+VolZmap::SetCurrTool( int nCurrTool)
+{
+   if ( nCurrTool < 0  ||  nCurrTool >= int( m_vTool.size()))
+      return false ;
+   m_nCurrTool = nCurrTool ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+int
+VolZmap::GetToolCount( void) const
+{
+   return int( m_vTool.size()) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+VolZmap::AddTool( void)
+{
+   m_vTool.emplace_back( true) ;
+   m_vTool.back().SetTolerances( LIN_TOL_STD, ANG_TOL_APPROX_DEG) ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+VolZmap::ResetAllTools( void)
+{
+   bool bOk = true ;
+   for ( int n = 0 ; n < int( m_vTool.size()) ; ++ n) {
+      bOk = bOk  ||  m_vTool[n].Clear() ;
+   }
+   m_vTool.clear() ;
+   return bOk ;
 }
 
 //----------------------------------------------------------------------------
 bool 
 VolZmap::ResetTool( void)
 {
-   return m_Tool.Clear() ; 
+   bool bOk = m_vTool.back().Clear() ;
+   m_vTool.erase( m_vTool.begin() + int( m_vTool.size()) - 1) ; 
+   return bOk ; 
+}
+
+//----------------------------------------------------------------------------
+const ICurveComposite&
+VolZmap::GetToolOutline( bool bApprox) const
+{
+   if ( m_nCurrTool < 0)
+      return cvEmptyOutline ;
+   return ( bApprox ? m_vTool[m_nCurrTool].GetApproxOutline() : m_vTool[m_nCurrTool].GetOutline()) ;
 }