From e0637dc8b946bd04973e58a0586305aedd0e48c6 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 6 Oct 2016 10:27:04 +0000
Subject: [PATCH] EgtExecutor 1.6v1 : - adattamenti per modifiche nomi classi
 in GeomKernel.

---
 EXE_GdbModifySurf.cpp  |   6 +++---
 EXE_NstMachining.cpp   |   2 +-
 EXE_NstPartNesting.cpp |   4 ++--
 EgtExecutor.rc         | Bin 11694 -> 11694 bytes
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/EXE_GdbModifySurf.cpp b/EXE_GdbModifySurf.cpp
index 46de1bd..66fe87c 100644
--- a/EXE_GdbModifySurf.cpp
+++ b/EXE_GdbModifySurf.cpp
@@ -22,7 +22,7 @@
 #include "/EgtDev/Include/EgkCurveComposite.h"
 #include "/EgtDev/Include/EgkSurfFlatRegion.h"
 #include "/EgtDev/Include/EgkSurfTriMesh.h"
-#include "/EgtDev/Include/EgkSimpleCDSurfFrMove.h"
+#include "/EgtDev/Include/EgkCDSimpleSurfFrMove.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
 
@@ -398,7 +398,7 @@ ExeSurfFrMoveSimpleNoCollision( int nId1, int nId2, const Vector3d& vtDir, doubl
   // porto in locale alla prima superficie il versore di movimento
    Vector3d vtDirL = GetVectorLocal( pGeomDB, vtDir, nRefType, frSurf1) ;
   // calcolo massima lunghezza di traslazione della prima regione senza semplice collisione con la seconda
-   return ( bOk && SimpleCDSurfFrMove( *pSfr1, *pSfr2L).Translate( vtDirL, dLen)) ;
+   return ( bOk && CDSimpleSurfFrMove( *pSfr1, *pSfr2L).Translate( vtDirL, dLen)) ;
 }
 
 //----------------------------------------------------------------------------
@@ -431,7 +431,7 @@ ExeSurfFrRotateSimpleNoCollision( int nId1, int nId2, const Point3d& ptCen, doub
   // porto in locale alla prima superficie il versore di movimento
    Point3d ptCenL = GetPointLocal( pGeomDB, ptCen, nRefType, frSurf1) ;
   // calcolo massimo angolo di rotazione della prima regione senza semplice collisione con la seconda
-   return ( bOk && SimpleCDSurfFrMove( *pSfr1, *pSfr2L).Rotate(ptCenL, dAngDeg)) ;
+   return ( bOk && CDSimpleSurfFrMove( *pSfr1, *pSfr2L).Rotate(ptCenL, dAngDeg)) ;
 }
 
 //----------------------------------------------------------------------------
diff --git a/EXE_NstMachining.cpp b/EXE_NstMachining.cpp
index 2419775..0f66b45 100644
--- a/EXE_NstMachining.cpp
+++ b/EXE_NstMachining.cpp
@@ -19,7 +19,7 @@
 #include "EXE_Nst.h"
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EXeConst.h"
-#include "/EgtDev/Include/EGkSimpleCDSurfFrMove.h"
+#include "/EgtDev/Include/EGkCDSimpleSurfFrMove.h"
 #include "/EgtDev/Include/EMkOperationConst.h"
 #include "/EgtDev/Include/EMkMachiningConst.h"
 #include "/EgtDev/Include/EMkMachiningGeoConst.h"
diff --git a/EXE_NstPartNesting.cpp b/EXE_NstPartNesting.cpp
index 49b40e4..5a7939c 100644
--- a/EXE_NstPartNesting.cpp
+++ b/EXE_NstPartNesting.cpp
@@ -23,7 +23,7 @@
 #include "/EgtDev/Include/EGkCurveComposite.h"
 #include "/EgtDev/Include/EgkDistPointCurve.h"
 #include "/EgtDev/Include/EGkSfrCreate.h"
-#include "/EgtDev/Include/EGkSimpleCDSurfFrMove.h"
+#include "/EgtDev/Include/EGkCDSimpleSurfFrMove.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EMkMachiningGeoConst.h"
 #include "/EgtDev/Include/EGkIntervals.h"
@@ -1181,7 +1181,7 @@ MySurfFrMoveSimpleNoCollision( int nId1, int nId2, const Vector3d& vtDir, double
    Vector3d vtDirL = vtDir ;
    vtDirL.ToLoc( frSurf1) ;
   // calcolo massima lunghezza di traslazione della prima regione senza semplice collisione con la seconda
-   SimpleCDSurfFrMove ScdSfrMove( *pSfr1, *pSfr2L) ;
+   CDSimpleSurfFrMove ScdSfrMove( *pSfr1, *pSfr2L) ;
    bOk = bOk && ScdSfrMove.Translate( vtDirL, dLen) ;
    if ( bOk) {
       scInfo = ScdSfrMove.GetSCollInfo() ;
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 832768ce88f8cd711f3097d8bc9817607c6e1114..0740f346c6a785ffd8ffbc33b2f94ab0fa9da85f 100644
GIT binary patch
delta 121
zcmZ1%y)Jsg4>ndK1|0^&%@@V4Gflq2nZsPhU^qFDTX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4InIeP$

delta 129
zcmZ1%y)Jsg4>ndq1|0^o%@@V4Gflq2nZsB*IZ;G%asj8<<^rw?7O3n&xywwG4+tX5
k8YsCjZeAp;#SAyVnHfd1ALHgp(s1d6a`wp521<3@0C7MjU;qFB