diff --git a/EGkVector3d.h b/EGkVector3d.h index 8de620e..fd173b5 100644 --- a/EGkVector3d.h +++ b/EGkVector3d.h @@ -80,6 +80,11 @@ class EGK_EXPORT Vector3d //! Verifica se il vettore è parallelo ed equiverso con Z- bool IsZminus( void) const { return ( fabs( x) < EPS_ZERO && fabs( y) < EPS_ZERO && z < - EPS_ZERO) ; } + //! Verifica se il vettore è generico + bool IsGeneric( void) const + { return (( fabs( x) > EPS_ZERO && fabs( y) > EPS_ZERO) || + ( fabs( y) > EPS_ZERO && fabs( z) > EPS_ZERO) || + ( fabs( z) > EPS_ZERO && fabs( x) > EPS_ZERO)) ; } //! Somma sul posto con altro vettore Vector3d& operator +=( const Vector3d& vtV) { this->x += vtV.x ; this->y += vtV.y ; this->z += vtV.z ; return *this ; } diff --git a/EInAPI.h b/EInAPI.h index 18dfd82..c4f8dcf 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -621,12 +621,14 @@ EIN_EXPORT int __stdcall EgtAddMachining( const wchar_t* wsName, const wchar_t* EIN_EXPORT int __stdcall EgtCreateMachining( const wchar_t* wsName, int nMchType, const wchar_t* wsTool) ; EIN_EXPORT BOOL __stdcall EgtSetCurrMachining( int nId) ; EIN_EXPORT int __stdcall EgtGetCurrMachining( void) ; +EIN_EXPORT BOOL __stdcall EgtSetMachiningParamBool( int nType, BOOL bVal) ; EIN_EXPORT BOOL __stdcall EgtSetMachiningParamInt( int nType, int nVal) ; EIN_EXPORT BOOL __stdcall EgtSetMachiningParamDouble( int nType, double dVal) ; EIN_EXPORT BOOL __stdcall EgtSetMachiningParamString( int nType, const wchar_t* wsVal) ; EIN_EXPORT BOOL __stdcall EgtSetMachiningGeometry( int nNumId, const int nIds[], const int nSubs[]) ; EIN_EXPORT BOOL __stdcall EgtPreviewMachining( BOOL bRecalc) ; EIN_EXPORT BOOL __stdcall EgtApplyMachining( BOOL bRecalc) ; +EIN_EXPORT BOOL __stdcall EgtGetMachiningParamBool( int nType, BOOL* pbVal) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningParamInt( int nType, int* pnVal) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningParamDouble( int nType, double* pdVal) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningParamString( int nType, wchar_t*& wsVal) ; diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 46ed736..c3e3587 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -175,7 +175,8 @@ enum { MILL_LI_NONE = 0, MILL_LI_LINEAR = 1, MILL_LI_TANGENT = 2, MILL_LI_GLIDE = 3, - MILL_LI_HELIX = 4} ; + MILL_LI_ZIGZAG = 4, + MILL_LI_HELIX = 5} ; // Tipo di uscita enum { MILL_LO_NONE = 0, MILL_LO_LINEAR = 1,