* rebasing changes

diff --git a/src/BRepCheck/BRepCheck_Analyzer.cxx b/src/BRepCheck/BRepCheck_Analyzer.cxx
index 68e9b82183ec16c164fadbe62aa4aece2838a68f..c16e211bb6c2ab6aec9cc88a5a4ec84b04fec8ad 100644 (file)
--- a/src/BRepCheck/BRepCheck_Analyzer.cxx
+++ b/src/BRepCheck/BRepCheck_Analyzer.cxx
@@ -164,6 +164,24 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
           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
       {
@@ -182,21 +200,18 @@ 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);
+        }
 
-          Handle(BRepCheck_Result) aRes = myMap(aVertex);
-
-          if ( ! aRes.IsNull() ) 
-          {
-            aRes->SetFailStatus(aVertex);
-            aRes->SetFailStatus(S);
-          }
-
+        if ( ! aRes.IsNull() ) 
+        {
+          aRes->SetFailStatus(S);
+        }
     }
 
-      TopTools_MapOfShape MapS;
+      TopTools_MapOfShape avertexMap;
       
       for (exp.Init(S,TopAbs_VERTEX);exp.More(); exp.Next())
       {
@@ -204,7 +219,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
         try
         {
           OCC_CATCH_SIGNALS
-          if (MapS.Add(aVertex))
+          if (avertexMap.Add(aVertex))
             myMap(aVertex)->InContext(S);
         }
         catch(Standard_Failure const& anException) {

diff --git a/src/BRepCheck/BRepCheck_Edge.hxx b/src/BRepCheck/BRepCheck_Edge.hxx
index 3051c1767387a07418ce78a758b00c6542126e7b..d319f5b4ffe6cdfb3cdcc8667b1c958c5ac3be24 100644 (file)
--- a/src/BRepCheck/BRepCheck_Edge.hxx
+++ b/src/BRepCheck/BRepCheck_Edge.hxx
@@ -48,6 +48,8 @@ public:
   Standard_EXPORT void GeometricControls (const Standard_Boolean B);
   
   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);

diff --git a/src/BRepCheck/BRepCheck_Status.hxx b/src/BRepCheck/BRepCheck_Status.hxx
index 1990d2873d05606d9a75e5d6d285841f3009f4ce..46114f8e8603e3c13bb6e6c8f87de48c5c44025f 100644 (file)
--- a/src/BRepCheck/BRepCheck_Status.hxx
+++ b/src/BRepCheck/BRepCheck_Status.hxx
@@ -56,6 +56,7 @@ BRepCheck_BadOrientationOfSubshape,
 BRepCheck_InvalidPolygonOnTriangulation,
 BRepCheck_InvalidToleranceValue,
 BRepCheck_EnclosedRegion,
+BRepCheck_CollapsedEdge,
 BRepCheck_CheckFail
 };
 

diff --git a/src/BRepTest/BRepTest_CheckCommands.cxx b/src/BRepTest/BRepTest_CheckCommands.cxx
index c1eecc34e2161466c58f51d9d32330e5864b5556..150e4b32b2fe3722834892416d8207112e9530fc 100644 (file)
--- a/src/BRepTest/BRepTest_CheckCommands.cxx
+++ b/src/BRepTest/BRepTest_CheckCommands.cxx
@@ -516,32 +516,6 @@ void ContextualDump(Draw_Interpretor& theCommands,
 static void FillProblems(const BRepCheck_Status stat,
                          Handle(TColStd_HArray1OfInteger)& NbProblems)
 {
-  case BRepCheck_CollapsedEdge:
-    NbProblems->SetValue(13,NbProblems->Value(13)+1); break;
-    NbProblems->SetValue(14,NbProblems->Value(14)+1); break;
-    NbProblems->SetValue(15,NbProblems->Value(15)+1); break;
-    NbProblems->SetValue(16,NbProblems->Value(16)+1); break;
-    NbProblems->SetValue(17,NbProblems->Value(17)+1); break;
-    NbProblems->SetValue(18,NbProblems->Value(18)+1); break;
-    NbProblems->SetValue(19,NbProblems->Value(19)+1); break;
-    NbProblems->SetValue(20,NbProblems->Value(20)+1); break;
-    NbProblems->SetValue(21,NbProblems->Value(21)+1); break;
-    NbProblems->SetValue(22,NbProblems->Value(22)+1); break;
-    NbProblems->SetValue(23,NbProblems->Value(23)+1); break;
-    NbProblems->SetValue(24,NbProblems->Value(24)+1); break;
-    NbProblems->SetValue(25,NbProblems->Value(25)+1); break;
-    NbProblems->SetValue(26,NbProblems->Value(26)+1); break;
-    NbProblems->SetValue(27,NbProblems->Value(27)+1); break;
-    NbProblems->SetValue(28,NbProblems->Value(28)+1); break;
-    NbProblems->SetValue(29,NbProblems->Value(29)+1); break;
-    NbProblems->SetValue(30,NbProblems->Value(30)+1); break;
-    NbProblems->SetValue(31,NbProblems->Value(31)+1); break;
-    NbProblems->SetValue(32,NbProblems->Value(32)+1); break;
-  case BRepCheck_InvalidToleranceValue:
-    NbProblems->SetValue(33,NbProblems->Value(33)+1); break;
-  case BRepCheck_CheckFail:
-    NbProblems->SetValue(34,NbProblems->Value(34)+1); break;
-
   const Standard_Integer anID = static_cast<Standard_Integer> (stat);
 
   if((NbProblems->Upper() < anID) || (NbProblems->Lower() > anID))
@@ -549,7 +523,7 @@ static void FillProblems(const BRepCheck_Status stat,
 
   NbProblems->SetValue(anID, NbProblems->Value(anID)+1);
 
-  }
+}
 
 
 //=======================================================================