mirror of
https://github.com/Open-Cascade-SAS/OCCT.git
synced 2026-09-04 11:47:53 +08:00
Coding - Deprecate NCollection_Vector (#1230)
- Updated multiple files to replace instances of NCollection_Vector with NCollection_DynamicArray
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
#include <GeomConvert.hxx>
|
||||
#include <GeomConvert_CompCurveToBSplineCurve.hxx>
|
||||
#include <GeomLProp.hxx>
|
||||
#include <NCollection_Vector.hxx>
|
||||
#include <NCollection_DynamicArray.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <Precision.hxx>
|
||||
#include <ShapeFix_Shape.hxx>
|
||||
@@ -79,10 +79,10 @@ TopoDS_Wire BRepAlgo::ConvertWire(const TopoDS_Wire& theWire,
|
||||
const double theAngleTol,
|
||||
const TopoDS_Face& theFace)
|
||||
{
|
||||
TopoDS_Wire aResult;
|
||||
double aMaxTol(0.);
|
||||
const occ::handle<Geom_Surface> aSurf = BRep_Tool::Surface(theFace);
|
||||
NCollection_Vector<OrientedCurve> vecCurve;
|
||||
TopoDS_Wire aResult;
|
||||
double aMaxTol(0.);
|
||||
const occ::handle<Geom_Surface> aSurf = BRep_Tool::Surface(theFace);
|
||||
NCollection_DynamicArray<OrientedCurve> vecCurve;
|
||||
|
||||
BRepTools_WireExplorer anExpE(theWire, theFace);
|
||||
// Explore the edges in the current wire, in their connection order
|
||||
|
||||
@@ -181,10 +181,10 @@ static void RemoveEdges(const TopoDS_Compound& theSourceComp,
|
||||
const NCollection_List<TopoDS_Shape>& theListToRemove,
|
||||
TopoDS_Compound& theResultComp);
|
||||
|
||||
static bool FilterSectionEdges(const NCollection_Vector<BOPDS_Curve>& theBCurves,
|
||||
const TopoDS_Face& theSecPlane,
|
||||
const BOPDS_PDS& theDS,
|
||||
TopoDS_Compound& theResult);
|
||||
static bool FilterSectionEdges(const NCollection_DynamicArray<BOPDS_Curve>& theBCurves,
|
||||
const TopoDS_Face& theSecPlane,
|
||||
const BOPDS_PDS& theDS,
|
||||
TopoDS_Compound& theResult);
|
||||
|
||||
static bool GetUEdges(const int theIndex,
|
||||
const int theRank,
|
||||
@@ -328,8 +328,8 @@ void BRepFill_TrimShellCorner::Perform()
|
||||
//
|
||||
const BOPDS_PDS& theDS = aPF.PDS();
|
||||
//
|
||||
NCollection_Vector<BOPDS_InterfFF>& aFFs = theDS->InterfFF();
|
||||
int aNbFFs = aFFs.Length();
|
||||
NCollection_DynamicArray<BOPDS_InterfFF>& aFFs = theDS->InterfFF();
|
||||
int aNbFFs = aFFs.Length();
|
||||
|
||||
if (!SplitUEdges(myUEdges, theDS, myIntPointCrossDir, myHistMap))
|
||||
{
|
||||
@@ -352,10 +352,10 @@ void BRepFill_TrimShellCorner::Perform()
|
||||
BOPDS_InterfFF& aFFi = aFFs(i);
|
||||
aFFi.Indices(nF1, nF2);
|
||||
//
|
||||
NCollection_Vector<BOPDS_Point>& aVP = aFFi.ChangePoints();
|
||||
aNbP = aVP.Length();
|
||||
const NCollection_Vector<BOPDS_Curve>& aVC = aFFi.Curves();
|
||||
aNbC = aVC.Length();
|
||||
NCollection_DynamicArray<BOPDS_Point>& aVP = aFFi.ChangePoints();
|
||||
aNbP = aVP.Length();
|
||||
const NCollection_DynamicArray<BOPDS_Curve>& aVC = aFFi.Curves();
|
||||
aNbC = aVC.Length();
|
||||
if (!aNbP && !aNbC)
|
||||
{
|
||||
if (!theDS->HasInterfSubShapes(nF1, nF2))
|
||||
@@ -754,9 +754,9 @@ bool BRepFill_TrimShellCorner::MakeFacesSec(const int theIndex,
|
||||
const int theFaceIndex2,
|
||||
const int theSSInterfIndex)
|
||||
{
|
||||
const NCollection_Vector<BOPDS_InterfFF>& aFFs = theDS->InterfFF();
|
||||
const BOPDS_InterfFF& aFFi = aFFs(theSSInterfIndex);
|
||||
const NCollection_Vector<BOPDS_Curve>& aBCurves = aFFi.Curves();
|
||||
const NCollection_DynamicArray<BOPDS_InterfFF>& aFFs = theDS->InterfFF();
|
||||
const BOPDS_InterfFF& aFFi = aFFs(theSSInterfIndex);
|
||||
const NCollection_DynamicArray<BOPDS_Curve>& aBCurves = aFFi.Curves();
|
||||
|
||||
TopoDS_Compound aSecEdges;
|
||||
TopoDS_Face aSecPlane;
|
||||
@@ -1206,7 +1206,7 @@ bool SplitUEdges(
|
||||
theHistMap)
|
||||
{
|
||||
|
||||
const NCollection_Vector<BOPDS_InterfVV>& aVVs = theDS->InterfVV();
|
||||
const NCollection_DynamicArray<BOPDS_InterfVV>& aVVs = theDS->InterfVV();
|
||||
|
||||
BRep_Builder aBB;
|
||||
int ueit = 0, upRow, lowCol, upCol;
|
||||
@@ -1354,7 +1354,7 @@ bool FindCommonVertex(const BOPDS_PDS& theDS,
|
||||
double& theParamOnE2)
|
||||
{
|
||||
|
||||
const NCollection_Vector<BOPDS_InterfEE>& aEEs = theDS->InterfEE();
|
||||
const NCollection_DynamicArray<BOPDS_InterfEE>& aEEs = theDS->InterfEE();
|
||||
|
||||
bool bvertexfound = false;
|
||||
TopoDS_Vertex aCommonVertex;
|
||||
@@ -2414,10 +2414,10 @@ void RemoveEdges(const TopoDS_Compound& theSourceComp,
|
||||
|
||||
//=================================================================================================
|
||||
|
||||
bool FilterSectionEdges(const NCollection_Vector<BOPDS_Curve>& theBCurves,
|
||||
const TopoDS_Face& theSecPlane,
|
||||
const BOPDS_PDS& theDS,
|
||||
TopoDS_Compound& theResult)
|
||||
bool FilterSectionEdges(const NCollection_DynamicArray<BOPDS_Curve>& theBCurves,
|
||||
const TopoDS_Face& theSecPlane,
|
||||
const BOPDS_PDS& theDS,
|
||||
TopoDS_Compound& theResult)
|
||||
{
|
||||
|
||||
theResult.Nullify();
|
||||
|
||||
Reference in New Issue
Block a user