diff --git a/EGkGdbIterator.h b/EGkGdbIterator.h index 7c20cef..d07163b 100644 --- a/EGkGdbIterator.h +++ b/EGkGdbIterator.h @@ -1,13 +1,14 @@ //---------------------------------------------------------------------------- // EgalTech 2013-2023 //---------------------------------------------------------------------------- -// File : EGkGdbIterator.h Data : 29.01.23 Versione : 2.5a2 +// File : EGkGdbIterator.h Data : 09.07.23 Versione : 2.5g1 // Contenuto : Dichiarazione della interfaccia IGdbIterator. // // // // Modifiche : 04.12.13 DS Creazione modulo. // 29.01.23 DS Aggiunte GetAllInfo e CopyAllInfoFrom. +// 09.07.23 DS Aggiunte SetStipple e GetStipple. // //---------------------------------------------------------------------------- @@ -144,6 +145,9 @@ class __declspec( novtable) IGdbIterator virtual bool RemoveInfo( const std::string& sKey) = 0 ; virtual bool GetAllInfo( STRVECTOR& vsInfo) const = 0 ; virtual bool CopyAllInfoFrom( const IGdbIterator& iIter) = 0 ; + // Stipple + virtual bool SetStipple( int nFactor, int nPattern) = 0 ; + virtual bool GetStipple( int& nFactor, int& nPattern) const = 0 ; // TextureData virtual bool SetTextureName( const std::string& sTxrName) = 0 ; virtual bool SetTextureFrame( const Frame3d& frTxrRef) = 0 ; diff --git a/EGkGeomDB.h b/EGkGeomDB.h index c76fc8d..e8b59a5 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2013-2023 //---------------------------------------------------------------------------- -// File : EGkGeomDB.h Data : 29.01.23 Versione : 2.5a +// File : EGkGeomDB.h Data : 09.07.23 Versione : 2.5g1 // Contenuto : Dichiarazione della interfaccia IGeomDB. // // @@ -12,6 +12,7 @@ // 30.05.14 DS Agg. metodi di Shear. // 03.12.14 DS Aggiunta gestione riferimento di griglia. // 29.01.23 DS Aggiunta GetAllInfo. +// 09.07.23 DS Aggiunte DumpStipple, SetStipple e GetStipple. // //---------------------------------------------------------------------------- @@ -179,6 +180,10 @@ class __declspec( novtable) IGeomDB virtual bool RemoveInfo( int nId, const std::string& sKey) = 0 ; virtual bool GetAllInfo( int nId, STRVECTOR& vsInfo) const = 0 ; virtual bool CopyAllInfoFrom( int nId, int nSouId) = 0 ; + // Stipple (significativo solo per curve) + virtual bool DumpStipple( int nId, std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const = 0 ; + virtual bool SetStipple( int nId, int nFactor, int nPattern) = 0 ; + virtual bool GetStipple( int nId, int& nFactor, int& nPattern) const = 0 ; // TextureData virtual bool DumpTextureData( int nId, std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const = 0 ; virtual bool SetTextureName( int nId, const std::string& sTxrName) = 0 ; diff --git a/EGnStringUtils.h b/EGnStringUtils.h index b728333..8e51f5b 100644 --- a/EGnStringUtils.h +++ b/EGnStringUtils.h @@ -196,11 +196,11 @@ EGN_EXPORT bool FromString( const std::string& sVal, STRVECTOR& vsVal) ; //---------------------------------------------------------------------------- inline const std::string -ToString( int nVal, int nPrec = 1) +ToString( int nVal, int nPrec = 1, int nRadix = 10) { // eseguo conversione char szBuff[24] ; - int nErr = _itoa_s( nVal, szBuff, 10) ; + int nErr = _itoa_s( nVal, szBuff, nRadix) ; // se errore, ritorno stringa opportuna if ( nErr != 0) { _ASSERT( 0) ; @@ -216,11 +216,11 @@ ToString( int nVal, int nPrec = 1) return sBuff ; } inline const std::string -ToString( unsigned int nVal, int nPrec = 1) +ToString( unsigned int nVal, int nPrec = 1, int nRadix = 10) { // eseguo conversione char szBuff[24] ; - int nErr = _ui64toa_s( nVal, szBuff, 24, 10) ; + int nErr = _ultoa_s( nVal, szBuff, nRadix) ; // se errore, ritorno stringa opportuna if ( nErr != 0) { _ASSERT( 0) ;