From 038142a6d78d7d16086a7ea604e0c0a94dc221f5 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 21 Jul 2021 16:44:28 +0200 Subject: [PATCH] =?UTF-8?q?EgtGeomKernel=202.3g3=20:=20-=20aggiustamenti?= =?UTF-8?q?=20e=20ricompilazione=20per=20seconda=20propriet=C3=A0=20tempor?= =?UTF-8?q?anea=20degli=20oggetti=20geometrici.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CurveArc.h | 11 ++++++----- CurveBezier.h | 11 ++++++----- CurveComposite.h | 11 ++++++----- CurveLine.h | 11 ++++++----- EgtGeomKernel.rc | Bin 11710 -> 11710 bytes ExtDimension.h | 11 ++++++----- ExtText.h | 11 ++++++----- GeoFrame3d.h | 11 ++++++----- GeoPoint3d.h | 11 ++++++----- GeoVector3d.h | 11 ++++++----- SurfBezier.cpp | 7 +++++-- SurfBezier.h | 11 ++++++----- SurfFlatRegion.h | 11 ++++++----- SurfTriMesh.h | 11 ++++++----- SurfTriMeshBooleans.cpp | 22 +++++++++++----------- VolZmap.cpp | 10 +++++++--- VolZmap.h | 11 ++++++----- 17 files changed, 101 insertions(+), 81 deletions(-) diff --git a/CurveArc.h b/CurveArc.h index c005958..69ba383 100644 --- a/CurveArc.h +++ b/CurveArc.h @@ -49,10 +49,11 @@ class CurveArc : public ICurveArc, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ICurve bool IsSimple( void) const override @@ -211,7 +212,7 @@ class CurveArc : public ICurveArc, public IGeoObjRW double m_dDeltaN ; // variazione di quota lungo VtN della fine rispetto all'inizio Vector3d m_VtExtr ; // vettore estrusione (normalmente coincide con m_VtN) double m_dThick ; // spessore - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; //----------------------------------------------------------------------------- diff --git a/CurveBezier.h b/CurveBezier.h index 5921c48..d5e96ac 100644 --- a/CurveBezier.h +++ b/CurveBezier.h @@ -51,10 +51,11 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ICurve bool IsSimple( void) const override { return true ; } @@ -189,7 +190,7 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW DBLVECTOR m_vWeCtrl ; // vettore dei pesi di controllo Vector3d m_VtExtr ; // vettore estrusione (normalmente coincide con m_VtN) double m_dThick ; // spessore - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; //----------------------------------------------------------------------------- diff --git a/CurveComposite.h b/CurveComposite.h index 8fd3187..e9cf54d 100644 --- a/CurveComposite.h +++ b/CurveComposite.h @@ -50,10 +50,11 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ICurve bool IsSimple( void) const override @@ -202,7 +203,7 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW Vector3d m_VtExtr ; // vettore estrusione (normalmente coincide con m_VtN) double m_dThick ; // spessore Point3d m_ptStart ; // punto iniziale per composita vuota per Add di linee o archi - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee mutable PCSD_CONST_ITER m_Iter ; // iteratore } ; diff --git a/CurveLine.h b/CurveLine.h index 337a493..a3179d6 100644 --- a/CurveLine.h +++ b/CurveLine.h @@ -49,10 +49,11 @@ class CurveLine : public ICurveLine, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ICurve bool IsSimple( void) const override @@ -164,7 +165,7 @@ class CurveLine : public ICurveLine, public IGeoObjRW Point3d m_PtEnd ; // punto finale Vector3d m_VtExtr ; // vettore estrusione double m_dThick ; // spessore - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; //----------------------------------------------------------------------------- diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc index 6c3373475938df8e28ee6dae041b543302850f8a..6978284f6feddd12b5a532bd530f7eb8b2c9e62d 100644 GIT binary patch delta 94 zcmdlNy)SyhFE&Qw&A-_cnHh~ID{|{@_Trkr0u;H;XNwSVW8B;$>;>dw2zN+>g;Df- LFmBFL4&ed-W11TR delta 94 zcmdlNy)SyhFE&P_&A-_cnHh~HD{|{@_Trkr0u;H;XNwSVW8B;$>;>dw2zN+>g;Df- LFmBFL4&ed-Vf-5U diff --git a/ExtDimension.h b/ExtDimension.h index 47ae2c2..a7e4e95 100644 --- a/ExtDimension.h +++ b/ExtDimension.h @@ -50,10 +50,11 @@ class ExtDimension : public IExtDimension, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropTemp = 0) override - { m_nTempProp[nPropTemp] = nProp ; } - int GetTempProp( int nPropTemp = 0) const override - { return m_nTempProp[nPropTemp] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // IExtDimension bool CopyFrom( const IGeoObj* pGObjSrc) override ; @@ -148,5 +149,5 @@ class ExtDimension : public IExtDimension, public IGeoObjRW int m_nDecDigit ; // numero di cifre decimali std::string m_sFont ; // font del testo double m_dTextHeight ; // altezza del testo - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; diff --git a/ExtText.h b/ExtText.h index 96bd6aa..053ed4a 100644 --- a/ExtText.h +++ b/ExtText.h @@ -50,10 +50,11 @@ class ExtText : public IExtText, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropTemp = 0) override - { m_nTempProp[nPropTemp] = nProp ; } - int GetTempProp( int nPropTemp = 0) const override - { return m_nTempProp[nPropTemp] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // IExtText bool CopyFrom( const IGeoObj* pGObjSrc) override ; @@ -143,5 +144,5 @@ class ExtText : public IExtText, public IGeoObjRW double m_dRatio ; // rapporto tra larghezza e altezza double m_dAddAdvance ; // avanzamento addizionale tra caratteri int m_nInsPos ; // posizione del punto di inserimento rispetto al testo - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; diff --git a/GeoFrame3d.h b/GeoFrame3d.h index da4cb56..728c1b0 100644 --- a/GeoFrame3d.h +++ b/GeoFrame3d.h @@ -57,10 +57,11 @@ class GeoFrame3d : public IGeoFrame3d, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // IGeoFrame3d bool CopyFrom( const IGeoObj* pGObjSrc) override ; @@ -95,5 +96,5 @@ class GeoFrame3d : public IGeoFrame3d, public IGeoObjRW private : ObjGraphicsMgr m_OGrMgr ; // gestore grafica dell'oggetto Frame3d m_frF ; // oggetto - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; diff --git a/GeoPoint3d.h b/GeoPoint3d.h index 1bd1b44..59f08a0 100644 --- a/GeoPoint3d.h +++ b/GeoPoint3d.h @@ -57,10 +57,11 @@ class GeoPoint3d : public IGeoPoint3d, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // IGeoPoint3d bool CopyFrom( const IGeoObj* pGObjSrc) override ; @@ -89,5 +90,5 @@ class GeoPoint3d : public IGeoPoint3d, public IGeoObjRW private : ObjGraphicsMgr m_OGrMgr ; // gestore grafica dell'oggetto Point3d m_ptP ; // oggetto - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; diff --git a/GeoVector3d.h b/GeoVector3d.h index ed9bbd2..aaeac07 100644 --- a/GeoVector3d.h +++ b/GeoVector3d.h @@ -65,10 +65,11 @@ class GeoVector3d : public IGeoVector3d, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // IGeoVector3d bool CopyFrom( const IGeoObj* pGObjSrc) override ; @@ -104,5 +105,5 @@ class GeoVector3d : public IGeoVector3d, public IGeoObjRW ObjGraphicsMgr m_OGrMgr ; // gestore grafica dell'oggetto Vector3d m_vtV ; // oggetto Point3d m_ptBase ; // punto base da cui tracciare il vettore - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; diff --git a/SurfBezier.cpp b/SurfBezier.cpp index 88ef863..97be565 100644 --- a/SurfBezier.cpp +++ b/SurfBezier.cpp @@ -35,8 +35,10 @@ GEOOBJ_REGISTER( SRF_BEZIER, NGE_S_BEZ, SurfBezier) ; //---------------------------------------------------------------------------- SurfBezier::SurfBezier(void) : m_pSTM( nullptr), m_nStatus( TO_VERIFY), m_nDegU(), m_nDegV(), m_nSpanU(), m_nSpanV(), m_bRat( false), - m_bTrimmed( false), m_pTrimReg( nullptr), m_nTempProp( 0) + m_bTrimmed( false), m_pTrimReg( nullptr) { + m_nTempProp[0] = 0 ; + m_nTempProp[1] = 0 ; } //---------------------------------------------------------------------------- @@ -566,7 +568,8 @@ SurfBezier::CopyFrom( const SurfBezier& sbSrc) m_vPtCtrl = sbSrc.m_vPtCtrl ; if ( sbSrc.m_bRat) m_vWeCtrl = sbSrc.m_vWeCtrl ; - m_nTempProp = sbSrc.m_nTempProp ; + m_nTempProp[0] = sbSrc.m_nTempProp[0] ; + m_nTempProp[1] = sbSrc.m_nTempProp[1] ; return true ; } diff --git a/SurfBezier.h b/SurfBezier.h index cc8e783..f64e5a1 100644 --- a/SurfBezier.h +++ b/SurfBezier.h @@ -53,10 +53,11 @@ class SurfBezier : public ISurfBezier, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum) override - { m_nTempProp = nProp ; } - int GetTempProp( int nPropNum) const override - { return m_nTempProp ; } + void SetTempProp( int nProp, int nPropInd) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ISurf bool IsSimple( void) const override @@ -165,7 +166,7 @@ class SurfBezier : public ISurfBezier, public IGeoObjRW PNTVECTOR m_vPtCtrl ; // vettore dei punti di controllo DBLVECTOR m_vWeCtrl ; // vettore dei pesi di controllo SurfFlatRegion* m_pTrimReg ; // eventuale regione di trim - int m_nTempProp ; // proprietà temporanea + int m_nTempProp[2] ; // vettore proprietà temporanee } ; //----------------------------------------------------------------------------- diff --git a/SurfFlatRegion.h b/SurfFlatRegion.h index b33eb67..3ace4b1 100644 --- a/SurfFlatRegion.h +++ b/SurfFlatRegion.h @@ -51,10 +51,11 @@ class SurfFlatRegion : public ISurfFlatRegion, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ISurf bool IsSimple( void) const override @@ -144,7 +145,7 @@ class SurfFlatRegion : public ISurfFlatRegion, public IGeoObjRW Frame3d m_frF ; // riferimento intrinseco PCRV_DEQUE m_vpLoop ; // deque delle curve che formano i loop INTVECTOR m_vExtInd ; // indice dei loop esterni nel precedente vettore - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee } ; //----------------------------------------------------------------------------- diff --git a/SurfTriMesh.h b/SurfTriMesh.h index 6e084af..a770898 100644 --- a/SurfTriMesh.h +++ b/SurfTriMesh.h @@ -206,10 +206,11 @@ class SurfTriMesh : public ISurfTriMesh, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp[nPropNum] = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp[nPropNum] ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // ISurf bool IsSimple( void) const override @@ -422,7 +423,7 @@ class SurfTriMesh : public ISurfTriMesh, public IGeoObjRW TRIAVECTOR m_vTria ; // vettore dei triangoli INTVECTOR m_vFacet ; // vettore delle sfaccettature mutable int m_nTimeStamp ; // orologio locale - int m_nTempProp[2] ; // vettore di proprietà temporanee + int m_nTempProp[2] ; // vettore proprietà temporanee int m_nMaxTFlag ; // massimo valore dei TFlag dei triangoli mutable int m_nParts ; // numero di parti connesse (-1 se da calcolare) mutable HashGrids3d* m_pHGrd3d ; // Hash Grid 3d nel suo riferimento diff --git a/SurfTriMeshBooleans.cpp b/SurfTriMeshBooleans.cpp index e6e5b26..0377b79 100644 --- a/SurfTriMeshBooleans.cpp +++ b/SurfTriMeshBooleans.cpp @@ -3168,17 +3168,17 @@ AddPolyLineToPolyLine( PolyLine& Poly, PolyLine& PolyToAdd) return true ; } -////---------------------------------------------------------------------------- -//struct PositionOnPolyLine { -// int nIndexInVec ; -// int nSegNum ; -// double dParOnSeg ; -// PositionOnPolyLine( int nIndex, int nSeg, double dPar) { -// nIndexInVec = nIndex ; -// nSegNum = nSeg ; -// dParOnSeg = dPar ; -// } -//} ; +//---------------------------------------------------------------------------- +struct PositionOnPolyLine { + int nIndexInVec ; + int nSegNum ; + double dParOnSeg ; + PositionOnPolyLine( int nIndex, int nSeg, double dPar) { + nIndexInVec = nIndex ; + nSegNum = nSeg ; + dParOnSeg = dPar ; + } +} ; //---------------------------------------------------------------------------- bool diff --git a/VolZmap.cpp b/VolZmap.cpp index cc0a5bd..36b9a93 100644 --- a/VolZmap.cpp +++ b/VolZmap.cpp @@ -35,7 +35,7 @@ GEOOBJ_REGISTER( VOL_ZMAP, NGE_V_ZMP, VolZmap) ; //---------------------------------------------------------------------------- VolZmap::VolZmap(void) : m_nStatus( TO_VERIFY), m_nMapNum( 0), m_nNumBlock( 0), m_nConnectedCompoCount( 0), m_dStep( 10.0), - m_nVoxNumPerBlock( N_VOXBLOCK), m_nDexVoxRatio( 1), m_nShape( GENERIC), m_nTempProp( 0), m_Tool( true) + m_nVoxNumPerBlock( N_VOXBLOCK), m_nDexVoxRatio( 1), m_nShape( GENERIC), m_Tool( true) { for ( int i = 0 ; i < N_MAPS ; ++ i) { m_nNx[i] = 0 ; @@ -45,6 +45,8 @@ VolZmap::VolZmap(void) m_dMaxZ[i] = 0 ; m_nFracLin[i] = 0 ; } + m_nTempProp[0] = 0 ; + m_nTempProp[1] = 0 ; m_Tool.SetTolerances( LIN_TOL_STD, ANG_TOL_APPROX_DEG) ; } @@ -72,7 +74,8 @@ VolZmap::Clear( void) m_Values[i].clear() ; } m_dStep = EPS_SMALL ; - m_nTempProp = 0 ; + m_nTempProp[0] = 0 ; + m_nTempProp[1] = 0 ; m_Tool.Clear() ; // imposto ricalcolo della grafica m_OGrMgr.Reset() ; @@ -138,7 +141,8 @@ VolZmap::CopyFrom( const VolZmap& vzmSrc) m_dStep = vzmSrc.m_dStep ; m_nStatus = vzmSrc.m_nStatus ; - m_nTempProp = vzmSrc.m_nTempProp ; + m_nTempProp[0] = vzmSrc.m_nTempProp[0] ; + m_nTempProp[1] = vzmSrc.m_nTempProp[1] ; // dimensiono membri legati ai blocchi m_BlockToUpdate = vzmSrc.m_BlockToUpdate ; diff --git a/VolZmap.h b/VolZmap.h index 302326a..69422b9 100644 --- a/VolZmap.h +++ b/VolZmap.h @@ -60,10 +60,11 @@ class VolZmap : public IVolZmap, public IGeoObjRW { return m_OGrMgr.GetObjGraphics() ; } const IObjGraphics* GetObjGraphics( void) const override { return m_OGrMgr.GetObjGraphics() ; } - void SetTempProp( int nProp, int nPropNum = 0) override - { m_nTempProp = nProp ; } - int GetTempProp( int nPropNum = 0) const override - { return m_nTempProp ; } + void SetTempProp( int nProp, int nPropInd = 0) override + { if ( nPropInd >= 0 && nPropInd < 2) + m_nTempProp[nPropInd] = nProp ; } + int GetTempProp( int nPropInd = 0) const override + { return (( nPropInd >= 0 && nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; } public : // IVolZmap bool CopyFrom( const IGeoObj* pGObjSrc) override ; @@ -401,7 +402,7 @@ class VolZmap : public IVolZmap, public IGeoObjRW private : ObjGraphicsMgr m_OGrMgr ; // gestore grafica dell'oggetto Status m_nStatus ; // stato - int m_nTempProp ; // proprietà temporanea + int m_nTempProp[2] ; // vettore proprietà temporanee double m_dStep ; // passo delle griglie int m_nMapNum ; // numero di griglie ( 1 o 3) Frame3d m_MapFrame ; // riferimento intrinseco dello Zmap