Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add “Grading” parameter to Adaptive 1D hypothesis
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_ImportSource.cxx
diff --git
a/src/StdMeshers/StdMeshers_ImportSource.cxx
b/src/StdMeshers/StdMeshers_ImportSource.cxx
index e93b83a61e3a218d64972d1c99103413aa14b3da..aea04659506f929498b36809838e4442662737fc 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ImportSource.cxx
+++ b/
src/StdMeshers/StdMeshers_ImportSource.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-121,7
+121,8
@@
namespace
//================================================================================
vector<SMESH_Group*> getValidGroups(const vector<SMESH_Group*>& groups,
//================================================================================
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 )
{
vector<SMESH_Group*> okGroups;
for ( int i = 0; i < groups.size(); ++i )
@@
-137,7
+138,11
@@
namespace
SMESH_Mesh::GroupIteratorPtr gIt = itm->second->GetGroups();
while ( gIt->more() && !okGroup )
if ( gIt->next() == groups[i] )
SMESH_Mesh::GroupIteratorPtr gIt = itm->second->GetGroups();
while ( gIt->more() && !okGroup )
if ( gIt->next() == groups[i] )
+ {
okGroup = groups[i];
okGroup = groups[i];
+ if ( loaded )
+ itm->second->Load();
+ }
}
if ( okGroup )
okGroups.push_back( okGroup );
}
if ( okGroup )
okGroups.push_back( okGroup );
@@
-193,14
+198,16
@@
namespace
//=============================================================================
/*!
* Returns groups to import elements from
//=============================================================================
/*!
* 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,
{
// 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;
if ( okGroups.size() != _groups.size() )
((StdMeshers_ImportSource1D*)this)->_groups = okGroups;