Merge branch 'master' into V7_5_BR

[modules/geom.git] / src / GEOMImpl / GEOMImpl_IMeasureOperations.hxx

diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
index 1a907183869cf1bb1a8ee442e969ec703a126d1b..86d0a9c7b2b83125f67acb9e36dda8658b4c5ab4 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOMImpl_IMeasureOperations_HXX_
 #define _GEOMImpl_IMeasureOperations_HXX_
@@ -25,13 +26,13 @@
 #include "GEOM_IOperations.hxx"
 
 #include <BRepCheck_Analyzer.hxx>
+#include <BRepCheck_Status.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
-#include <gp_Ax3.hxx>
+#include <TopTools_DataMapOfIntegerListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 #include <Geom_Surface.hxx>
 #include <Precision.hxx>
 
@@ -113,20 +114,31 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations {
                                    Standard_Real& Ix , Standard_Real& Iy , Standard_Real& Iz);
 
   Standard_EXPORT void GetBoundingBox (Handle(GEOM_Object) theShape,
+                                       const Standard_Boolean precise,
                                        Standard_Real& Xmin, Standard_Real& Xmax,
                                        Standard_Real& Ymin, Standard_Real& Ymax,
                                        Standard_Real& Zmin, Standard_Real& Zmax);
 
-  Standard_EXPORT Handle(GEOM_Object) GetBoundingBox (Handle(GEOM_Object) theShape);
+  Standard_EXPORT Handle(GEOM_Object) GetBoundingBox (Handle(GEOM_Object) theShape,
+                                                      const Standard_Boolean precise);
 
   Standard_EXPORT void GetTolerance (Handle(GEOM_Object) theShape,
                                      Standard_Real& FaceMin, Standard_Real& FaceMax,
                                      Standard_Real& EdgeMin, Standard_Real& EdgeMax,
                                      Standard_Real& VertMin, Standard_Real& VertMax);
 
-  Standard_EXPORT bool CheckShape (Handle(GEOM_Object)      theShape,
-                                   const Standard_Boolean   theIsCheckGeom,
-                                   TCollection_AsciiString& theDump);
+  struct ShapeError {
+    BRepCheck_Status error;
+    std::list<int>   incriminated;
+  };
+
+  Standard_EXPORT bool CheckShape (Handle(GEOM_Object)     theShape,
+                                   const Standard_Boolean  theIsCheckGeom,
+                                   std::list<ShapeError>  &theErrors);
+
+  Standard_EXPORT TCollection_AsciiString PrintShapeErrors
+                                  (Handle(GEOM_Object)          theShape,
+                                   const std::list<ShapeError> &theErrors);
 
   Standard_EXPORT bool CheckSelfIntersections (Handle(GEOM_Object) theShape,
                                                Handle(TColStd_HSequenceOfInteger)& theIntersections);
@@ -174,22 +186,21 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations {
                                                             Handle(GEOM_Object) thePoint);
 
  private:
-  void StructuralDump (const BRepCheck_Analyzer& theAna,
-                       const TopoDS_Shape&       theShape,
-                       TCollection_AsciiString&  theDump);
-
-  void GetProblemShapes (const BRepCheck_Analyzer&           theAna,
-                         const TopoDS_Shape&                 theShape,
-                         Handle(TopTools_HSequenceOfShape)&  sl,
-                         Handle(TColStd_HArray1OfInteger)&   NbProblems,
-                         TopTools_DataMapOfShapeListOfShape& theMap);
-
-  void GetProblemSub (const BRepCheck_Analyzer&           theAna,
-                      const TopoDS_Shape&                 theShape,
-                      Handle(TopTools_HSequenceOfShape)&  sl,
-                      Handle(TColStd_HArray1OfInteger)&   NbProblems,
-                      const TopAbs_ShapeEnum              Subtype,
-                      TopTools_DataMapOfShapeListOfShape& theMap);
+
+   void FillErrorsSub
+           (const BRepCheck_Analyzer                   &theAna,
+            const TopoDS_Shape                         &theShape,
+            const TopAbs_ShapeEnum                     theSubType,
+                  TopTools_DataMapOfIntegerListOfShape &theMapErrors) const;
+   void FillErrors
+             (const BRepCheck_Analyzer                   &theAna,
+              const TopoDS_Shape                         &theShape,
+                    TopTools_DataMapOfIntegerListOfShape &theMapErrors,
+                    TopTools_MapOfShape                  &theMapShapes) const;
+
+  void FillErrors (const BRepCheck_Analyzer &theAna,
+                   const TopoDS_Shape       &theShape,
+                   std::list<ShapeError>    &theErrors) const;
 
   Standard_Real getSurfaceCurvatures (const Handle(Geom_Surface)& aSurf,
                                       Standard_Real theUParam,