diff --git a/EGkGeomDB.h b/EGkGeomDB.h index 723ea62..cd147c3 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -66,6 +66,7 @@ class __declspec( novtable) IGeomDB virtual bool MirrorGlob( int nId, const Point3d& ptOn, const Vector3d& vtNorm) = 0 ; virtual bool DumpAttributes( int nId, std::string& sOut, const char* szNewLine) const = 0 ; virtual bool SetDefaultColor( Color cCol) = 0 ; + virtual bool GetDefaultColor( Color& cCol) const = 0 ; virtual bool SetColor( int nId, Color cCol) = 0 ; virtual bool GetColor( int nId, Color& cCol) const = 0 ; } ; diff --git a/EGnScan.h b/EGnScan.h index 5e9d3d6..a99a12d 100644 --- a/EGnScan.h +++ b/EGnScan.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2013 +// EgalTech 2013-2014 //---------------------------------------------------------------------------- -// File : EgnScan.h Data : 20.11.13 Versione : 1.3a1 +// File : EgnScan.h Data : 06.03.14 Versione : 1.5c1 // Contenuto : Dichiarazione della classe CScan. // // @@ -28,17 +28,25 @@ class Scanner { public : - EGN_EXPORT Scanner( void) ; - EGN_EXPORT ~Scanner( void) ; + EGN_EXPORT Scanner( void) + : m_nLineNbr( 0), m_bUnget( false), m_nDeltaLineUnget(0) {} + EGN_EXPORT ~Scanner( void) + { Terminate() ; } EGN_EXPORT bool Init( const std::string& sCmdFile, const char* szRemInit = NULL) ; EGN_EXPORT bool Terminate( void) ; EGN_EXPORT bool GetLine( std::string& sLine) ; - EGN_EXPORT int GetCurrLineNbr( void) { return m_nLineNbr ; } - EGN_EXPORT const std::string& GetFilePath( void) { return m_sFName ; } + EGN_EXPORT bool UngetLine( std::string& sLine) ; + EGN_EXPORT int GetCurrLineNbr( void) + { return m_nLineNbr ; } + EGN_EXPORT const std::string& GetFilePath( void) + { return m_sFName ; } private : std::ifstream m_InFile ; std::string m_sFName ; std::string m_sRemInit ; int m_nLineNbr ; + bool m_bUnget ; + std::string m_sUnget ; + int m_nDeltaLineUnget ; } ;