Test case bugs/N4. A fix by PKV.

[modules/geom.git] / src / ShHealOper / ShHealOper_ChangeOrientation.cxx

diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.cxx b/src/ShHealOper/ShHealOper_ChangeOrientation.cxx
index b81fccd5723fb547f7243a79927eaa35a0a2edef..2128cd539d6ca7070d9c5cf91198f269e919856a 100644 (file)
--- a/src/ShHealOper/ShHealOper_ChangeOrientation.cxx
+++ b/src/ShHealOper/ShHealOper_ChangeOrientation.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File:      ShHealOper_ChangeOrientation.cxx
 // Created:   11.07.06 11:46:45
@@ -25,10 +26,17 @@
 
 #include <ShHealOper_ChangeOrientation.hxx>
 
-#include <BRep_Builder.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
-
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRep_Builder.hxx>
+#include <Geom_Curve.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
 #include <TopoDS_Iterator.hxx>
+#include <Geom_TrimmedCurve.hxx>
 
 //=======================================================================
 //function : ShHealOper_ChangeOrientation()
@@ -58,7 +66,8 @@ void ShHealOper_ChangeOrientation::Init(const TopoDS_Shape& theShape)
 Standard_Boolean ShHealOper_ChangeOrientation::Perform()
 {
   BRep_Builder B;
-  if (myInitShape.ShapeType() == TopAbs_SHELL) {
+  if (myInitShape.ShapeType() == TopAbs_SHELL)
+  {
     myResultShape = myInitShape.EmptyCopied();
     TopoDS_Iterator itr (myInitShape);
     while (itr.More()) {
@@ -66,7 +75,8 @@ Standard_Boolean ShHealOper_ChangeOrientation::Perform()
       itr.Next();
     }
   }
-  else if (myInitShape.ShapeType() == TopAbs_FACE) {
+  else if (myInitShape.ShapeType() == TopAbs_FACE)
+  {
     myResultShape = myInitShape.EmptyCopied();
     TopoDS_Iterator itr (myInitShape);
     while (itr.More()) {
@@ -75,16 +85,43 @@ Standard_Boolean ShHealOper_ChangeOrientation::Perform()
     }
     myResultShape.Reverse();
   }
-  else if ( myInitShape.ShapeType() == TopAbs_WIRE || myInitShape.ShapeType() == TopAbs_EDGE) {
-    myResultShape = myInitShape.EmptyCopied();
-    TopoDS_Iterator itr (myInitShape);
-    while (itr.More()) {
-      B.Add(myResultShape,itr.Value());
-      itr.Next();
+  else if ( myInitShape.ShapeType() == TopAbs_WIRE || myInitShape.ShapeType() == TopAbs_EDGE)
+  {
+    TopTools_ListOfShape reversedEdges;
+    for ( TopExp_Explorer edgeIt( myInitShape, TopAbs_EDGE ); edgeIt.More(); edgeIt.Next() )
+    {
+      const TopoDS_Edge& edge = TopoDS::Edge( edgeIt.Current() );
+
+      double f,l;
+      Handle(Geom_Curve) curve = BRep_Tool::Curve( edge, f,l );
+      Handle(Geom_TrimmedCurve) tc = Handle(Geom_TrimmedCurve)::DownCast(curve);
+      if ( !tc.IsNull() ) curve = tc->BasisCurve();
+
+      f = curve->ReversedParameter( f );
+      l = curve->ReversedParameter( l );
+      curve = curve->Reversed();
+      reversedEdges.Prepend( BRepBuilderAPI_MakeEdge( curve, Min( f, l ), Max( f, l )));
     }
-    myResultShape.Reverse();
+    if ( myInitShape.ShapeType() == TopAbs_EDGE )
+    {
+      myResultShape = reversedEdges.First();
+    }
+    else
+    {
+      BRepBuilderAPI_MakeWire wire;
+      wire.Add( reversedEdges );
+      myResultShape = wire;
+    }
+    // myResultShape = myInitShape.EmptyCopied();
+    // TopoDS_Iterator itr (myInitShape);
+    // while (itr.More()) {
+    //   B.Add(myResultShape,itr.Value());
+    //   itr.Next();
+    // }
+    // myResultShape.Reverse();
   }
-  else {
+  else
+  {
     BRepBuilderAPI_Copy Copy (myInitShape);
     if (!Copy.IsDone()) return false;