0029136: Tolerance is increased excessively during fixing same parameter on the edge.

Small modification in BRepFill_Sweep: to avoid exception, return status NotDone if construction of pipe surface fails.

src/BOPTest/BOPTest_TolerCommands.cxx

@@ -414,8 +414,7 @@ void ProcessVertex(const TopoDS_Vertex& aV,
   }
   //
   // Update Tolerance
-  // with a small margin
+  TV->Tolerance(aTolMax2);
-  TV->Tolerance(aTolMax2 + aTolMax2*0.0001);
 }
 //=======================================================================
 //function : breducetolerance

src/BRepCheck/BRepCheck.cxx

@@ -244,10 +244,6 @@ void BRepCheck::Print(const BRepCheck_Status stat,
   case BRepCheck_EnclosedRegion:
     OS << "BRepCheck_EnclosedRegion\n";
     break;
-  case BRepCheck_CollapsedEdge:
-    OS << "BRepCheck_CollapsedEdge\n";
-    break;
-
   default:
     break;
   }

src/BRepCheck/BRepCheck_Analyzer.cxx

@@ -123,66 +123,6 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
     {
       Handle(BRepCheck_Result)& aRes = myMap(S);
 
-      try
-      {
-        BRepCheck_Status ste = Handle(BRepCheck_Edge)::
-          DownCast(aRes)->CheckTolerance(TopoDS::Edge(S));
-
-        if(ste != BRepCheck_NoError)
-        {
-          Handle(BRepCheck_Edge)::DownCast(aRes)->SetStatus(ste);
-          break;
-        }
-      }
-      catch(Standard_Failure)
-      {
-#ifdef DEB
-        cout<<"BRepCheck_Analyzer : ";
-        Standard_Failure::Caught()->Print(cout);  
-        cout<<endl;
-#endif
-        if ( ! myMap(S).IsNull() )
-        {
-          myMap(S)->SetFailStatus(S);
-        }
-
-        if ( ! aRes.IsNull() )
-        {
-          aRes->SetFailStatus(exp.Current());
-          aRes->SetFailStatus(S);
-        }
-      }
-
-      TopTools_MapOfShape MapS;
-
-      for (exp.Init(S,TopAbs_VERTEX);exp.More(); exp.Next())
-      {
-        const TopoDS_Shape& aVertex = exp.Current();
-        try
-        {
-          OCC_CATCH_SIGNALS
-          if (MapS.Add(aVertex))
-            myMap(aVertex)->InContext(S);
-        }
-        catch (Standard_Failure)
-        {
-#ifdef DEB
-          cout << "BRepCheck_Analyzer : ";
-          Standard_Failure::Caught()->Print(cout);
-          cout << endl;
-#endif
-          if (!myMap(S).IsNull())
-            myMap(S)->SetFailStatus(S);
-
-          Handle(BRepCheck_Result) aVertexRes = myMap(aVertex);
-
-          if (!aVertexRes.IsNull())
-          {
-            aVertexRes->SetFailStatus(aVertex);
-            aVertexRes->SetFailStatus(S);
-          }
-        } 
-      }
       try
       {
         BRepCheck_Status ste = Handle(BRepCheck_Edge)::
@@ -200,7 +140,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
         std::cout<<std::endl;
 #endif
         (void)anException;
-        if (!myMap(S).IsNull())
+        if ( ! myMap(S).IsNull() )
         {
           myMap(S)->SetFailStatus(S);
         }
@@ -211,7 +151,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
         }
       }
 
-      TopTools_MapOfShape avertexMap;
+      TopTools_MapOfShape MapS;
       
       for (exp.Init(S,TopAbs_VERTEX);exp.More(); exp.Next())
       {
@@ -219,7 +159,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
         try
         {
           OCC_CATCH_SIGNALS
-          if (avertexMap.Add(aVertex))
+          if (MapS.Add(aVertex))
             myMap(aVertex)->InContext(S);
         }
         catch(Standard_Failure const& anException) {
@@ -316,12 +256,6 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
                   performwire = Standard_False;
                   break;
                 }
-
-                //if(ste == BRepCheck_CollapsedEdge)
-                //{
-                //  isInvalidTolerance = Standard_True;
-                //  break;
-                //}
               }
             }
           }

src/BRepCheck/BRepCheck_Edge.cxx

@@ -27,15 +27,6 @@
 #include <BRep_PolygonOnTriangulation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_TFace.hxx>
-
-#include <BRepAdaptor_Curve.hxx>
-
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_GCurve.hxx>
-#include <BRep_CurveOnSurface.hxx>
-
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepCheck.hxx>
@@ -49,10 +40,6 @@
 #include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
-
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
@@ -73,23 +60,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <Precision.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Edge,BRepCheck_Result)
-//Golden ratio
-static const Standard_Real  GoldRatio = (sqrt(5.0)-1)/2.0;
-
-static const Standard_Real  DivPoints[] = {
-                                            GoldRatio,
-                                            1.0-GoldRatio,
-                                            4.0*GoldRatio-2.0,
-                                            3.0-4.0*GoldRatio,
-                                            0.5
-                                          };
-
-static const Standard_Integer maxNIter = sizeof(DivPoints)/sizeof(DivPoints[0]);
-
 
 //modified by NIZNHY-PKV Thu May 05 09:01:57 2011f
 static 
@@ -97,7 +69,6 @@ static
   const Adaptor3d_CurveOnSurface&,
   const Standard_Real,
   const Standard_Boolean);
-
 static
   void PrintProblematicPoint(const gp_Pnt&,
   const Standard_Real,
@@ -154,7 +125,7 @@ void BRepCheck_Edge::Minimum()
     if (!SameRange && SameParameter) {
       BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
     }
-//    Handle(Geom_Curve) C3d;
+    //    Handle(Geom_Curve) C3d;
 
     while (itcr.More()) {
       const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@@ -318,7 +289,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
   Standard_Real Tol = BRep_Tool::Tolerance(TopoDS::Edge(myShape));
 
   TopAbs_ShapeEnum styp = S.ShapeType();
-//  for (TopExp_Explorer exp(S,TopAbs_EDGE); exp.More(); exp.Next()) {
+  //  for (TopExp_Explorer exp(S,TopAbs_EDGE); exp.More(); exp.Next()) {
   TopExp_Explorer exp(S,TopAbs_EDGE) ;
   for ( ; exp.More(); exp.Next()) {
     if (exp.Current().IsSame(myShape)) {
@@ -334,11 +305,6 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
   {
   case TopAbs_WIRE:
     {
-      //if (CheckTolerance(TopoDS::Edge(myShape)) == BRepCheck_CollapsedEdge)
-      //{
-      //  BRepCheck::Add(lst,BRepCheck_CollapsedEdge);
-      //  return;
-      //}
     }
     break;
 
@@ -347,8 +313,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
 
       Standard_Boolean SameParameter = TE->SameParameter();
       Standard_Boolean SameRange = TE->SameRange();
-
+      //  Modified by skv - Tue Apr 27 11:48:13 2004 Begin
-//  Modified by skv - Tue Apr 27 11:48:13 2004 Begin
       if (!SameParameter || !SameRange) {
         if (!SameParameter)
           BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
@@ -357,7 +322,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
 
         return;
       }
-//  Modified by skv - Tue Apr 27 11:48:14 2004 End
+      //  Modified by skv - Tue Apr 27 11:48:14 2004 End
       Standard_Real First = myHCurve->FirstParameter();
       Standard_Real Last  = myHCurve->LastParameter();
 
@@ -386,13 +351,13 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
             ll = myCref->Curve3D()->TransformedParameter(l, Etrsf);
           }
           // gka OCC
-//  Modified by skv - Tue Apr 27 11:50:35 2004 Begin
+          //  Modified by skv - Tue Apr 27 11:50:35 2004 Begin
           if (Abs(ff-First) > eps ||
               Abs(ll-Last)  > eps) {
               BRepCheck::Add(lst,BRepCheck_InvalidSameRangeFlag);
               BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
           }
-//  Modified by skv - Tue Apr 27 11:50:37 2004 End
+          //  Modified by skv - Tue Apr 27 11:50:37 2004 End
           //
           const Handle(Geom2d_Curve)& pc = cr->PCurve();
           Standard_Boolean IsPeriodic = pc->IsPeriodic();
@@ -427,7 +392,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
           if (myGctrl) {
             Handle(Geom_Surface) Sb = cr->Surface();
             Sb = Handle(Geom_Surface)::DownCast
-//	      (Su->Transformed(L.Transformation()));
+              //	      (Su->Transformed(L.Transformation()));
               (Su->Transformed(/*L*/(Floc * TFloc).Transformation()));
             Handle(Geom2d_Curve) PC = cr->PCurve();
             Handle(GeomAdaptor_Surface) GAHS = new GeomAdaptor_Surface(Sb);
@@ -441,12 +406,12 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
               else {
                 BRepCheck::Add(lst,BRepCheck_InvalidCurveOnSurface);
               }
-//  Modified by skv - Tue Apr 27 11:53:00 2004 Begin
+              //  Modified by skv - Tue Apr 27 11:53:00 2004 Begin
               BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
-// 	      if (SameParameter) {
+              // 	      if (SameParameter) {
-// 		BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
+              // 		BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
-// 	      }
+              // 	      }
-//  Modified by skv - Tue Apr 27 11:53:01 2004 End
+              //  Modified by skv - Tue Apr 27 11:53:01 2004 End
             }
             if (cr->IsCurveOnClosedSurface()) {
               GHPC->Load(cr->PCurve2(),f,l); // same bounds
@@ -454,11 +419,11 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
               ok = Validate(*myHCurve,ACS,Tol,SameParameter);
               if (!ok) {
                 BRepCheck::Add(lst,BRepCheck_InvalidCurveOnClosedSurface);
-//  Modified by skv - Tue Apr 27 11:53:20 2004 Begin
+                //  Modified by skv - Tue Apr 27 11:53:20 2004 Begin
                 if (SameParameter) {
                   BRepCheck::Add(lst,BRepCheck_InvalidSameParameterFlag);
                 }
-//  Modified by skv - Tue Apr 27 11:53:23 2004 End
+                //  Modified by skv - Tue Apr 27 11:53:23 2004 End
               }
             }
           }
@@ -557,12 +522,12 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
 
 void BRepCheck_Edge::Blind()
 {
-//  Modified by skv - Tue Apr 27 11:36:01 2004 Begin
+  //  Modified by skv - Tue Apr 27 11:36:01 2004 Begin
-// The body of this function is removed because of its useless.
+  // The body of this function is removed because of its useless.
   if (!myBlind) {
     myBlind = Standard_True;
   }
-//  Modified by skv - Tue Apr 27 11:36:02 2004 End
+  //  Modified by skv - Tue Apr 27 11:36:02 2004 End
 }
 
 
@@ -591,14 +556,12 @@ Standard_Boolean BRepCheck_Edge::GeometricControls() const
 //function :   SetStatus
 //purpose  : 
 //=======================================================================
-
 void BRepCheck_Edge::SetStatus(const BRepCheck_Status theStatus)
 {
   BRepCheck::Add(myMap(myShape),theStatus);
 }
 
 
-
 //=======================================================================
 //function : Tolerance
 //purpose  : 
@@ -814,127 +777,6 @@ BRepCheck_Status BRepCheck_Edge::
 
   return BRepCheck_NoError;
 }
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRep_TVertex.hxx>
-#include <DBRep.hxx>
-//=======================================================================
-//function : CheckTolerance
-//purpose  : Cheks, if theEdge lies entirely into sphere, center of which
-//            is middle point of line segment, which joins first and last 
-//            vertex of an edge, and radius is aTol (see function's body).
-//=======================================================================
-BRepCheck_Status BRepCheck_Edge::CheckTolerance(const TopoDS_Edge& theEdge)
-{
-  BRepCheck_Status aStatus = BRepCheck_NoError;
-  Standard_Real aTol1 = 1.0e-7, aTol2 = 1.0e-7;
-  
-  if(BRep_Tool::Degenerated(theEdge))
-  {
-    aStatus = BRepCheck_NoError;
-    return aStatus;
-  }
-
-  TopoDS_Vertex aV1 = TopExp::FirstVertex(theEdge),
-                aV2 = TopExp::LastVertex(theEdge);
-
-  if(aV2.IsNull() || aV1.IsNull())
-  {
-    aStatus = BRepCheck_NoError;
-    return aStatus;
-  }
-
-  gp_Pnt aPnt1, aPnt2;
-
-  aPnt1 = BRep_Tool::Pnt(aV1);
-  aPnt2 = BRep_Tool::Pnt(aV2);
-
-  aTol1 = BRep_Tool::Tolerance(aV1);
-  aTol2 = BRep_Tool::Tolerance(aV2);
-
-  if( Precision::IsInfinite(aTol1) ||
-      Precision::IsInfinite(aTol2))
-  {
-    aStatus = BRepCheck_CollapsedEdge;
-    return aStatus;
-  }
-
-  Standard_Real st = aTol1 + aTol2;
-
-  if(aPnt1.SquareDistance(aPnt2) >= st*st)
-  {
-    aStatus = BRepCheck_NoError;
-    return aStatus;
-  }
-
-  gp_Pnt aPn( (aPnt1.X() + aPnt2.X())/2.0,
-              (aPnt1.Y() + aPnt2.Y())/2.0,
-              (aPnt1.Z() + aPnt2.Z())/2.0);
-
-  
-  const Standard_Real aTol = Max(aTol1,aTol2) + aPnt1.Distance(aPnt2)/2.0;
-  const Standard_Real aTols = aTol*aTol;
-
-  BRepAdaptor_Curve BACurve(theEdge);
-
-  const Standard_Real aFirst = BACurve.FirstParameter(), 
-                      aLast  =  BACurve.LastParameter();
-
-  const Standard_Real dParam = aLast - aFirst;
-
-  for(Standard_Integer i = 0; i < maxNIter; i++)
-  {
-    const Standard_Real ParOnC = aFirst + DivPoints[i]*dParam;
-
-    gp_Pnt pt = BACurve.Value(ParOnC);
-    if((aPn.SquareDistance(pt) >= aTols))
-    {
-      aStatus = BRepCheck_NoError;
-      return aStatus;
-    }
-  }
-
-  gp_Pnt aPFirst = BACurve.Value(aFirst);
-  gp_Pnt aPLast = BACurve.Value(aLast);
-  double aFirstLastDist = aPFirst.Distance(aPLast);
-  double aV1V2Dist = aPnt1.Distance(aPnt2);
-  TopoDS_Vertex aVFirst = BRepBuilderAPI_MakeVertex(aPFirst);
-  TopoDS_Vertex aVLast = BRepBuilderAPI_MakeVertex(aPLast);
-
-  const Handle(BRep_TEdge)& theTEdge = Handle(BRep_TEdge)::DownCast(theEdge.TShape());
-
-  Standard_Boolean sp1 = theTEdge->SameParameter();
-  Standard_Boolean sr1 = theTEdge->SameRange();
-  Standard_Boolean dg1 = theTEdge->Degenerated();
-  Standard_Boolean ch1 = theTEdge->Checked();
-  Standard_Boolean or1 = theTEdge->Orientable();
-  Standard_Boolean cl1 = theTEdge->Closed();
-  Standard_Boolean in1 = theTEdge->Infinite();
-  Standard_Boolean cv1 = theTEdge->Convex();
-
-  //std::cout << std::endl;
-  //std::cout << (aV1.IsEqual(aV2) ? "Vertexes are equal" : "Vertexes are different") << std::endl;
-  //std::cout << "aPnt1: " << aPnt1.X() << " " << aPnt1.Y() << " " << aPnt1.Z() << std::endl;
-  //std::cout << "aPnt2: " << aPnt2.X() << " " << aPnt2.Y() << " " << aPnt2.Z() << std::endl;
-  //std::cout << (aPnt1.IsEqual(aPFirst, 1E-6) ? "aPnt1 & aPFirst are equal" : "aPnt1 & aPFirst are different") << std::endl;
-  //std::cout << (aPnt2.IsEqual(aPLast, 1E-6)  ? "aPnt2 & aPLast are equal"  : "aPnt2 & aPLast are different")  << std::endl;
-  //std::cout << "aPFirst: " << aPFirst.X() << " " << aPFirst.Y() << " " << aPFirst.Z() << std::endl;
-  //std::cout << "aPLast: "  << aPLast.X()  << " " << aPLast.Y()  << " " << aPLast.Z()  << std::endl;
-
-  //std::cout << "aTol1: " << aTol1 << " aTol2: " << aTol2 << std::endl;
-  //std::cout << "aFirstLastDist: " << aFirstLastDist << std::endl;
-  //std::cout << "aV1V2Dist: " << aV1V2Dist << std::endl;
-  //std::cout << "Degenerated: " << theTEdge->Degenerated() << std::endl;
-  //std::cout << "Closed: " << theTEdge->Closed() << std::endl;
-
-  static int num(0);
-  num++;
-  std::cout << "vertex vf" << num << " " << aPnt1.X() << " " << aPnt1.Y() << " " << aPnt1.Z() << std::endl;
-  std::cout << "vertex vl" << num << " " << aPnt2.X() << " " << aPnt2.Y() << " " << aPnt2.Z() << std::endl;
-  
-
-  aStatus = BRepCheck_CollapsedEdge;
-  return aStatus;
-}
 
 //=======================================================================
 //function : Validate
@@ -1066,7 +908,7 @@ Standard_Real Prec(const Adaptor3d_Curve& aAC3D,
   //
   aXC = BRepCheck::PrecCurve(aAC3D);
   aXS = BRepCheck::PrecSurface(aAHS);
-  aXEmax=(aXC>aXS) ? aXC: aXS;
+  aXEmax = (aXC>aXS) ? aXC: aXS;
   return aXEmax;
 }
 

src/BRepCheck/BRepCheck_Edge.hxx

@@ -49,8 +49,6 @@ public:
   
   Standard_EXPORT Standard_Real Tolerance();
   
-  Standard_EXPORT BRepCheck_Status CheckTolerance(const TopoDS_Edge& theEdge);
-  
   //! Sets status of Edge;
   Standard_EXPORT void SetStatus (const BRepCheck_Status theStatus);
   

src/BRepCheck/BRepCheck_Status.hxx

@@ -56,7 +56,6 @@ BRepCheck_BadOrientationOfSubshape,
 BRepCheck_InvalidPolygonOnTriangulation,
 BRepCheck_InvalidToleranceValue,
 BRepCheck_EnclosedRegion,
-BRepCheck_CollapsedEdge,
 BRepCheck_CheckFail
 };
 

src/BRepTest/BRepTest_CheckCommands.cxx

@@ -75,7 +75,7 @@
 //Number of BRepCheck_Statuses in BRepCheck_Status.hxx file
 //(BRepCheck_NoError is not considered, i.e. general status 
 //is smaller by one specified in file)
-static const Standard_Integer NumberOfStatus = 37;
+static const Standard_Integer NumberOfStatus = 36;
 
 static char* checkfaultyname = NULL;
 Standard_EXPORT void BRepTest_CheckCommands_SetFaultyName(const char* name)
@@ -516,6 +516,7 @@ void ContextualDump(Draw_Interpretor& theCommands,
 static void FillProblems(const BRepCheck_Status stat,
                          Handle(TColStd_HArray1OfInteger)& NbProblems)
 {
+
   const Standard_Integer anID = static_cast<Standard_Integer> (stat);
 
   if((NbProblems->Upper() < anID) || (NbProblems->Lower() > anID))
@@ -654,78 +655,9 @@ void StructuralDump(Draw_Interpretor& theCommands,
   GetProblemShapes(theAna, theShape, sl, NbProblems);
   theMap.Clear();
   
-  if(NbProblems->Value(13)>0)
-    theCommands<<"  Edge is collapsed in vertex............... "<<NbProblems->Value(13)<<"\n";
-    //cout<<"  Invalid Degenerated Flag ................. "<<NbProblems->Value(12)<<endl;
-  if(NbProblems->Value(14)>0)
-    theCommands<<"  Free Edge ................................ "<<NbProblems->Value(14)<<"\n";
-    //cout<<"  Free Edge ................................ "<<NbProblems->Value(14)<<endl;
-  if(NbProblems->Value(15)>0)
-    theCommands<<"  Invalid MultiConnexity ................... "<<NbProblems->Value(15)<<"\n";
-    //cout<<"  Invalid MultiConnexity ................... "<<NbProblems->Value(15)<<endl;
-  if(NbProblems->Value(16)>0)
-    theCommands<<"  Invalid Range ............................ "<<NbProblems->Value(16)<<"\n";
-    //cout<<"  Invalid Range ............................ "<<NbProblems->Value(16)<<endl;
-  if(NbProblems->Value(17)>0)
-    theCommands<<"  Empty Wire ............................... "<<NbProblems->Value(17)<<"\n";
-    //cout<<"  Empty Wire ............................... "<<NbProblems->Value(17)<<endl;
-  if(NbProblems->Value(18)>0)
-    theCommands<<"  Redundant Edge ........................... "<<NbProblems->Value(18)<<"\n";
-    //cout<<"  Redundant Edge ........................... "<<NbProblems->Value(18)<<endl;
-  if(NbProblems->Value(19)>0)
-    theCommands<<"  Self Intersecting Wire ................... "<<NbProblems->Value(19)<<"\n";
-    //cout<<"  Self Intersecting Wire ................... "<<NbProblems->Value(19)<<endl;
-  if(NbProblems->Value(20)>0)
-    theCommands<<"  No Surface ............................... "<<NbProblems->Value(20)<<"\n";
-    //cout<<"  No Surface ............................... "<<NbProblems->Value(20)<<endl;
-  if(NbProblems->Value(21)>0)
-    theCommands<<"  Invalid Wire ............................. "<<NbProblems->Value(21)<<"\n";
-    //cout<<"  Invalid Wire ............................. "<<NbProblems->Value(21)<<endl;
-  if(NbProblems->Value(22)>0)
-    theCommands<<"  Redundant Wire ........................... "<<NbProblems->Value(22)<<"\n";
-    //cout<<"  Redundant Wire ........................... "<<NbProblems->Value(22)<<endl;
-  if(NbProblems->Value(23)>0)
-    theCommands<<"  Intersecting Wires ....................... "<<NbProblems->Value(23)<<"\n";
-    //cout<<"  Intersecting Wires ....................... "<<NbProblems->Value(23)<<endl;
-  if(NbProblems->Value(24)>0)
-    theCommands<<"  Invalid Imbrication of Wires ............. "<<NbProblems->Value(24)<<"\n";
-    //cout<<"  Invalid Imbrication of Wires ............. "<<NbProblems->Value(24)<<endl;
-  if(NbProblems->Value(25)>0)
-    theCommands<<"  Empty Shell .............................. "<<NbProblems->Value(25)<<"\n";
-    //cout<<"  Empty Shell .............................. "<<NbProblems->Value(25)<<endl;
-  if(NbProblems->Value(26)>0)
-    theCommands<<"  Redundant Face ........................... "<<NbProblems->Value(26)<<"\n";
-    //cout<<"  Redundant Face ........................... "<<NbProblems->Value(26)<<endl;
-  if(NbProblems->Value(27)>0)
-    theCommands<<"  Unorientable Shape ....................... "<<NbProblems->Value(27)<<"\n";
-    //cout<<"  Unorientable Shape ....................... "<<NbProblems->Value(27)<<endl;
-  if(NbProblems->Value(28)>0)
-    theCommands<<"  Not Closed ............................... "<<NbProblems->Value(28)<<"\n";
-    //cout<<"  Not Closed ............................... "<<NbProblems->Value(28)<<endl;
-  if(NbProblems->Value(29)>0)
-    theCommands<<"  Not Connected ............................ "<<NbProblems->Value(29)<<"\n";
-    //cout<<"  Not Connected ............................ "<<NbProblems->Value(29)<<endl;
-  if(NbProblems->Value(30)>0)
-    theCommands<<"  Subshape not in Shape .................... "<<NbProblems->Value(30)<<"\n";
-    //cout<<"  Subshape not in Shape .................... "<<NbProblems->Value(30)<<endl;
-  if(NbProblems->Value(31)>0)
-    theCommands<<"  Bad Orientation .......................... "<<NbProblems->Value(31)<<"\n";
-    //cout<<"  Bad Orientation .......................... "<<NbProblems->Value(31)<<endl;
-  if(NbProblems->Value(32)>0)
-    theCommands<<"  Bad Orientation of Subshape .............. "<<NbProblems->Value(32)<<"\n";
-    //cout<<"  Bad Orientation of Subshape .............. "<<NbProblems->Value(32)<<endl;
-  if(NbProblems->Value(33)>0)
-    theCommands<<"  Invalid tolerance value................... "<<NbProblems->Value(33)<<"\n";
-    //cout<<"  checkshape failure......... .............. "<<NbProblems->Value(33)<<endl;
-  if(NbProblems->Value(34)>0)
-    theCommands<<"  checkshape failure......... .............. "<<NbProblems->Value(34)<<"\n";
-    //cout<<"  checkshape failure......... .............. "<<NbProblems->Value(34)<<endl;
   Standard_Integer aProblemID = static_cast<Standard_Integer>(BRepCheck_InvalidPointOnCurve);
   if(NbProblems->Value(aProblemID) > 0)
     theCommands<<"  Invalid Point on Curve ................... "<<NbProblems->Value(aProblemID)<<"\n";
-  if(NbProblems->Value(34)>0)
-    theCommands<<"  checkshape failure........................ "<<NbProblems->Value(34)<<"\n";
-    //cout<<"  checkshape failure......... .............. "<<NbProblems->Value(32)<<endl;
 
   aProblemID = static_cast<Standard_Integer>(BRepCheck_InvalidPointOnCurveOnSurface);
   if(NbProblems->Value(aProblemID)>0)

src/BRepTest/BRepTest_PrimitiveCommands.cxx

@@ -19,11 +19,7 @@
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 #include <DrawTrSurf.hxx>
-#include <TopExp.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepBuilderAPI.hxx>
 #include <BRepPreviewAPI_MakeBox.hxx>
@@ -387,78 +383,6 @@ static Standard_Integer torus(Draw_Interpretor& , Standard_Integer n, const char
   return 0;
 }
 
-//=======================================================================
-//function : DrawTolerance
-//purpose  : 
-//=======================================================================
-static Standard_Integer DrawTolerance(Draw_Interpretor& theDI, Standard_Integer theNArg, const char** a)
-{
-  if(theNArg != 3)
-  {
-    theDI << "use toolsphere name vertex\\edge\n";
-    return 1;
-  }
-
-  TopoDS_Shape aS = DBRep::Get(a[2]);
-  if(aS.IsNull())
-  {
-    theDI << "No source shape found\n";
-    return 1;
-  }
-
-  Standard_Real aRadius;
-  gp_Pnt aCenter;
-
-  switch(aS.ShapeType())
-  {
-  case TopAbs_VERTEX:
-    {
-      TopoDS_Vertex aV = TopoDS::Vertex(aS);
-      aRadius = BRep_Tool::Tolerance(aV);
-      aCenter = BRep_Tool::Pnt(aV);
-    }
-    break;
-  case TopAbs_EDGE:
-    {
-      TopoDS_Edge anE = TopoDS::Edge(DBRep::Get(a[2]));
-      TopoDS_Vertex aV1 = TopExp::FirstVertex(anE),
-                  aV2 = TopExp::LastVertex(anE);
-
-      Standard_Real aTol1 = BRep_Tool::Tolerance(aV1);
-      Standard_Real aTol2 = BRep_Tool::Tolerance(aV2);
-
-      if( Precision::IsInfinite(aTol1) ||
-          Precision::IsInfinite(aTol2))
-      {
-        theDI << "Tolerance is infinity\n";
-        return 0;
-      }
-
-      gp_Pnt aPnt1 = BRep_Tool::Pnt(aV1);
-      gp_Pnt aPnt2 = BRep_Tool::Pnt(aV2);
-      
-      aCenter = gp_Pnt( (aPnt1.X() + aPnt2.X())/2.0,
-                        (aPnt1.Y() + aPnt2.Y())/2.0,
-                        (aPnt1.Z() + aPnt2.Z())/2.0);
-
-      aRadius = Max(aTol1,aTol2) + aPnt1.Distance(aPnt2)/2.0;
-    }
-    break;
-  default:
-    {
-      theDI << "Enter a vertex or an edge (see help)\n";
-      return 1;
-    }
-  }
-
-  TopoDS_Solid S = BRepPrimAPI_MakeSphere(aCenter,aRadius);
-
-  DBRep::Set(a[1],S);
-  return 0;
-}
-
-
-
 
 
 //=======================================================================
@@ -535,9 +459,6 @@ void  BRepTest::PrimitiveCommands(Draw_Interpretor& theCommands)
                   "\n\t\t: - angle2 second angle to create a torus ring segment"
                   "\n\t\t: - angle  angle to create a torus pipe segment",
                   __FILE__, torus, g);
-  theCommands.Add("tolsphere", "toolsphere name vertex\\edge (if vertex is given, center of sphere is the \"vertex\", "
-    "radius is a tolerance of vertex; if edge is given, sphere is built, which is determined in "
-    "BRepCheck_Edge::CheckTolerance(...) function)",__FILE__,DrawTolerance,g);
 }
 
 

src/SWDRAW/SWDRAW_ShapeFix.cxx

@@ -412,7 +412,6 @@ static Standard_Integer fixshape (Draw_Interpretor& di, Standard_Integer argc, c
   Standard_Integer par = 0, mess=0;
   for ( Standard_Integer i=1; i < argc; i++ )
   {
-    const char* ai = argv[i];
     if (strlen(argv[i]) == 2 &&
       (argv[i][0] == '-' || argv[i][0] == '+' || argv[i][0] == '*'))
     {

src/ShapeAnalysis/ShapeAnalysis_Wire.cxx

@@ -688,8 +688,7 @@ Standard_Boolean ShapeAnalysis_Wire::CheckSmall (const Standard_Integer num,
   Standard_Real dist = p1.Distance(p2);
   Standard_Real prec = precsmall;//Min ( myPrecision, precsmall );
   //Standard_Real prec = Min(BRep_Tool::Tolerance(V1),BRep_Tool::Tolerance(V2)); //skl
-  if (dist > prec) 
+  if (dist > prec) return Standard_False;  // pas nulle
-    return Standard_False;  // pas nulle
   
   // La courbe 3D a present : est-elle FERMEE ou DE LONGUEUR NULLE ... ???
   // Pour cela on prend le point milieu (y a-t-il mieux)
@@ -698,8 +697,7 @@ Standard_Boolean ShapeAnalysis_Wire::CheckSmall (const Standard_Integer num,
   gp_Pnt Pm;
   Standard_Real cf,cl;
   Handle(Geom_Curve) c3d;    
-  if ( sae.Curve3d (E,c3d,cf,cl,Standard_False) )
+  if ( sae.Curve3d (E,c3d,cf,cl,Standard_False) ) Pm = c3d->Value ( (cf+cl)/2. );
-    Pm = c3d->Value ( (cf+cl)/2. );
   else {
     Handle(Geom2d_Curve) c2d;
     if ( ! myFace.IsNull() && sae.PCurve (E,myFace,c2d,cf,cl,Standard_False)) {
@@ -712,8 +710,7 @@ Standard_Boolean ShapeAnalysis_Wire::CheckSmall (const Standard_Integer num,
 //:n2      return Standard_False;
     }
   }
-  if ( Pm.Distance(p1) > prec || Pm.Distance(p2) > prec )
+  if ( Pm.Distance(p1) > prec || Pm.Distance(p2) > prec ) return Standard_False;
-    return Standard_False;
 
   myStatus |= ShapeExtend::EncodeStatus ( V1.IsSame(V2) ? ShapeExtend_DONE1 : ShapeExtend_DONE2 );
   return Standard_True;

tests/blend/buildevol/D6

@@ -1,4 +1,3 @@
-puts "TODO CR32185 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90

tests/blend/simple/H4

@@ -1,4 +1,3 @@
-puts "TODO CR32185 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90

tests/boolean/bcut_complex/G3

@@ -11,6 +11,5 @@ fsameparameter part
 restore [locate_data_file cts18078-tool.rle] tool
 
 bcut result part tool
-breducetolerance result
 checkprops result -s 147330
 checkview -display result -2d -s -otherwise { part tool } -path ${imagedir}/${test_image}.png

tests/boolean/bcut_complex/N9

@@ -7,7 +7,6 @@ restore [locate_data_file pro14942b.rle] b
 
 bcut result a b
 
-breducetolerance result
 checkshape result
 
 checkprops result -s 192941

tests/boolean/bfuse_complex/E4

@@ -6,7 +6,6 @@ restore [locate_data_file pro14260d.rle] d
 
 bfuse result c d
 
-breducetolerance result
 checkprops result -s 46305.1
 checknbshapes result -solid 1 -shell 1 -face 35
 checkview -display result -2d -otherwise { c d } -s -path ${imagedir}/${test_image}.png

tests/boolean/bfuse_complex/M7

@@ -1,9 +1,6 @@
 # Original bug : cts20176
 # Date : 16July98
 
-# because CTO904_cts20176a.rle has a bad topology vertex 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-
 restore [locate_data_file CTO904_cts20176a.rle] a 
 restore [locate_data_file cts20176b.rle] b
 
@@ -11,6 +8,6 @@ restore [locate_data_file cts20176b.rle] b
 tclean a
 
 bfuse result a b
-breducetolerance result
+
 checkprops result -s 70265.2
 checkview -display result -2d -otherwise { a b } -s -path ${imagedir}/${test_image}.png

tests/boolean/bopcommon_complex/K2

@@ -1,5 +1,3 @@
-# because b201 has a bad topology vertex 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 restore [locate_data_file a201] a
 restore [locate_data_file b201] b
 

tests/boolean/bopcut_complex/F2

@@ -4,6 +4,5 @@ explode sh
 bop sh_1 sh_2
 bopcut result
 
-breducetolerance result
 checkprops result -s 29167.3
 checkview -display result -2d -otherwise { sh_1 sh_2 } -s -path ${imagedir}/${test_image}.png

tests/boolean/bopfuse_complex/E1

@@ -4,6 +4,5 @@ explode sh
 bop sh_1 sh_2
 bopfuse result
 
-breducetolerance result
 checkprops result -s 35009.9
 checkview -display result -2d -otherwise { sh_1 sh_2 } -s -path ${imagedir}/${test_image}.png

tests/boolean/bopfuse_complex/E2

@@ -4,6 +4,5 @@ explode sh
 bop sh_2 sh_1
 bopfuse result
 
-breducetolerance result
 checkprops result -s 35009.9
 checkview -display result -2d -otherwise { sh_2 sh_1 } -s -path ${imagedir}/${test_image}.png

tests/bugs/heal/bug22919

@@ -6,8 +6,6 @@ puts ""
 # Shape Healing fails to correct a face with missing seam
 #############################################
 
-puts "TODO CR32272 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-
 restore [locate_data_file bug22919_ss.brep] ss
 explode ss
 

tests/bugs/iges/buc60823

@@ -2,13 +2,9 @@ puts "========================"
 puts "BUC60823"
 puts "========================"                                                
 
-# because buc60823.igs has one too small edge with too much tolerance 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-
 igesbrep [locate_data_file buc60823.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/buc60850

@@ -2,13 +2,9 @@ puts "==========="
 puts "BUC60850"
 puts "==========="
 
-# because BUC60850.igs has 2 bad faces 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_4"
-
 igesbrep [locate_data_file BUC60850.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug131_7

@@ -2,13 +2,10 @@ puts "========"
 puts "OCC131"
 puts "========"
 puts ""
-# because OCC58a.igs has 6 too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_6"
 
 igesbrep [locate_data_file OCC131-7.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug133_1

@@ -7,13 +7,10 @@ puts ""
 ##############################################
 ##Loading phase returns error status (though no exception raised).
 ##############################################
-# because igsBF5.igs has 6 too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_6"
 
 igesbrep [locate_data_file igsBF5.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug16424

@@ -5,11 +5,8 @@ puts ""
 ##############################################
 # Exception in reading of attached IGES file
 ##############################################
-# because file has too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_8"
 
 igesread [locate_data_file bug16424_s554_tassello_per_punzone_pos09.igs] a *
-breducetolerance a
 checkshape a
 
 smallview

tests/bugs/iges/bug22283

@@ -5,12 +5,10 @@ puts ""
 ##########################################################################
 # Problem with reading of attached IGES file
 ##########################################################################
-# because file has too small bad edges with too much tolerances 
-puts "TODO CR32209 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 igesbrep [locate_data_file bug22283_Mtwz_Training_Part.iges] a *
 tpcompound result
-breducetolerance result
+
 checkprops result -s 46235.4
 checkshape result
 

tests/bugs/iges/bug272_1

@@ -1,13 +1,10 @@
 puts "========"
 puts "OCC272"
 puts "========"
-# because OCC58a.igs has 21 too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_21"
 
 igesbrep [locate_data_file 919-001-T02-04-CP-VL.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug272_2

@@ -1,13 +1,10 @@
 puts "========"
 puts "OCC272"
 puts "========"
-# because OCC58a.igs has 2 too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 igesbrep [locate_data_file 919-001-T02-04-FT-VL.igs] a * 
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug283

@@ -2,13 +2,10 @@ puts "========"
 puts "OCC283"
 puts "========"
 puts ""
-# because BUC50030.igs has too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_10"
 
 igesbrep [locate_data_file BUC50030.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug285

@@ -1,8 +1,6 @@
 puts "========"
 puts "OCC285"
 puts "========"
-# because OCC285.igs has edges with too much tolerances 
-puts "TODO CR32209 ALL: Faulty shapes in variables faulty_1 to faulty_35"
 
 igesbrep [locate_data_file OCC285.igs] a *
 

tests/bugs/iges/bug306

@@ -5,8 +5,6 @@ puts ""
 #############################################################################
 ##After applying sewing on the model from the file TibTray_Size3.igs (see the attachment) one surface is not shaded.
 #############################################################################
-# because TibTray_Size3.igs has 3 too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 igesbrep [locate_data_file TibTray_Size3.igs] a *
 
@@ -15,7 +13,6 @@ tclean a
 
 sewing result a
 
-breducetolerance result
 checkshape result
 
 vinit
@@ -25,7 +22,7 @@ vfit
 
 checktrinfo result -tri 5812 -nod 5809
 
-checkmaxtol result -ref 0.37347422132393693
+checkmaxtol result -ref 0.92213088179312575
 checknbshapes result -shell 1
 checkfreebounds result 239
 checkview -display result -3d -path ${imagedir}/${test_image}.png

tests/bugs/iges/bug365_3

@@ -2,13 +2,10 @@ puts "========"
 puts "OCC365"
 puts "========"
 puts ""
-# because file has too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 igesbrep [locate_data_file BUC61004-2.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/bug58_1

@@ -5,13 +5,10 @@ puts ""
 puts "Shape is incorrect after translation"
 puts "case 1 (6546a01.igs)"
 puts ""
-# because OCC58a.igs has 5 too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_5"
 
 igesbrep [locate_data_file OCC58a.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/iges/ger61337

@@ -1,15 +1,12 @@
 puts "==========="
 puts "GER61337"
 puts "=================================="
-# because file has too small bad edges with too much tolerances 
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_4"
 
 cpulimit 3000
 
 igesbrep [locate_data_file ger61337a.igs] a *
 
 tpcompound result
-breducetolerance result
 checkshape result
 checkshape result r
 

tests/bugs/mesh/bug25628

@@ -3,8 +3,6 @@ puts "CR25628: BRepMesh fails to mesh face with open wire, considered as correct
 puts "========="
 puts ""
 
-puts "TODO CR32223 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-
 pload XDE
 
 stepread [locate_data_file bug25628_twr_hull.stp] a *

tests/bugs/mesh/bug31144

@@ -3,7 +3,6 @@ puts "0031144: Shape Healing - ShapeAnalysis::OuterWire() infinite loop on solid
 puts "======="
 puts ""
 puts "REQUIRED ALL: Meshing statuses: Failure"
-puts "TODO CR32226 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 cpulimit 10
 

tests/bugs/modalg_1/buc60462_2

@@ -1,5 +1,5 @@
 puts "TODO OCC27024 ALL: Error : operation bfuse is WRONG because number of SOLID entities in shape"
-puts "TODO CR32209 ALL: Faulty shapes in variables faulty_1 to faulty_6"
+
 puts "=========="
 puts "BUC60462"
 puts "=========="

tests/bugs/modalg_1/buc60585_2

@@ -3,8 +3,7 @@ puts "========================"
 puts "BUC60585"
 puts "========================"
 
-restore [locate_data_file buc60585b.brep] a
+restore [locate_data_file buc60585b.brep] t
-fixshape t a
 checkshape t
 plane pt 2036.25  -97.5  -1460.499755859375  0.0  -1.0  0.0 1.0 0.0 0.0
 

tests/bugs/modalg_1/buc60930

@@ -6,8 +6,6 @@ puts ""
 ######################################
 ## Exception ConstructionError in LocOpe_SplitShape. 
 ######################################
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file BUC60930_splitshape.brep] c 
 explode c

tests/bugs/modalg_1/bug10232

@@ -1,5 +1,4 @@
 puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
-puts "TODO CR32226 ALL: Faulty shapes in variables faulty_1 to faulty_6"
 
 puts "============"
 puts "OCC10232"
@@ -9,7 +8,6 @@ puts ""
 # Exception "Segmentation violation" in Boolean Operations
 #######################################################################
 
-
 set BugNumber OCC10232
 
 puts "Load first shape ..."

tests/bugs/modalg_1/bug140

@@ -5,7 +5,6 @@ puts ""
 #########################################################
 ## Fillet is created incorrectly on attached shape.
 #########################################################
-puts "TODO CR32185 ALL: Faulty shapes in variables faulty_1 to faulty_4"
 
 restore [locate_data_file shading_137.brep] s 
 checkshape s

tests/bugs/modalg_1/bug174

@@ -6,7 +6,6 @@ puts ""
 ## After analyze given face (file ff97.brep) using BRepCheck we receive problem - "Bad Orientation of Subshape".
 ## But we believe that this shape must be OK or we have to receive more detail another reply from BRepCheck.
 ###########################################################################
-puts "TODO CR32229 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 restore [locate_data_file OCC174.brep] result
 

tests/bugs/modalg_2/bug21415

@@ -1,5 +1,4 @@
 puts "TODO OCC11111 ALL: Error : The area of result shape is"
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 pload QAcommands
 
 puts "============"

tests/bugs/modalg_2/bug22631

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Regression in visualization for b-spline surface
 ######################################################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_63"
 
 set BugNumber OCC22631
 

tests/bugs/modalg_2/bug22641

@@ -1,6 +1,5 @@
 puts "TODO OCC11111 ALL: Error : The area of result shape is"
 puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_10"
 
 puts "================"
 puts "OCC22641"

tests/bugs/modalg_2/bug22770_10

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_11

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_18

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_20

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32226  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_23

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_27

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_4"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_28

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_3

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32226  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_30

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_5

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32226  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_8

@@ -7,7 +7,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22770_9

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # Improve command sewing in DRAW
 ######################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC22770
 

tests/bugs/modalg_2/bug22804

@@ -5,7 +5,6 @@ puts ""
 #######################################################################
 # Sewing increases tolerance of vertices for redundant value.
 #######################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 set BugNumber OCC22804
 

tests/bugs/modalg_2/bug22893

@@ -5,7 +5,6 @@ puts ""
 #############################################################################
 # Possible regression is tessellation algorithm of OCCT 6.5.2 
 #############################################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_75"
 
 set BugNumber OCC22893
 

tests/bugs/modalg_2/bug287

@@ -1,7 +1,6 @@
 puts "TODO OCC12345 ALL: Error : The area of result shape is"
 #puts "TODO OCC12345 ALL: Error: Number of triangles"
 #puts "TODO OCC12345 ALL: Error: Number of nodes"
-puts "TODO CR32226 ALL: Faulty shapes in variables faulty_1 to faulty_12"
 
 puts "========================"
 puts " OCC287 "

tests/bugs/modalg_2/bug291

@@ -4,7 +4,6 @@ puts "================= OCC291 ==================="
 #################################################################
 ## Some triangles of shading mesh are outside of shape boundaries. (See attached shape). 
 #################################################################
-puts "TODO CR32229 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 restore [locate_data_file shading_171.brep] result
 checkshape result

tests/bugs/modalg_2/bug302_1

@@ -7,7 +7,6 @@ puts ""
 ## After performing command "checkbrep" to attached face I receive "Bad Orientation of Subshape"
 ##  but I believe that orientation of this face is correct.
 #################################################################
-puts "TODO CR32210 ALL: checkbrep works wrongly"
 
 restore [locate_data_file OCC302a.brep] result
 

tests/bugs/modalg_2/bug302_3

@@ -7,7 +7,6 @@ puts ""
 ## After performing command "checkshape" to attached face I receive "Bad Orientation of Subshape"
 ##  but I believe that orientation of this face is correct.
 #################################################################
-puts "TODO CR32229 ALL: checkshape works wrongly"
 
 restore [locate_data_file OCC302c.brep] result
 

tests/bugs/modalg_2/bug337

@@ -8,7 +8,6 @@ puts ""
 ############################################
 
 restore [locate_data_file OCC337_clone1.brep] a 
-breducetolerance a
 explode a
 
 set che [checkshape a_1]

tests/bugs/modalg_2/bug347_1

@@ -4,7 +4,6 @@ puts " BUC60959 "
 puts " OCC347 "
 puts " (case 1) "
 puts "========================"
-puts "TODO CR32210 ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 restore [locate_data_file OCC347a.brep] result
 checkshape result

tests/bugs/modalg_2/bug347_2

@@ -4,10 +4,8 @@ puts " BUC60959 "
 puts " OCC347 "
 puts " (case 2) "
 puts "========================"
-puts "TODO CR32229 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
-restore [locate_data_file OCC347b.brep] r1
+restore [locate_data_file OCC347b.brep] result
-fixshape result r1
 checkshape result
 
 tclean result

tests/bugs/modalg_2/bug369

@@ -8,7 +8,6 @@ puts ""
 #################################################################
 ## BndLib_Add3dCurve raised an exception on edges which range is out of the domain of the curve.
 #################################################################
-puts "TODO CR32209 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file OCC369.brep] result 
 OCC369 result

tests/bugs/modalg_2/bug397

@@ -1,7 +1,7 @@
 puts "========================"
 puts " OCC397 "
 puts "========================"
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
+
 pload QAcommands
 
 restore [locate_data_file OCC397.brep] a 

tests/bugs/modalg_2/bug406

@@ -1,6 +1,5 @@
 puts "TODO OCC12345 ALL: Faulty OCC406: Command checkshape works wrongly: Source shape looks invalid"
 puts "TODO OCC12345 ALL: Error : The area of result shape is"
-puts "TODO CR32226  ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 puts "========"
 puts "OCC406"

tests/bugs/modalg_2/bug472_1

@@ -1,5 +1,4 @@
 puts "TODO OCC25917 ALL: Error : The area of result shape is"
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 puts "========================"
 puts " OCC472 "

tests/bugs/modalg_2/bug497_3

@@ -11,8 +11,8 @@ restore [locate_data_file OCC497e.brep] a_1
 checkshape a_1
 
 restore [locate_data_file OCC497f.brep] a_2
-breducetolerance a_2
 checkshape a_2
+breducetolerance a_2
 
 bcut result a_1 a_2
 

tests/bugs/modalg_4/bug6725

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # Application crashed with "Segmentation Fault" message. Red Hat Linux 8.0
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 set BugNumber OCC6725
 

tests/bugs/modalg_4/bug714

@@ -6,7 +6,6 @@ puts ""
 ####################################################
 ## After command sew in DRAW on attached shape free wires are disappeared.
 ####################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file OCC714.brep] a 
 checkshape a

tests/bugs/modalg_4/bug767

@@ -6,7 +6,6 @@ puts ""
 ############################################
 ## Command sameparameter in DRAW hangs  on attached edge.
 ############################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 restore [locate_data_file OCC767.brep] result
 

tests/bugs/modalg_4/bug78

@@ -5,7 +5,6 @@ puts ""
 #####################################################
 # BUC60875. Pipe is created incorrectly on two wires.
 #####################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 restore [locate_data_file BUC60875_wire.brep] wire
 restore [locate_data_file BUC60875_profile.brep] profile

tests/bugs/modalg_4/bug80

@@ -6,7 +6,6 @@ puts ""
 ##########################################################
 ## The command "section" in Draw gives exception "attempt to access to null object " 
 ##########################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 restore [locate_data_file BUC60877_lh.brep] sh 
 checkshape sh

tests/bugs/modalg_4/bug8228

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # exception is raised during the vprops in DRAW on the attached shape
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 set BugNumber OCC8228
 

tests/bugs/modalg_4/bug828

@@ -7,7 +7,6 @@ puts ""
 ###############################
 ## BRepFilletAPI_MakeFillet fails on prism
 ###############################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 if { [ catch { set info_result [OCC828 a1] } ] } {
     puts "Faulty : an exception was caught"

tests/bugs/modalg_4/bug829_1

@@ -39,8 +39,7 @@ if { [catch { mkoffset result a_1 1 5 } status] } {
         }
     }
     checkprops result -l 8577.24 
-fixshape r1 result     
+checkshape result 
-checkshape r1 
+checksection result
-checksection r1
+    checkview -display result -2d -path ${imagedir}/${test_image}.png
-    checkview -display r1 -2d -path ${imagedir}/${test_image}.png
 }

tests/bugs/modalg_4/bug829_2

@@ -6,10 +6,7 @@ puts ""
 ###################################
 ## BRepOffsetAPI_MakeOffset fails on given wires
 ###################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_4"
-
 restore [locate_data_file OCC829_w2.brep] a 
-breducetolerance a
 checkshape a
 explode a w
 

tests/bugs/modalg_4/bug8370

@@ -5,7 +5,6 @@ puts ""
 #######################################################################################
 # One face is not displayed in shading mode 
 ######################################################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_155"
 
 set BugNumber OCC8370
 

tests/bugs/modalg_4/bug919

@@ -7,17 +7,15 @@ puts ""
 #############################
 ## Impossible to fuse the shapes. 
 ##############################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_18"
 
 restore [locate_data_file OCC919.brep] a 
-breducetolerance a
+
 explode a
 
 # See comment in CR23244:
 restore [locate_data_file OCC919-PROC.brep] a_1 
 #
 fixshape a_1 a_1
-breducetolerance a_1
 checkshape a_1
 checkshape a_2
 

tests/bugs/modalg_5/bug23625_1

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # New functionality building reflect lines on a shape
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 smallview
 

tests/bugs/modalg_5/bug23625_2

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # New functionality building reflect lines on a shape
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_1"
 
 smallview
 

tests/bugs/modalg_5/bug23625_3

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # New functionality building reflect lines on a shape
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 smallview
 

tests/bugs/modalg_5/bug23625_4

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # New functionality building reflect lines on a shape
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_4"
 
 smallview
 

tests/bugs/modalg_5/bug23625_5

@@ -5,7 +5,6 @@ puts ""
 ######################################################
 # New functionality building reflect lines on a shape
 ######################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 smallview
 

tests/bugs/modalg_5/bug23708

@@ -7,7 +7,6 @@ puts ""
 ############################################################################
 
 restore [locate_data_file bug23708_invalidface.brep] result
-fixshape result result
 checkshape result
 
 checkview -display result -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_5/bug23731

@@ -1,24 +0,0 @@
-puts "============"
-puts "CR23731"
-puts "============"
-puts ""
-######################################################
-# The shape obtained by stepread is valid in terms of checkshape but it is not valid in terms of usability.
-######################################################
-
-catch { pload XDE }
-
-set filepath [locate_data_file OCC6289.stp]
-stepread $filepath a *
-
-explode a_1 f
-
-renamevar a_1_24 result
-
-smallview
-donly result
-fit
-
-set square 1
-
-set only_screen_axo 1

tests/bugs/modalg_5/bug25243

@@ -17,7 +17,6 @@ donly a_4 e
 fit
 
 splitshape result a_4 a_4 e
-breducetolerance result
 
 set bug_info [checkshape result]
 if {[string compare $bug_info "This shape seems to be valid"] != 0} {

tests/bugs/modalg_5/bug25298_09

@@ -5,7 +5,6 @@ puts ""
 #######################################################################
 # New option of BRepOffsetAPI_MakeOffset algorithm: processing of sharp corners in mode GeomAbs_Intersection
 #######################################################################
-puts "TODO CR32256  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 polyline pp 0 0 0 10 0 0 10 10 0 6 10 0 6 15 0 4 15 0 4 10 0 0 10 0 0 0 0
 

tests/bugs/modalg_6/bug26440_1

@@ -5,7 +5,6 @@ puts ""
 ##########################################################################################################
 # Invalid shape as a result of solid construction in BRepOffset_MakeOffset
 ##########################################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file bug26440_plate.brep] sh1
 

tests/bugs/modalg_6/bug26440_2

@@ -5,7 +5,6 @@ puts ""
 ##########################################################################################################
 # Invalid shape as a result of solid construction in BRepOffset_MakeOffset
 ##########################################################################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_4"
 
 restore [locate_data_file bug26440_plate2.brep] sh1
 

tests/bugs/modalg_6/bug26440_3

@@ -5,7 +5,6 @@ puts ""
 ##########################################################################################################
 # Invalid shape as a result of solid construction in BRepOffset_MakeOffset
 ##########################################################################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file bug26440_plate3.brep] sh1
 

tests/bugs/modalg_6/bug28028

@@ -5,7 +5,6 @@ puts ""
 #################################################
 # Solid becomes invalid after scaling
 #################################################
-puts "TODO CR32209  ALL: Faulty shapes in variables faulty_1 to faulty_46"
 
 pload XDE
 

tests/bugs/modalg_6/bug28501_7

@@ -5,7 +5,6 @@ puts ""
 #################################################
 # Incomplete result of offset operation in mode Complete with Join type intersection
 #################################################
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_2"
 
 restore [locate_data_file bug28501_N9_lf.brep] ls
 

tests/bugs/modalg_7/bug22886

@@ -2,7 +2,6 @@ puts "============"
 puts "OCC22886: Bug in boolean"
 puts "============"
 puts ""
-puts "TODO CR32210  ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 restore [locate_data_file bug22886_solid1.brep] solid1
 restore [locate_data_file bug22886_solid2.brep] solid2

tests/bugs/modalg_7/bug25856_2

@@ -10,8 +10,7 @@ restore [locate_data_file bug25856_threeWires.brep] t
 
 explode t
 
-thrusections -N r_1 0 0 t_1 t_2 t_3
+thrusections -N r 0 0 t_1 t_2 t_3
-fixshape r r_1
 checkshape r
 
 fixshape rr r

tests/bugs/modalg_7/bug27614

@@ -7,7 +7,6 @@ puts ""
 #################################################
 # Sewing returns result with too high tolerance
 #################################################
-puts "TODO CR32226  ALL: Faulty shapes in variables faulty_1 to faulty_3"
 
 set sew_Tol 0.2