IPAL21725 TC 5.1.4: Partition problem (PKV fix)

src/GEOMAlgo/GEOMAlgo_Builder.cxx

@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2008  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
@@ -19,7 +19,6 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 // File:        GEOMAlgo_Builder.cxx
 // Created:     
 // Author:      Peter KURNEV 
@@ -42,6 +41,7 @@
 
 #include <BRepLib.hxx>
 #include <NMTTools_PaveFiller.hxx>
+#include <GEOMAlgo_Tools.hxx>
 
 //=======================================================================
 //function : 
@@ -158,28 +158,7 @@
     AddShape1(aS);
   }
 }
-//=======================================================================
-//function : PostTreat
-//purpose  : 
-//=======================================================================
-  void GEOMAlgo_Builder::PostTreat()
-{
-  Standard_Integer aNbS;
-  TopoDS_Iterator aIt;
-  TopTools_ListOfShape aLS;
-  //
-  aIt.Initialize(myShape);
-  for (; aIt.More(); aIt.Next()) {
-    const TopoDS_Shape& aS=aIt.Value();
-    aLS.Append(aS);
-  }
-  aNbS=aLS.Extent();
-  if (aNbS==1) {
-    myShape=aLS.First();
-  }
 
-  BRepLib::SameParameter(myShape, 1.e-7, Standard_True);
-}
 //=======================================================================
 //function : AddShape1
 //purpose  : 
@@ -399,6 +378,34 @@
   PostTreat();
 }
 //
+static 
+  void CorrectWires(const TopoDS_Shape& aS);
+//
+//=======================================================================
+//function : PostTreat
+//purpose  : 
+//=======================================================================
+  void GEOMAlgo_Builder::PostTreat()
+{
+  Standard_Integer aNbS;
+  TopoDS_Iterator aIt;
+  TopTools_ListOfShape aLS;
+  //
+  aIt.Initialize(myShape);
+  for (; aIt.More(); aIt.Next()) {
+    const TopoDS_Shape& aS=aIt.Value();
+    aLS.Append(aS);
+  }
+  aNbS=aLS.Extent();
+  if (aNbS==1) {
+    myShape=aLS.First();
+  }
+  
+  BRepLib::SameParameter(myShape, 1.e-7, Standard_True);
+  //
+  GEOMAlgo_Tools::CorrectWires(myShape);
+}
+//
 // myErrorStatus
 // 
 // 0  - Ok
@@ -406,3 +413,4 @@
 // 2  - PaveFiller is failed
 // 10 - No shapes to process
 // 30 - SolidBuilder failed
+

src/GEOMAlgo/GEOMAlgo_Tools.cdl

@@ -1,4 +1,4 @@
---  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+--  Copyright (C) 2007-2008  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
@@ -19,7 +19,6 @@
 --
 --  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 --
-
 -- File:	GEOMAlgo_Tools.cdl
 -- Created:	Mon Dec  6 11:26:02 2004
 -- Author:	Peter KURNEV
@@ -108,6 +107,9 @@ is
     	    aS:Surface from Geom) 
     	returns Boolean from Standard;   
 
+    CorrectWires(myclass; 
+    	    aS  :Shape from TopoDS) 
+    	returns Boolean from Standard; 
 --fields
 
 end Tools;

src/GEOMAlgo/GEOMAlgo_Tools.hxx

@@ -1,24 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//                     Copyright (C) 1991 - 2000 by  
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//                      Matra Datavision SA.  All rights reserved.
 //  
-//  This library is free software; you can redistribute it and/or
+//                     Copyright (C) 2001 - 2004 by
-//  modify it under the terms of the GNU Lesser General Public
+//                     Open CASCADE SA.  All rights reserved.
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
 // 
-//  This library is distributed in the hope that it will be useful,
+// This file is part of the Open CASCADE Technology software.
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
+// This software may be distributed and/or modified under the terms and
-//  License along with this library; if not, write to the Free Software
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// and appearing in the file LICENSE included in the packaging of this file.
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
 
 #ifndef _GEOMAlgo_Tools_HeaderFile
 #define _GEOMAlgo_Tools_HeaderFile
@@ -110,6 +109,9 @@ Standard_EXPORT static  void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,con
 Standard_EXPORT static  Standard_Boolean IsUPeriodic(const Handle(Geom_Surface)& aS) ;
 
 
+Standard_EXPORT static  Standard_Boolean CorrectWires(const TopoDS_Shape& aS) ;
+
+
 
 
 

src/GEOMAlgo/GEOMAlgo_Tools_1.cxx

@@ -0,0 +1,323 @@
+// File:	GEOMAlgo_Tools_1.cxx
+// Created:	Thu May  6 10:46:21 2010
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+
+#include <GEOMAlgo_Tools.ixx>
+//
+#include <NCollection_DataMap.hxx>
+
+#include <gp_Pnt2d.hxx>
+#include <gp_Pnt.hxx>
+
+#include <Geom2dAdaptor_Curve.hxx>
+#include <Geom2dInt_GInter.hxx>
+#include <Geom2d_Curve.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+#include <GeomAdaptor_Surface.hxx>
+
+#include <IntRes2d_Domain.hxx>
+#include <IntRes2d_IntersectionPoint.hxx>
+#include <IntRes2d_Transition.hxx>
+
+#include <TopoDS_Iterator.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopExp_Explorer.hxx>
+
+#include <BRep_Tool.hxx>
+#include <BRep_Builder.hxx>
+
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_DataMapOfShapeListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+
+static 
+  inline Standard_Boolean IsEqual(const TopoDS_Shape& aS1, 
+				  const TopoDS_Shape& aS2) {
+  return TopTools_ShapeMapHasher::IsEqual(aS1, aS2);
+}
+//
+static
+  Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
+			       const TopoDS_Face& aF);
+
+//=======================================================================
+//function : CorrectWires
+//purpose  : 
+//=======================================================================
+  Standard_Boolean GEOMAlgo_Tools::CorrectWires(const TopoDS_Shape& aShape)
+{
+  Standard_Boolean bRet;
+  TopoDS_Iterator aItF;
+  TopExp_Explorer aExp;
+  TopTools_MapOfShape aMF;
+  GeomAdaptor_Surface aGAS;
+  GeomAbs_SurfaceType aTS;
+  TopLoc_Location aLoc; 
+  //
+  bRet=Standard_False;
+  //
+  aExp.Init(aShape, TopAbs_FACE);
+  for (; aExp.More(); aExp.Next()) {
+    const TopoDS_Face& aF=*((TopoDS_Face*)&aExp.Current());
+    if (aMF.Add(aF)) {
+      const Handle(Geom_Surface)& aS=BRep_Tool::Surface(aF, aLoc);
+      aGAS.Load(aS);
+      aTS=aGAS.GetType();
+      if (aTS==GeomAbs_Cylinder) {
+	aItF.Initialize(aF);
+	for (; aItF.More(); aItF.Next()) {
+	  const TopoDS_Wire& aW=*((TopoDS_Wire*)&aItF.Value());
+	  if (CorrectWire(aW, aF)) {
+	   bRet=Standard_True;
+	  }
+	}
+      }
+    }
+  }
+  return bRet;
+}
+//=======================================================================
+//class: GEOMAlgo_InfoEdge
+//purpose  : 
+//=======================================================================
+class GEOMAlgo_InfoEdge {
+ public:
+  //
+  GEOMAlgo_InfoEdge() {
+    myErrorStatus=0;
+    myTolInt=1.0e-10;
+  };
+  //
+  ~GEOMAlgo_InfoEdge(){
+  };
+  //
+  void Init(const TopoDS_Edge& aE, 
+	    const TopoDS_Face& aF);
+  //
+  void SetTolInt(const Standard_Real aTolInt) {
+    myTolInt=aTolInt;
+  };
+  //
+  const Standard_Real TolInt() const {
+    return myTolInt;
+  }
+  //
+  const Geom2dAdaptor_Curve& Adaptor() const {
+    return myGAC2D;
+  }
+  //
+  const IntRes2d_Domain& Domain()const {
+    return myDomain;
+  }
+  //
+  const Handle(Geom2d_Curve)& CurveOnSurface()const {
+    return myC2D;
+  }
+  //
+  const Handle(Geom_Curve)& Curve()const {
+    return myC3D;
+  }
+  //
+  Standard_Integer ErrorStatus()const {
+    return myErrorStatus;
+  }
+  //
+ protected:
+  Standard_Integer myErrorStatus;
+  Standard_Real myTolInt;
+  Geom2dAdaptor_Curve myGAC2D;
+  IntRes2d_Domain myDomain;
+  Handle(Geom2d_Curve) myC2D;
+  Handle(Geom_Curve) myC3D;
+};
+//
+typedef NCollection_DataMap<TopoDS_Shape, GEOMAlgo_InfoEdge> GEOMAlgo_DataMapOfShapeInfoEdge; 
+typedef GEOMAlgo_DataMapOfShapeInfoEdge::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeInfoEdge; 
+
+//=======================================================================
+//function : Init
+//purpose  : 
+//=======================================================================
+  void GEOMAlgo_InfoEdge::Init(const TopoDS_Edge& aE, 
+			       const TopoDS_Face& aF)
+{
+  Standard_Real aT1, aT2, aT1x, aT2x;
+  gp_Pnt2d aP2D1, aP2D2;
+  //
+  myErrorStatus=0;
+  //
+  myC3D=BRep_Tool::Curve(aE, aT1, aT2);
+  myC2D=BRep_Tool::CurveOnSurface(aE ,aF, aT1, aT2);
+  if (!myC2D.IsNull() && aT2>aT1) {
+    myGAC2D.Load(myC2D);
+    if(!myGAC2D.IsPeriodic()) {
+      aT1x=myGAC2D.FirstParameter();
+      aT2x=myGAC2D.LastParameter();
+      if(aT1x > aT1) {
+	aT1=aT1x;
+      }
+      if(aT2x < aT2) {
+	aT2=aT2x;
+      }
+    }
+    //
+    BRep_Tool::UVPoints(aE, aF, aP2D1, aP2D2);
+    myDomain.SetValues(aP2D1, aT1, myTolInt, aP2D2, aT2, myTolInt);
+  }
+  else {
+    myErrorStatus=10;
+    return;
+  }
+}
+//=======================================================================
+//function : CorrectWire
+//purpose  : 
+//=======================================================================
+Standard_Boolean CorrectWire(const TopoDS_Wire& aW,
+			     const TopoDS_Face& aF)
+{
+  Standard_Boolean bRet;
+  Standard_Real aTolInt;
+  Standard_Integer iErr, aNbV, aNbE;
+  TopoDS_Iterator aItW, aItE;
+  Geom2dInt_GInter aInter;
+  GEOMAlgo_DataMapOfShapeInfoEdge aDMEIE;
+  TopTools_DataMapOfShapeListOfShape aDMVLE;
+  TopTools_DataMapIteratorOfDataMapOfShapeListOfShape aItDMVLE;
+  //
+  bRet=Standard_False;
+  aTolInt=1.0e-10;
+  //
+  aItW.Initialize(aW);
+  for (; aItW.More(); aItW.Next()) {
+    const TopoDS_Edge& aE=*((TopoDS_Edge*)&aItW.Value());
+    
+    aItE.Initialize(aE);
+    for (aNbV=0; aItE.More(); aItE.Next(), ++aNbV) {
+    }
+    if (aNbV<2) {
+      return bRet; //
+    }
+    //
+    if (!aDMEIE.IsBound(aE)) {
+      GEOMAlgo_InfoEdge aInfoEdge;
+      //
+      aInfoEdge.Init (aE, aF);
+      iErr=aInfoEdge.ErrorStatus();
+      if (iErr) {
+	return bRet; //
+      }
+      //
+      aDMEIE.Bind(aE, aInfoEdge);
+    }
+    //
+    aItE.Initialize(aE);
+    for (; aItE.More(); aItE.Next()) {
+      const TopoDS_Shape& aV=aItE.Value();
+      if (aDMVLE.IsBound(aV)) {
+	TopTools_ListOfShape& aLE=aDMVLE.ChangeFind(aV);
+	aLE.Append(aE);
+      }
+      else {
+	TopTools_ListOfShape aLE;
+	aLE.Append(aE);
+	aDMVLE.Bind(aV, aLE);
+      }
+    }
+  }
+  //
+  // 2
+  Standard_Real aTolV, aD1, aD2, aDmax, aCoeff;
+  gp_Pnt aPV;
+  Handle(Geom_Surface) aS;
+  BRep_Builder aBB;
+  //
+  aCoeff=1.1;
+  aS=BRep_Tool::Surface(aF);
+  //
+  aItDMVLE.Initialize(aDMVLE);
+  for(; aItDMVLE.More(); aItDMVLE.Next()) {
+    const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aItDMVLE.Key());
+    const TopTools_ListOfShape& aLE=aItDMVLE.Value();
+    aNbE=aLE.Extent();
+    if (aNbE!=2) {
+      continue;
+    }
+    //
+    aPV=BRep_Tool::Pnt(aV);
+    aTolV=BRep_Tool::Tolerance(aV);
+    //
+    const TopoDS_Edge& aE1=*((TopoDS_Edge*)&aLE.First());
+    const GEOMAlgo_InfoEdge& aIE1=aDMEIE.Find(aE1); 
+    const Geom2dAdaptor_Curve& aGAC1=aIE1.Adaptor();
+    const IntRes2d_Domain& aDomain1=aIE1.Domain();
+    //
+    const TopoDS_Edge& aE2=*((TopoDS_Edge*)&aLE.Last()); 
+    const GEOMAlgo_InfoEdge& aIE2=aDMEIE.Find(aE2);
+    const Geom2dAdaptor_Curve& aGAC2=aIE2.Adaptor();
+    const IntRes2d_Domain& aDomain2=aIE2.Domain();
+    //
+    aInter.Perform(aGAC1, aDomain1,aGAC2, aDomain2, aTolInt, aTolInt);
+    if(!aInter.IsDone()) { 
+      continue;
+    }
+    //
+    Standard_Integer i, aNbP;
+    Standard_Real aIP_ParamOnFirst, aIP_ParamOnSecond;
+    gp_Pnt aP3D1, aP3D2;
+    gp_Pnt2d aP2D1, aP2D2;
+    IntRes2d_Transition aTr1, aTr2;
+    //
+    aNbP=aInter.NbPoints();
+    for (i=1; i<=aNbP; ++i) {
+      const IntRes2d_IntersectionPoint& aIP = aInter.Point(i);
+      aIP_ParamOnFirst  = aIP.ParamOnFirst();
+      aIP_ParamOnSecond = aIP.ParamOnSecond();
+      aTr1 =aIP.TransitionOfFirst();
+      aTr2 =aIP.TransitionOfSecond();
+      if(aTr1.PositionOnCurve()==IntRes2d_Middle ||
+	 aTr2.PositionOnCurve()==IntRes2d_Middle) {
+	//
+	const Handle(Geom_Curve)& aC3D1=aIE1.Curve();
+	if (!aC3D1.IsNull()) {
+	  aP3D1=aC3D1->Value(aIP_ParamOnFirst);
+	}
+	else {
+	  aP2D1=aGAC1.Value(aIP_ParamOnFirst);
+	  aS->D0(aP2D1.X(), aP2D1.Y(), aP3D1);
+	}
+	//
+	const Handle(Geom_Curve)& aC3D2=aIE2.Curve();   
+	if (!aC3D2.IsNull()) {
+	  aP3D2=aC3D2->Value(aIP_ParamOnSecond);
+	}
+	else {
+	  aP2D2=aGAC2.Value(aIP_ParamOnSecond);
+	  aS->D0(aP2D2.X(), aP2D2.Y(), aP3D2);
+	}
+	//
+	aD1=aPV.Distance(aP3D1);
+	aD2=aPV.Distance(aP3D2);
+	aDmax=(aD1>aD2)? aD1 : aD2;
+	if (aDmax>aCoeff*aTolV) {
+	  if (aDmax<10.*aTolV){
+	    aBB.UpdateVertex(aV, aDmax);
+	    bRet=Standard_True;
+	  }
+	}
+      }//
+    }//for (i=1; i<=aNbP; ++i) {
+  }//for(; aItDMVLE.More(); aItDMVLE.Next()) {
+  return bRet;
+}
+
+

src/GEOMAlgo/Makefile.am

@@ -103,6 +103,7 @@ dist_libGEOMAlgo_la_SOURCES =			\
 	GEOMAlgo_SurfaceTools.cxx		\
 	GEOMAlgo_Tools3D.cxx			\
 	GEOMAlgo_Tools.cxx			\
+	GEOMAlgo_Tools_1.cxx			\
 	GEOMAlgo_VertexSolid.cxx		\
 	GEOMAlgo_WESCorrector.cxx		\
 	GEOMAlgo_WireEdgeSet.cxx		\