Tolerance post Build (Perform) fix was changed for:

- BRepBuilderAPI_Sewing,
- BRepFeat_MakePrism,
- BRepFilletAPI_MakeChamfer,
- BRepFilletAPI_MakeFillet,
- BRepOffsetAPI_MakePipe,
- BRepOffsetAPI_MakePipeShell
so that input shapes remain unchanged by the fix.

Tolerance post Build (Perform) fix was slightly changed for:
- BRepOffsetAPI_NormalProjection,
- ShapeFix_Shape,
- ShapeUpgrade_ShapeDivide.

Correction of tolerances in input shapes was made for tests:
- blend buildevol F9,
-       complex B6,
-               B8,
-               D5,
-               E2,
-               E4,
-               E6,
-               E9,
- sewing tol_0_01 G3,
-                 G4.

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cdl b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cdl
index b04686613e33be8e8684b22a1b28c49cd680bfa1..51ee751c51b788abe1551183622d7aad861bcfa4 100755 (executable)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cdl
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cdl
@@ -212,6 +212,9 @@ is
     raises NoSuchObject from Standard; -- raised if shape has not been modified
        ---Purpose: Gives a modifieded subshape
        
+    IsProtectedFromModification(me; theS : Shape from TopoDS) returns Boolean;
+      ---Purpose: Indicates if theS is protected from modification.
+
     Dump(me);
        ---Purpose: print the informations
 
@@ -554,4 +557,6 @@ fields
 
     myReShape        : ReShape from BRepTools is protected;
     myMergedEdges    : MapOfShape from TopTools;
+
+    myProtectedFromModificationShapes : IndexedMapOfShape from TopTools;
 end Sewing;

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
index b2b021201769bb782f9a2b75a4f9ad36c7f93a35..0cf12318ff775f9961ba9e2ff362367d916c270b 100755 (executable)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
@@ -55,6 +55,7 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 #include <BRepTools_Quilt.hxx>
 #include <BSplCLib.hxx>
 #include <Extrema_ExtPC.hxx>
@@ -1736,7 +1737,12 @@ void BRepBuilderAPI_Sewing::Load(const TopoDS_Shape& theShape)
 {
   myReShape->Clear();
   if (theShape.IsNull()) myShape.Nullify();
-  else myShape = myReShape->Apply(theShape);
+  else
+  {
+    TopExp::MapShapes(theShape, myProtectedFromModificationShapes);
+    //
+    myShape = myReShape->Apply(theShape);
+  }
   mySewedShape.Nullify();
   // Nullify flags and counters
   myNbShapes = myNbEdges = myNbVertices = 0;
@@ -1766,6 +1772,9 @@ void BRepBuilderAPI_Sewing::Load(const TopoDS_Shape& theShape)
 void BRepBuilderAPI_Sewing::Add(const TopoDS_Shape& aShape)
 {
   if (aShape.IsNull()) return;
+  //
+  TopExp::MapShapes(aShape, myProtectedFromModificationShapes);
+  //
   TopoDS_Shape oShape = myReShape->Apply(aShape);
   myOldShapes.Add(aShape,oShape);
   myNbShapes = myOldShapes.Extent();
@@ -1909,7 +1918,8 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
       mySewedShape.Nullify();
       return;
     }
-    BRepLib::UpdateTolerances(mySewedShape);
+    BRepLib_ToleranceRule::SetProperTolerances(
+      mySewedShape, *this);
   }
 #if DEB
   chr_total.Stop();
@@ -2148,6 +2158,16 @@ TopoDS_Shape BRepBuilderAPI_Sewing::ModifiedSubShape(const TopoDS_Shape& aShape)
   return myReShape->Apply(aShape);
 }
 
+//=======================================================================
+//function : IsProtectedFromModification
+//purpose  :
+//=======================================================================
+Standard_Boolean BRepBuilderAPI_Sewing::IsProtectedFromModification(
+  const TopoDS_Shape & theS) const
+{
+  return myProtectedFromModificationShapes.Contains(theS);
+}
+
 //=======================================================================
 //function : Dump
 //purpose  : 

diff --git a/src/BRepFeat/BRepFeat_MakePrism.cdl b/src/BRepFeat/BRepFeat_MakePrism.cdl
index d3d3df3d064fcb9ecae6af24f68d3cd0eb4aac02..88a341db21b84cf997f8fb8f8be111545eb76449 100755 (executable)
--- a/src/BRepFeat/BRepFeat_MakePrism.cdl
+++ b/src/BRepFeat/BRepFeat_MakePrism.cdl
@@ -168,6 +168,10 @@ is
     BarycCurve(me: in out)    
        returns Curve from Geom;
        ---Purpose: Generates a curve along the center of mass of the primitive.
+
+    IsProtectedFromModification(me; theS : Shape from TopoDS)
+    returns Boolean from Standard;
+      ---Purpose: Indicates if theS is protected from modification.
 fields
 
     myPbase  : Shape                     from TopoDS;
@@ -176,5 +180,6 @@ fields
     myCurves : SequenceOfCurve           from TColGeom;
     myBCurve : Curve                     from Geom;
     myStatusError : StatusError          from BRepFeat;
+    myProtectedFromModificationShapes : IndexedMapOfShape from TopTools;
 
 end MakePrism;

diff --git a/src/BRepFeat/BRepFeat_MakePrism.cxx b/src/BRepFeat/BRepFeat_MakePrism.cxx
index 36aa37ceb68586d4b8d73a38455ac9dc714017a9..5134ca56416cd8422c25bda910bbe623624cef1e 100755 (executable)
--- a/src/BRepFeat/BRepFeat_MakePrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakePrism.cxx
@@ -45,7 +45,7 @@
 
 #include <BRep_Tool.hxx>
 
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 
 #include <BRepTools.hxx>
 
@@ -141,6 +141,10 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
   Standard_Boolean trc = BRepFeat_GettraceFEAT();
   if (trc) cout << "BRepFeat_MakePrism::Init" << endl;
 #endif
+  TopExp::MapShapes(Sbase,  myProtectedFromModificationShapes);
+  TopExp::MapShapes(Pbase,  myProtectedFromModificationShapes);
+  TopExp::MapShapes(Skface, myProtectedFromModificationShapes);
+  //
   mySkface = Skface;
   SketchFaceValid();
   mySbase  = Sbase;
@@ -206,6 +210,8 @@ void BRepFeat_MakePrism::Add(const TopoDS_Edge& E,
   Standard_Boolean trc = BRepFeat_GettraceFEAT();
   if (trc) cout << "BRepFeat_MakePrism::Add(Edge,face)" << endl;
 #endif
+  TopExp::MapShapes(E, myProtectedFromModificationShapes);
+  //
   TopExp_Explorer exp;
   for (exp.Init(mySbase,TopAbs_FACE);exp.More();exp.Next()) {
     if (exp.Current().IsSame(F)) {
@@ -366,6 +372,8 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
   Standard_Boolean trc = BRepFeat_GettraceFEAT();
   if (trc) cout << "BRepFeat_MakePrism::Perform(Until)" << endl;
 #endif
+  TopExp::MapShapes(Until, myProtectedFromModificationShapes);
+  //
   if (Until.IsNull()) {
     Standard_ConstructionError::Raise();
   }
@@ -465,7 +473,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
       }
     }         
   }
-  BRepLib::UpdateTolerances(myShape);
+  BRepLib_ToleranceRule::SetProperTolerances(myShape, *this);
 /*   // loop of control of descendance
 
   TopExp_Explorer expr(mySbase, TopAbs_FACE);
@@ -517,6 +525,9 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& From,
   Standard_Boolean trc = BRepFeat_GettraceFEAT();
   if (trc) cout << "BRepFeat_MakePrism::Perform(From,Until)" << endl;
 #endif
+  TopExp::MapShapes(From,  myProtectedFromModificationShapes);
+  TopExp::MapShapes(Until, myProtectedFromModificationShapes);
+  //
   if (From.IsNull() || Until.IsNull()) {
     Standard_ConstructionError::Raise();
   }
@@ -788,6 +799,8 @@ void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)
   Standard_Boolean trc = BRepFeat_GettraceFEAT();
   if (trc) cout << "BRepFeat_MakePrism::PerformFromEnd(From,Until)" << endl;
 #endif
+  TopExp::MapShapes(Until, myProtectedFromModificationShapes);
+  //
   if (Until.IsNull()) {
     Standard_ConstructionError::Raise();
   }
@@ -991,6 +1004,8 @@ void BRepFeat_MakePrism::PerformUntilHeight(const TopoDS_Shape& Until,
   Standard_Boolean trc = BRepFeat_GettraceFEAT();
   if (trc) cout << "BRepFeat_MakePrism::PerformUntilHeight(Until,Length)" << endl;
 #endif
+  TopExp::MapShapes(Until, myProtectedFromModificationShapes);
+  //
   if (Until.IsNull()) {
     Perform(Length);
   }
@@ -1435,8 +1450,12 @@ Standard_Boolean ToFuse(const TopoDS_Face& F1,
   return ValRet;
 }
 
-
-
-
-
-
+//=======================================================================
+//function : IsProtectedFromModification
+//purpose  :
+//=======================================================================
+Standard_Boolean BRepFeat_MakePrism::IsProtectedFromModification(
+  const TopoDS_Shape & theS) const
+{
+  return myProtectedFromModificationShapes.Contains(theS);
+}

diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl
index 5d6dfb19ca506a8abba53bd364675620c77d52dd..2c7b2dd312ef429c8548e4876518ed0f72906400 100755 (executable)
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl
@@ -379,6 +379,10 @@ is
     returns Boolean
     is redefined virtual;
 
+    IsProtectedFromModification(me; theS : Shape from TopoDS)
+    returns Boolean from Standard;
+      ---Purpose: Indicates if theS is protected from modification.
+
     -------------------------------
     ---Methods for quick simulation
     -------------------------------
@@ -396,6 +400,7 @@ fields
 
     myBuilder : ChBuilder  from ChFi3d;
     myMap     : MapOfShape from TopTools;
+    myProtectedFromModificationShapes : IndexedMapOfShape from TopTools;
     
 end MakeChamfer;
 

diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
index a6da6c646394a747bbc70c4f3b2f6a1194d89006..538f3f999cf9ca28cf933edcbafcffb8071fe9f5 100755 (executable)
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
@@ -25,7 +25,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <TopExp_Explorer.hxx>
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
+#include <TopExp.hxx>
 
 
 
@@ -35,6 +36,7 @@
 //=======================================================================
 BRepFilletAPI_MakeChamfer::BRepFilletAPI_MakeChamfer(const TopoDS_Shape &S):myBuilder(S)
 {
+  TopExp::MapShapes(S, myProtectedFromModificationShapes);
 }
 
 
@@ -392,7 +394,7 @@ void BRepFilletAPI_MakeChamfer::Build()
   if (myBuilder.IsDone()){
     Done();
     myShape = myBuilder.Shape();
-    BRepLib::UpdateTolerances(myShape);
+    BRepLib_ToleranceRule::SetProperTolerances(myShape, *this);
       
       //creation of the Map.
     TopExp_Explorer ex;
@@ -472,6 +474,16 @@ Standard_Boolean BRepFilletAPI_MakeChamfer::IsDeleted(const TopoDS_Shape& F)
   return Standard_True;    
 }
 
+//=======================================================================
+//function : IsProtectedFromModification
+//purpose  :
+//=======================================================================
+Standard_Boolean BRepFilletAPI_MakeChamfer::IsProtectedFromModification(
+  const TopoDS_Shape & theS) const
+{
+  return myProtectedFromModificationShapes.Contains(theS);
+}
+
 //=======================================================================
 //function : Simulate
 //purpose  : 

diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl
index 07a6e88296ab8fd2f86c7b60d8f6bae8e096053e..45b7494ad39f84c89f20497f25b625f346de651d 100755 (executable)
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl
@@ -450,6 +450,10 @@ is
     returns Boolean
     is redefined virtual;
 
+    IsProtectedFromModification(me; theS : Shape from TopoDS)
+    returns Boolean from Standard;
+      ---Purpose: Indicates if theS is protected from modification.
+
     -------------------------------------------
     -- Methods usefull for BRepCtx utilities --
     -------------------------------------------
@@ -538,5 +542,6 @@ fields
 
     myBuilder : FilBuilder from ChFi3d;
     myMap     : MapOfShape from TopTools;
+    myProtectedFromModificationShapes : IndexedMapOfShape from TopTools;
 
 end MakeFillet;

diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
index b8ccc2f031be606160bc698cbed92b39eba4d2f1..fa359323306e9e75228ad213f93564643fbaa1e4 100755 (executable)
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
@@ -30,7 +30,8 @@
 #include <Law_Linear.hxx>
 #include <Law_S.hxx>
 #include <Law_Interpol.hxx>
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
+#include <TopExp.hxx>
 
 //=======================================================================
 //function : BRepFilletAPI_MakeFillet
@@ -41,6 +42,7 @@ BRepFilletAPI_MakeFillet::BRepFilletAPI_MakeFillet(const TopoDS_Shape& S,
                                       const ChFi3d_FilletShape FShape):
    myBuilder(S,FShape)
 {
+  TopExp::MapShapes(S, myProtectedFromModificationShapes);
 }
 
 //=======================================================================
@@ -533,7 +535,7 @@ void BRepFilletAPI_MakeFillet::Build()
   if(myBuilder.IsDone()) {
     Done();
     myShape = myBuilder.Shape();
-    BRepLib::UpdateTolerances(myShape);
+    BRepLib_ToleranceRule::SetProperTolerances(myShape, *this);
 
     // creation of the Map.
     TopExp_Explorer ex;
@@ -667,6 +669,16 @@ Standard_Boolean BRepFilletAPI_MakeFillet::IsDeleted(const TopoDS_Shape& F)
   return Standard_True;    
 }
 
+//=======================================================================
+//function : IsProtectedFromModification
+//purpose  :
+//=======================================================================
+Standard_Boolean BRepFilletAPI_MakeFillet::IsProtectedFromModification(
+  const TopoDS_Shape & theS) const
+{
+  return myProtectedFromModificationShapes.Contains(theS);
+}
+
 //=======================================================================
 //function : NbFaultyContours
 //purpose  : 

diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl
index 1d1b6032cdc58044b90ccf1974ff8afc123423f0..ce7f11cb933cf4e8ff8394b99f336f5d989dd45c 100755 (executable)
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl
@@ -86,8 +86,14 @@ is
     returns Shape from TopoDS;
 
 
+    IsProtectedFromModification(me; theS : Shape from TopoDS)
+      ---Purpose: Indicates if theS is protected from modification.
+    returns Boolean from Standard;
+
 fields
 
     myPipe : Pipe from BRepFill;
 
+    myProtectedFromModificationShapes : IndexedMapOfShape from TopTools;
+
 end MakePipe; 

diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
index 8b06baa3d7f46fadc0623adfdb02d17a777d9b94..d6ce5a7f597477c9fd8342fd3eb79408d09f6b04 100755 (executable)
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
@@ -21,13 +21,14 @@
 
 #include <BRepOffsetAPI_MakePipe.ixx>
 
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS.hxx>
 #include <TopAbs_ShapeEnum.hxx>
+#include <TopExp.hxx>
 
 //=======================================================================
 //function : BRepOffsetAPI_MakePipe
@@ -38,6 +39,8 @@ BRepOffsetAPI_MakePipe::BRepOffsetAPI_MakePipe(const TopoDS_Wire&  Spine ,
                                   const TopoDS_Shape& Profile)
      : myPipe(Spine, Profile)
 {
+  TopExp::MapShapes(Profile, myProtectedFromModificationShapes);
+  //
   Build();
 }
 
@@ -60,7 +63,7 @@ const BRepFill_Pipe& BRepOffsetAPI_MakePipe::Pipe() const
 void BRepOffsetAPI_MakePipe::Build() 
 {
   myShape = myPipe.Shape();
-  BRepLib::UpdateTolerances(myShape);
+  BRepLib_ToleranceRule::SetProperTolerances(myShape, *this);
   Done();
 }
 
@@ -107,3 +110,12 @@ TopoDS_Shape BRepOffsetAPI_MakePipe::Generated (const TopoDS_Shape& SSpine,
   return bid;
 }
 
+//=======================================================================
+//function : IsProtectedFromModification
+//purpose  :
+//=======================================================================
+Standard_Boolean BRepOffsetAPI_MakePipe::IsProtectedFromModification(
+  const TopoDS_Shape & theS) const
+{
+  return myProtectedFromModificationShapes.Contains(theS);
+}

diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl
index 1141a12fac089fdcbb80d53a85bf45471a692b70..682e5e108f503734159f620fa29198d549630eaf 100755 (executable)
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl
@@ -320,9 +320,15 @@ is
     returns ListOfShape from TopTools
     is redefined; 
      
+    IsProtectedFromModification(me; theS : Shape)
+      ---Purpose: Indicates if theS is protected from modification.
+    returns Boolean;
+
 fields 
   myPipe  :  PipeShell  from  BRepFill;
 
+  myProtectedFromModificationShapes : IndexedMapOfShape from TopTools;
+
 end MakePipeShell;
 
 

diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
index de3fb850058c306e834b71a3af323222fd8316f0..b0ece929653b7f3109b279aa85fc8d692a944756 100755 (executable)
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
@@ -22,10 +22,11 @@
 
 #include <BRepOffsetAPI_MakePipeShell.ixx>
 
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 #include <GeomFill_PipeError.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>
+#include <TopExp.hxx>
 
 //=======================================================================
 //function :
@@ -96,6 +97,7 @@ BRepOffsetAPI_MakePipeShell::BRepOffsetAPI_MakePipeShell(const TopoDS_Wire& Spin
                                       const Standard_Boolean WithContact,
                                       const Standard_Boolean WithCorrection) 
 {
+  TopExp::MapShapes(Profile, myProtectedFromModificationShapes);
   myPipe->Add(Profile, WithContact, WithCorrection);
 }
 
@@ -108,6 +110,7 @@ BRepOffsetAPI_MakePipeShell::BRepOffsetAPI_MakePipeShell(const TopoDS_Wire& Spin
                                       const Standard_Boolean WithContact,
                                       const Standard_Boolean WithCorrection) 
 {
+  TopExp::MapShapes(Profile, myProtectedFromModificationShapes);
   myPipe->Add(Profile, Location, WithContact, WithCorrection);
 }
 
@@ -120,6 +123,7 @@ BRepOffsetAPI_MakePipeShell::BRepOffsetAPI_MakePipeShell(const TopoDS_Wire& Spin
                                          const Standard_Boolean WithContact,
                                          const Standard_Boolean WithCorrection) 
 {
+  TopExp::MapShapes(Profile, myProtectedFromModificationShapes);
   myPipe->SetLaw(Profile, L, WithContact, WithCorrection);
 }
 
@@ -133,6 +137,7 @@ BRepOffsetAPI_MakePipeShell::BRepOffsetAPI_MakePipeShell(const TopoDS_Wire& Spin
                                          const Standard_Boolean WithContact,
                                          const Standard_Boolean WithCorrection) 
 {
+  TopExp::MapShapes(Profile, myProtectedFromModificationShapes);
   myPipe->SetLaw(Profile, L, Location, WithContact, WithCorrection);
 }
 
@@ -226,7 +231,7 @@ void BRepOffsetAPI_MakePipeShell::Delete( const TopoDS_Shape& Profile)
   Ok = myPipe->Build();
   if (Ok) {
     myShape = myPipe->Shape();
-    BRepLib::UpdateTolerances(myShape);
+    BRepLib_ToleranceRule::SetProperTolerances(myShape, *this);
     Done();
   }
   else NotDone(); 
@@ -274,3 +279,12 @@ BRepOffsetAPI_MakePipeShell::Generated(const TopoDS_Shape& S)
   return myGenerated;
 }
 
+//=======================================================================
+//function : IsProtectedFromModification
+//purpose  :
+//=======================================================================
+Standard_Boolean BRepOffsetAPI_MakePipeShell::IsProtectedFromModification(
+  const TopoDS_Shape & theS) const
+{
+  return myProtectedFromModificationShapes.Contains(theS);
+}

diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
index e8e9749b93cb2c3b134c88fce5db05de6cb09ffa..f2aacb4548517f0d2c68a3ddab095ebdb1fb40db 100755 (executable)
--- a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
@@ -20,7 +20,7 @@
 
 
 #include <BRepOffsetAPI_NormalProjection.ixx>
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 
 BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
 {
@@ -65,7 +65,7 @@ BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
 {
   myNormalProjector.Build();
   myShape = myNormalProjector.Projection();
-  BRepLib::UpdateTolerances(myShape);
+  BRepLib_ToleranceRule::SetProperTolerances(myShape);
   Done();
 }
 

diff --git a/src/ShapeFix/ShapeFix_Shape.cxx b/src/ShapeFix/ShapeFix_Shape.cxx
index fbe2d5ec01b8fc7fa172fb61345fd4a573703d42..66fbfa55ee2f37e0944fb861e7e3a524c26c7139 100755 (executable)
--- a/src/ShapeFix/ShapeFix_Shape.cxx
+++ b/src/ShapeFix/ShapeFix_Shape.cxx
@@ -33,7 +33,7 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 
 #include <ShapeFix.hxx>
 #include <ShapeBuild_ReShape.hxx>
@@ -103,7 +103,7 @@ void ShapeFix_Shape::Init(const TopoDS_Shape& shape)
 Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator)& theProgress)
 {
   Standard_Boolean aR = PerformR(theProgress);
-  BRepLib::UpdateTolerances(myResult);
+  BRepLib_ToleranceRule::SetProperTolerances(myResult);
   return aR;
 }
 

diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
index 254e0c35728113f279c0b9988b1dbe6bc023deb8..8962386d277727606ead6006c6dff4fa2ff1ddc2 100755 (executable)
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
@@ -37,7 +37,7 @@
 #include <ShapeUpgrade_WireDivide.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
-#include <BRepLib.hxx>
+#include <BRepLib_ToleranceRule.hxx>
 
 //=======================================================================
 //function : ShapeUpgrade_ShapeDivide
@@ -175,7 +175,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
     if ( Status ( ShapeExtend_DONE ) ) {
       myResult = myContext->Apply ( C, TopAbs_SHAPE );
       myContext->Replace ( myShape, myResult );
-      BRepLib::UpdateTolerances(myResult);
+      BRepLib_ToleranceRule::SetProperTolerances(myResult);
       return Standard_True;
     }
     myResult = myShape;
@@ -284,7 +284,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
     }
   }
   myResult = myContext->Apply ( myShape, TopAbs_SHAPE );
-  BRepLib::UpdateTolerances(myResult);
+  BRepLib_ToleranceRule::SetProperTolerances(myResult);
   return ! myResult.IsSame ( myShape );
 }
 

diff --git a/tests/blend/buildevol/F9 b/tests/blend/buildevol/F9
index cd89940ac68be9efa639b55f2e842a20aadd77c2..a1aff6f872fa7db0b292154b58e84be9ce5f9081 100644 (file)
--- a/tests/blend/buildevol/F9
+++ b/tests/blend/buildevol/F9
@@ -1,4 +1,5 @@
 restore [locate_data_file CFI_2_o12ffq.rle] s
+updatetolerance s
 explode s e
 
 mkevol result s

diff --git a/tests/blend/complex/B6 b/tests/blend/complex/B6
index 75136c155f89ee05836dfedaff9723d4ae44e50b..48f529f4b652e39115a4a27e2803cfffba79f809 100644 (file)
--- a/tests/blend/complex/B6
+++ b/tests/blend/complex/B6
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CTO900_pro12880c.rle] a
+updatetolerance a
 explode a e
 blend result a 5 a_89
 

diff --git a/tests/blend/complex/B8 b/tests/blend/complex/B8
index e48cc1a8ee90a39fa17421cc6e4665715bd38824..9a2117874770769a030bda81d5d983dab3fa734a 100644 (file)
--- a/tests/blend/complex/B8
+++ b/tests/blend/complex/B8
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CFI_pro12894.rle] a
+updatetolerance a
 explode a e
 blend result a 5 a_89
 

diff --git a/tests/blend/complex/D5 b/tests/blend/complex/D5
index f841944e12d14f194241c8d15407687830a54493..f900b75fff343981a2d4322ea8028454e31e035d 100644 (file)
--- a/tests/blend/complex/D5
+++ b/tests/blend/complex/D5
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CFI_ger60206.rle] a
+updatetolerance a
 explode a e
 mkevol result a
 updatevol a_21 0 0.5 1 1

diff --git a/tests/blend/complex/E2 b/tests/blend/complex/E2
index ed3742eb35cd127ea4e2b50384f17cfec9fe90a1..38cf1dec7d2ad4137c42f3aaeb11fd1acadf0e6f 100644 (file)
--- a/tests/blend/complex/E2
+++ b/tests/blend/complex/E2
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CFI_pro8792.rle] a
+updatetolerance a
 explode a e
 mkevol result a
 updatevol a_20 0 15 0.5 20 1 5

diff --git a/tests/blend/complex/E4 b/tests/blend/complex/E4
index 099e2e281a863aed6d0d253c8a874a53c06e263c..0ef6d74dfbce8020663a31384bef75dd8fad1ef3 100644 (file)
--- a/tests/blend/complex/E4
+++ b/tests/blend/complex/E4
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CFI_pro10631.rle] a
+updatetolerance a
 explode a e
 blend result a 5 a_45
 

diff --git a/tests/blend/complex/E6 b/tests/blend/complex/E6
index 15f8fc27c4077566ea1c830aba8f54e0b19a112e..b25c4f1f628cc335af34cb18c283aca137a313be 100644 (file)
--- a/tests/blend/complex/E6
+++ b/tests/blend/complex/E6
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CFI_pro10522.rle] a
+updatetolerance a
 explode a e
 blend result a 2 a_82
 

diff --git a/tests/blend/complex/E9 b/tests/blend/complex/E9
index 019310ec01006867ee18fb4b1169514e08b05d00..d9f1be77cd41a1dd01d2bc95d500b2a9dcb45eb1 100644 (file)
--- a/tests/blend/complex/E9
+++ b/tests/blend/complex/E9
@@ -5,6 +5,7 @@
 ## ====================================
 
 restore [locate_data_file CFI_pro10117.rle] a
+updatetolerance a
 explode a e
 blend result a 2 a_128 1 a_10
 

diff --git a/tests/sewing/tol_0_01/G3 b/tests/sewing/tol_0_01/G3
index 61e280f899c30f5959b2041099b74a6d65d402f2..e0abbaee8489ee251f82afa8c2be9c7108e92619 100644 (file)
--- a/tests/sewing/tol_0_01/G3
+++ b/tests/sewing/tol_0_01/G3
@@ -1 +1,2 @@
 restore [locate_data_file CCH_propag.rle] a
+updatetolerance a

diff --git a/tests/sewing/tol_0_01/G4 b/tests/sewing/tol_0_01/G4
index 22a7f0a317504c4e2b2c6861189b3b086e2683bd..6aebc42c3f2632aac6d56eb91492f2eda67eff12 100644 (file)
--- a/tests/sewing/tol_0_01/G4
+++ b/tests/sewing/tol_0_01/G4
@@ -1 +1,2 @@
 restore [locate_data_file CCH_r2.rle] a
+updatetolerance a