From 6b170b6ec17afd14ab63b485347dceda6b91bf13 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 24 May 2021 20:08:00 +0200 Subject: [PATCH 01/10] Include : - aggiunta costante MCH_SIM_COB_CONE. --- EGkCDeConeFrustumClosedSurfTm.h | 2 +- EMkMachMgr.h | 2 +- EMkSimuGenConst.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/EGkCDeConeFrustumClosedSurfTm.h b/EGkCDeConeFrustumClosedSurfTm.h index c74e185..735c2bd 100644 --- a/EGkCDeConeFrustumClosedSurfTm.h +++ b/EGkCDeConeFrustumClosedSurfTm.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2020-2020 //---------------------------------------------------------------------------- -// File : EGkCDeConeClosedSurfTm.h Data : 09.11.20 Versione : +// File : EGkCDeConeFrustumClosedSurfTm.h Data : 09.11.20 Versione : // Contenuto : Dichiarazione funzione verifica collisione tra // Cone e Closed SurfTriMesh. // diff --git a/EMkMachMgr.h b/EMkMachMgr.h index a510c0d..923f8dc 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 13.01.21 Versione : 2.3a3 +// File : EMkMachMgr.h Data : 24.05.21 Versione : 2.3e3 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 2ea3dbd..3fcb367 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -34,7 +34,8 @@ enum SimUiStat { MCH_UISIM_NULL = 0, enum SimCollObjType { MCH_SIM_COB_NULL = 0, MCH_SIM_COB_BOX = 1, MCH_SIM_COB_CYL = 2, - MCH_SIM_COB_SPHE = 3} ; + MCH_SIM_COB_SPHE = 3, + MCH_SIM_COB_CONE = 4} ; //------------------------ Stato di visualizzazione della macchina ------------ enum MachLook { MCH_LOOK_NONE = -1, From 3a3198b63bbabe33c8af0c6a546bcc10064ecf72 Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 1 Jun 2021 19:36:25 +0200 Subject: [PATCH 02/10] Include : - aggiornamento prototipi. --- EExBeamMgr.h | 10 +++++----- EInAPI.h | 4 ++-- EXeExecutor.h | 4 ++-- EgtKeyCodes.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EExBeamMgr.h b/EExBeamMgr.h index ae7b1ab..6c98f7e 100644 --- a/EExBeamMgr.h +++ b/EExBeamMgr.h @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2020-2020 +// EgalTech 2020-2021 //---------------------------------------------------------------------------- -// File : EExBeamMgr.h Data : 30.08.20 Versione : 2.2i1 +// File : EExBeamMgr.h Data : 01.06.21 Versione : 2.2f1 // Contenuto : Dichiarazione della interfaccia IBeamMgr. // // // // Modifiche : 30.08.20 DS Creazione modulo. -// +// 01.06.21 DS Aggiunti parametri vsUAtt per Process. // //---------------------------------------------------------------------------- @@ -41,9 +41,9 @@ class __declspec( novtable) IBeamMgr virtual bool SetPartCount( int nCount) = 0 ; virtual bool SetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) = 0 ; virtual int AddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) = 0 ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ; virtual int ModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) = 0 ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ; virtual bool EraseProcess( int nGeomId, bool bUpdate = true) = 0 ; virtual bool EnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) = 0 ; virtual bool CalcSolid( int nPartId, bool bRecalc = false) = 0 ; diff --git a/EInAPI.h b/EInAPI.h index a7b8c23..43e69bf 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -126,10 +126,10 @@ EIN_EXPORT BOOL __stdcall EgtBeamSetPartCount( int nCount) ; EIN_EXPORT BOOL __stdcall EgtBeamSetPartBox( double dLength, double dHeight, double dWidth, BOOL bUpdate) ; EIN_EXPORT int __stdcall EgtBeamAddProcess( int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId, const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3], - int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) ; + int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ; EIN_EXPORT int __stdcall EgtBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId, const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3], - int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) ; + int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ; EIN_EXPORT BOOL __stdcall EgtBeamEraseProcess( int nGeomId, BOOL bUpdate) ; EIN_EXPORT BOOL __stdcall EgtBeamEnableProcess( int nGeomId, BOOL bEnable, BOOL bUpdate) ; EIN_EXPORT BOOL __stdcall EgtBeamCalcSolid( int nPartId, BOOL bRecalc) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index f50434e..0cfcd6a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -131,9 +131,9 @@ EXE_EXPORT bool ExeBeamSetPartName( const std::string& sName) ; EXE_EXPORT bool ExeBeamSetPartCount( int nCount) ; EXE_EXPORT bool ExeBeamSetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) ; EXE_EXPORT int ExeBeamAddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ; EXE_EXPORT int ExeBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ; EXE_EXPORT bool ExeBeamEraseProcess( int nGeomId, bool bUpdate = true) ; EXE_EXPORT bool ExeBeamEnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) ; EXE_EXPORT bool ExeBeamCalcSolid( int nPartId, bool bRecalc = false) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 3bc6a85..d43e6dd 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -21,7 +21,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2305 ; +const int KEY_BASELIB_VER = 2306 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From 828a8017cbf15500b2865bf602245facab47b389 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 16 Jun 2021 17:24:35 +0200 Subject: [PATCH 03/10] Include : - aggiornamento prototipi. --- EXeExecutor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/EXeExecutor.h b/EXeExecutor.h index 0cfcd6a..9a98ca9 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -49,6 +49,7 @@ EXE_EXPORT bool ExeGetIniFile( std::string& sIniFile) ; EXE_EXPORT bool ExeSetCommandLogger( const std::string& sLogFile) ; EXE_EXPORT bool ExeEnableCommandLogger( void) ; EXE_EXPORT bool ExeDisableCommandLogger( void) ; +EXE_EXPORT bool ExeGetExecutableVersion( std::string& sVer) ; EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeSetLockType( int nType) ; From 10309c05287be601201832247f105c6cd4cacc45 Mon Sep 17 00:00:00 2001 From: SaraP Date: Tue, 29 Jun 2021 15:59:16 +0200 Subject: [PATCH 04/10] Include : - aggiornamento PolyLine. --- EGkPolyLine.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/EGkPolyLine.h b/EGkPolyLine.h index 72a2afb..5dc7b02 100644 --- a/EGkPolyLine.h +++ b/EGkPolyLine.h @@ -132,3 +132,30 @@ class PolyLine // Raccolte di PolyLine typedef std::vector POLYLINEVECTOR ; // vettore di PolyLine typedef std::list POLYLINELIST ; // lista di PolyLine + +//---------------------------------------------------------------------------- +/*static*/ bool +ChangePolyLineStart( const Point3d& ptNewStart, PolyLine& Loop, double dTol = EPS_SMALL) ; +// nSegNum 0-based +/*static*/ bool +PointPositionOnPolyLine( const Point3d& ptPoint, /*const*/ PolyLine& Loop, int& nSegNum, double& dParOnSeg, double dTol = EPS_SMALL) ; +/*static*/ bool +IsPointInsidePolyLine( const Point3d& ptP, const PolyLine& plPoly) ; +/*static*/ bool +DistPointPolyLine( const Point3d& ptP, const PolyLine& plPoly, double& dPointPolyLineDist) ; +/*static*/ bool +SplitPolyLineAtPoint( const Point3d& ptPoint, /*const*/ PolyLine& Loop, PolyLine& Loop1, PolyLine& Loop2, double dTol = EPS_SMALL) ; +/*static*/ bool +AddPolyLineToPolyLine( PolyLine& Poly, PolyLine& PolyToAdd, double dTol = EPS_SMALL) ; + +//---------------------------------------------------------------------------- +struct PositionOnPolyLine { + int nIndexInVec ; + int nSegNum ; + double dParOnSeg ; + PositionOnPolyLine( int nIndex, int nSeg, double dPar) { + nIndexInVec = nIndex ; + nSegNum = nSeg ; + dParOnSeg = dPar ; + } +} ; From daabdc44b9fcf7a2825d8fabb71240bcdf0cebac Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 5 Jul 2021 08:37:04 +0200 Subject: [PATCH 05/10] Include : - aggiornamento mensile protezione librerie. --- EgtKeyCodes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index d43e6dd..477644e 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -21,7 +21,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2306 ; +const int KEY_BASELIB_VER = 2307 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From 43cd4214d3b8f50811a838e66dd14e523b8cf161 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Mon, 5 Jul 2021 08:48:14 +0200 Subject: [PATCH 06/10] Revert "Include :" This reverts commit 828a8017cbf15500b2865bf602245facab47b389. --- EXeExecutor.h | 1 - 1 file changed, 1 deletion(-) diff --git a/EXeExecutor.h b/EXeExecutor.h index 9a98ca9..0cfcd6a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -49,7 +49,6 @@ EXE_EXPORT bool ExeGetIniFile( std::string& sIniFile) ; EXE_EXPORT bool ExeSetCommandLogger( const std::string& sLogFile) ; EXE_EXPORT bool ExeEnableCommandLogger( void) ; EXE_EXPORT bool ExeDisableCommandLogger( void) ; -EXE_EXPORT bool ExeGetExecutableVersion( std::string& sVer) ; EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeSetLockType( int nType) ; From add5670d3b73ae3221c15b6639ab1cc5301d569e Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 5 Jul 2021 09:48:07 +0200 Subject: [PATCH 07/10] Include : - ripristino stato. --- EGkPolyLine.h | 27 --------------------------- EXeExecutor.h | 1 + 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/EGkPolyLine.h b/EGkPolyLine.h index 5dc7b02..72a2afb 100644 --- a/EGkPolyLine.h +++ b/EGkPolyLine.h @@ -132,30 +132,3 @@ class PolyLine // Raccolte di PolyLine typedef std::vector POLYLINEVECTOR ; // vettore di PolyLine typedef std::list POLYLINELIST ; // lista di PolyLine - -//---------------------------------------------------------------------------- -/*static*/ bool -ChangePolyLineStart( const Point3d& ptNewStart, PolyLine& Loop, double dTol = EPS_SMALL) ; -// nSegNum 0-based -/*static*/ bool -PointPositionOnPolyLine( const Point3d& ptPoint, /*const*/ PolyLine& Loop, int& nSegNum, double& dParOnSeg, double dTol = EPS_SMALL) ; -/*static*/ bool -IsPointInsidePolyLine( const Point3d& ptP, const PolyLine& plPoly) ; -/*static*/ bool -DistPointPolyLine( const Point3d& ptP, const PolyLine& plPoly, double& dPointPolyLineDist) ; -/*static*/ bool -SplitPolyLineAtPoint( const Point3d& ptPoint, /*const*/ PolyLine& Loop, PolyLine& Loop1, PolyLine& Loop2, double dTol = EPS_SMALL) ; -/*static*/ bool -AddPolyLineToPolyLine( PolyLine& Poly, PolyLine& PolyToAdd, double dTol = EPS_SMALL) ; - -//---------------------------------------------------------------------------- -struct PositionOnPolyLine { - int nIndexInVec ; - int nSegNum ; - double dParOnSeg ; - PositionOnPolyLine( int nIndex, int nSeg, double dPar) { - nIndexInVec = nIndex ; - nSegNum = nSeg ; - dParOnSeg = dPar ; - } -} ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 0cfcd6a..9a98ca9 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -49,6 +49,7 @@ EXE_EXPORT bool ExeGetIniFile( std::string& sIniFile) ; EXE_EXPORT bool ExeSetCommandLogger( const std::string& sLogFile) ; EXE_EXPORT bool ExeEnableCommandLogger( void) ; EXE_EXPORT bool ExeDisableCommandLogger( void) ; +EXE_EXPORT bool ExeGetExecutableVersion( std::string& sVer) ; EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeSetLockType( int nType) ; From 7c182e9d3368160f41d3ded6505c9ed967912ab4 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 21 Jul 2021 16:51:28 +0200 Subject: [PATCH 08/10] =?UTF-8?q?Include=20:=20-=20modifiche=20per=20secon?= =?UTF-8?q?da=20propriet=C3=A0=20temporanea=20degli=20oggetti=20geometrici?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EGkCurveComposite.h | 8 ++++---- EGkGdbConst.h | 3 +++ EGkGeoObj.h | 9 +++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index 7b3eab2..ccc3c49 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- // EgalTech 2013-2021 //---------------------------------------------------------------------------- -// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3d1 +// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3g2 // Contenuto : Dichiarazione della interfaccia ICurveComposite. // // // // Modifiche : 22.11.13 DS Creazione modulo. -// +// 21.07.21 LM Aggiunto parametro opzionale a Set/GetCurveTempProp. // //---------------------------------------------------------------------------- @@ -58,8 +58,8 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool IsAPoint( void) const = 0 ; virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ; virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ; - virtual bool SetCurveTempProp( int nCrv, int nProp) = 0 ; - virtual bool GetCurveTempProp( int nCrv, int& nProp) const = 0 ; + virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropInd = 0) = 0 ; + virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropInd = 0) const = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EGkGdbConst.h b/EGkGdbConst.h index 8ccab1d..8a53360 100644 --- a/EGkGdbConst.h +++ b/EGkGdbConst.h @@ -60,6 +60,9 @@ enum GdbStatus { GDB_ST_OFF = 0, enum GdbMark { GDB_MK_OFF = 0, GDB_MK_ON = 1} ; +//----------------- Costante per numero proprietà temporanee ------------------- +const int GDB_NUM_TEMP_PROP = 2 ; + //----------------- Costanti materiale oggetti del DB geometrico --------------- enum GdbMaterial { GDB_MT_COLOR = -1, GDB_MT_PARENT = 0} ; diff --git a/EGkGeoObj.h b/EGkGeoObj.h index 716af3a..466dda6 100644 --- a/EGkGeoObj.h +++ b/EGkGeoObj.h @@ -1,13 +1,14 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2014 +// EgalTech 2013-2021 //---------------------------------------------------------------------------- -// File : EGkGeoObj.h Data : 14.04.14 Versione : 1.5d5 +// File : EGkGeoObj.h Data : 21.07.21 Versione : 2.3g2 // Contenuto : Dichiarazione della interfaccia IGeoObj. // // // // Modifiche : 20.11.13 DS Creazione modulo. // 14.04.14 DS Tolti metodi GetKey, Save e Load. +// 21.07.21 LM Aggiunto parametro opzionale a Set/GetTempProp. // //---------------------------------------------------------------------------- @@ -53,8 +54,8 @@ class __declspec( novtable) IGeoObj virtual void SetObjGraphics( IObjGraphics* pOGr) = 0 ; virtual IObjGraphics* GetObjGraphics( void) = 0 ; virtual const IObjGraphics* GetObjGraphics( void) const = 0 ; - virtual void SetTempProp( int nProp) = 0 ; - virtual int GetTempProp( void) const = 0 ; + virtual void SetTempProp( int nProp, int nPropInd = 0) = 0 ; + virtual int GetTempProp( int nPropInd = 0) const = 0 ; } ; //----------------------------------------------------------------------------- From 8af39cbdf323ea813ef8b64ac51bcb508be83c0e Mon Sep 17 00:00:00 2001 From: DarioS Date: Sat, 31 Jul 2021 12:05:50 +0200 Subject: [PATCH 09/10] Include : - codice abilitazione librerie portato a 2308. --- EgtKeyCodes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 477644e..ba8d31c 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2020 +// EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : EgtKeyCodes.h Data : 04.08.20 Versione : 2.2h1 +// File : EgtKeyCodes.h Data : 31.07.21 Versione : 2.3h1 // Contenuto : Costanti per codici di protezione librerie di base. // // @@ -21,7 +21,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2307 ; +const int KEY_BASELIB_VER = 2308 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From 0d0fccf1d461d6cdbbde7ce6df71066f76e61573 Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 1 Aug 2021 17:14:27 +0200 Subject: [PATCH 10/10] Include : - a ISurfTriMesh::DoSewing aggiunto parametro opzionale dTol (default 2*EPS_SMALL). --- EGkSurfTriMesh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index ff07308..97adc87 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -53,7 +53,7 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool CreateByScrewing( const PolyLine& PL, const Point3d& ptAx, const Vector3d& vtAx, double dAngRot, double dStepRot, double dMove) = 0 ; virtual bool DoCompacting( double dTol = EPS_SMALL) = 0 ; - virtual bool DoSewing( const ISurfTriMesh& stmOther, const Frame3d& frOther = GLOB_FRM) = 0 ; + virtual bool DoSewing( const ISurfTriMesh& stmOther, const Frame3d& frOther = GLOB_FRM, double dTol = 2 * EPS_SMALL) = 0 ; virtual int GetVertexCount( void) const = 0 ; virtual int GetTriangleCount( void) const = 0 ; virtual int GetTriangleCount( int nTFlag) const = 0 ;