SMESH_Gen::_map1D_Algo no longer exists

This commit is contained in:
eap 2013-07-03 16:07:54 +00:00
parent ed5bf36e41
commit fc8ad974ab
2 changed files with 9 additions and 11 deletions

View File

@ -316,11 +316,10 @@ public:
static TNodeDistributor* GetDistributor(SMESH_Mesh& aMesh) static TNodeDistributor* GetDistributor(SMESH_Mesh& aMesh)
{ {
const int myID = -1000; const int myID = -1000;
map < int, SMESH_1D_Algo * > & algoMap = aMesh.GetGen()->_map1D_Algo; TNodeDistributor* myHyp = dynamic_cast<TNodeDistributor*>( aMesh.GetHypothesis( myID ));
map < int, SMESH_1D_Algo * >::iterator id_algo = algoMap.find( myID ); if ( !myHyp )
if ( id_algo == algoMap.end() ) myHyp = new TNodeDistributor( myID, 0, aMesh.GetGen() );
return new TNodeDistributor( myID, 0, aMesh.GetGen() ); return myHyp;
return static_cast< TNodeDistributor* >( id_algo->second );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
bool Compute( vector< double > & positions, bool Compute( vector< double > & positions,

View File

@ -295,12 +295,11 @@ public:
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
static TNodeDistributor* GetDistributor(SMESH_Mesh& aMesh) static TNodeDistributor* GetDistributor(SMESH_Mesh& aMesh)
{ {
const int myID = -1000; const int myID = -1001;
map < int, SMESH_1D_Algo * > & algoMap = aMesh.GetGen()->_map1D_Algo; TNodeDistributor* myHyp = dynamic_cast<TNodeDistributor*>( aMesh.GetHypothesis( myID ));
map < int, SMESH_1D_Algo * >::iterator id_algo = algoMap.find( myID ); if ( !myHyp )
if ( id_algo == algoMap.end() ) myHyp = new TNodeDistributor( myID, 0, aMesh.GetGen() );
return new TNodeDistributor( myID, 0, aMesh.GetGen() ); return myHyp;
return static_cast< TNodeDistributor* >( id_algo->second );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
//! Computes distribution of nodes on a straight line ending at pIn and pOut //! Computes distribution of nodes on a straight line ending at pIn and pOut