EgtMachKernel :

- modifiche varie per OmagCut.

MachineCalc.cpp

@@ -20,6 +20,7 @@
 #include "Head.h"
 #include "Exit.h"
 #include "/EgtDev/Include/EGkGeoVector3d.h"
+#include "/EgtDev/Include/EMkToolConst.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
 #include "/EgtDev/Include/EGnFileUtils.h"
 
@@ -41,6 +42,28 @@ Machine::SetCurrTable( const string& sTable)
    return true ;
 }
 
+//----------------------------------------------------------------------------
+int
+Machine::GetCurrTable( void)
+{
+  // controllo GeomDB
+   if ( m_pGeomDB == nullptr)
+      return GDB_ID_NULL ;
+  // recupero identificativo della tavola corrente
+   return m_nCalcTabId ;
+}
+
+//----------------------------------------------------------------------------
+bool
+Machine::GetCurrTable( string& sTable)
+{
+  // controllo GeomDB
+   if ( m_pGeomDB == nullptr)
+      return false ;
+  // recupero nome della tavola corrente
+   return m_pGeomDB->GetName( m_nCalcTabId, sTable) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
@@ -72,8 +95,8 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
    int nToolId = m_pGeomDB->GetFirstNameInGroup( nExitId, sTool) ;
    if ( nToolId == GDB_ID_NULL  ||  m_pGeomDB->GetGdbType( nToolId) != GDB_TY_GROUP)
       return false ;
-   double dTLen ;
-   if ( ! m_pGeomDB->GetInfo( nToolId, "L", dTLen))
+   double dTLen = 0 ;
+   if ( ! m_pMchMgr->GetToolParam( sTool, TPA_LEN, dTLen))
       return false ;
   // assegno tutti i dati
    m_nCalcHeadId = nHeadId ;
@@ -87,6 +110,28 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
    return CalculateKinematicChain() ;
 }
 
+//----------------------------------------------------------------------------
+int
+Machine::GetCurrTool( void)
+{
+  // controllo GeomDB
+   if ( m_pGeomDB == nullptr)
+      return GDB_ID_NULL ;
+  // recupero identificativo dell'utensile
+   return m_nCalcToolId ;
+}
+
+//----------------------------------------------------------------------------
+bool
+Machine::GetCurrTool( string& sTool)
+{
+  // controllo GeomDB
+   if ( m_pGeomDB == nullptr)
+      return false ;
+  // recupero nome gruppo dell'utensile
+   return m_pGeomDB->GetName( m_nCalcToolId, sTool) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 Machine::CalculateKinematicChain( void)