From df224e8a2ac58cc32187781a74d9ce8f59aad832 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sun, 31 May 2015 14:11:59 +0000
Subject: [PATCH] Include : - aggiornamenti.

---
 EGkFrame3d.h  | 1 +
 EGkObjUser.h  | 5 ++++-
 EMkMachMgr.h  | 5 +++--
 EXeExecutor.h | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/EGkFrame3d.h b/EGkFrame3d.h
index 338b2c0..2cbec60 100644
--- a/EGkFrame3d.h
+++ b/EGkFrame3d.h
@@ -42,6 +42,7 @@ class EGK_EXPORT Frame3d
       bool Set( const Point3d& ptOrig, const Vector3d& vtDirZ) ;
       bool Set( const Point3d& ptOrig, const Vector3d& vtDirZ, const Vector3d& vtNearDirX) ;
       bool Set( const Point3d& ptOrig, Type nType) ;
+      bool Set( const Point3d& ptOrig, double dAngCDeg, double dAngADeg, double dAngC1Deg) ;
       bool Reset( void) ;
       void Translate( const Vector3d& vtMove) ;
       bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) ;
diff --git a/EGkObjUser.h b/EGkObjUser.h
index 27ed572..addac8a 100644
--- a/EGkObjUser.h
+++ b/EGkObjUser.h
@@ -15,6 +15,8 @@
 
 #include "/EgtDev/Include/EgtStringBase.h"
 
+class IGeomDB ;
+
 //----------------------------------------------------------------------------
 class __declspec( novtable) IObjUser
 {
@@ -27,6 +29,7 @@ class __declspec( novtable) IObjUser
       virtual bool ToSave( void) const { return false ; }
       virtual bool Save( STRVECTOR& vString) const { return false ; }
       virtual bool Load( const STRVECTOR& vString) { return false ; }
-      virtual bool SetOwner( int nId) = 0 ;
+      virtual bool SetOwner( int nId, IGeomDB* pGDB) = 0 ;
       virtual int  GetOwner( void) const = 0 ;
+      virtual IGeomDB* GetGeomDB( void) const = 0 ;
 } ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index 335bdcc..a1da5bb 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -53,10 +53,10 @@ class __declspec( novtable) IMachMgr
       virtual int  AddRawPartWithPart( int nPartId, int nCrvSrfId, double dOverMat, Color cCol) = 0 ;
       virtual bool ModifyRawPartHeight( int nRawId, double dHeight) = 0 ;
       virtual bool RemoveRawPart( int nRawId) = 0 ;
-      virtual bool TranslateRawPart( int nRawId, const Vector3d& vtMove) = 0 ;
       virtual bool RotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) = 0 ;
       virtual bool MoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) = 0 ;
       virtual bool MoveToCenterRawPart( int nRawId, const Point3d& ptCenter, int nFlag) = 0 ;
+      virtual bool MoveRawPart( int nRawId, const Vector3d& vtMove) = 0 ;
      // Parts
       virtual int  GetPartInRawPartNbr( int nRawId) const = 0 ;
       virtual int  GetFirstPartInRawPart( int nRawId) const = 0 ;
@@ -65,7 +65,8 @@ class __declspec( novtable) IMachMgr
       virtual bool RemovePartFromRawPart( int nPartId) = 0 ;
       virtual bool TranslatePartInRawPart( int nPartId, const Vector3d& vtMove) = 0 ;
       virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ;
-     // Fixtures
+     // Tables and Fixtures
+      virtual bool SetTable( const std::string& sTable) = 0 ;
       virtual int  AddSubPiece( const std::string& sName, const Point3d& ptPos) = 0 ;
      // Machine
       virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index c72df3a..d196814 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -403,10 +403,10 @@ EXE_EXPORT int  ExeAddRawPart( Point3d ptOrig, double dWidth, double dLength, do
 EXE_EXPORT int  ExeAddRawPartWithPart( int nPartId, int nCrvId, double dOverMat, Color cCol) ;
 EXE_EXPORT bool ExeModifyRawPartHeight( int nRawId, double dHeight) ;
 EXE_EXPORT bool ExeRemoveRawPart( int nRawId) ;
-EXE_EXPORT bool ExeTranslateRawPart( int nRawId, const Vector3d& vtMove) ;
 EXE_EXPORT bool ExeRotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) ;
 EXE_EXPORT bool ExeMoveToCornerRawPart( int nRawId, const Point3d& ptCorner, int nFlag) ;
 EXE_EXPORT bool ExeMoveToCenterRawPart( int nRawId, const Point3d& ptCenter, int nFlag) ;
+EXE_EXPORT bool ExeMoveRawPart( int nRawId, const Vector3d& vtMove) ;
 EXE_EXPORT int  ExeGetPartInRawPartNbr( int nRawId) ;
 EXE_EXPORT int  ExeGetFirstPartInRawPart( int nRawId) ;
 EXE_EXPORT int  ExeGetNextPartInRawPart( int nPartId) ;
@@ -414,6 +414,7 @@ EXE_EXPORT bool ExeAddPartToRawPart( int nPartId, const Point3d& ptPos, int nRaw
 EXE_EXPORT bool ExeRemovePartFromRawPart( int nPartId) ;
 EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) ;
 EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ;
+EXE_EXPORT bool ExeSetTable( const std::string& sTable) ;
 EXE_EXPORT int  ExeAddSubPiece( const std::string& sName, const Point3d& ptPos) ;
 EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ;
 EXE_EXPORT bool ExeGetAxisPos( const std::string& sAxis, double* pdVal) ;