-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//================================================================================
vector<SMESH_Group*> getValidGroups(const vector<SMESH_Group*>& groups,
- StudyContextStruct* studyContext)
+ StudyContextStruct* studyContext,
+ bool loaded=false)
{
vector<SMESH_Group*> okGroups;
for ( int i = 0; i < groups.size(); ++i )
SMESH_Mesh::GroupIteratorPtr gIt = itm->second->GetGroups();
while ( gIt->more() && !okGroup )
if ( gIt->next() == groups[i] )
+ {
okGroup = groups[i];
+ if ( loaded )
+ itm->second->Load();
+ }
}
if ( okGroup )
okGroups.push_back( okGroup );
//=============================================================================
/*!
* Returns groups to import elements from
+ * \param [in] loaded - if \c true, meshes holding the groups are loaded
*/
//=============================================================================
-const std::vector<SMESH_Group*>& StdMeshers_ImportSource1D::GetGroups() const
+const std::vector<SMESH_Group*>& StdMeshers_ImportSource1D::GetGroups(bool loaded) const
{
// filter off deleted groups
vector<SMESH_Group*> okGroups = getValidGroups( _groups,
- _gen->GetStudyContext(_studyId) );
+ _gen->GetStudyContext(_studyId),
+ loaded);
if ( okGroups.size() != _groups.size() )
((StdMeshers_ImportSource1D*)this)->_groups = okGroups;