using namespace std;
+/*Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
+ {
+ return S1.IsSame( S2 );
+ }*/
+
//=======================================================================
//function : Create
//purpose :
{
// removal of a shape to mesh, delete ...
// - hypotheses
- myShapeToHypothesis.clear();
+ myShapeToHypothesis.Clear();
// - shape indices in SMDS_Position of nodes
map<int,SMESHDS_SubMesh*>::iterator i_sub = myShapeIndexToSubMesh.begin();
for ( ; i_sub != myShapeIndexToSubMesh.end(); i_sub++ ) {
//=======================================================================
bool SMESHDS_Mesh::AddHypothesis(const TopoDS_Shape & SS,
- const SMESHDS_Hypothesis * H)
+ const SMESHDS_Hypothesis * H)
{
- list<const SMESHDS_Hypothesis *>& alist=myShapeToHypothesis[SS];
+ if (!myShapeToHypothesis.IsBound(SS.Oriented(TopAbs_FORWARD))) {
+ list<const SMESHDS_Hypothesis *> aList;
+ myShapeToHypothesis.Bind(SS.Oriented(TopAbs_FORWARD), aList);
+ }
+ list<const SMESHDS_Hypothesis *>& alist =
+ myShapeToHypothesis(SS.Oriented(TopAbs_FORWARD)); // ignore orientation of SS
- //Check if the Hypothesis is still present
- list<const SMESHDS_Hypothesis*>::iterator ith=alist.begin();
+ //Check if the Hypothesis is still present
+ list<const SMESHDS_Hypothesis*>::iterator ith = find(alist.begin(),alist.end(), H );
- for (; ith!=alist.end(); ith++)
- if (H == *ith) return false;
+ if (alist.end() != ith) return false;
- alist.push_back(H);
- return true;
+ alist.push_back(H);
+ return true;
}
//=======================================================================
//purpose :
//=======================================================================
-bool SMESHDS_Mesh::RemoveHypothesis(const TopoDS_Shape & S,
- const SMESHDS_Hypothesis * H)
+bool SMESHDS_Mesh::RemoveHypothesis(const TopoDS_Shape & S,
+ const SMESHDS_Hypothesis * H)
{
- ShapeToHypothesis::iterator its=myShapeToHypothesis.find(S);
- if(its!=myShapeToHypothesis.end())
- {
- list<const SMESHDS_Hypothesis*>::iterator ith=(*its).second.begin();
-
- for (; ith!=(*its).second.end(); ith++)
- if (H == *ith)
- {
- (*its).second.erase(ith);
- return true;
- }
- }
- return false;
+ if( myShapeToHypothesis.IsBound( S.Oriented(TopAbs_FORWARD) ) )
+ {
+ list<const SMESHDS_Hypothesis *>& alist=myShapeToHypothesis.ChangeFind( S.Oriented(TopAbs_FORWARD) );
+ list<const SMESHDS_Hypothesis*>::iterator ith=find(alist.begin(),alist.end(), H );
+ if (ith != alist.end())
+ {
+ alist.erase(ith);
+ return true;
+ }
+ }
+ return false;
}
//=======================================================================
//purpose :
//=======================================================================
-const list<const SMESHDS_Hypothesis*>& SMESHDS_Mesh::GetHypothesis(
- const TopoDS_Shape & S) const
+const list<const SMESHDS_Hypothesis*>&
+SMESHDS_Mesh::GetHypothesis(const TopoDS_Shape & S) const
{
- if (myShapeToHypothesis.find(S)!=myShapeToHypothesis.end())
- return myShapeToHypothesis.find(S)->second;
+ if ( myShapeToHypothesis.IsBound( S.Oriented(TopAbs_FORWARD) ) ) // ignore orientation of S
+ return myShapeToHypothesis.Find( S.Oriented(TopAbs_FORWARD) );
- static list<const SMESHDS_Hypothesis*> empty;
- return empty;
+ static list<const SMESHDS_Hypothesis*> empty;
+ return empty;
}
//=======================================================================
//=======================================================================
bool SMESHDS_Mesh::HasHypothesis(const TopoDS_Shape & S)
{
- return myShapeToHypothesis.find(S)!=myShapeToHypothesis.end();
+ return myShapeToHypothesis.IsBound(S.Oriented(TopAbs_FORWARD));
}
//=======================================================================