0029746: Modeling Algoriothms - declare Boolean operation classes in BRepAlgo package...

The API classes in the package BRepAlgo providing access to old Boolean operations (Fuse, Common, Cut, Section) are marked as deprecated.
Corresponding classes from the package BRepAlgoAPI should be used instead.

diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md
index d1c5e44e0fff9d0bfe0192d55a1026243494af18..b5fbc61d45fb2cf9305f3baf61b68b7a6adde96f 100644 (file)
--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -1515,7 +1515,7 @@ Multiple changes have been applied to lights management within TKV3d and TKOpenG
   (preserving most methods of V3d_Light sub-classes to simplify porting).
 * Obsolete debugging functionality for drawing lights source has been removed from V3d_Light.
   Methods and constructors taking parameters for this drawing and not affecting light definition itself has been also removed.
-* Light constructors taking V3d_Viewer has been marked deprecated.
+* Light constructors taking V3d_Viewer have been marked deprecated.
   Application may call V3d_Viewer::AddLight() explicitly to register new light sources created by new constructors within V3d_Viewer, but this step is now optional.
 * The upper limit of 8 light sources has been removed.
 * Dedicated classes per light source type V3d_AmbientLight, V3d_DirectionalLight, V3d_PositionalLight and V3d_SpotLight have been preserved,
@@ -1561,3 +1561,12 @@ Since new version, these unclassified faces are no longer added into resulting s
 The following public methods of the *BOPAlgo_BuilderSolid* class have been removed as excessive:
 * void SetSolid(const TopoDS_Solid& theSolid);
 * const TopoDS_Solid& Solid() const;
+
+@subsection upgrade_730_BRepAlgoBO Boolean Operation classes in BRepAlgo are deprecated
+
+The API classes in the package BRepAlgo providing access to old Boolean operations are marked as deprecated:
+* BRepAlgo_Fuse
+* BRepAlgo_Common
+* BRepAlgo_Cut
+* BRepAlgo_Section
+Corresponding classes from the package BRepAlgoAPI should be used instead.

diff --git a/src/BRepAlgo/BRepAlgo_Common.cxx b/src/BRepAlgo/BRepAlgo_Common.cxx
index e8b8527a64eb9a510aa208561a3bb845b37f87d9..dc2a1d3e001f70c62ef3fd331795c9f7339a0e21 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Common.cxx
+++ b/src/BRepAlgo/BRepAlgo_Common.cxx
@@ -18,6 +18,8 @@
 #include <BRepAlgo_Common.hxx>
 #include <TopoDS_Shape.hxx>
 
+Standard_DISABLE_DEPRECATION_WARNINGS
+
 //=======================================================================
 //function : BRepAlgo_Common
 //purpose  : 
@@ -30,3 +32,5 @@ BRepAlgo_Common::BRepAlgo_Common(const TopoDS_Shape& S1,
   PerformDS();
   Perform(TopAbs_IN,TopAbs_IN);
 }
+
+Standard_ENABLE_DEPRECATION_WARNINGS

diff --git a/src/BRepAlgo/BRepAlgo_Common.hxx b/src/BRepAlgo/BRepAlgo_Common.hxx
index 585a255092b74b7ed437ef4e1498e911675f4ee4..4a8b4d015798a0cb189f02337cb652890f9e15ab 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Common.hxx
+++ b/src/BRepAlgo/BRepAlgo_Common.hxx
@@ -31,7 +31,8 @@ class TopoDS_Shape;
 //! - defining the construction of a common shape,
 //! - implementing the construction algorithm, and
 //! - consulting the result.
-class BRepAlgo_Common  : public BRepAlgo_BooleanOperation
+class Standard_DEPRECATED("This class is deprecated - BRepAlgoAPI_Common should be used instead")
+  BRepAlgo_Common  : public BRepAlgo_BooleanOperation
 {
 public:
 

diff --git a/src/BRepAlgo/BRepAlgo_Cut.cxx b/src/BRepAlgo/BRepAlgo_Cut.cxx
index 1260d47332aa724e9144b3ffbc99126c74aba389..c180c762bcf4647579ef63139e055d5cafc06a64 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Cut.cxx
+++ b/src/BRepAlgo/BRepAlgo_Cut.cxx
@@ -18,6 +18,8 @@
 #include <BRepAlgo_Cut.hxx>
 #include <TopoDS_Shape.hxx>
 
+Standard_DISABLE_DEPRECATION_WARNINGS
+
 //=======================================================================
 //function : BRepAlgo_Cut
 //purpose  : 
@@ -30,3 +32,5 @@ BRepAlgo_Cut::BRepAlgo_Cut(const TopoDS_Shape& S1,
   PerformDS();
   Perform(TopAbs_OUT,TopAbs_IN);
 }
+
+Standard_ENABLE_DEPRECATION_WARNINGS

diff --git a/src/BRepAlgo/BRepAlgo_Cut.hxx b/src/BRepAlgo/BRepAlgo_Cut.hxx
index 6a6b0cbaa4f69408469cab578882d26fbc925246..7b35738a648de3cea3b3a973bc70c6c550efd6a0 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Cut.hxx
+++ b/src/BRepAlgo/BRepAlgo_Cut.hxx
@@ -31,7 +31,8 @@ class TopoDS_Shape;
 //! - defining the construction of a cut shape,
 //! - implementing the construction algorithm, and
 //! - consulting the result.
-class BRepAlgo_Cut  : public BRepAlgo_BooleanOperation
+class Standard_DEPRECATED("This class is deprecated - BRepAlgoAPI_Cut should be used instead")
+  BRepAlgo_Cut : public BRepAlgo_BooleanOperation
 {
 public:
 

diff --git a/src/BRepAlgo/BRepAlgo_Fuse.cxx b/src/BRepAlgo/BRepAlgo_Fuse.cxx
index 1b6ee38ffc57f6fa8af8f64f0075358cd4c74bfb..f36dbbb3ee52a726ede80e5f436f69630437f037 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Fuse.cxx
+++ b/src/BRepAlgo/BRepAlgo_Fuse.cxx
@@ -18,6 +18,8 @@
 #include <BRepAlgo_Fuse.hxx>
 #include <TopoDS_Shape.hxx>
 
+Standard_DISABLE_DEPRECATION_WARNINGS
+
 //=======================================================================
 //function : BRepAlgo_Fuse
 //purpose  : 
@@ -30,3 +32,5 @@ BRepAlgo_Fuse::BRepAlgo_Fuse(const TopoDS_Shape& S1,
   PerformDS();
   Perform(TopAbs_OUT,TopAbs_OUT);
 }
+
+Standard_ENABLE_DEPRECATION_WARNINGS

diff --git a/src/BRepAlgo/BRepAlgo_Fuse.hxx b/src/BRepAlgo/BRepAlgo_Fuse.hxx
index fc9be1cb21b5b9d68473a534c8525b93c7106dbd..432b70a300d602b5b2db6db050eab4a3342251b6 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Fuse.hxx
+++ b/src/BRepAlgo/BRepAlgo_Fuse.hxx
@@ -31,7 +31,8 @@ class TopoDS_Shape;
 //! - defining the construction of a fused shape,
 //! - implementing the construction algorithm, and
 //! - consulting the result.
-class BRepAlgo_Fuse  : public BRepAlgo_BooleanOperation
+class Standard_DEPRECATED("This class is deprecated - BRepAlgoAPI_Fuse should be used instead")
+  BRepAlgo_Fuse  : public BRepAlgo_BooleanOperation
 {
 public:
 

diff --git a/src/BRepAlgo/BRepAlgo_Section.cxx b/src/BRepAlgo/BRepAlgo_Section.cxx
index 11b08c42d414412654e3439aebab4ab5d84e4971..1e9b3672c0a03d32ff8df2517d8c6af083e98c7a 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Section.cxx
+++ b/src/BRepAlgo/BRepAlgo_Section.cxx
@@ -34,6 +34,8 @@
 
 static TopoDS_Shape MakeShape(const Handle(Geom_Surface)& );
 
+Standard_DISABLE_DEPRECATION_WARNINGS
+
 //=======================================================================
 //function : BRepAlgo_Section
 //purpose  : 
@@ -352,3 +354,5 @@ TopoDS_Shape MakeShape(const Handle(Geom_Surface)& S)
   if (c >= GeomAbs_C2) return BRepBuilderAPI_MakeFace(S, Precision::Confusion());
   else return BRepBuilderAPI_MakeShell(S);
 }
+
+Standard_ENABLE_DEPRECATION_WARNINGS

diff --git a/src/BRepAlgo/BRepAlgo_Section.hxx b/src/BRepAlgo/BRepAlgo_Section.hxx
index fdf7fb56ccf7c727542787d52715397ef377996a..20b80f18313c3241a03de7b1a193fc153e5d92de 100644 (file)
--- a/src/BRepAlgo/BRepAlgo_Section.hxx
+++ b/src/BRepAlgo/BRepAlgo_Section.hxx
@@ -54,7 +54,8 @@ class Geom_Surface;
 //! S.Build();
 //! TopoDS_Shape R = S.Shape();
 //! On Null Shapes of geometries, NotDone() is called.
-class BRepAlgo_Section  : public BRepAlgo_BooleanOperation
+class Standard_DEPRECATED("This class is deprecated - BRepAlgoAPI_Section should be used instead")
+  BRepAlgo_Section  : public BRepAlgo_BooleanOperation
 {
 public:
 

diff --git a/src/BRepTest/BRepTest_TopologyCommands.cxx b/src/BRepTest/BRepTest_TopologyCommands.cxx
index 71d34dd1cd2c9683963eec5c579a0c1d7e79efca..5134caf3f1b37bf706663ae4a7073e866de46435 100644 (file)
--- a/src/BRepTest/BRepTest_TopologyCommands.cxx
+++ b/src/BRepTest/BRepTest_TopologyCommands.cxx
@@ -45,6 +45,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
 
+Standard_DISABLE_DEPRECATION_WARNINGS
+
 //=======================================================================
 // topop
 //=======================================================================
@@ -154,6 +156,8 @@ static Standard_Integer psection(Draw_Interpretor& , Standard_Integer n, const c
   return 0;
 }
 
+Standard_ENABLE_DEPRECATION_WARNINGS
+
 static Standard_Integer halfspace(Draw_Interpretor& di,
                                  Standard_Integer n, const char** a)
 {