EgtGeomKernel : GeoFactory ora usa nType invece di sKey,

aggiunto map da sKey a nType.
This commit is contained in:
Dario Sassi
2013-11-26 20:53:50 +00:00
parent 81a1e3d994
commit cc2db726db
15 changed files with 97 additions and 32 deletions
+11 -2
View File
@@ -21,7 +21,7 @@
using namespace std ;
//----------------------------------------------------------------------------
GEOOBJ_REGISTER( KEY_CRV_COMPO, CurveComposite) ;
GEOOBJ_REGISTER( CRV_COMPO, "C_CMP", CurveComposite) ;
//----------------------------------------------------------------------------
CurveComposite::CurveComposite( void)
@@ -158,6 +158,13 @@ CurveComposite::Clone( void) const
return pCrv ;
}
//----------------------------------------------------------------------------
const string&
CurveComposite::GetKey( void) const
{
return GEOOBJ_GETKEY( CurveComposite) ;
}
//----------------------------------------------------------------------------
bool
CurveComposite::Save( ostream& osOut) const
@@ -192,6 +199,7 @@ CurveComposite::Save( ostream& osOut) const
bool
CurveComposite::Load( CScan& TheScanner)
{
int nType ;
string sLine ;
STRVECTOR vsParams ;
bool bOk ;
@@ -218,7 +226,8 @@ CurveComposite::Load( CScan& TheScanner)
if ( ! TheScanner.GetLine( sLine))
return false ;
// creo l'oggetto
pGeoO = GEOOBJ_CREATE( sLine) ;
nType = GEOOBJ_KEYTOTYPE( sLine) ;
pGeoO = GEOOBJ_CREATE( nType) ;
if ( pGeoO == nullptr)
return false ;
// recupero la linea con il nome