Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for bos #16366 and bos #16182
[modules/geom.git]
/
src
/
GEOMAlgo
/
GEOMAlgo_FinderShapeOn.hxx
diff --git
a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
index 09caf37e2f857c7f144ad7b86fb894dd5ae87ff1..7cad3f29b1be271174ff75b7993b50e552ca03ae 100644
(file)
--- a/
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
+++ b/
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
@@
-1,5
+1,5
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-7,7
+7,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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-30,17
+30,21
@@
#include <Standard.hxx>
#include <Standard_Macro.hxx>
#include <Standard.hxx>
#include <Standard_Macro.hxx>
-#include <Handle_Geom_Surface.hxx>
+#include <Standard_Boolean.hxx>
+
+#include <Geom_Surface.hxx>
+
#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_ShapeEnum.hxx>
-#include <GEOMAlgo_State.hxx>
+
#include <TopoDS_Shape.hxx>
#include <TopoDS_Shape.hxx>
+
#include <TopTools_ListOfShape.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
-#include <Standard_Boolean.hxx>
+
+
+#include <GEOMAlgo_State.hxx>
#include <GEOMAlgo_ShapeAlgo.hxx>
#include <GEOMAlgo_ShapeAlgo.hxx>
-#include <Geom_Surface.hxx>
-#include <TopoDS_Shape.hxx>
+#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
//=======================================================================
//function : GEOMAlgo_FinderShapeOn
//=======================================================================
//function : GEOMAlgo_FinderShapeOn
@@
-68,7
+72,7
@@
class GEOMAlgo_FinderShapeOn : public GEOMAlgo_ShapeAlgo
void SetState(const GEOMAlgo_State aSF) ;
Standard_EXPORT
void SetState(const GEOMAlgo_State aSF) ;
Standard_EXPORT
- const Handle
_Geom_Surface
& Surface() const;
+ const Handle
(Geom_Surface)
& Surface() const;
Standard_EXPORT
TopAbs_ShapeEnum ShapeType() const;
Standard_EXPORT
TopAbs_ShapeEnum ShapeType() const;
@@
-81,9
+85,9
@@
class GEOMAlgo_FinderShapeOn : public GEOMAlgo_ShapeAlgo
Standard_EXPORT
static void CopySource(const TopoDS_Shape& aS,
Standard_EXPORT
static void CopySource(const TopoDS_Shape& aS,
- TopTools_DataMapOfShapeShape& aImages,
- TopTools_DataMapOfShapeShape& aOriginals,
- TopoDS_Shape& aSC) ;
+
TopTools_DataMapOfShapeShape& aImages,
+
TopTools_DataMapOfShapeShape& aOriginals,
+
TopoDS_Shape& aSC) ;
Standard_EXPORT
static Standard_Boolean BuildTriangulation(const TopoDS_Shape& aS) ;
Standard_EXPORT
static Standard_Boolean BuildTriangulation(const TopoDS_Shape& aS) ;
@@
-108,7
+112,7
@@
protected:
void FindVertices() ;
void FindVertices() ;
- Handle
_Geom_Surface
mySurface;
+ Handle
(Geom_Surface)
mySurface;
TopAbs_ShapeEnum myShapeType;
GEOMAlgo_State myState;
TopoDS_Shape myArg1;
TopAbs_ShapeEnum myShapeType;
GEOMAlgo_State myState;
TopoDS_Shape myArg1;