From e0c15f3c9320147a0e4f5f2187ba052d6db81010 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 19 Sep 2015 08:28:53 +0000 Subject: [PATCH] Include : - aggiornamenti vari. --- EInAPI.h | 14 ++++++++++++++ EMkMachMgr.h | 10 +++++++++- EMkToolConst.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ EXeExecutor.h | 9 ++++++++- 4 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 EMkToolConst.h diff --git a/EInAPI.h b/EInAPI.h index ac29032..22e255f 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -452,6 +452,20 @@ EIN_EXPORT int __stdcall EgtGetMachGroupId( const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtSetCurrMachGroup( int nMGroupId) ; EIN_EXPORT BOOL __stdcall EgtResetCurrMachGroup( void) ; EIN_EXPORT int __stdcall EgtGetCurrMachGroup( void) ; +EIN_EXPORT int __stdcall EgtGetRawPartCount( void) ; +EIN_EXPORT int __stdcall EgtGetFirstRawPart( void) ; +EIN_EXPORT int __stdcall EgtGetNextRawPart( int nRawId) ; +EIN_EXPORT int __stdcall EgtAddRawPart( const double ptOrig[3], + double dLength, double dWidth, 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 EgtRemoveRawPart( int nRawId) ; +EIN_EXPORT BOOL __stdcall EgtMoveToCornerRawPart( int nRawId, const double ptCorner[3], int nFlag) ; +EIN_EXPORT BOOL __stdcall EgtAddPartToRawPart( int nPartId, const double ptPos[3], int nRawId) ; +EIN_EXPORT BOOL __stdcall EgtRemovePartFromRawPart( int nPartId) ; +EIN_EXPORT BOOL __stdcall EgtSetTable( const wchar_t* wsTable) ; +EIN_EXPORT BOOL __stdcall EgtGetTableRef1( double ptPos[3]) ; +EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ; // Scene EIN_EXPORT BOOL __stdcall EgtInitScene( HWND hWnd, int nDriver, BOOL b2Buff, int nColorBits, int nDepthBits) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 83f62a9..29f800e 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -50,8 +50,9 @@ class __declspec( novtable) IMachMgr virtual int GetRawPartCount( void) const = 0 ; virtual int GetFirstRawPart( void) const = 0 ; virtual int GetNextRawPart( int nId) const = 0 ; - virtual int AddRawPart( const Point3d& ptOrig, double dWidth, double dLen, double dHeight, Color cCol) = 0 ; + virtual int AddRawPart( const Point3d& ptOrig, double dLen, double dWidth, double dHeight, Color cCol) = 0 ; virtual int AddRawPartWithPart( int nPartId, int nCrvSrfId, double dOverMat, 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 RemoveRawPart( int nRawId) = 0 ; virtual bool RotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; @@ -68,7 +69,9 @@ class __declspec( novtable) IMachMgr virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; // Tables and Fixtures virtual bool SetTable( const std::string& sTable) = 0 ; + virtual bool GetTableRef1( Point3d& ptPos) = 0 ; virtual int AddSubPiece( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) = 0 ; + virtual bool ShowOnlyTable( bool bVal) = 0 ; // Machine virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ; virtual bool GetAxisPos( const std::string& sAxis, double& dVal) = 0 ; @@ -78,11 +81,16 @@ class __declspec( novtable) IMachMgr virtual bool ResetHeadSet( const std::string& sHead) = 0 ; virtual bool SetCalcTable( const std::string& sTable) = 0 ; virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; + virtual bool GetCalcTool( std::string& sTool) = 0 ; virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) = 0 ; virtual bool GetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, int& nStat, double& dX, double& dY, double& dZ) = 0 ; virtual bool VerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; + // Tools + virtual bool GetToolParam( const std::string& sName, int nType, int& nVal) const = 0 ; + virtual bool GetToolParam( const std::string& sName, int nType, double& dVal) const = 0 ; + virtual bool GetToolParam( const std::string& sName, int nType, std::string& sVal) const = 0 ; // Operations virtual int AddMachining( const std::string& sName, const std::string& sMachining) = 0 ; virtual bool SetMachiningParam( int nType, bool bVal) = 0 ; diff --git a/EMkToolConst.h b/EMkToolConst.h new file mode 100644 index 0000000..c26a36c --- /dev/null +++ b/EMkToolConst.h @@ -0,0 +1,51 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : EmkToolConst.h Data : 16.09.15 Versione : 1.6i7 +// Contenuto : Costanti degli utensili. +// +// +// +// Modifiche : 16.09.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include + +//---------------------------------------------------------------------------- +// Costanti famiglie di parametri ( i primi 12 bit (0-4095) restano liberi) +const int TPA_BOOL = 0x1000 ; +const int TPA_INT = 0x2000 ; +const int TPA_DOU = 0x4000 ; +const int TPA_STR = 0x8000 ; +// Costanti tipo parametri modificabili direttamente negli utensili +enum TpaType { TPA_NONE = 0, + TPA_CORR = ( TPA_INT + 0), + TPA_EXIT = ( TPA_INT + 1), + TPA_TYPE = ( TPA_INT + 2), + TPA_CORNRAD = ( TPA_DOU + 0), + TPA_DIAM = ( TPA_DOU + 1), + TPA_TOTDIAM = ( TPA_DOU + 2), + TPA_FEED = ( TPA_DOU + 3), + TPA_ENDFEED = ( TPA_DOU + 4), + TPA_STARTFEED = ( TPA_DOU + 5), + TPA_TIPFEED = ( TPA_DOU + 6), + TPA_LEN = ( TPA_DOU + 7), + TPA_TOTLEN = ( TPA_DOU + 8), + TPA_MAXMAT = ( TPA_DOU + 9), + TPA_LONOFFSET = ( TPA_DOU + 10), + TPA_RADOFFSET = ( TPA_DOU + 11), + TPA_SPEED = ( TPA_DOU + 12), + TPA_SIDEANG = ( TPA_DOU + 13), + TPA_MAXSPEED = ( TPA_DOU + 14), + TPA_THICK = ( TPA_DOU + 15), + TPA_DRAW = ( TPA_STR + 0), + TPA_HEAD = ( TPA_STR + 1), + TPA_NAME = ( TPA_STR + 2), + TPA_SYSNOTES = ( TPA_STR + 3), + TPA_USERNOTES = ( TPA_STR + 4), + TPA_TCPOS = ( TPA_STR + 5), + TPA_UUID = ( TPA_STR + 6)} ; diff --git a/EXeExecutor.h b/EXeExecutor.h index c2846e0..f616452 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -466,8 +466,9 @@ EXE_EXPORT int ExeGetCurrMachGroup( void) ; EXE_EXPORT int ExeGetRawPartCount( void) ; EXE_EXPORT int ExeGetFirstRawPart( void) ; EXE_EXPORT int ExeGetNextRawPart( int nRawId) ; -EXE_EXPORT int ExeAddRawPart( Point3d ptOrig, double dWidth, double dLength, double dHeight, Color cCol) ; +EXE_EXPORT int ExeAddRawPart( Point3d ptOrig, double dLength, double dWidth, double dHeight, Color cCol) ; EXE_EXPORT int ExeAddRawPartWithPart( int nPartId, int nCrvId, double dOverMat, 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 ExeRemoveRawPart( int nRawId) ; EXE_EXPORT bool ExeRotateRawPart( int nRawId, const Vector3d& vtAx, double dAngRotDeg) ; @@ -482,6 +483,8 @@ 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 bool ExeGetTableRef1( Point3d& ptPos) ; +EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ; EXE_EXPORT int ExeAddSubPiece( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) ; EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ; EXE_EXPORT bool ExeGetAxisPos( const std::string& sAxis, double* pdVal) ; @@ -491,11 +494,15 @@ EXE_EXPORT bool ExeLoadTool( const std::string& sHead, int nExit, const std::str EXE_EXPORT bool ExeResetHeadSet( const std::string& sHead) ; EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ; EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ; +EXE_EXPORT bool ExeGetCalcTool( std::string& sTool) ; EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ; EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, int& nStat, double& dX, double& dY, double& dZ) ; EXE_EXPORT bool ExeVerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; +EXE_EXPORT bool ExeGetToolParam( const std::string& sName, int nType, int& nVal) ; +EXE_EXPORT bool ExeGetToolParam( const std::string& sName, int nType, double& dVal) ; +EXE_EXPORT bool ExeGetToolParam( const std::string& sName, int nType, std::string& sVal) ; EXE_EXPORT int ExeAddMachining( const std::string& sName, const std::string& sMachining) ; EXE_EXPORT bool ExeSetMachiningParam( int nType, bool bVal) ; EXE_EXPORT bool ExeSetMachiningParam( int nType, int nVal) ;