From 7c182e9d3368160f41d3ded6505c9ed967912ab4 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 21 Jul 2021 16:51:28 +0200 Subject: [PATCH] =?UTF-8?q?Include=20:=20-=20modifiche=20per=20seconda=20p?= =?UTF-8?q?ropriet=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 ; } ; //-----------------------------------------------------------------------------