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

PAL7933. Use SMESH_HypoFilter to retrieve assigned hypotheses

Browse Source
This commit is contained in:
eap 2005-02-04 11:00:40 +00:00
parent 36409e98c9
commit 9b3ccd683e
1 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/SMESH/SMESH_Algo.cxx
View File

@ -30,6 +30,7 @@ using namespace std;
#include "SMESH_Algo.hxx" #include "SMESH_Algo.hxx"
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SMESH_HypoFilter.hxx"
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
@ -92,28 +93,16 @@ const list <const SMESHDS_Hypothesis *> & SMESH_Algo::GetUsedHypothesis(
SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
{ {
_usedHypList.clear(); _usedHypList.clear();
_usedHypList = GetAppliedHypothesis(aMesh, aShape); // copy if ( !_compatibleHypothesis.empty() )
int nbHyp = _usedHypList.size();
if (nbHyp == 0)
{ {
TopTools_ListIteratorOfListOfShape ancIt( aMesh.GetAncestors( aShape )); SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( _compatibleHypothesis[0] ));
for (; ancIt.More(); ancIt.Next()) for ( int i = 1; i < _compatibleHypothesis.size(); ++i )
{ filter.Or( filter.HasName( _compatibleHypothesis[ i ] ));
const TopoDS_Shape& ancestor = ancIt.Value();
_usedHypList = GetAppliedHypothesis(aMesh, ancestor); // copy aMesh.GetHypotheses( aShape, filter, _usedHypList, true );
nbHyp = _usedHypList.size(); if ( _usedHypList.size() > 1 )
if (nbHyp == 1)
break;
}
// TopoDS_Shape mainShape = aMesh.GetMeshDS()->ShapeToMesh();
// if (!mainShape.IsSame(aShape))
// {
// _usedHypList = GetAppliedHypothesis(aMesh, mainShape); // copy
// nbHyp = _usedHypList.size();
// }
}
if (nbHyp > 1)
_usedHypList.clear(); //only one compatible hypothesis allowed _usedHypList.clear(); //only one compatible hypothesis allowed
}
return _usedHypList; return _usedHypList;
} }
@ -128,32 +117,14 @@ const list <const SMESHDS_Hypothesis *> & SMESH_Algo::GetUsedHypothesis(
const list<const SMESHDS_Hypothesis *> & SMESH_Algo::GetAppliedHypothesis( const list<const SMESHDS_Hypothesis *> & SMESH_Algo::GetAppliedHypothesis(
SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
{ {
const SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
const list<const SMESHDS_Hypothesis*> & listHyp = meshDS->GetHypothesis(aShape);
list<const SMESHDS_Hypothesis*>::const_iterator it=listHyp.begin();
int hypType;
string hypName;
_appliedHypList.clear(); _appliedHypList.clear();
while (it!=listHyp.end()) if ( !_compatibleHypothesis.empty() )
{ {
const SMESHDS_Hypothesis *anHyp = *it; SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( _compatibleHypothesis[0] ));
hypType = anHyp->GetType(); for ( int i = 1; i < _compatibleHypothesis.size(); ++i )
//SCRUTE(hypType); filter.Or( filter.HasName( _compatibleHypothesis[ i ] ));
if (hypType == SMESHDS_Hypothesis::PARAM_ALGO)
{ aMesh.GetHypotheses( aShape, filter, _appliedHypList, false );
hypName = anHyp->GetName();
vector < string >::iterator ith =
find(_compatibleHypothesis.begin(), _compatibleHypothesis.end(),
hypName);
if (ith != _compatibleHypothesis.end()) // count only relevant
{
_appliedHypList.push_back(anHyp);
//SCRUTE(hypName);
}
}
it++;
} }
return _appliedHypList; return _appliedHypList;
} }