PAL9874. Fix error in SMESH_HypoFilter::IsGlobalPredicate; add possibility to add...

diff --git a/src/SMESH/SMESH_HypoFilter.cxx b/src/SMESH/SMESH_HypoFilter.cxx
index 783547bb103973f060c842abbec89e45f68a0c11..ff14016d8dae8ae62af359d12b7862aaf5b3db77 100644 (file)
--- a/src/SMESH/SMESH_HypoFilter.cxx
+++ b/src/SMESH/SMESH_HypoFilter.cxx
@@ -97,11 +97,11 @@ bool SMESH_HypoFilter::InstancePredicate::IsOk(const SMESH_Hypothesis* aHyp,
 }
 
 //=======================================================================
 }
 
 //=======================================================================

-//function : IsGlobalPredicate::IsOk
+//function : IsAssignedToPredicate::IsOk

 //purpose  : 
 //=======================================================================
 
 //purpose  : 
 //=======================================================================
 

-bool SMESH_HypoFilter::IsGlobalPredicate::IsOk(const SMESH_Hypothesis* aHyp,
+bool SMESH_HypoFilter::IsAssignedToPredicate::IsOk(const SMESH_Hypothesis* aHyp,

                                                const TopoDS_Shape&     aShape) const
 {
   return ( !_mainShape.IsNull() && !aShape.IsNull() && _mainShape.IsSame( aShape ));
                                                const TopoDS_Shape&     aShape) const
 {
   return ( !_mainShape.IsNull() && !aShape.IsNull() && _mainShape.IsSame( aShape ));


@@ -131,9 +131,10 @@ SMESH_HypoFilter::SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNag
 //purpose  : 
 //=======================================================================
 
 //purpose  : 
 //=======================================================================
 

-void SMESH_HypoFilter::And( SMESH_HypoPredicate* aPredicate )
+SMESH_HypoFilter & SMESH_HypoFilter::And( SMESH_HypoPredicate* aPredicate )

 {
   add( AND, aPredicate );
 {
   add( AND, aPredicate );

+  return *this;

 }
 
 //=======================================================================
 }
 
 //=======================================================================


@@ -141,9 +142,10 @@ void SMESH_HypoFilter::And( SMESH_HypoPredicate* aPredicate )
 //purpose  : 
 //=======================================================================
 
 //purpose  : 
 //=======================================================================
 

-void SMESH_HypoFilter::AndNot( SMESH_HypoPredicate* aPredicate )
+SMESH_HypoFilter & SMESH_HypoFilter::AndNot( SMESH_HypoPredicate* aPredicate )

 {
   add( AND_NOT, aPredicate );
 {
   add( AND_NOT, aPredicate );

+  return *this;

 }
 
 //=======================================================================
 }
 
 //=======================================================================


@@ -151,9 +153,10 @@ void SMESH_HypoFilter::AndNot( SMESH_HypoPredicate* aPredicate )
 //purpose  : 
 //=======================================================================
 
 //purpose  : 
 //=======================================================================
 

-void SMESH_HypoFilter::Or( SMESH_HypoPredicate* aPredicate )
+SMESH_HypoFilter & SMESH_HypoFilter::Or( SMESH_HypoPredicate* aPredicate )

 {
   add( OR, aPredicate );
 {
   add( OR, aPredicate );

+  return *this;

 }
 
 //=======================================================================
 }
 
 //=======================================================================


@@ -161,9 +164,10 @@ void SMESH_HypoFilter::Or( SMESH_HypoPredicate* aPredicate )
 //purpose  : Return predicates
 //=======================================================================
 
 //purpose  : Return predicates
 //=======================================================================
 

-void SMESH_HypoFilter::OrNot( SMESH_HypoPredicate* aPredicate )
+SMESH_HypoFilter & SMESH_HypoFilter::OrNot( SMESH_HypoPredicate* aPredicate )

 {
   add( OR_NOT, aPredicate );
 {
   add( OR_NOT, aPredicate );

+  return *this;

 }
 
 //=======================================================================
 }
 
 //=======================================================================


@@ -193,7 +197,17 @@ SMESH_HypoPredicate* SMESH_HypoFilter::IsAlgo()
 
  SMESH_HypoPredicate* SMESH_HypoFilter::IsGlobal(const TopoDS_Shape& theMainShape)
 {
 
  SMESH_HypoPredicate* SMESH_HypoFilter::IsGlobal(const TopoDS_Shape& theMainShape)
 {

-  return new IsGlobalPredicate( theMainShape );
+  return new IsAssignedToPredicate( theMainShape );
+}
+
+//=======================================================================
+//function : IsAssignedTo
+//purpose  : 
+//=======================================================================
+
+ SMESH_HypoPredicate* SMESH_HypoFilter::IsAssignedTo(const TopoDS_Shape& theShape)
+{
+  return new IsAssignedToPredicate( theShape );

 }
 
 //=======================================================================
 }
 
 //=======================================================================


@@ -268,13 +282,14 @@ bool SMESH_HypoFilter::IsOk (const SMESH_Hypothesis* aHyp,
 //purpose  : 
 //=======================================================================
 
 //purpose  : 
 //=======================================================================
 

-void SMESH_HypoFilter::Init  ( SMESH_HypoPredicate* aPredicate, bool notNagate )
+SMESH_HypoFilter & SMESH_HypoFilter::Init  ( SMESH_HypoPredicate* aPredicate, bool notNagate )

 {
   list<SMESH_HypoPredicate*>::const_iterator pred = myPredicates.begin();
   for ( ; pred != myPredicates.end(); ++pred )
     delete *pred;
 
   add( notNagate ? AND : AND_NOT, aPredicate );
 {
   list<SMESH_HypoPredicate*>::const_iterator pred = myPredicates.begin();
   for ( ; pred != myPredicates.end(); ++pred )
     delete *pred;
 
   add( notNagate ? AND : AND_NOT, aPredicate );

+  return *this;

 }
 
 
 }
 
 

diff --git a/src/SMESH/SMESH_HypoFilter.hxx b/src/SMESH/SMESH_HypoFilter.hxx
index 673b9fe2a988f8fa638420f88f7008b49e997dde..6bc34bf5365f1fd994e93f7f389e9998f559e0a2 100644 (file)
--- a/src/SMESH/SMESH_HypoFilter.hxx
+++ b/src/SMESH/SMESH_HypoFilter.hxx
@@ -35,10 +35,10 @@
 
 #include <list>
 #include <string>
 
 #include <list>
 #include <string>

+#include <TopoDS_Shape.hxx>

 
 class SMESH_HypoFilter;
 class SMESH_Hypothesis;
 
 class SMESH_HypoFilter;
 class SMESH_Hypothesis;

-class TopoDS_Shape;

 
 class SMESH_HypoPredicate {
  public:
 
 class SMESH_HypoPredicate {
  public:


@@ -59,15 +59,16 @@ class SMESH_HypoFilter: public SMESH_HypoPredicate
   SMESH_HypoFilter();
   SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
   // notNagate==false means !aPredicate->IsOk()
   SMESH_HypoFilter();
   SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
   // notNagate==false means !aPredicate->IsOk()

-  void Init  ( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
-  void And   ( SMESH_HypoPredicate* aPredicate );
-  void AndNot( SMESH_HypoPredicate* aPredicate );
-  void Or    ( SMESH_HypoPredicate* aPredicate );
-  void OrNot ( SMESH_HypoPredicate* aPredicate );
+  SMESH_HypoFilter & Init  ( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
+  SMESH_HypoFilter & And   ( SMESH_HypoPredicate* aPredicate );
+  SMESH_HypoFilter & AndNot( SMESH_HypoPredicate* aPredicate );
+  SMESH_HypoFilter & Or    ( SMESH_HypoPredicate* aPredicate );
+  SMESH_HypoFilter & OrNot ( SMESH_HypoPredicate* aPredicate );

 
   // Create predicates
   static SMESH_HypoPredicate* IsAlgo();
 
   // Create predicates
   static SMESH_HypoPredicate* IsAlgo();

-  static SMESH_HypoPredicate* IsApplicableTo(const TopoDS_Shape& theMainShape);
+  static SMESH_HypoPredicate* IsApplicableTo(const TopoDS_Shape& theShape);
+  static SMESH_HypoPredicate* IsAssignedTo(const TopoDS_Shape& theShape);

   static SMESH_HypoPredicate* Is(const SMESH_Hypothesis* theHypo);
   static SMESH_HypoPredicate* IsGlobal(const TopoDS_Shape& theMainShape);
   static SMESH_HypoPredicate* HasName(const std::string & theName);
   static SMESH_HypoPredicate* Is(const SMESH_Hypothesis* theHypo);
   static SMESH_HypoPredicate* IsGlobal(const TopoDS_Shape& theMainShape);
   static SMESH_HypoPredicate* HasName(const std::string & theName);


@@ -150,9 +151,9 @@ class SMESH_HypoFilter: public SMESH_HypoPredicate
               const TopoDS_Shape&     aShape) const;
   };
         
               const TopoDS_Shape&     aShape) const;
   };
         

-  struct IsGlobalPredicate : public SMESH_HypoPredicate {
-    const TopoDS_Shape& _mainShape;
-    IsGlobalPredicate( const TopoDS_Shape& mainShape ):_mainShape(mainShape){}
+  struct IsAssignedToPredicate : public SMESH_HypoPredicate {
+    TopoDS_Shape _mainShape;
+    IsAssignedToPredicate( const TopoDS_Shape& mainShape ):_mainShape(mainShape){}

     bool IsOk(const SMESH_Hypothesis* aHyp,
               const TopoDS_Shape&     aShape) const;
   };
     bool IsOk(const SMESH_Hypothesis* aHyp,
               const TopoDS_Shape&     aShape) const;
   };

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index c473bd61291d1e30cf64bf204a9f8edeec377003..8622faec56ff35b218ba2235fce7b8f7f357eb82 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -1080,11 +1080,10 @@ void SMESH_Mesh::RemoveGroup (const int theGroupID)
 //=============================================================================
 const SMESH_Hypothesis* SMESH_Mesh::IsLocal1DHypothesis (const TopoDS_Shape& theEdge)
 {
 //=============================================================================
 const SMESH_Hypothesis* SMESH_Mesh::IsLocal1DHypothesis (const TopoDS_Shape& theEdge)
 {

-  SMESH_HypoFilter filter( SMESH_HypoFilter::HasDim( 1 ));
-  filter.AndNot( SMESH_HypoFilter::IsAlgo() );
-  filter.AndNot( SMESH_HypoFilter::IsGlobal( GetMeshDS()->ShapeToMesh() ));
+  SMESH_HypoFilter hypo ( SMESH_HypoFilter::HasDim( 1 ));
+  hypo.AndNot( hypo.IsAlgo() ).AndNot( hypo.IsAssignedTo( GetMeshDS()->ShapeToMesh() ));

 
 

-  return GetHypothesis( theEdge, filter, true );
+  return GetHypothesis( theEdge, hypo, true );

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -1426,4 +1425,4 @@ ostream& SMESH_Mesh::Dump(ostream& save)
 SMDSAbs_ElementType SMESH_Mesh::GetElementType( const int id, const bool iselem )
 {
   return _myMeshDS->GetElementType( id, iselem );
 SMDSAbs_ElementType SMESH_Mesh::GetElementType( const int id, const bool iselem )
 {
   return _myMeshDS->GetElementType( id, iselem );

-}
\ No newline at end of file
+}