ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-05 23:24:18 +05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust to CVS HEAD modifications

Browse Source
This commit is contained in:
apo 2005-10-12 11:17:21 +00:00
parent cd6f3c42cf
commit c0562941ea
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -113,6 +113,7 @@ DriverMED_R_SMESHDS_Mesh
if(MYDEBUG) MESSAGE(aGroupName); if(MYDEBUG) MESSAGE(aGroupName);
aFamily->AddGroupName(aGroupName); aFamily->AddGroupName(aGroupName);
} }
aFamily->SetId( aFamId );
myFamilies[aFamId] = aFamily; myFamilies[aFamId] = aFamily;
} }
} }
@ -126,6 +127,7 @@ DriverMED_R_SMESHDS_Mesh
EBooleen anIsNodeNum = aNodeInfo->IsElemNum(); EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
TInt aNbElems = aNodeInfo->GetNbElem(); TInt aNbElems = aNodeInfo->GetNbElem();
if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum); if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
DriverMED_FamilyPtr aFamily = myFamilies.begin()->second;
for(TInt iElem = 0; iElem < aNbElems; iElem++){ for(TInt iElem = 0; iElem < aNbElems; iElem++){
TCCoordSlice aCoordSlice = aNodeInfo->GetCoordSlice(iElem); TCCoordSlice aCoordSlice = aNodeInfo->GetCoordSlice(iElem);
double aCoords[3] = {0.0, 0.0, 0.0}; double aCoords[3] = {0.0, 0.0, 0.0};
@ -143,10 +145,10 @@ DriverMED_R_SMESHDS_Mesh
// Save reference to this node from its family // Save reference to this node from its family
TInt aFamNum = aNodeInfo->GetFamNum(iElem); TInt aFamNum = aNodeInfo->GetFamNum(iElem);
if (myFamilies.find(aFamNum) != myFamilies.end()) if ( checkFamilyID ( aFamily, aFamNum ))
{ {
myFamilies[aFamNum]->AddElement(aNode); aFamily->AddElement(aNode);
myFamilies[aFamNum]->SetType(SMDSAbs_Node); aFamily->SetType(SMDSAbs_Node);
} }
} }
@ -220,10 +222,11 @@ DriverMED_R_SMESHDS_Mesh
if(aResult < DRS_WARN_RENUMBER) if(aResult < DRS_WARN_RENUMBER)
aResult = DRS_WARN_RENUMBER; aResult = DRS_WARN_RENUMBER;
} }
if(myFamilies.find(aFamNum) != myFamilies.end()){ if ( checkFamilyID ( aFamily, aFamNum ))
{
// Save reference to this element from its family // Save reference to this element from its family
myFamilies[aFamNum]->AddElement(anElement); aFamily->AddElement(anElement);
myFamilies[aFamNum]->SetType(anElement->GetType()); aFamily->SetType(anElement->GetType());
} }
} }
} // for (TInt iPG = 0; iPG < nbPolygons; iPG++) } // for (TInt iPG = 0; iPG < nbPolygons; iPG++)
@ -289,10 +292,11 @@ DriverMED_R_SMESHDS_Mesh
if (aResult < DRS_WARN_RENUMBER) if (aResult < DRS_WARN_RENUMBER)
aResult = DRS_WARN_RENUMBER; aResult = DRS_WARN_RENUMBER;
} }
if(myFamilies.find(aFamNum) != myFamilies.end()){ if ( checkFamilyID ( aFamily, aFamNum ))
{
// Save reference to this element from its family // Save reference to this element from its family
myFamilies[aFamNum]->AddElement(anElement); aFamily->AddElement(anElement);
myFamilies[aFamNum]->SetType(anElement->GetType()); aFamily->SetType(anElement->GetType());
} }
} }
} // for (int iPE = 0; iPE < nbPolyedres; iPE++) } // for (int iPE = 0; iPE < nbPolyedres; iPE++)
@ -519,7 +523,7 @@ DriverMED_R_SMESHDS_Mesh
if (aResult < DRS_WARN_RENUMBER) if (aResult < DRS_WARN_RENUMBER)
aResult = DRS_WARN_RENUMBER; aResult = DRS_WARN_RENUMBER;
} }
if (myFamilies.find(aFamNum) != myFamilies.end()) { if ( checkFamilyID ( aFamily, aFamNum )) {
// Save reference to this element from its family // Save reference to this element from its family
myFamilies[aFamNum]->AddElement(anElement); myFamilies[aFamNum]->AddElement(anElement);
myFamilies[aFamNum]->SetType(anElement->GetType()); myFamilies[aFamNum]->SetType(anElement->GetType());
@ -570,10 +574,10 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
return aMeshNames; return aMeshNames;
} }
list<string> DriverMED_R_SMESHDS_Mesh::GetGroupNames() list<TNameAndType> DriverMED_R_SMESHDS_Mesh::GetGroupNamesAndTypes()
{ {
list<string> aResult; list<TNameAndType> aResult;
set<string> aResGroupNames; set<TNameAndType> aResGroupNames;
map<int, DriverMED_FamilyPtr>::iterator aFamsIter = myFamilies.begin(); map<int, DriverMED_FamilyPtr>::iterator aFamsIter = myFamilies.begin();
for (; aFamsIter != myFamilies.end(); aFamsIter++) for (; aFamsIter != myFamilies.end(); aFamsIter++)
@ -583,12 +587,11 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetGroupNames()
set<string>::const_iterator aGrNamesIter = aGroupNames.begin(); set<string>::const_iterator aGrNamesIter = aGroupNames.begin();
for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++) for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++)
{ {
string aName = *aGrNamesIter; TNameAndType aNameAndType = make_pair( *aGrNamesIter, aFamily->GetType() );
// Check, if this is a Group or SubMesh name // Check, if this is a Group or SubMesh name
//if (aName.substr(0, 5) == string("Group")) { //if (aName.substr(0, 5) == string("Group")) {
if (aResGroupNames.find(aName) == aResGroupNames.end()) { if ( aResGroupNames.insert( aNameAndType ).second ) {
aResGroupNames.insert(aName); aResult.push_back( aNameAndType );
aResult.push_back(aName);
} }
// } // }
} }
@ -606,7 +609,7 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
for (; aFamsIter != myFamilies.end(); aFamsIter++) for (; aFamsIter != myFamilies.end(); aFamsIter++)
{ {
DriverMED_FamilyPtr aFamily = (*aFamsIter).second; DriverMED_FamilyPtr aFamily = (*aFamsIter).second;
if (aFamily->MemberOf(aGroupName)) if (aFamily->GetType() == theGroup->GetType() && aFamily->MemberOf(aGroupName))
{ {
const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements(); const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements();
set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElements.begin(); set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElements.begin();
@ -704,3 +707,20 @@ void DriverMED_R_SMESHDS_Mesh::CreateAllSubMeshes ()
} }
} }
} }
/*!
* \brief Ensure aFamily to have required ID
* \param aFamily - a family to check and update
* \param anID - an ID aFamily should have
* \retval bool - true if successful
*/
bool DriverMED_R_SMESHDS_Mesh::checkFamilyID(DriverMED_FamilyPtr & aFamily, int anID) const
{
if ( !aFamily || aFamily->GetId() != anID ) {
map<int, DriverMED_FamilyPtr>::const_iterator i_fam = myFamilies.find(anID);
if ( i_fam == myFamilies.end() )
return false;
aFamily = i_fam->second;
}
return ( aFamily->GetId() == anID );
}