From 5ff9cda42803dd52a92c64d6c453abb639b7b420 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 12 May 2016 15:20:38 +0000
Subject: [PATCH] EgtExecutor 1.6r1 : - in approssimazione curve aggiunto tipo
 APP_SPECIAL_LINES (nel caso di composite non toglie estremi curve componenti)
 - piccole correzioni.

---
 EXE_GdbModifyCurve.cpp |   2 +-
 EXE_MachMgr.cpp        |   8 ++++----
 EgtExecutor.rc         | Bin 11694 -> 11694 bytes
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp
index 27933b1..f483892 100644
--- a/EXE_GdbModifyCurve.cpp
+++ b/EXE_GdbModifyCurve.cpp
@@ -154,7 +154,7 @@ ExeApproxCurve( int nId, int nApprType, double dLinTol)
    const double LIN_FEA_LEN_STD = 20 ;
    PtrOwner<ICurveComposite> pCC( CreateCurveComposite()) ;
    bOk = bOk && ! IsNull( pCC) ;
-   if ( nApprType == APP_LINES  ||
+   if ( nApprType == APP_LINES  ||  nApprType == APP_SPECIAL_LINES  ||
         nApprType == APP_LEFT_LINES  ||  nApprType == APP_LEFT_CONVEX_LINES  ||
         nApprType == APP_RIGHT_LINES  ||  nApprType == APP_RIGHT_CONVEX_LINES) {
       PolyLine PL ;
diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 7a18d97..5b2c167 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -1909,7 +1909,7 @@ int
 ExeGetBaseId( const string& sBase)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
-   VERIFY_CTX_MACHMGR( pGseCtx, false)
+   VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL)
   // restituisco identificativo della base indicata nella macchina della macchinata corrente
    return pGseCtx->m_pMachMgr->GetBaseId( sBase) ;
 }
@@ -1919,7 +1919,7 @@ int
 ExeGetTableId( const string& sTable)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
-   VERIFY_CTX_MACHMGR( pGseCtx, false)
+   VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL)
   // restituisco identificativo della tavola indicata nella macchina della macchinata corrente
    return pGseCtx->m_pMachMgr->GetTableId( sTable) ;
 }
@@ -1929,7 +1929,7 @@ int
 ExeGetAxisId( const string& sAxis)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
-   VERIFY_CTX_MACHMGR( pGseCtx, false)
+   VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL)
   // restituisco identificativo dell'asse indicato nella macchina della macchinata corrente
    return pGseCtx->m_pMachMgr->GetAxisId( sAxis) ;
 }
@@ -1939,7 +1939,7 @@ int
 ExeGetHeadId( const string& sHead)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
-   VERIFY_CTX_MACHMGR( pGseCtx, false)
+   VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL)
   // restituisco identificativo della testa indicata nella macchina della macchinata corrente
    return pGseCtx->m_pMachMgr->GetHeadId( sHead) ;
 }
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 14beaa1933d8c05a2cbb9feca70f8976d04b6824..6900f617e0e37ba5f283f2bbe78822f47743c55e 100644
GIT binary patch
delta 121
zcmZ1%y)Jsg4>nc{1|0^&%@@V4Gflq2nZsPfU^qFDTX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4Liz18w

delta 121
zcmZ1%y)Jsg4>nda1|0^I%@@V4Gflq2nZsPbU@|$7TX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4NF(Q-z