From: msv Date: Thu, 10 May 2018 08:50:03 +0000 (+0300) Subject: 0029746: Modeling Algoriothms - declare Boolean operation classes in BRepAlgo package... X-Git-Tag: V7_3_0~20 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=9ce99357a4d06be37834b475b2b14102b3fe7f74;p=occt.git 0029746: Modeling Algoriothms - declare Boolean operation classes in BRepAlgo package as deprecated 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 d1c5e44e0f..b5fbc61d45 100644 --- 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 e8b8527a64..dc2a1d3e00 100644 --- a/src/BRepAlgo/BRepAlgo_Common.cxx +++ b/src/BRepAlgo/BRepAlgo_Common.cxx @@ -18,6 +18,8 @@ #include #include +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 585a255092..4a8b4d0157 100644 --- 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 1260d47332..c180c762bc 100644 --- a/src/BRepAlgo/BRepAlgo_Cut.cxx +++ b/src/BRepAlgo/BRepAlgo_Cut.cxx @@ -18,6 +18,8 @@ #include #include +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 6a6b0cbaa4..7b35738a64 100644 --- 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 1b6ee38ffc..f36dbbb3ee 100644 --- a/src/BRepAlgo/BRepAlgo_Fuse.cxx +++ b/src/BRepAlgo/BRepAlgo_Fuse.cxx @@ -18,6 +18,8 @@ #include #include +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 fc9be1cb21..432b70a300 100644 --- 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 11b08c42d4..1e9b3672c0 100644 --- 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 fdf7fb56cc..20b80f1831 100644 --- 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 71d34dd1cd..5134caf3f1 100644 --- a/src/BRepTest/BRepTest_TopologyCommands.cxx +++ b/src/BRepTest/BRepTest_TopologyCommands.cxx @@ -45,6 +45,8 @@ #include #include +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) {