PAL7933. Use SMESH_HypoFilter to retrieve assigned hypotheses

[modules/smesh.git] / src / SMESH / SMESH_Algo.cxx

diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx
index 234b7ecce8e0a661b71e2f94d35c738fea1574ad..60a55f3be27dd636fc2c45051f8203a560931082 100644 (file)
--- a/src/SMESH/SMESH_Algo.cxx
+++ b/src/SMESH/SMESH_Algo.cxx
@@ -26,11 +26,11 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 using namespace std;
 #include "SMESH_Algo.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
+#include "SMESH_HypoFilter.hxx"
 
 #include <GeomAdaptor_Curve.hxx>
 #include <BRep_Tool.hxx>
@@ -39,6 +39,8 @@ using namespace std;
 #include "utilities.h"
 
 #include <algorithm>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=============================================================================
 /*!
@@ -52,6 +54,8 @@ SMESH_Algo::SMESH_Algo(int hypId, int studyId,
 //   _compatibleHypothesis.push_back("hypothese_bidon");
        _type = ALGO;
        gen->_mapAlgo[hypId] = this;
+
+        _onlyUnaryInput = _requireDescretBoundary = true;
 }
 
 //=============================================================================
@@ -75,77 +79,6 @@ const vector < string > &SMESH_Algo::GetCompatibleHypothesis()
        return _compatibleHypothesis;
 }
 
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
-
-ostream & SMESH_Algo::SaveTo(ostream & save)
-{
-       return save << this;
-}
-
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
-
-istream & SMESH_Algo::LoadFrom(istream & load)
-{
-       return load >> (*this);
-}
-
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
-
-ostream & operator <<(ostream & save, SMESH_Algo & hyp)
-{
-       return save;
-}
-
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
-
-istream & operator >>(istream & load, SMESH_Algo & hyp)
-{
-       return load;
-}
-
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
-
-bool SMESH_Algo::CheckHypothesis(SMESH_Mesh & aMesh,
-       const TopoDS_Shape & aShape)
-{
-       MESSAGE("SMESH_Algo::CheckHypothesis");
-       ASSERT(0);                                      // use method from derived classes
-       return false;
-}
-
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
-
-bool SMESH_Algo::Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
-{
-       MESSAGE("SMESH_Algo::Compute");
-       ASSERT(0);                                      // use method from derived classes
-       return false;
-}
-
 //=============================================================================
 /*!
  *  List the hypothesis used by the algorithm associated to the shape.
@@ -159,21 +92,18 @@ bool SMESH_Algo::Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
 const list <const SMESHDS_Hypothesis *> & SMESH_Algo::GetUsedHypothesis(
        SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
 {
-       _usedHypList.clear();
-       _usedHypList = GetAppliedHypothesis(aMesh, aShape);     // copy
-       int nbHyp = _usedHypList.size();
-       if (nbHyp == 0)
-       {
-               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
-       return _usedHypList;
+  _usedHypList.clear();
+  if ( !_compatibleHypothesis.empty() )
+  {
+    SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( _compatibleHypothesis[0] ));
+    for ( int i = 1; i < _compatibleHypothesis.size(); ++i )
+      filter.Or( filter.HasName( _compatibleHypothesis[ i ] ));
+
+    aMesh.GetHypotheses( aShape, filter, _usedHypList, true );
+    if ( _usedHypList.size() > 1 )
+      _usedHypList.clear();    //only one compatible hypothesis allowed
+  }
+  return _usedHypList;
 }
 
 //=============================================================================
@@ -187,34 +117,16 @@ const list <const SMESHDS_Hypothesis *> & SMESH_Algo::GetUsedHypothesis(
 const list<const SMESHDS_Hypothesis *> & SMESH_Algo::GetAppliedHypothesis(
        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();
-       while (it!=listHyp.end())
-       {
-               const SMESHDS_Hypothesis *anHyp = *it;
-               hypType = anHyp->GetType();
-               //SCRUTE(hypType);
-               if (hypType == SMESHDS_Hypothesis::PARAM_ALGO)
-               {
-                       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;
+  _appliedHypList.clear();
+  if ( !_compatibleHypothesis.empty() )
+  {
+    SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( _compatibleHypothesis[0] ));
+    for ( int i = 1; i < _compatibleHypothesis.size(); ++i )
+      filter.Or( filter.HasName( _compatibleHypothesis[ i ] ));
+    
+    aMesh.GetHypotheses( aShape, filter, _appliedHypList, false );
+  }
+  return _appliedHypList;
 }
 
 //=============================================================================