X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Algo.cxx;h=60a55f3be27dd636fc2c45051f8203a560931082;hp=b35793e02ab0f5ba21590487c82f17f6cd563f3e;hb=9b3ccd683e189bff97c8a48d1411cbe71df573f3;hpb=789d7f7415a1e465aee36232e7633eea548ff1fb

diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx
index b35793e02..60a55f3be 100644
--- a/src/SMESH/SMESH_Algo.cxx
+++ b/src/SMESH/SMESH_Algo.cxx
@@ -26,14 +26,11 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 using namespace std;
 #include "SMESH_Algo.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
-
-#include "SMESHDS_ListOfPtrHypothesis.hxx"
-#include "SMESHDS_ListIteratorOfListOfPtrHypothesis.hxx"
+#include "SMESH_HypoFilter.hxx"
 
 #include <GeomAdaptor_Curve.hxx>
 #include <BRep_Tool.hxx>
@@ -42,6 +39,8 @@ using namespace std;
 #include "utilities.h"
 
 #include <algorithm>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=============================================================================
 /*!
@@ -49,22 +48,14 @@ using namespace std;
  */
 //=============================================================================
 
-SMESH_Algo::SMESH_Algo(int hypId, int studyId, SMESH_Gen* gen)
-  : SMESH_Hypothesis(hypId, studyId, gen)
+SMESH_Algo::SMESH_Algo(int hypId, int studyId,
+	SMESH_Gen * gen):SMESH_Hypothesis(hypId, studyId, gen)
 {
 //   _compatibleHypothesis.push_back("hypothese_bidon");
-  _type = ALGO;
-  gen->_mapAlgo[hypId] = this;
-}
-
-//=============================================================================
-/*!
- *  
- */
-//=============================================================================
+	_type = ALGO;
+	gen->_mapAlgo[hypId] = this;
 
-SMESH_Algo::~SMESH_Algo()
-{
+        _onlyUnaryInput = _requireDescretBoundary = true;
 }
 
 //=============================================================================
@@ -73,67 +64,8 @@ SMESH_Algo::~SMESH_Algo()
  */
 //=============================================================================
 
-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)
+SMESH_Algo::~SMESH_Algo()
 {
-  MESSAGE("SMESH_Algo::CheckHypothesis");
-  ASSERT(0); // use method from derived classes
-  return false;
 }
 
 //=============================================================================
@@ -142,12 +74,9 @@ bool SMESH_Algo::CheckHypothesis(SMESH_Mesh& aMesh,
  */
 //=============================================================================
 
-bool SMESH_Algo::Compute(SMESH_Mesh& aMesh,
-			 const TopoDS_Shape& aShape)
+const vector < string > &SMESH_Algo::GetCompatibleHypothesis()
 {
-  MESSAGE("SMESH_Algo::Compute");
-  ASSERT(0); // use method from derived classes
-  return false;
+	return _compatibleHypothesis;
 }
 
 //=============================================================================
@@ -160,23 +89,20 @@ bool SMESH_Algo::Compute(SMESH_Mesh& aMesh,
  */
 //=============================================================================
 
-const list<SMESHDS_Hypothesis*>&
-SMESH_Algo::GetUsedHypothesis(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
+  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;
 }
 
@@ -188,56 +114,36 @@ SMESH_Algo::GetUsedHypothesis(SMESH_Mesh& aMesh,
  */
 //=============================================================================
 
-const list<SMESHDS_Hypothesis*>&
-SMESH_Algo::GetAppliedHypothesis(SMESH_Mesh& aMesh,
-				 const TopoDS_Shape& aShape)
+const list<const SMESHDS_Hypothesis *> & SMESH_Algo::GetAppliedHypothesis(
+	SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
 {
-  const Handle(SMESHDS_Mesh)& meshDS = aMesh.GetMeshDS();
-  const SMESHDS_ListOfPtrHypothesis& listHyp = meshDS->GetHypothesis(aShape);
-  SMESHDS_ListIteratorOfListOfPtrHypothesis it(listHyp);
-
-  int hypType;
-  string hypName;
-
   _appliedHypList.clear();
-  while (it.More())
-    {
-      SMESHDS_Hypothesis* anHyp = it.Value();
-      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.Next();
-    }
+  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;
 }
 
-
 //=============================================================================
 /*!
  *  Compute length of an edge
  */
 //=============================================================================
 
-double SMESH_Algo::EdgeLength(const TopoDS_Edge& E)
+double SMESH_Algo::EdgeLength(const TopoDS_Edge & E)
 {
-  double UMin = 0, UMax = 0;
-  TopLoc_Location L;
-  if (BRep_Tool::Degenerated(E)) return 0;
-  Handle (Geom_Curve) C = BRep_Tool::Curve(E, L, UMin, UMax);
-  GeomAdaptor_Curve AdaptCurve(C);
-  GCPnts_AbscissaPoint gabs;
-  double length = gabs.Length(AdaptCurve, UMin, UMax);
-  return length;
+	double UMin = 0, UMax = 0;
+	TopLoc_Location L;
+	if (BRep_Tool::Degenerated(E))
+		return 0;
+	Handle(Geom_Curve) C = BRep_Tool::Curve(E, L, UMin, UMax);
+	GeomAdaptor_Curve AdaptCurve(C);
+	GCPnts_AbscissaPoint gabs;
+	double length = gabs.Length(AdaptCurve, UMin, UMax);
+	return length;
 }
-