From b775e58f2271561bcb694849b60a8b59de9ff0a7 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 21 Feb 2020 11:04:17 +0000
Subject: [PATCH] EgtMachKernel : - aggiunto sottotipo fresa per polishing.

---
 MachMgrDBTools.cpp | 14 ++++++++++----
 Milling.cpp        | 12 ++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/MachMgrDBTools.cpp b/MachMgrDBTools.cpp
index 58c89a7..8f9035b 100644
--- a/MachMgrDBTools.cpp
+++ b/MachMgrDBTools.cpp
@@ -515,8 +515,8 @@ MachMgr::UpdateStandardToolDraw( const ToolData* pTdata, int nGenCtx, int nToolC
   // Acquisisco il programma lua di creazione disegno utensile
    if ( ! ExeLuaExecFile( m_sToolMakersDir + "\\" + sMaker))
       return TD_INT_ERR ;
-  // Assegno i dati utensile a seconda del tipo
-   bool bOk = true ;
+  // Assegno i dati utensile
+   bool bOk = ExeLuaSetGlobIntVar( "TOOL.TYPE", nType) ;
    switch ( nType) {
    case TT_DRILL_STD :
    case TT_DRILL_LONG :
@@ -539,6 +539,7 @@ MachMgr::UpdateStandardToolDraw( const ToolData* pTdata, int nGenCtx, int nToolC
       break ;
    case TT_MILL_STD :
    case TT_MILL_NOTIP :
+   case TT_MILL_POLISHING :
    case TT_WATERJET :
       bOk = bOk && ExeLuaSetGlobStringVar( "TOOL.TOOLHOLDER", sThPath) ;
       bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.TOTLEN", dTotLen) ;
@@ -596,7 +597,7 @@ MachMgr::UpdateCustomToolDraw( const ToolData* pTdata, int nGenCtx, int nToolCtx
    double dDiam = 0 ;
    pTdata->GetParam( TPA_DIAM, dDiam) ;
   // Solo per frese
-   if ( nType != TT_MILL_STD  &&  nType != TT_MILL_NOTIP)
+   if ( nType != TT_MILL_STD  &&  nType != TT_MILL_NOTIP  &&  nType != TT_MILL_POLISHING)
       return TD_INT_ERR ;
   // Imposto contesto per il disegno utensile
    if ( ! ExeSetCurrentContext( nToolCtx))
@@ -628,6 +629,7 @@ MachMgr::GetToolMakerKeyFromType( int nType) const
       return SAWBLADEMAKER_KEY ;
    case TT_MILL_STD :
    case TT_MILL_NOTIP :
+   case TT_MILL_POLISHING :
       return MILLMAKER_KEY ;
    case TT_MORTISE_STD :
       return MORTISEMAKER_KEY ;
@@ -670,6 +672,10 @@ MachMgr::GetToolHolderPath( const string& sHeadName, int nExit, int nType) const
       string sKey2 = sKey + ":MILL_NOTIP" ;
       sToolHolder = GetPrivateProfileStringUtf8( TOOLHOLDER_SEC.c_str(), sKey2.c_str(), "", sMachIni.c_str()) ;
    }
+   else if ( nType == TT_MILL_POLISHING) {
+      string sKey2 = sKey + ":MILL_POLISHING" ;
+      sToolHolder = GetPrivateProfileStringUtf8( TOOLHOLDER_SEC.c_str(), sKey2.c_str(), "", sMachIni.c_str()) ;
+   }
    if ( sToolHolder.empty())
       sToolHolder = GetPrivateProfileStringUtf8( TOOLHOLDER_SEC.c_str(), sKey.c_str(), "", sMachIni.c_str()) ;
   // Se non trovato, provo da sezione Tools di Ini di macchina
@@ -678,7 +684,7 @@ MachMgr::GetToolHolderPath( const string& sHeadName, int nExit, int nType) const
          sToolHolder = GetPrivateProfileStringUtf8( TOOLS_SEC.c_str(), DRILLHOLDER_KEY.c_str(), "", sMachIni.c_str()) ;
       else if ( nType == TT_SAW_STD  ||  nType == TT_SAW_FLAT)
          sToolHolder = GetPrivateProfileStringUtf8( TOOLS_SEC.c_str(), SAWBLADEHOLDER_KEY.c_str(), "", sMachIni.c_str()) ;
-      else if ( nType == TT_MILL_STD  ||  nType == TT_MILL_NOTIP)
+      else if ( nType == TT_MILL_STD  ||  nType == TT_MILL_NOTIP  ||  nType == TT_MILL_POLISHING)
          sToolHolder = GetPrivateProfileStringUtf8( TOOLS_SEC.c_str(), MILLHOLDER_KEY.c_str(), "", sMachIni.c_str()) ;
    }
   // Se non trovato ancora, esco
diff --git a/Milling.cpp b/Milling.cpp
index b8a0646..2b4317e 100644
--- a/Milling.cpp
+++ b/Milling.cpp
@@ -2295,7 +2295,8 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                }
               // altrimenti, affondo in feed opportuna
                else {
-                  SetFeed( ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
+                  bool bStartFeed = ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP  ||  m_TParams.m_nType == TT_MILL_POLISHING) ;
+                  SetFeed( bStartFeed ? GetStartFeed() : GetTipFeed()) ;
                   if ( AddLinearMove( ptP1) == GDB_ID_NULL)
                      return false ;
                }
@@ -3061,7 +3062,8 @@ Milling::AddSawZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtT
             }
            // altrimenti, affondo in feed opportuna
             else {
-               SetFeed( ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
+               bool bStartFeed = ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP  ||  m_TParams.m_nType == TT_MILL_POLISHING) ;
+               SetFeed( bStartFeed ? GetStartFeed() : GetTipFeed()) ;
                if ( AddLinearMove( ptP1) == GDB_ID_NULL)
                   return false ;
             }
@@ -3197,7 +3199,8 @@ Milling::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafeZ,
       }
      // affondo al punto iniziale
       SetFlag( 0) ;
-      SetFeed( ( bOutStart ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
+      bool bStartFeed = ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP  ||  m_TParams.m_nType == TT_MILL_POLISHING) ;
+      SetFeed( bStartFeed ? GetStartFeed() : GetTipFeed()) ;
       if ( AddLinearMove( ptP) == GDB_ID_NULL)
          return false ;
    }
@@ -3209,7 +3212,8 @@ Milling::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafeZ,
          return false ;
      // affondo al punto iniziale
       SetFlag( 0) ;
-      SetFeed( ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
+      bool bStartFeed = ( bOutStart  ||  m_TParams.m_nType == TT_MILL_NOTIP  ||  m_TParams.m_nType == TT_MILL_POLISHING) ;
+      SetFeed( bStartFeed ? GetStartFeed() : GetTipFeed()) ;
       if ( AddLinearMove( ptP) == GDB_ID_NULL)
          return false ;
    }