Merge from BR_Dev_For_4_0 branch (from tag mergeto_BR_QT4_Dev_17Jan08)

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_Gluer.hxx

diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
index 7d9b7734815f8cd536915f050217fc69bc97c52a..5ca326149aa9b810af5f3a0e47d7f5d4e6fba339 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
@@ -1,18 +1,18 @@
 // Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // 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 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
@@ -38,12 +38,18 @@
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
+#ifndef _TopTools_MapOfShape_HeaderFile
+#include <TopTools_MapOfShape.hxx>
+#endif
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
 #include <GEOMAlgo_ShapeAlgo.hxx>
 #endif
 #ifndef _TopAbs_ShapeEnum_HeaderFile
 #include <TopAbs_ShapeEnum.hxx>
 #endif
+#ifndef _TopoDS_Compound_HeaderFile
+#include <TopoDS_Compound.hxx>
+#endif
 class TopTools_ListOfShape;
 class TopoDS_Shape;
 class TopoDS_Edge;
@@ -61,6 +67,7 @@ class TopTools_DataMapOfShapeShape;
 #include <Standard_Macro.hxx>
 #endif
 
+
 class GEOMAlgo_Gluer  : public GEOMAlgo_ShapeAlgo {
 
 public:
@@ -79,16 +86,39 @@ public:
       }
  // Methods PUBLIC
  // 
+
+
 Standard_EXPORT GEOMAlgo_Gluer();
 Standard_EXPORT virtual ~GEOMAlgo_Gluer();
+
+
 Standard_EXPORT   void SetCheckGeometry(const Standard_Boolean aFlag) ;
+
+
 Standard_EXPORT   Standard_Boolean CheckGeometry() const;
+
+
+Standard_EXPORT   void SetKeepNonSolids(const Standard_Boolean aFlag) ;
+
+
 Standard_EXPORT virtual  void Perform() ;
+
+
 Standard_EXPORT   Standard_Integer AloneShapes() const;
+
+
 Standard_EXPORT  const TopTools_ListOfShape& Modified(const TopoDS_Shape& S) ;
+
+
 Standard_EXPORT  const TopTools_ListOfShape& Generated(const TopoDS_Shape& S) ;
+
+
 Standard_EXPORT   Standard_Boolean IsDeleted(const TopoDS_Shape& S) ;
+
+
 Standard_EXPORT  const TopTools_DataMapOfShapeListOfShape& Images() const;
+
+
 Standard_EXPORT  const TopTools_DataMapOfShapeShape& Origins() const;
 
 
@@ -99,27 +129,65 @@ protected:
 
  // Methods PROTECTED
  // 
+
+
 Standard_EXPORT virtual  void CheckData() ;
+
+
 Standard_EXPORT virtual  void CheckResult() ;
+
+
 Standard_EXPORT   void MakeVertices() ;
+
+
 Standard_EXPORT   void MakeEdges() ;
+
+
 Standard_EXPORT   void MakeFaces() ;
+
+
 Standard_EXPORT   void MakeShapes(const TopAbs_ShapeEnum aType) ;
+
+
 Standard_EXPORT   void MakeShells() ;
+
+
+Standard_EXPORT   void MakeSubShapes(const TopoDS_Shape& theShape,
+                                     TopTools_MapOfShape& theMS,
+                                     TopoDS_Compound& theResult);
+
+
 Standard_EXPORT   void MakeSolids() ;
+
+
 Standard_EXPORT   void InnerTolerance() ;
+
+
 Standard_EXPORT   void EdgePassKey(const TopoDS_Edge& aE,GEOMAlgo_PassKeyShape& aPK) ;
+
+
 Standard_EXPORT   void FacePassKey(const TopoDS_Face& aF,GEOMAlgo_PassKeyShape& aPK) ;
+
+
 Standard_EXPORT   void MakeVertex(const TopTools_ListOfShape& aLV,TopoDS_Vertex& aNewV) ;
+
+
 Standard_EXPORT   void MakeEdge(const TopoDS_Edge& aEdge,TopoDS_Edge& aNewEdge) ;
+
+
 Standard_EXPORT   void MakeFace(const TopoDS_Face& aFace,TopoDS_Face& aNewEdge) ;
+
+
 Standard_EXPORT   Standard_Boolean IsToReverse(const TopoDS_Face& aFR,const TopoDS_Face& aF) ;
+
+
 Standard_EXPORT   Standard_Boolean HasNewSubShape(const TopoDS_Shape& aS) const;
 
 
  // Fields PROTECTED
  //
 Standard_Boolean myCheckGeometry;
+Standard_Boolean myKeepNonSolids;
 Standard_Real myTol;
 TopTools_DataMapOfShapeListOfShape myImages;
 TopTools_DataMapOfShapeShape myOrigins;