diff --git a/EGkGdbConst.h b/EGkGdbConst.h index 56f536a..3d6a4cc 100644 --- a/EGkGdbConst.h +++ b/EGkGdbConst.h @@ -58,7 +58,8 @@ enum GdbStatus { GDB_ST_OFF = 0, //----------------- Costanti marcatura oggetti del DB geometrico --------------- enum GdbMark { GDB_MK_OFF = 0, - GDB_MK_ON = 1} ; + GDB_MK_ON = 1, + GDB_MK_ON_2 = 2} ; //----------------- Costante per numero proprietà temporanee ------------------- const int GDB_NUM_TEMP_PROP = 2 ; diff --git a/EGkGdbFunct.h b/EGkGdbFunct.h index 1f6f5d0..e6cddaa 100644 --- a/EGkGdbFunct.h +++ b/EGkGdbFunct.h @@ -80,7 +80,7 @@ CalcMark( int nObjMark, int nParentMark) if ( nObjMark == GDB_MK_OFF && nParentMark == GDB_MK_OFF) return GDB_MK_OFF ; - return GDB_MK_ON ; + return ( nParentMark != GDB_MK_OFF ? nParentMark : nObjMark) ; } // ovviamente la marcatura si combina con lo stato, nel senso che un oggetto // non visibile non viene nemmeno marcato \ No newline at end of file diff --git a/EGkGdbIterator.h b/EGkGdbIterator.h index d07163b..9689d40 100644 --- a/EGkGdbIterator.h +++ b/EGkGdbIterator.h @@ -104,7 +104,7 @@ class __declspec( novtable) IGdbIterator virtual bool RevertStatus( void) = 0 ; virtual bool GetStatus( int& nStat) const = 0 ; virtual bool GetCalcStatus( int& nStat) const = 0 ; - virtual bool SetMark( void) = 0 ; + virtual bool SetMark( int nMark = GDB_MK_ON) = 0 ; virtual bool ResetMark( void) = 0 ; virtual bool GetMark( int& nMark) const = 0 ; virtual bool GetCalcMark( int& nMark) const = 0 ; diff --git a/EGkGeomDB.h b/EGkGeomDB.h index e8b59a5..fa5bc5d 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -134,7 +134,7 @@ class __declspec( novtable) IGeomDB virtual bool RevertStatus( int nId) = 0 ; virtual bool GetStatus( int nId, int& nStat) const = 0 ; virtual bool GetCalcStatus( int nId, int& nStat) const = 0 ; - virtual bool SetMark( int nId) = 0 ; + virtual bool SetMark( int nId, int nMark = GDB_MK_ON) = 0 ; virtual bool ResetMark( int nId) = 0 ; virtual bool GetMark( int nId, int& nMark) const = 0 ; virtual bool GetCalcMark( int nId, int& nMark) const = 0 ; diff --git a/EGrScene.h b/EGrScene.h index dcb9f8d..a5c649c 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -90,6 +90,7 @@ class IEGrScene virtual bool SetExtension( const BBox3d& b3Ext) = 0 ; virtual bool UpdateExtension( void) = 0 ; virtual bool SetMark( Color colMark) = 0 ; + virtual bool SetMark2( Color colMark) = 0 ; virtual bool SetSelSurf( Color colSelSurf) = 0 ; virtual bool SetLineWidth( int nW) = 0 ; // Grid diff --git a/EInAPI.h b/EInAPI.h index 236ebb6..541cd44 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -997,7 +997,7 @@ EIN_EXPORT BOOL __stdcall EgtInitScene( HWND hWnd, int nDriver, BOOL b2Buff, int EIN_EXPORT BOOL __stdcall EgtGetSceneInfo( wchar_t*& wsInfo) ; EIN_EXPORT BOOL __stdcall EgtSetBackground( const int nTopCol[4], const int nBottomCol[4], BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtSetLineAttribs( int nWidth) ; -EIN_EXPORT BOOL __stdcall EgtSetMarkAttribs( const int MarkCol[4]) ; +EIN_EXPORT BOOL __stdcall EgtSetMarkAttribs( const int MarkCol[4], const int Mark2Col[4]) ; EIN_EXPORT BOOL __stdcall EgtSetSelSurfAttribs( const int SelSurfCol[4]) ; EIN_EXPORT BOOL __stdcall EgtSetGeoLineAttribs( const int GlCol[4]) ; EIN_EXPORT BOOL __stdcall EgtSetGeoTriaAttribs( const int GtCol[4]) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 1d6df15..207189c 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -487,7 +487,7 @@ EXE_EXPORT bool ExeSetStatus( const INTVECTOR& vIds, int nStat) ; EXE_EXPORT bool ExeRevertStatus( int nId) ; EXE_EXPORT bool ExeGetStatus( int nId, int* pnStat) ; EXE_EXPORT bool ExeGetCalcStatus( int nId, int* pnStat) ; -EXE_EXPORT bool ExeSetMark( int nId) ; +EXE_EXPORT bool ExeSetMark( int nId, int nMark = 1) ; EXE_EXPORT bool ExeResetMark( int nId) ; EXE_EXPORT bool ExeGetMark( int nId, int* pnMark) ; EXE_EXPORT bool ExeGetCalcMark( int nId, int* pnMark) ; @@ -1299,7 +1299,7 @@ EXE_EXPORT bool ExeGetSceneInfo( std::string& sInfo) ; EXE_EXPORT bool ExeSetBackground( Color TopCol, Color BottomCol, bool bRedraw) ; EXE_EXPORT bool ExeGetBackground( Color& TopCol, Color& BottomCol) ; EXE_EXPORT bool ExeSetLineAttribs( int nWidth) ; -EXE_EXPORT bool ExeSetMarkAttribs( Color MarkCol) ; +EXE_EXPORT bool ExeSetMarkAttribs( Color MarkCol, Color Mark2Col) ; EXE_EXPORT bool ExeSetSelSurfAttribs( Color SelSurfCol) ; EXE_EXPORT bool ExeSetGeoLineAttribs( Color GlCol) ; EXE_EXPORT bool ExeSetGeoTriaAttribs( Color GtCol) ;