}
}
HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty
+ GetMeshDS()->Modified();
if(MYDEBUG) subMesh->DumpAlgoState(true);
if(MYDEBUG) SCRUTE(ret);
}
HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty
+ GetMeshDS()->Modified();
if(MYDEBUG) subMesh->DumpAlgoState(true);
if(MYDEBUG) SCRUTE(ret);
}
}
if ( toNotify )
+ {
smToNotify.push_back( aSubMesh );
-
- if ( !aSubMesh->IsEmpty() &&
- aSubMesh->GetSubShape().ShapeType() == TopAbs_EDGE &&
- !toNotify )
- allMeshedEdgesNotified = false;
+ if ( aSubMesh->GetAlgoState() == SMESH_subMesh::MISSING_HYP )
+ allMeshedEdgesNotified = false; // update of algo state needed, not mesh clearing
+ }
+ else
+ {
+ if ( !aSubMesh->IsEmpty() &&
+ aSubMesh->GetSubShape().ShapeType() == TopAbs_EDGE )
+ allMeshedEdgesNotified = false;
+ }
}
+ if ( smToNotify.empty() )
+ return;
// if all meshed EDGEs will be notified then the notification is equivalent
- // to the whole mesh clearing
- if ( allMeshedEdgesNotified )
+ // to the whole mesh clearing, which is usually faster
+ if ( allMeshedEdgesNotified && NbNodes() > 0 )
+ {
Clear();
+ }
else
- // notify in reverse order to avoid filling of the pool of IDs
+ {
+ // notify in reverse order to avoid filling the pool of IDs
for ( int i = smToNotify.size()-1; i >= 0; --i )
smToNotify[i]->AlgoStateEngine(SMESH_subMesh::MODIF_HYP,
const_cast< SMESH_Hypothesis*>( hyp ));
-
+ }
HasModificationsToDiscard(); // to reset _isModified flag if mesh becomes empty
GetMeshDS()->Modified();
}
* - 2D if all mesh nodes lie on XOY coordinate plane, or
* - 3D in the rest cases.
* If \a theAutoDimension is \c false, the space dimension is always 3.
+ * \param [in] theAddODOnVertices - to create 0D elements on all vertices
+ * \param [in] theAllElemsToGroup - to make every element to belong to any group (PAL23413)
* \return int - mesh index in the file
*/
//================================================================================
int theVersion,
const SMESHDS_Mesh* meshPart,
bool theAutoDimension,
- bool theAddODOnVertices)
+ bool theAddODOnVertices,
+ bool theAllElemsToGroup)
throw(SALOME_Exception)
{
SMESH_TRY;
myWriter.AddGroupOfEdges();
myWriter.AddGroupOfFaces();
myWriter.AddGroupOfVolumes();
+ myWriter.AddGroupOf0DElems();
+ myWriter.AddGroupOfBalls();
}
+ if ( theAllElemsToGroup )
+ myWriter.AddAllToGroup();
// Pass groups to writer. Provide unique group names.
//set<string> aGroupNames; // Corrected for Mantis issue 0020028
cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";
cmd += "\"";
system(cmd.c_str());
- ExportMED(medfilename.c_str(), theMeshName, theAutoGroups, 1);
+ ExportMED(medfilename.c_str(), theMeshName, theAutoGroups, /*theVersion=*/1,
+ /*meshPart=*/NULL, /*theAutoDimension=*/false, /*theAddODOnVertices=*/false,
+ /*theAllElemsToGroup=*/true ); // theAllElemsToGroup is for PAL0023413
#ifdef WIN32
cmd = "%PYTHONBIN% ";
#else
vector<SMESH_subMesh*>::iterator onlyBIt = onlyOrderedList.begin();
vector<SMESH_subMesh*>::iterator onlyEIt = onlyOrderedList.end();
- // iterate on ordered submeshes and insert them in detected positions
+ // iterate on ordered sub-meshes and insert them in detected positions
map< int, TPosInList >::iterator i_pos = sortedPos.begin();
for ( ; onlyBIt != onlyEIt; ++onlyBIt, ++i_pos )
*(i_pos->second) = *onlyBIt;
const SMESH_subMesh* smAfter ) const
{
TListOfListOfInt::const_iterator listIdsIt = _mySubMeshOrder.begin();
- TListOfInt::const_iterator idBef, idAft;
for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++)
{
const TListOfInt& listOfId = *listIdsIt;
- idBef = std::find( listOfId.begin(), listOfId.end(), smBefore->GetId() );
- if ( idBef != listOfId.end() )
- idAft = std::find( listOfId.begin(), listOfId.end(), smAfter->GetId() );
- if ( idAft != listOfId.end () )
- return ( std::distance( listOfId.begin(), idBef ) <
- std::distance( listOfId.begin(), idAft ) );
+ int iB = -1, iA = -1, i = 0;
+ for ( TListOfInt::const_iterator id = listOfId.begin(); id != listOfId.end(); ++id, ++i )
+ {
+ if ( *id == smBefore->GetId() )
+ {
+ iB = i;
+ if ( iA > -1 )
+ return iB < iA;
+ }
+ else if ( *id == smAfter->GetId() )
+ {
+ iA = i;
+ if ( iB > -1 )
+ return iB < iA;
+ }
+ }
}
- return true; // no order imposed to given submeshes
+ return true; // no order imposed to given sub-meshes
}
//=============================================================================