Include :

- aggiornamenti.
This commit is contained in:
Dario Sassi
2016-02-15 07:46:23 +00:00
parent 8cab5d6e00
commit b14d3ab4ed
5 changed files with 45 additions and 12 deletions
+14 -1
View File
@@ -478,7 +478,7 @@ EIN_EXPORT void __stdcall EgtSaveCollInfo( void) ;
EIN_EXPORT void __stdcall EgtRestoreCollInfo( void) ;
EIN_EXPORT BOOL __stdcall EgtGetPartClusterCenterGlob( int nId[], int nCount, double ptCen[3]) ;
EIN_EXPORT BOOL __stdcall EgtVerifyMachining( int nMchId, int* pnResult) ;
EIN_EXPORT BOOL __stdcall EgtVerifyCutAsSplitting( int nMchId) ;
EIN_EXPORT int __stdcall EgtVerifyCutAsSplitting( int nMchId) ;
// Machining
EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir) ;
@@ -496,6 +496,12 @@ 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) ;
// Phases
EIN_EXPORT int __stdcall EgtAddPhase( void) ;
EIN_EXPORT BOOL __stdcall EgtSetCurrPhase( int nPhase) ;
EIN_EXPORT int __stdcall EgtGetCurrPhase( void) ;
EIN_EXPORT BOOL __stdcall EgtRemoveLastPhase( void) ;
EIN_EXPORT int __stdcall EgtGetPhaseCount( void) ;
// RawParts & Parts
EIN_EXPORT int __stdcall EgtGetRawPartCount( void) ;
EIN_EXPORT int __stdcall EgtGetFirstRawPart( void) ;
@@ -506,9 +512,12 @@ EIN_EXPORT BOOL __stdcall EgtModifyRawPart( int nRawId, 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 EgtKeepRawPart( int nRawId) ;
EIN_EXPORT BOOL __stdcall EgtVerifyRawPartPhase( int nRawId, int nPhase) ;
EIN_EXPORT BOOL __stdcall EgtRemoveRawPart( int nRawId) ;
EIN_EXPORT BOOL __stdcall EgtMoveToCornerRawPart( int nRawId, const double ptCorner[3], int nFlag) ;
EIN_EXPORT BOOL __stdcall EgtMoveRawPart( int nRawId, const double vtMove[3]) ;
EIN_EXPORT int __stdcall EgtSplitFlatRawPartWithMachinings( int nRawId, int nNumMchId, const int nMchIds[]) ;
EIN_EXPORT int __stdcall EgtGetPartInRawPartCount( int nRawId) ;
EIN_EXPORT int __stdcall EgtGetFirstPartInRawPart( int nRawId) ;
EIN_EXPORT int __stdcall EgtGetNextPartInRawPart( int nPartId) ;
@@ -566,7 +575,9 @@ EIN_EXPORT BOOL __stdcall EgtMdbGetMachiningDir( wchar_t*& wsMchDir) ;
EIN_EXPORT int __stdcall EgtGetFirstOperation( void) ;
EIN_EXPORT int __stdcall EgtGetNextOperation( int nId) ;
EIN_EXPORT int __stdcall EgtGetOperationType( int nId) ;
EIN_EXPORT int __stdcall EgtGetOperationPhase( int nId) ;
EIN_EXPORT BOOL __stdcall EgtRemoveOperation( int nId) ;
EIN_EXPORT BOOL __stdcall EgtRemoveAllPhaseOperations( int nPhase) ;
EIN_EXPORT BOOL __stdcall EgtRemoveAllOperations( void) ;
EIN_EXPORT BOOL __stdcall EgtSetOperationMode( int nId, BOOL bActive) ;
EIN_EXPORT BOOL __stdcall EgtGetOperationMode( int nId) ;
@@ -574,6 +585,8 @@ EIN_EXPORT BOOL __stdcall EgtSetAllOperationsMode( BOOL bActive) ;
EIN_EXPORT BOOL __stdcall EgtSetOperationStatus( int nId, BOOL bShow) ;
EIN_EXPORT BOOL __stdcall EgtGetOperationStatus( int nId) ;
EIN_EXPORT BOOL __stdcall EgtSetAllOperationsStatus( BOOL bShow) ;
EIN_EXPORT BOOL __stdcall EgtChangeOperationPhase( int nId, int nNewPhase) ;
EIN_EXPORT int __stdcall EgtGetPhaseDisposition( int nPhase) ;
// Machinings
EIN_EXPORT BOOL __stdcall EgtSetCurrMachining( int nId) ;
EIN_EXPORT BOOL __stdcall EgtSetMachiningParamInt( int nType, int nVal) ;
+14 -9
View File
@@ -50,11 +50,11 @@ class __declspec( novtable) IMachMgr
virtual bool ResetCurrMachGroup( void) = 0 ;
virtual int GetCurrMachGroup( void) const = 0 ;
// Phases
virtual int AddPhase( void) ;
virtual bool SetCurrPhase( int nPhase) ;
virtual int GetCurrPhase( void) const ;
virtual bool RemoveLastPhase( void) ;
virtual int GetPhaseCount( void) const ;
virtual int AddPhase( void) = 0 ;
virtual bool SetCurrPhase( int nPhase) = 0 ;
virtual int GetCurrPhase( void) const = 0 ;
virtual bool RemoveLastPhase( void) = 0 ;
virtual int GetPhaseCount( void) const = 0 ;
// RawParts
virtual int GetRawPartCount( void) const = 0 ;
virtual int GetFirstRawPart( void) const = 0 ;
@@ -64,12 +64,14 @@ class __declspec( novtable) IMachMgr
virtual bool ModifyRawPart( int nRawId, const Point3d& ptOrig, double dLen, double dWidth, 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) ;
virtual bool KeepRawPart( int nRawId) = 0 ;
virtual bool VerifyRawPartPhase( int nRawId, int nPhase) const = 0 ;
virtual bool RemoveRawPart( int nRawId) = 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 ;
virtual int SplitFlatRawPartWithMachinings( int nRawId, const INTVECTOR& vMchId) = 0 ;
// Parts
virtual int GetPartInRawPartCount( int nRawId) const = 0 ;
virtual int GetFirstPartInRawPart( int nRawId) const = 0 ;
@@ -140,18 +142,21 @@ class __declspec( novtable) IMachMgr
virtual int GetLastActiveOperation( void) const = 0 ;
virtual int GetPrevActiveOperation( int nId) const = 0 ;
virtual int GetOperationType( int nId) const = 0 ;
virtual int GetOperationPhase( int nId) const = 0 ;
virtual std::string GetOperationName( int nId) const = 0 ;
virtual int GetOperationId( const std::string& sName) const = 0 ;
virtual bool RemoveOperation( int nId) = 0 ;
virtual bool RemoveAllOperations( bool bExceptFirstDisp) = 0 ;
virtual bool RemoveAllPhaseOperations( int nPhase) = 0 ;
virtual bool RemoveAllOperations( void) = 0 ;
virtual bool SetOperationMode( int nId, bool bActive) = 0 ;
virtual bool GetOperationMode( int nId, bool& bActive) const = 0 ;
virtual bool SetAllOperationsMode( bool bExceptFirstDisp, bool bActive) = 0 ;
virtual bool SetOperationStatus( int nId, bool bShow) = 0 ;
virtual bool GetOperationStatus( int nId, bool& bShow) const = 0 ;
virtual bool SetAllOperationsStatus( bool bExceptFirstDisp, bool bShow) = 0 ;
virtual bool ChangeOperationPhase( int nId, int nNewPhase) = 0 ;
// Operations : dispositions
virtual int AddDisposition( const std::string& sName) = 0 ;
virtual int GetPhaseDisposition( int nPhase) const = 0 ;
// Operations : machinings
virtual int AddMachining( const std::string& sName, const std::string& sMachining) = 0 ;
virtual bool SetCurrMachining( int nId) = 0 ;
@@ -169,7 +174,7 @@ class __declspec( novtable) IMachMgr
virtual bool GetMachiningParam( int nType, double& dVal) const = 0 ;
virtual bool GetMachiningParam( int nType, std::string& sVal) const = 0 ;
virtual bool GetMachiningGeometry( SELVECTOR& vIds) const = 0 ;
virtual bool IsEmpty( void) const = 0 ;
virtual bool IsMachiningEmpty( void) const = 0 ;
// Simulation
virtual bool SimStart( void) = 0 ;
virtual bool SimMove( int& nStatus) = 0 ;
+2
View File
@@ -41,3 +41,5 @@ static std::string MCH_PV_RLOCUT = "RLOCUT" ;
// 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" ;
// Chiave info per rinvio a preview spostato nel pezzo in Preview
static std::string MCH_PV_KEY_RELOCATE = "PvId" ;
+7 -1
View File
@@ -63,5 +63,11 @@ enum FmiType{ FMI_NONE = 0, // nessuna interferenza
FMI_RM = 2, // interferenza con lavorazione ridotta
FMI_LO = 4} ; // interferenza con uscita
//----------------- Costanti risultato verifica tagli lama allungati -----------
enum CarRes{ CAR_INTERF = 0, // interferiscono entrambi gli allungamenti
CAR_LI_OK = 1, // allungamento inizio va bene
CAR_LO_OK = 2, // allungameno uscita va bene
CAR_LI_LO_OK = 1 + 2} ; // entrambi gli allungamenti vanno bene
//----------------- Costante per sostituzione nome progetto --------------------
const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ;
const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ;
+8 -1
View File
@@ -515,7 +515,7 @@ EXE_EXPORT void ExeRestoreCollInfo( void) ;
EXE_EXPORT bool ExeGetPartClusterCenterGlob( const INTVECTOR& vIds, Point3d& ptCen) ;
// Machining Nest
EXE_EXPORT bool ExeVerifyMachining( int nMchId, int& nResult) ;
EXE_EXPORT bool ExeVerifyCutAsSplitting( int nMchId) ;
EXE_EXPORT int ExeVerifyCutAsSplitting( int nMchId) ;
// Machining
EXE_EXPORT bool ExeInitMachMgr( const std::string& sMachinesDir) ;
@@ -539,6 +539,7 @@ EXE_EXPORT int ExeGetCurrMachGroup( void) ;
EXE_EXPORT int ExeAddPhase( void) ;
EXE_EXPORT bool ExeSetCurrPhase( int nPhase) ;
EXE_EXPORT int ExeGetCurrPhase( void) ;
EXE_EXPORT bool ExeRemoveLastPhase( void) ;
EXE_EXPORT int ExeGetPhaseCount( void) ;
// Raw Parts & Parts
EXE_EXPORT int ExeGetRawPartCount( void) ;
@@ -550,11 +551,13 @@ EXE_EXPORT bool ExeModifyRawPart( int nRawId, Point3d ptOrig, double dLength, do
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 ExeVerifyRawPartPhase( int nRawId, int nPhase) ;
EXE_EXPORT bool ExeRemoveRawPart( int nRawId) ;
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 ExeSplitFlatRawPartWithMachinings( int nRawId, const INTVECTOR& vMchId) ;
EXE_EXPORT int ExeGetPartInRawPartCount( int nRawId) ;
EXE_EXPORT int ExeGetFirstPartInRawPart( int nRawId) ;
EXE_EXPORT int ExeGetNextPartInRawPart( int nPartId) ;
@@ -615,7 +618,9 @@ EXE_EXPORT bool ExeMdbGetMachiningDir( std::string& sMchDir) ;
EXE_EXPORT int ExeGetFirstOperation( void) ;
EXE_EXPORT int ExeGetNextOperation( int nId) ;
EXE_EXPORT int ExeGetOperationType( int nId) ;
EXE_EXPORT int ExeGetOperationPhase( int nId) ;
EXE_EXPORT bool ExeRemoveOperation( int nId) ;
EXE_EXPORT bool ExeRemoveAllPhaseOperations( int nPhase) ;
EXE_EXPORT bool ExeRemoveAllOperations( void) ;
EXE_EXPORT bool ExeSetOperationMode( int nId, bool bActive) ;
EXE_EXPORT bool ExeGetOperationMode( int nId, bool& bActive) ;
@@ -623,6 +628,8 @@ EXE_EXPORT bool ExeSetAllOperationsMode( bool bActive) ;
EXE_EXPORT bool ExeSetOperationStatus( int nId, bool bShow) ;
EXE_EXPORT bool ExeGetOperationStatus( int nId, bool& bShow) ;
EXE_EXPORT bool ExeSetAllOperationsStatus( bool bShow) ;
EXE_EXPORT bool ExeChangeOperationPhase( int nId, int nNewPhase) ;
EXE_EXPORT int ExeGetPhaseDisposition( int nPhase) ;
// Machinings
EXE_EXPORT int ExeAddMachining( const std::string& sName, const std::string& sMachining) ;
EXE_EXPORT bool ExeSetCurrMachining( int nId) ;