EgtMachKernel :

- prime modifiche per tagli inclinati su esterno archi.
This commit is contained in:
Dario Sassi
2020-01-20 06:52:47 +00:00
parent 20d04076b6
commit bff983e12c
31 changed files with 118 additions and 106 deletions
+7 -7
View File
@@ -70,7 +70,7 @@ Processor::Init( MachMgr* pMchMgr)
//----------------------------------------------------------------------------
bool
Processor::Run( const string& sOutFile, const std::string& sInfo)
Processor::Run( const string& sOutFile, const string& sInfo)
{
// verifico ci sia una macchinata corrente
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr || m_pMachine == nullptr ||
@@ -684,11 +684,11 @@ Processor::ProcessToolData( void)
// altrimenti emetto direttamente gli utensili
else {
// ordino l'elenco degli utensili
std::sort( vTdata.begin(), vTdata.end(), []( const MyToolData& a, const MyToolData& b)
{ if ( a.sHead == b.sHead)
return a.nExit < b.nExit ;
else
return a.sHead < b.sHead ; }) ;
sort( vTdata.begin(), vTdata.end(), []( const MyToolData& a, const MyToolData& b)
{ if ( a.sHead == b.sHead)
return a.nExit < b.nExit ;
else
return a.sHead < b.sHead ; }) ;
// emetto l'elenco degli utensili
string sPrevHead ; int nPrevExit = 0 ; string sPrevTcPos ; string sPrevTool ;
for ( size_t i = 0 ; i < vTdata.size() ; ++ i) {
@@ -826,7 +826,7 @@ Processor::OnToolSelect( const string& sTool, const string& sHead, int nExit, co
//----------------------------------------------------------------------------
bool
Processor::OnToolDeselect( const std::string& sNextTool, const string& sNextHead, int nNextExit, const string& sNextTcPos)
Processor::OnToolDeselect( const string& sNextTool, const string& sNextHead, int nNextExit, const string& sNextTcPos)
{
// assegno il prossimo utensile
bool bOk = m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_NEXTTOOL, sNextTool) ;