0023252: Fillet regression

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cdl
index 4f4acd2f634a16a9c99d91e825bf5ec441f757fd..6f0451423c3876e7c29fb884ae7659136a3b5906 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cdl
@@ -56,9 +56,13 @@ is
     ResetElement(me : in out; E : Shape from TopoDS) is deferred;
     ---Purpose: prepare classification involving element <E>.
     
-    CompareElement(me : in out; E : Shape from TopoDS) is deferred;
-    ---Purpose: Add element <E> in the set of elements used in classification.
-    
+    CompareElement(me : in out; E : Shape from TopoDS)  
+    returns Boolean from Standard 
+    is deferred;
+    ---Purpose: Add element <E> in the set of elements used in classification.  
+    --  Returns FALSE if the element <E> has been already added to the set of elements, 
+    --  otherwise returns TRUE.
+     
     State(me : in out) returns State from TopAbs is deferred;
     ---Purpose: Returns state of classification of 2D point, defined by 
     -- ResetElement, with the current set of elements, defined by Compare.

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cxx
index 2074b5d583ec4b0a497c832260657f1960a6892c..141d07f6cf4a55a01dddaa3b6ac50b00027c1a43 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cxx
@@ -94,7 +94,8 @@ TopAbs_State TopOpeBRepBuild_CompositeClassifier::Compare
     TopOpeBRepBuild_BlockIterator Bit2 = L2->BlockIterator();
     for (Bit2.Initialize(); Bit2.More(); Bit2.Next()) {
       const TopoDS_Shape& s2 = MYBB->Element(Bit2);
-      CompareElement(s2);
+      if (!CompareElement(s2)) 
+        break;
     }
     state = State();
   }

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cdl
index 4aedee08058a4c6862b876ddd6809ca3c5462d0e..074d740d1b6bd7470ad0c482f33fb938a9c1008b 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cdl
@@ -65,10 +65,13 @@ is
     ---Purpose: prepare classification involving face <F>
     -- define 3D point (later used in Compare()) on first vertex of face <F>.
     
-    CompareElement(me : in out; F : Shape);
+    CompareElement(me : in out; F : Shape) 
+    returns  Boolean from Standard; 
     ---Purpose: Add the face <F> in the set of faces used in 3D point
-    -- classification.
-    
+    -- classification. Returns FALSE if the face <F> has been already  
+    -- added to the set of faces, otherwise returns TRUE.
+
+ 
     State(me : in out) returns State from TopAbs;
     ---Purpose: Returns state of classification of 3D point, defined by 
     -- ResetElement, with the current set of faces, defined by Compare.

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx
index 165d766032d0f68e7891aad5a6d917fb3b307475..3cf2588ba3865ab98a3c7820204bed67edbc9c98 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx
@@ -154,12 +154,13 @@ void  TopOpeBRepBuild_ShellFaceClassifier::ResetElement(const TopoDS_Shape& F)
 //purpose  : 
 //=======================================================================
 
-void TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F)
+Standard_Boolean TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F)
 {
 #ifdef DEB
 //  const TopAbs_ShapeEnum t = F.ShapeType();
 #endif
-
+  Standard_Boolean bRet = Standard_True;
+  //
   if (myFirstCompare) {
     Standard_Boolean found = myFaceShellMap.IsBound(F);
     if ( !found ) {
@@ -178,6 +179,7 @@ void TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F)
       // dont F fait partie.
       TopoDS_Shape sbid = myFaceShellMap.Find(F);
       myShell = TopoDS::Shell(sbid);
+      bRet = !bRet;
     }
     myFirstCompare = Standard_False;
   }
@@ -187,7 +189,7 @@ void TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F)
     // dont F fait partie
     myBuilder.Add(myShell,F);
   }
-
+  return bRet;
 }
 
 #ifdef DEB

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cdl
index 6c3717034f45d336e75c89af95c178e6b8c522dc..f2fc5c17298c33d375263250ca3061d9dbcd7c9c 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cdl
@@ -66,7 +66,8 @@ is
     ---Purpose: prepare classification involving edge <E>
     -- define 2D point (later used in Compare()) on first vertex of edge <E>.
     
-    CompareElement(me : in out; E : Shape from TopoDS);
+    CompareElement(me : in out; E : Shape from TopoDS) 
+    returns Boolean from Standard;
     ---Purpose: Add the edge <E> in the set of edges used in 2D point
     -- classification.
     

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx
index d8c7515e72315026436280f46a7f063429cefe82..b5c341a5e597dd055ce474d3309773a0a1baf535 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx
@@ -421,8 +421,9 @@ void  TopOpeBRepBuild_WireEdgeClassifier::ResetElement(const TopoDS_Shape& EE)
 //purpose  : 
 //=======================================================================
 
-void TopOpeBRepBuild_WireEdgeClassifier::CompareElement(const TopoDS_Shape& EE)
+Standard_Boolean TopOpeBRepBuild_WireEdgeClassifier::CompareElement(const TopoDS_Shape& EE)
 {
+  Standard_Boolean bRet = Standard_True;
   const TopoDS_Edge& E = TopoDS::Edge(EE);
   const TopoDS_Face& F = myBCEdge.Face();
 
@@ -462,6 +463,7 @@ void TopOpeBRepBuild_WireEdgeClassifier::CompareElement(const TopoDS_Shape& EE)
 #ifdef DEB
 //  TopAbs_State state = myFPC.State();
 #endif
+  return bRet;
 }