diff --git a/EInAPI.h b/EInAPI.h index 3fd1a76..40b4653 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -456,12 +456,16 @@ EIN_EXPORT BOOL __stdcall EgtPackBox( int nId, double dXmin, double dYmin, double dXmax, double dYmax, double dOffs, BOOL bBottomUp) ; EIN_EXPORT BOOL __stdcall EgtPackBoxCluster( int nId[], int nCount, double dXmin, double dYmin, double dXmax, double dYmax, double dOffs, BOOL bBottomUp) ; -EIN_EXPORT BOOL __stdcall EgtGetClusterBBoxGlob( int nId[], int nCount, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtMoveBoxCluster( int nId[], int nCount, double vtMove[3], double dXmin, double dYmin, double dXmax, double dYmax, double dOffs) ; -EIN_EXPORT BOOL __stdcall EgtMovePartCluster( int nId[], int nCount, double vtMove[3], +EIN_EXPORT BOOL __stdcall EgtGetClusterBBoxGlob( int nId[], int nCount, double ptMin[3], double ptMax[3]) ; +EIN_EXPORT BOOL __stdcall EgtVerifyPartCluster( int nId[], int nCount, BOOL bReducedCut, + double dXmin, double dYmin, double dXmax, double dYmax) ; +EIN_EXPORT BOOL __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, + double dXmin, double dYmin, double dXmax, double dYmax, BOOL bBottomUp) ; +EIN_EXPORT BOOL __stdcall EgtMovePartCluster( int nId[], int nCount, BOOL bReducedCut, double vtMove[3], double dXmin, double dYmin, double dXmax, double dYmax) ; -EIN_EXPORT BOOL __stdcall EgtRotatePartCluster( int nId[], int nCount, const double ptCen[3], double* pdRotAngDeg, +EIN_EXPORT BOOL __stdcall EgtRotatePartCluster( int nId[], int nCount, BOOL bReducedCut, const double ptCen[3], double* pdRotAngDeg, double dXmin, double dYmin, double dXmax, double dYmax) ; EIN_EXPORT BOOL __stdcall EgtGetPartClusterCenterGlob( int nId[], int nCount, double ptCen[3]) ; diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index b809b5d..b428f06 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -14,7 +14,6 @@ #pragma once #include "\EgtDev\Include\EMkOperationConst.h" -#include //---------------------------------------------------------------------------- // Tipologie di lavorazioni (derivano da tipologie di operazioni) diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h new file mode 100644 index 0000000..0e63e0e --- /dev/null +++ b/EMkMachiningGeoConst.h @@ -0,0 +1,36 @@ +//---------------------------------------------------------------------------- +// EgalTech 2016-2016 +//---------------------------------------------------------------------------- +// File : EmkMachiningGeoConst.h Data : 06.01.16 Versione : 1.6l6 +// Contenuto : Costanti per le geometrie delle lavorazioni. +// +// +// +// Modifiche : 06.01.16 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include + +//---------------------------------------------------------------------------- +// Chiave per elenco identificativi di selezione +static std::string KEY_IDS = "IDS" ; +// Sottogruppi delle lavorazioni +static std::string MCH_AUX = "AUX" ; +static std::string MCH_PV = "PV" ; +static std::string MCH_CL = "CL" ; +static std::string MCH_PATH = "P" ; +// Nomi di entità speciali +static std::string MCH_RISE = "RISE" ; +// Nomi di entità di preview +static std::string MCH_PV_CUT = "CUT" ; +static std::string MCH_PV_PRE_CUT = "PRC" ; +static std::string MCH_PV_POST_CUT = "POC" ; +static std::string MCH_PV_RRCUT = "RRCUT" ; +static std::string MCH_PV_RCUT = "RCUT" ; +// Chiave info con WidthT e DeltaT lama in Preview +static std::string MCH_PV_KEY_WT = "WT" ; +static std::string MCH_PV_KEY_DT = "DT" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 3325a0a..935c500 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -484,13 +484,17 @@ EXE_EXPORT bool ExePackBox( int nId, double dXmin, double dYmin, double dXmax, double dYmax, double dOffs, bool bBottomUp) ; EXE_EXPORT bool ExePackBoxCluster( const INTVECTOR& vIds, double dXmin, double dYmin, double dXmax, double dYmax, double dOffs, bool bBottomUp) ; -EXE_EXPORT bool ExeGetClusterBBoxGlob( const INTVECTOR& vIds, BBox3d& b3Box) ; EXE_EXPORT bool ExeMoveBoxCluster( const INTVECTOR& vIds, Vector3d& vtMove, double dXmin, double dYmin, double dXmax, double dYmax, double dOffs) ; +EXE_EXPORT bool ExeGetClusterBBoxGlob( const INTVECTOR& vIds, BBox3d& b3Box) ; // Part Nesting -EXE_EXPORT bool ExeMovePartCluster( const INTVECTOR& vIds, Vector3d& vtMove, +EXE_EXPORT bool ExeVerifyPartCluster( const INTVECTOR& vIds, bool bReducedCut, + double dXmin, double dYmin, double dXmax, double dYmax) ; +EXE_EXPORT bool ExePackPartCluster( const INTVECTOR& vIds, bool bReducedCut, + double dXmin, double dYmin, double dXmax, double dYmax, bool bBottomUp) ; +EXE_EXPORT bool ExeMovePartCluster( const INTVECTOR& vIds, bool bReducedCut, Vector3d& vtMove, double dXmin, double dYmin, double dXmax, double dYmax) ; -EXE_EXPORT bool ExeRotatePartCluster( const INTVECTOR& vIds, const Point3d& ptCen, double& dRotAngDeg, +EXE_EXPORT bool ExeRotatePartCluster( const INTVECTOR& vIds, bool bReducedCut, const Point3d& ptCen, double& dRotAngDeg, double dXmin, double dYmin, double dXmax, double dYmax) ; EXE_EXPORT bool ExeGetPartClusterCenterGlob( const INTVECTOR& vIds, Point3d& ptCen) ;