From daabdc44b9fcf7a2825d8fabb71240bcdf0cebac Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 5 Jul 2021 08:37:04 +0200 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] =?UTF-8?q?Include=20:=20-=20modifiche=20per=20seconda?= =?UTF-8?q?=20propriet=C3=A0=20temporanea=20degli=20oggetti=20geometrici.?= 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 ; } ; //-----------------------------------------------------------------------------