ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic changes

Browse Source
This commit is contained in:
eap 2020-05-27 20:48:43 +03:00
parent 2fcf0d1b8e
commit 75b15d2531
1 changed files with 80 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -6426,7 +6426,7 @@ class SMESH_DimHyp
int _dim; //!< a dimension the algo can build (concurrent dimension) int _dim; //!< a dimension the algo can build (concurrent dimension)
int _ownDim; //!< dimension of shape of _subMesh (>=_dim) int _ownDim; //!< dimension of shape of _subMesh (>=_dim)
TopTools_MapOfShape _shapeMap; //!< [sub-]shapes of dimension == _dim TopTools_MapOfShape _shapeMap; //!< [sub-]shapes of dimension == _dim
SMESH_subMesh* _subMesh; const SMESH_subMesh* _subMesh;
list<const SMESHDS_Hypothesis*> _hypotheses; //!< algo is first, then its parameters list<const SMESHDS_Hypothesis*> _hypotheses; //!< algo is first, then its parameters
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -6440,7 +6440,7 @@ class SMESH_DimHyp
const int theDim, const int theDim,
const TopoDS_Shape& theShape) const TopoDS_Shape& theShape)
{ {
_subMesh = (SMESH_subMesh*)theSubMesh; _subMesh = theSubMesh;
SetShape( theDim, theShape ); SetShape( theDim, theShape );
} }
@ -6571,7 +6571,8 @@ void addDimHypInstance(const int theDim,
theAlgo->NeedLowerHyps( theDim )) // IPAL54678 theAlgo->NeedLowerHyps( theDim )) // IPAL54678
return; return;
TDimHypList& listOfdimHyp = theDimHypListArr[theDim]; TDimHypList& listOfdimHyp = theDimHypListArr[theDim];
if ( listOfdimHyp.empty() || listOfdimHyp.back()->_subMesh != theSubMesh ) { if ( listOfdimHyp.empty() || listOfdimHyp.back()->_subMesh != theSubMesh )
{
SMESH_DimHyp* dimHyp = new SMESH_DimHyp( theSubMesh, theDim, theShape ); SMESH_DimHyp* dimHyp = new SMESH_DimHyp( theSubMesh, theDim, theShape );
dimHyp->_hypotheses.push_front(theAlgo); dimHyp->_hypotheses.push_front(theAlgo);
listOfdimHyp.push_back( dimHyp ); listOfdimHyp.push_back( dimHyp );
@ -6627,7 +6628,8 @@ void unionLists(TListOfInt& theListOfId,
const int theIndx ) const int theIndx )
{ {
TListOfListOfInt::iterator it = theListOfListOfId.begin(); TListOfListOfInt::iterator it = theListOfListOfId.begin();
for ( int i = 0; it != theListOfListOfId.end(); it++, i++ ) { for ( int i = 0; it != theListOfListOfId.end(); it++, i++ )
{
if ( i < theIndx ) if ( i < theIndx )
continue; //skip already treated lists continue; //skip already treated lists
// check if other list has any same submesh object // check if other list has any same submesh object
@ -6750,7 +6752,7 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
{ {
TListOfListOfInt anOrder; TListOfListOfInt anOrder;
::SMESH_Mesh& mesh = GetImpl(); ::SMESH_Mesh& mesh = GetImpl();
{
// collect submeshes and detect concurrent algorithms and hypothesises // collect submeshes and detect concurrent algorithms and hypothesises
TDimHypList dimHypListArr[4]; // dimHyp list for each shape dimension TDimHypList dimHypListArr[4]; // dimHyp list for each shape dimension
@ -6791,11 +6793,13 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
} // end iterations on submesh } // end iterations on submesh
// iterate on created dimension-hypotheses and check for concurrents // iterate on created dimension-hypotheses and check for concurrents
for ( int i = 0; i < 4; i++ ) { for ( int i = 0; i < 4; i++ )
{
const TDimHypList& listOfDimHyp = dimHypListArr[i]; const TDimHypList& listOfDimHyp = dimHypListArr[i];
// check for concurrents in own and other dimensions (step-by-step) // check for concurrents in own and other dimensions (step-by-step)
TDimHypList::const_iterator dhIt = listOfDimHyp.begin(); TDimHypList::const_iterator dhIt = listOfDimHyp.begin();
for ( ; dhIt != listOfDimHyp.end(); dhIt++ ) { for ( ; dhIt != listOfDimHyp.end(); dhIt++ )
{
const SMESH_DimHyp* dimHyp = *dhIt; const SMESH_DimHyp* dimHyp = *dhIt;
TDimHypList listOfConcurr; TDimHypList listOfConcurr;
set<int> setOfConcurrIds; set<int> setOfConcurrIds;
@ -6803,7 +6807,8 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
for ( int j = i; j < 4; j++ ) for ( int j = i; j < 4; j++ )
findConcurrents( dimHyp, dimHypListArr[j], listOfConcurr, setOfConcurrIds ); findConcurrents( dimHyp, dimHypListArr[j], listOfConcurr, setOfConcurrIds );
// check if any concurrents found // check if any concurrents found
if ( listOfConcurr.size() > 0 ) { if ( listOfConcurr.size() > 0 )
{
// add own submesh to list of concurrent // add own submesh to list of concurrent
addInOrderOfPriority( dimHyp, listOfConcurr ); addInOrderOfPriority( dimHyp, listOfConcurr );
list<int> listOfConcurrIds; list<int> listOfConcurrIds;
@ -6825,7 +6830,6 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
TListOfListOfInt::iterator listIt = anOrder.begin(); TListOfListOfInt::iterator listIt = anOrder.begin();
for(; listIt != anOrder.end(); listIt++, listIndx++ ) for(; listIt != anOrder.end(); listIt++, listIndx++ )
unionLists( *listIt, anOrder, listIndx + 1 ); unionLists( *listIt, anOrder, listIndx + 1 );
}
return anOrder; return anOrder;
} }
@ -6913,7 +6917,8 @@ void SMESH_Mesh_i::convertMeshOrder (const TListOfListOfInt& theIdsOrder,
theResOrder.length(nbSet); theResOrder.length(nbSet);
TListOfListOfInt::const_iterator it = theIdsOrder.begin(); TListOfListOfInt::const_iterator it = theIdsOrder.begin();
int listIndx = 0; int listIndx = 0;
for( ; it != theIdsOrder.end(); it++ ) { for( ; it != theIdsOrder.end(); it++ )
{
// translate submesh identificators into submesh objects // translate submesh identificators into submesh objects
// takeing into account real number of concurrent lists // takeing into account real number of concurrent lists
const TListOfInt& aSubOrder = (*it); const TListOfInt& aSubOrder = (*it);
@ -6926,7 +6931,8 @@ void SMESH_Mesh_i::convertMeshOrder (const TListOfListOfInt& theIdsOrder,
aResSubSet->length(aSubOrder.size()); aResSubSet->length(aSubOrder.size());
TListOfInt::const_iterator subIt = aSubOrder.begin(); TListOfInt::const_iterator subIt = aSubOrder.begin();
int j; int j;
for( j = 0; subIt != aSubOrder.end(); subIt++ ) { for( j = 0; subIt != aSubOrder.end(); subIt++ )
{
if ( _mapSubMeshIor.find(*subIt) == _mapSubMeshIor.end() ) if ( _mapSubMeshIor.find(*subIt) == _mapSubMeshIor.end() )
continue; continue;
SMESH::SMESH_subMesh_var subMesh = SMESH::SMESH_subMesh_var subMesh =