EDF 25230 - Large tolerance delta

diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index 0cffa8223b8e4bd9a89deccfbdaa1bd8bf113683..b301df8ae7937dec7c73ca46fc9e3492c41902fe 100644 (file)
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -216,12 +216,16 @@ void BuildGUI_FaceDlg::Init()
 
   connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
   connect( myGroupWire->LineEdit1,   SIGNAL( returnPressed()), this, SLOT( LineEditReturnPressed() ) );
   connect( myGroupWire->PushButton1, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+  connect( myGroupWire->CheckButton1, SIGNAL( toggled(bool) ), this, SLOT( OnPlanarCheck() ) );
+
   connect( myGroupSurf->LineEdit1,   SIGNAL( returnPressed()), this, SLOT( LineEditReturnPressed() ) );
   connect( myGroupSurf->PushButton1, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
   connect( myGroupSurf->LineEdit2,   SIGNAL( returnPressed()), this, SLOT( LineEditReturnPressed() ) );
   connect( myGroupSurf->PushButton2, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+
   connect( myGroupWireConstraints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
   connect( myGroupWireConstraints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
   connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
@@ -534,6 +538,15 @@ void BuildGUI_FaceDlg::SetEditCurrentArgument()
   SelectionIntoArgument();
 }
 
+//=================================================================================
+// function : OnPlanarCheck()
+// purpose  :
+//=================================================================================
+void BuildGUI_FaceDlg::OnPlanarCheck()
+{
+  erasePreview();
+  displayPreview( true, false, true, true, -1, -1, -1, true );
+}
 
 //=================================================================================
 // function : ActivateThisDialog()

diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h
index d9cadafec6352b8a6098dd96c59d281b21afcff6..641676f083d2305ad6896402bf71b601efb27ac1 100644 (file)
--- a/src/BuildGUI/BuildGUI_FaceDlg.h
+++ b/src/BuildGUI/BuildGUI_FaceDlg.h
@@ -84,6 +84,7 @@ private slots:
   void                               ActivateThisDialog();
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
+  void                               OnPlanarCheck();
   void                               onItemClicked( QTreeWidgetItem*, int );
 };
 

diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx
index 9244e3d2afebdb410090346ceee7ea6a83c9e3cb..0253c0b5319fc3e18e25d5ac503897eb23aaa0f4 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx
@@ -184,7 +184,6 @@ class GEOMAlgo_AlgoTools  {
                                                       const TopoDS_Edge& aEnew,
                                                       const TopoDS_Face& aF,
                                                       const Handle(IntTools_Context)& aCtx) ;
-
 //
   Standard_EXPORT
     static void FindChains(const GEOMAlgo_ListOfCoupleOfShapes& aLCS,

diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
index 65fbe73d9786e5d08bfb779c57f0ae0c84c42c1f..51e1cdb8705b9b0e431ce11e604bb68dcc38ed3b 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
@@ -39,10 +39,18 @@
 #include <gp_Ax1.hxx>
 #include <gp_Vec.hxx>
 
+#include <BRep_Tool.hxx>
+#include <TopLoc_Location.hxx>
+
 #include <GeomAbs_SurfaceType.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <IntSurf_Quadric.hxx>
 
+#include <TopoDS.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS_Edge.hxx>
+#include <Geom2d_Curve.hxx>
+
 
 //=======================================================================
 //function : GetState
@@ -232,3 +240,75 @@ Standard_Boolean GEOMAlgo_SurfaceTools::IsConformState
   }
   return bRet;
 }
+//=======================================================================
+//function : IsBelongsToSameSurface
+//purpose  : Returns true if all edges of theShape have a reference to 
+//           the same surface
+//=======================================================================
+Standard_Boolean GEOMAlgo_SurfaceTools::IsBelongsToSameSurface
+                                    (const TopoDS_Shape& theShape)
+{
+  Standard_Boolean aResult = false;
+  
+  TopExp_Explorer ex;
+  ex.Init(theShape,TopAbs_EDGE);
+  if (!ex.More()) return aResult; // no edges ....
+
+  TopoDS_Edge anEdge = TopoDS::Edge(ex.Current());
+  Standard_Real f,l,ff,ll;
+  Handle(Geom2d_Curve) PC,aPPC;
+  Handle(Geom_Surface) aSurface, aCurSurface;
+  TopLoc_Location aLoc, aCurLoc;
+  Standard_Integer i = 0,j;
+
+  // iterate on the surfaces of the first edge
+  for(;;) 
+  {
+    i++;
+    BRep_Tool::CurveOnSurface(anEdge,PC,aSurface,aLoc,f,l,i);
+    if (aSurface.IsNull()) 
+    {
+      break;
+    }
+    // check the other edges
+    for (ex.Init(theShape,TopAbs_EDGE); ex.More(); ex.Next()) 
+    {
+      if (!anEdge.IsSame(ex.Current())) 
+      {
+        j = 0;
+        for(;;)
+        {
+          j++;
+          BRep_Tool::CurveOnSurface(TopoDS::Edge(ex.Current()),aPPC,aCurSurface,aCurLoc,ff,ll,j);
+          if (aCurSurface.IsNull()) {
+            break;
+          }
+          if ((aCurSurface == aSurface) && (aCurLoc.IsEqual(aLoc))) 
+          {
+            break;
+          }
+          aCurSurface.Nullify();
+        }
+
+        if (aCurSurface.IsNull()) 
+        {
+          aSurface.Nullify();
+          break;
+        }
+      }
+    }
+
+    if (!aSurface.IsNull()) 
+    {
+      break;
+    }
+  }
+
+  if (!aSurface.IsNull()) 
+  {
+    aResult = Standard_True;
+  }
+
+  return aResult;
+
+}
\ No newline at end of file

diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
index 2ff92f83e2179285259d03639c8e5a90df98f6ef..8b09d02825640f0a7f4c4cb6b9b617cc61d992cf 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
@@ -42,6 +42,7 @@
 #include <gp_Pln.hxx>
 #include <gp_Sphere.hxx>
 
+#include <TopoDS_Shape.hxx>
 
 //=======================================================================
 //function : GEOMAlgo_SurfaceTools
@@ -77,5 +78,9 @@ class GEOMAlgo_SurfaceTools
   Standard_EXPORT
     static  TopAbs_State ReverseState(const TopAbs_State aSt) ;
 
+  //! Returns true if all edges of theShape have a reference to the same surface
+  Standard_EXPORT
+    static Standard_Boolean IsBelongsToSameSurface(const TopoDS_Shape& theShape) ;
+
 };
 #endif

diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
index 8c00accde97e51de1f7649a51d1c19f938c9afec..13d765af2d836f34f4044616a3c9cec07db51fd0 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
+++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
@@ -23,6 +23,7 @@
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_Block6Explorer.hxx>
+#include <GEOMAlgo_SurfaceTools.hxx>
 
 #include <ShHealOper_ShapeProcess.hxx>
 
@@ -43,6 +44,7 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
+#include <BRepBuilderAPI_FindPlane.hxx>
 
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
@@ -1224,6 +1226,17 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire&
                                                            const Standard_Boolean isPlanarWanted,
                                                            TopoDS_Shape&          theResult)
 {
+  TCollection_AsciiString aWarning;
+  BRepBuilderAPI_FindPlane aFindPlane(theWire);
+  if (aFindPlane.Found()) 
+  {
+    BRepBuilderAPI_MakeFace MK (theWire, isPlanarWanted);
+    if (MK.IsDone()) {
+      theResult = MK.Shape();
+      return aWarning;
+    }
+  }
+
   if (!isPlanarWanted)
     return MakeAnyFace(theWire, theResult);
 
@@ -1232,14 +1245,6 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire&
   // If required tolerance increase will be
   // higher than PLANAR_FACE_MAX_TOLERANCE,
   // we will try to build a non-planar face.
-
-  TCollection_AsciiString aWarning;
-  BRepBuilderAPI_MakeFace MK (theWire, isPlanarWanted);
-  if (MK.IsDone()) {
-    theResult = MK.Shape();
-    return aWarning;
-  }
-
   // try to update wire tolerances to build a planar face
 
   // Find a deviation
@@ -1300,12 +1305,15 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeAnyFace (const TopoDS_Wire&
                                                               TopoDS_Shape&      theResult)
 {
   TCollection_AsciiString aWarning;
-
-  // try to build a face on any surface under the edges of the wire
-  BRepBuilderAPI_MakeFace MK (theWire, Standard_False);
-  if (MK.IsDone()) {
-    theResult = MK.Shape();
-    return aWarning;
+  
+  //check if all edges already belong to the some surface
+  if(GEOMAlgo_SurfaceTools::IsBelongsToSameSurface(theWire))
+  {
+    BRepBuilderAPI_MakeFace MK (theWire, false);
+    if (MK.IsDone()) {
+      theResult = MK.Shape();
+      return aWarning;
+    }
   }
 
   // try to construct filling surface