From f88573d400712f985b905ba1ee4cb71eed1704c5 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 17 Oct 2016 08:04:11 +0000
Subject: [PATCH] Include : - aggiornamenti.

---
 EInAPI.h      | 10 +++++++++-
 EMkMachMgr.h  |  3 ++-
 EXeExecutor.h |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/EInAPI.h b/EInAPI.h
index 929b862..b8ba204 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -550,7 +550,7 @@ EIN_EXPORT BOOL __stdcall EgtModifyRawPart2( int nRawId, int nCrvId,
                                              double dOverMat, double dZmin, double dHeight, const int vCol[4]) ;
 EIN_EXPORT BOOL __stdcall EgtModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) ;
 EIN_EXPORT BOOL __stdcall EgtModifyRawPartHeight( int nRawId, double dHeight) ;
-EIN_EXPORT BOOL __stdcall EgtKeepRawPart( int nRawId) ;
+EIN_EXPORT BOOL __stdcall EgtKeepRawPart( int nRawId, int nSouPhase) ;
 EIN_EXPORT BOOL __stdcall EgtVerifyRawPartPhase( int nRawId, int nPhase) ;
 EIN_EXPORT BOOL __stdcall EgtRemoveRawPartFromCurrPhase( int nRawId) ;
 EIN_EXPORT BOOL __stdcall EgtRemoveRawPart( int nRawId) ;
@@ -569,6 +569,14 @@ EIN_EXPORT BOOL __stdcall EgtGetTableName( wchar_t*& wsTableName) ;
 EIN_EXPORT BOOL __stdcall EgtGetTableRef( int nInd, double ptPos[3]) ;
 EIN_EXPORT BOOL __stdcall EgtGetTableArea( int nInd, double ptMin[3], double ptMax[3]) ;
 EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ;
+EIN_EXPORT int  __stdcall EgtAddFixture( const wchar_t* wsName, const double ptPos[3], double dAngRotDeg, double dMov) ;
+EIN_EXPORT BOOL __stdcall EgtKeepFixture( int nFxtId, int nSouPhase) ;
+EIN_EXPORT BOOL __stdcall EgtRemoveFixture( int nFxtId) ;
+EIN_EXPORT int  __stdcall EgtGetFirstFixture( void) ;
+EIN_EXPORT int  __stdcall EgtGetNextFixture( int nFxtId) ;
+EIN_EXPORT BOOL __stdcall EgtMoveFixture( int nFxtId, const double vtMove[3]) ;
+EIN_EXPORT BOOL __stdcall EgtRotateFixture( int nFxtId, double dDeltaAngDeg) ;
+EIN_EXPORT BOOL __stdcall EgtMoveFixtureMobile( int nFxtId, double dDeltaMov) ;
 // Tools DataBase
 EIN_EXPORT BOOL __stdcall EgtTdbGetToolNewName( const wchar_t* wsName, wchar_t*& wsNewName) ;
 EIN_EXPORT BOOL __stdcall EgtTdbAddTool( const wchar_t* wsName, int nType) ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index 9237f43..1a1ef5d 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -65,7 +65,7 @@ class __declspec( novtable) IMachMgr
       virtual bool ModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dZmin, double dHeight, Color cCol) = 0 ;
       virtual bool ModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) = 0 ;
       virtual bool ModifyRawPartHeight( int nRawId, double dHeight) = 0 ;
-      virtual bool KeepRawPart( int nRawId) = 0 ;
+      virtual bool KeepRawPart( int nRawId, int nSouPhase) = 0 ;
       virtual bool VerifyRawPartPhase( int nRawId, int nPhase) const = 0 ;
       virtual bool RemoveRawPartFromCurrPhase( int nRawId) = 0 ;
       virtual bool RemoveRawPart( int nRawId) = 0 ;
@@ -90,6 +90,7 @@ class __declspec( novtable) IMachMgr
       virtual bool GetTableArea( int nInd, BBox3d& b3Area) = 0 ;
       virtual bool ShowOnlyTable( bool bVal) = 0 ;
       virtual int  AddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg, double dMov) = 0 ;
+      virtual bool KeepFixture( int nFxtId, int nSouPhase) = 0 ;
       virtual bool RemoveFixture( int nFxtId) = 0 ;
       virtual int  GetFirstFixture( void) = 0 ;
       virtual int  GetNextFixture( int nFxtId) = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 42c5331..3075475 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -583,7 +583,7 @@ EXE_EXPORT bool ExeModifyRawPart( int nRawId, Point3d ptOrig, double dLength, do
 EXE_EXPORT bool ExeModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dZmin, double dHeight, Color cCol) ;
 EXE_EXPORT bool ExeModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) ;
 EXE_EXPORT bool ExeModifyRawPartHeight( int nRawId, double dHeight) ;
-EXE_EXPORT bool ExeKeepRawPart( int nRawId) ;
+EXE_EXPORT bool ExeKeepRawPart( int nRawId, int nSouPhase) ;
 EXE_EXPORT bool ExeVerifyRawPartPhase( int nRawId, int nPhase) ;
 EXE_EXPORT bool ExeRemoveRawPartFromCurrPhase( int nRawId) ;
 EXE_EXPORT bool ExeRemoveRawPart( int nRawId) ;
@@ -607,6 +607,7 @@ EXE_EXPORT bool ExeGetTableRef( int nInd, Point3d& ptPos) ;
 EXE_EXPORT bool ExeGetTableArea( int nInd, BBox3d& b3Area) ;
 EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ;
 EXE_EXPORT int  ExeAddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg, double dMov) ;
+EXE_EXPORT bool ExeKeepFixture( int nFxtId, int nSouPhase) ;
 EXE_EXPORT bool ExeRemoveFixture( int nFxtId) ;
 EXE_EXPORT int  ExeGetFirstFixture( void) ;
 EXE_EXPORT int  ExeGetNextFixture( int nFxtId) ;