OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0028576: Get rid of the TopOpeBRep* algorithms in TKFeat toolkit

Browse Source 
The TKFeat toolkit has been cleared from the usage of TopOpeBRep* classes.
This commit is contained in:
emv 2017-03-20 16:54:37 +03:00 committed by bugmaster
parent e8b9db57cd
commit f1b2eddc0f
13 changed files with 4 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dox/dev_guides/upgrade/upgrade.md
View File

@ -1098,7 +1098,6 @@ The following obsolete features have been removed:
Text resolution can be managed by rendering parameter *Graphic3d_RenderingParams::Resolution*, returned by *V3d_View::ChangeRenderingParams()*.
* Methods *PrsMgr_PresentationManager::BoundBox*, *PrsMgr_PresentationManager::Hilight* and *SelectMgr_EntityOwner::Hilight* have been removed as not used. The corresponding method in custom implementations of *SelectMgr_EntityOwner* can be removed safely. *PrsMgr_PresentationManager::Color* with the corresponding style must be used instead.
* Class *NCollection_QuickSort* has been removed. The code that used the tools provided by that class should be corrected manually. The recommended approach is to use sorting algorithms provided by STL (std::sort). See also @ref upgrade_occt700_sorttools above.
* The class *QANewBRepNaming_BooleanOperationFeat* has been removed. The class *QANewBRepNaming_BooleanOperation* should be used instead.
* Package *Dico*. The code that used the tools provided by that package should be corrected manually. The recommended approach is to use *NCollection_DataMap* and *NCollection_IndexedDataMap* classes.
@ -1125,6 +1124,8 @@ The following obsolete features have been removed:
These properties were unused, and therefore application should remove occurrences of these methods.
* *AIS_InteractiveObject::SelectionPriority()*.
These property was not implemented.
* The class *LocOpe_HBuilder* has been removed as obsolete.
* The class *QANewBRepNaming_BooleanOperationFeat* has been removed. The class *QANewBRepNaming_BooleanOperation* should be used instead.
@subsection upgrade_occt720_correction_of_Offset_API Corrections in BRepOffset API

86
src/BRepFeat/BRepFeat_Form.cxx
View File

@ -17,6 +17,7 @@
#include <Bnd_Box.hxx>
#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
#include <BRepAlgo.hxx>
#include <BRepAlgoAPI_BooleanOperation.hxx>
#include <BRepAlgoAPI_Cut.hxx>
@ -50,7 +51,6 @@
#include <TopoDS_Compound.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Solid.hxx>
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
@ -1270,90 +1270,6 @@ static void Descendants(const TopoDS_Shape& S,
}
}
//=======================================================================
//function : UpdateDescendants
//purpose :
//=======================================================================
void BRepFeat_Form::UpdateDescendants(const Handle(TopOpeBRepBuild_HBuilder)& B,
const TopoDS_Shape& S,
const Standard_Boolean SkipFace)
{
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itdm;
TopTools_ListIteratorOfListOfShape it,it2;
TopTools_MapIteratorOfMapOfShape itm;
TopExp_Explorer exp;
for (itdm.Initialize(myMap);itdm.More();itdm.Next()) {
const TopoDS_Shape& orig = itdm.Key();
if (SkipFace && orig.ShapeType() == TopAbs_FACE) {
continue;
}
TopTools_MapOfShape newdsc;
if (itdm.Value().IsEmpty()) {myMap.ChangeFind(orig).Append(orig);}
for (it.Initialize(itdm.Value());it.More();it.Next()) {
const TopoDS_Shape& sh = it.Value();
if(sh.ShapeType() != TopAbs_FACE) continue;
const TopoDS_Face& fdsc = TopoDS::Face(it.Value());
for (exp.Init(S,TopAbs_FACE);exp.More();exp.Next()) {
if (exp.Current().IsSame(fdsc)) { // preserved
newdsc.Add(fdsc);
break;
}
}
if (!exp.More()) {
if (B->IsSplit(fdsc, TopAbs_OUT)) {
for (it2.Initialize(B->Splits(fdsc,TopAbs_OUT));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsSplit(fdsc, TopAbs_IN)) {
for (it2.Initialize(B->Splits(fdsc,TopAbs_IN));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsSplit(fdsc, TopAbs_ON)) {
for (it2.Initialize(B->Splits(fdsc,TopAbs_ON));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsMerged(fdsc, TopAbs_OUT)) {
for (it2.Initialize(B->Merged(fdsc,TopAbs_OUT));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsMerged(fdsc, TopAbs_IN)) {
for (it2.Initialize(B->Merged(fdsc,TopAbs_IN));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsMerged(fdsc, TopAbs_ON)) {
for (it2.Initialize(B->Merged(fdsc,TopAbs_ON));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
}
}
myMap.ChangeFind(orig).Clear();
for (itm.Initialize(newdsc); itm.More(); itm.Next()) {
// check the appartenance to the shape...
for (exp.Init(S,TopAbs_FACE);exp.More();exp.Next()) {
if (exp.Current().IsSame(itm.Key())) {
// const TopoDS_Shape& sh = itm.Key();
myMap.ChangeFind(orig).Append(itm.Key());
break;
}
}
}
}
}
//=======================================================================
//function : UpdateDescendants
//purpose :

3
src/BRepFeat/BRepFeat_Form.hxx
View File

@ -36,7 +36,6 @@ class TopoDS_Shape;
class Geom_Curve;
class LocOpe_Gluer;
class BRepAlgoAPI_BooleanOperation;
class TopOpeBRepBuild_HBuilder;
//! Provides general functions to build form features.
@ -158,8 +157,6 @@ protected:
Standard_EXPORT void UpdateDescendants (const BRepAlgoAPI_BooleanOperation& aBOP, const TopoDS_Shape& SResult, const Standard_Boolean SkipFace = Standard_False);
Standard_EXPORT void UpdateDescendants (const Handle(TopOpeBRepBuild_HBuilder)& B, const TopoDS_Shape& SResult, const Standard_Boolean SkipFace = Standard_False);
Standard_EXPORT Standard_Boolean TransformShapeFU (const Standard_Integer flag);

1
src/BRepFeat/BRepFeat_MakeLinearForm.cxx
View File

@ -71,7 +71,6 @@
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Wire.hxx>
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>

1
src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
View File

@ -85,7 +85,6 @@
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Wire.hxx>
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>

84
src/BRepFeat/BRepFeat_RibSlot.cxx
View File

@ -17,6 +17,7 @@
#include <Bnd_Box.hxx>
#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepAlgo.hxx>
#include <BRepAlgoAPI_BooleanOperation.hxx>
@ -73,7 +74,6 @@
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
@ -358,88 +358,6 @@ void BRepFeat_RibSlot::UpdateDescendants(const LocOpe_Gluer& G)
}
}
//=======================================================================
//function : UpdateDescendants
//purpose :
//=======================================================================
void BRepFeat_RibSlot::UpdateDescendants (const Handle(TopOpeBRepBuild_HBuilder)& B,
const TopoDS_Shape& S,
const Standard_Boolean SkipFace)
{
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itdm;
TopTools_ListIteratorOfListOfShape it,it2;
TopTools_MapIteratorOfMapOfShape itm;
TopExp_Explorer exp;
for (itdm.Initialize(myMap);itdm.More();itdm.Next()) {
const TopoDS_Shape& orig = itdm.Key();
if (SkipFace && orig.ShapeType() == TopAbs_FACE) {
continue;
}
TopTools_MapOfShape newdsc;
for (it.Initialize(itdm.Value());it.More();it.Next()) {
const TopoDS_Shape& sh = it.Value();
if(sh.ShapeType() != TopAbs_FACE) continue;
const TopoDS_Face& fdsc = TopoDS::Face(it.Value());
for (exp.Init(S,TopAbs_FACE);exp.More();exp.Next()) {
if (exp.Current().IsSame(fdsc)) { // preserved
newdsc.Add(fdsc);
break;
}
}
if (!exp.More()) {
if (B->IsSplit(fdsc, TopAbs_OUT)) {
for (it2.Initialize(B->Splits(fdsc,TopAbs_OUT));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsSplit(fdsc, TopAbs_IN)) {
for (it2.Initialize(B->Splits(fdsc,TopAbs_IN));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsSplit(fdsc, TopAbs_ON)) {
for (it2.Initialize(B->Splits(fdsc,TopAbs_ON));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsMerged(fdsc, TopAbs_OUT)) {
for (it2.Initialize(B->Merged(fdsc,TopAbs_OUT));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsMerged(fdsc, TopAbs_IN)) {
for (it2.Initialize(B->Merged(fdsc,TopAbs_IN));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
if (B->IsMerged(fdsc, TopAbs_ON)) {
for (it2.Initialize(B->Merged(fdsc,TopAbs_ON));
it2.More();it2.Next()) {
newdsc.Add(it2.Value());
}
}
}
}
myMap.ChangeFind(orig).Clear();
for (itm.Initialize(newdsc); itm.More(); itm.Next()) {
// check the belonging to the shape...
for (exp.Init(S,TopAbs_FACE);exp.More();exp.Next()) {
if (exp.Current().IsSame(itm.Key())) {
myMap.ChangeFind(orig).Append(itm.Key());
break;
}
}
}
}
}
//=======================================================================
//function : FirstShape

3
src/BRepFeat/BRepFeat_RibSlot.hxx
View File

@ -43,7 +43,6 @@ class TopoDS_Face;
class Geom_Curve;
class TopoDS_Vertex;
class LocOpe_Gluer;
class TopOpeBRepBuild_HBuilder;
class BRepAlgoAPI_BooleanOperation;
@ -146,8 +145,6 @@ protected:
//! and deleted faces during the course of the glueing operation.
Standard_EXPORT void UpdateDescendants (const LocOpe_Gluer& G);
Standard_EXPORT void UpdateDescendants (const Handle(TopOpeBRepBuild_HBuilder)& B, const TopoDS_Shape& SResult, const Standard_Boolean SkipFace = Standard_False);
Standard_EXPORT void UpdateDescendants (const BRepAlgoAPI_BooleanOperation& aBOP, const TopoDS_Shape& SResult, const Standard_Boolean SkipFace = Standard_False);

3
src/LocOpe/FILES
View File

@ -31,9 +31,6 @@ LocOpe_GluedShape.hxx
LocOpe_Gluer.cxx
LocOpe_Gluer.hxx
LocOpe_Gluer.lxx
LocOpe_HBuilder.cxx
LocOpe_HBuilder.hxx
LocOpe_HBuilder.lxx
LocOpe_LinearForm.cxx
LocOpe_LinearForm.hxx
LocOpe_LinearForm.lxx

2
src/LocOpe/LocOpe.hxx
View File

@ -47,7 +47,6 @@ class LocOpe_CurveShapeIntersector;
class LocOpe_CSIntersector;
class LocOpe_BuildShape;
class LocOpe_SplitDrafts;
class LocOpe_HBuilder;
class LocOpe_BuildWires;
@ -107,7 +106,6 @@ friend class LocOpe_CurveShapeIntersector;
friend class LocOpe_CSIntersector;
friend class LocOpe_BuildShape;
friend class LocOpe_SplitDrafts;
friend class LocOpe_HBuilder;
friend class LocOpe_BuildWires;
};

22
src/LocOpe/LocOpe_HBuilder.cxx
View File

@ -1,22 +0,0 @@
// Created on: 1996-07-01
// Created by: Jacques GOUSSARD
// Copyright (c) 1996-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <LocOpe_HBuilder.hxx>
#include <Standard_Type.hxx>
#include <TopOpeBRepDS_BuildTool.hxx>
IMPLEMENT_STANDARD_RTTIEXT(LocOpe_HBuilder,TopOpeBRepBuild_HBuilder)

68
src/LocOpe/LocOpe_HBuilder.hxx
View File

@ -1,68 +0,0 @@
// Created on: 1996-07-01
// Created by: Jacques GOUSSARD
// Copyright (c) 1996-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _LocOpe_HBuilder_HeaderFile
#define _LocOpe_HBuilder_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <Standard_Boolean.hxx>
class TopOpeBRepDS_BuildTool;
class LocOpe_HBuilder;
DEFINE_STANDARD_HANDLE(LocOpe_HBuilder, TopOpeBRepBuild_HBuilder)
class LocOpe_HBuilder : public TopOpeBRepBuild_HBuilder
{
public:
LocOpe_HBuilder(const TopOpeBRepDS_BuildTool& BT);
Standard_Boolean Classify() const;
void Classify (const Standard_Boolean B);
DEFINE_STANDARD_RTTIEXT(LocOpe_HBuilder,TopOpeBRepBuild_HBuilder)
protected:
private:
};
#include <LocOpe_HBuilder.lxx>
#endif // _LocOpe_HBuilder_HeaderFile

50
src/LocOpe/LocOpe_HBuilder.lxx
View File

@ -1,50 +0,0 @@
// Created on: 1996-07-01
// Created by: Jacques GOUSSARD
// Copyright (c) 1996-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//=======================================================================
//function : LocOpe_HBuilder
//purpose :
//=======================================================================
inline LocOpe_HBuilder::LocOpe_HBuilder(const TopOpeBRepDS_BuildTool& BT):
TopOpeBRepBuild_HBuilder(BT)
{
myBuilder.ChangeClassify(Standard_True);
}
//=======================================================================
//function : Classify
//purpose :
//=======================================================================
inline Standard_Boolean LocOpe_HBuilder::Classify () const
{
return myBuilder.Classify();
}
//=======================================================================
//function : Classify
//purpose :
//=======================================================================
inline void LocOpe_HBuilder::Classify (const Standard_Boolean B)
{
myBuilder.ChangeClassify(B);
}

1
src/TopTrans/TopTrans_SurfaceTransition.cxx
View File

@ -33,7 +33,6 @@
static Standard_Boolean STATIC_DEFINED = Standard_False;
//#include <TopOpeBRepTool_EXPORT.hxx>
static gp_Dir FUN_nCinsideS(const gp_Dir& tgC, const gp_Dir& ngS)
{
// Give us a curve C on suface S, <parOnC>, a parameter