From 84e502af91b9b2cca092d88541d7267aba371f20 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 11 Jan 2016 14:35:21 +0000
Subject: [PATCH] EgtInterface 1.6l7 : - modifiche per funzioni di nesting.

---
 API_Nesting.cpp |  50 ++++++++++++++++++++++++++++++++++--------------
 EgtInterface.rc | Bin 11726 -> 11726 bytes
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/API_Nesting.cpp b/API_Nesting.cpp
index 332e28b..e24f412 100644
--- a/API_Nesting.cpp
+++ b/API_Nesting.cpp
@@ -88,10 +88,10 @@ __stdcall EgtMoveBoxCluster( int nId[], int nCount, double vtMove[3],
       vIds.push_back( nId[i]) ;
   // eseguo
    Vector3d vtM = vtMove ;
-   bool bOk = ExeMoveBoxCluster( vIds, vtM, dXmin, dYmin, dXmax, dYmax, dOffs) ;
+   if ( ! ExeMoveBoxCluster( vIds, vtM, dXmin, dYmin, dXmax, dYmax, dOffs))
+      return FALSE ;
    VEC_FROM_3D( vtMove, vtM)
-
-   return ( bOk ? TRUE : FALSE) ;
+   return TRUE ;
 }
 
 //-----------------------------------------------------------------------------
@@ -108,9 +108,9 @@ __stdcall EgtVerifyPartCluster( int nId[], int nCount, BOOL bReducedCut,
    for ( int i = 0 ; i < nCount ; ++ i)
       vIds.push_back( nId[i]) ;
   // eseguo
-   bool bOk = ExeVerifyPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax) ;
-
-   return ( bOk ? TRUE : FALSE) ;
+   if ( ! ExeVerifyPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax))
+      return FALSE ;
+   return TRUE ;
 }
 
 //-----------------------------------------------------------------------------
@@ -127,9 +127,9 @@ __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut,
    for ( int i = 0 ; i < nCount ; ++ i)
       vIds.push_back( nId[i]) ;
   // eseguo
-   bool bOk = ExePackPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax, ( bBottomUp != FALSE)) ;
-
-   return ( bOk ? TRUE : FALSE) ;
+   if ( ! ExePackPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax, ( bBottomUp != FALSE)))
+      return FALSE ;
+   return TRUE ;
 }
 
 //-----------------------------------------------------------------------------
@@ -147,10 +147,32 @@ __stdcall EgtMovePartCluster( int nId[], int nCount, BOOL bReducedCut, double vt
       vIds.push_back( nId[i]) ;
   // eseguo
    Vector3d vtM = vtMove ;
-   bool bOk = ExeMovePartCluster( vIds, ( bReducedCut != FALSE), vtM, dXmin, dYmin, dXmax, dYmax) ;
+   if ( ! ExeMovePartCluster( vIds, ( bReducedCut != FALSE), vtM, dXmin, dYmin, dXmax, dYmax))
+      return FALSE ;
    VEC_FROM_3D( vtMove, vtM)
+   return TRUE ;
+}
 
-   return ( bOk ? TRUE : FALSE) ;
+//-----------------------------------------------------------------------------
+BOOL
+__stdcall EgtGetObstacleTangent( double vtTang[3])
+{
+   Vector3d vtT ;
+   if ( ! ExeGetObstacleTangent( vtT))
+      return FALSE ;
+   VEC_FROM_3D( vtTang, vtT)
+   return TRUE ;
+}
+
+//-----------------------------------------------------------------------------
+BOOL
+__stdcall EgtGetMovingTangent( double vtTang[3])
+{
+   Vector3d vtT ;
+   if ( ! ExeGetMovingTangent( vtT))
+      return FALSE ;
+   VEC_FROM_3D( vtTang, vtT)
+   return TRUE ;
 }
 
 //-----------------------------------------------------------------------------
@@ -167,9 +189,9 @@ __stdcall EgtRotatePartCluster( int nId[], int nCount, BOOL bReducedCut, const d
    for ( int i = 0 ; i < nCount ; ++ i)
       vIds.push_back( nId[i]) ;
   // eseguo
-   bool bOk = ExeRotatePartCluster( vIds, ( bReducedCut != FALSE), ptCen, *pdRotAngDeg, dXmin, dYmin, dXmax, dYmax) ;
-
-   return ( bOk ? TRUE : FALSE) ;
+   if ( ! ExeRotatePartCluster( vIds, ( bReducedCut != FALSE), ptCen, *pdRotAngDeg, dXmin, dYmin, dXmax, dYmax))
+      return FALSE ;
+   return TRUE ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/EgtInterface.rc b/EgtInterface.rc
index 57ae7bda86183777cd58457f768986a17329cdab..6a93099fedf1413a5e9e2abfe9d41d43113b900d 100644
GIT binary patch
delta 113
zcmX>XeJ*;#A2vqw%@4(HGEKh5na5~8`6H+9WG^L)&3#f*jGK>e8!&^VPclv3Cs+lM
i-t491#khHcFjUGNr~*ls7YjlI&*XKAP&0v=TDSq0S1Anu

delta 97
zcmX>XeJ*;#A2vp_%@4(HGEKh5nK!veL}IgpR0iYbBisheV2P7VllKW$fh7WjCa{3T
d+?k;YXF&L1H9V8oDMAbg5K3U&JVn`x3jjlaBclKS