ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-14 21:40:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to new version of OCC

Browse Source
This commit is contained in:
mpa 2014-07-03 16:18:44 +04:00
parent b5261a9818
commit e1cd65f236
53 changed files with 221 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx
View File

@ -35,7 +35,6 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>

4
src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
View File

@ -36,7 +36,7 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <QTabWidget> #include <QTabWidget>
@ -541,7 +541,7 @@ void AdvancedGUI_PipeTShapeDlg::SelectionIntoArgument()
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) { if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(anIO, aMap); aSelMgr->GetIndexes(anIO, aMap);
if (aMap.Extent() == 1) { // Local Selection if (aMap.Extent() == 1) { // Local Selection
int anIndex = aMap(1); int anIndex = aMap(1);

1
src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx
View File

@ -33,7 +33,6 @@
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>

1
src/BasicGUI/BasicGUI_ArcDlg.cxx
View File

@ -35,7 +35,6 @@
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>

1
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

@ -36,7 +36,6 @@
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>

4
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
View File

@ -44,7 +44,7 @@
#include <gp_Dir.hxx> #include <gp_Dir.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
// QT Includes // QT Includes
@ -328,7 +328,7 @@ void BasicGUI_WorkingPlaneDlg::SelectionIntoArgument()
if ( aRes && !aSelectedObject->_is_nil() ) { if ( aRes && !aSelectedObject->_is_nil() ) {
TopoDS_Shape aShape; TopoDS_Shape aShape;
if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) { if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(aSelList.First(), aMap); aSelMgr->GetIndexes(aSelList.First(), aMap);
if ( aMap.Extent() == 1 ) { if ( aMap.Extent() == 1 ) {
int anIndex = aMap( 1 ); int anIndex = aMap( 1 );

4
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
View File

@ -40,7 +40,7 @@
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
// OCCT Includes // OCCT Includes
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
//================================================================================= //=================================================================================
// class : BlocksGUI_TrsfDlg() // class : BlocksGUI_TrsfDlg()
@ -262,7 +262,7 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
anObj = GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); anObj = GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
if ( GEOMBase::IsShape(anObj) ) { if ( GEOMBase::IsShape(anObj) ) {
aName = GEOMBase::GetName(anObj); aName = GEOMBase::GetName(anObj);
TColStd_IndexedMapOfInteger anIndexes; NCollection_IndexedMap<Standard_Integer> anIndexes;
aSelMgr->GetIndexes(aSelList.First(), anIndexes); aSelMgr->GetIndexes(aSelList.First(), anIndexes);
if (anIndexes.Extent() == 1) { if (anIndexes.Extent() == 1) {

4
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
View File

@ -52,7 +52,7 @@
//OCCT includes //OCCT includes
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx> #include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepBuilderAPI_MakePolygon.hxx> #include <BRepBuilderAPI_MakePolygon.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx> #include <BRepBuilderAPI_MakeEdge.hxx>
@ -761,7 +761,7 @@ void EntityGUI_3DSketcherDlg::SelectionIntoArgument()
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE)) { if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE)) {
// Explore the shape if its a local selection // Explore the shape if its a local selection
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(aSelList.First(), aMap); aSelMgr->GetIndexes(aSelList.First(), aMap);
if (aMap.Extent() == 1) { if (aMap.Extent() == 1) {
int anIndex = aMap(1); int anIndex = aMap(1);

5
src/EntityGUI/EntityGUI_FieldDlg.cxx
View File

@ -69,7 +69,6 @@
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx> #include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
@ -1206,7 +1205,7 @@ void EntityGUI_FieldDlg::SelectionIntoArgument()
myCurStepTable->blockSignals(true); myCurStepTable->blockSignals(true);
QList< int > rowsToSelect; QList< int > rowsToSelect;
TColStd_IndexedMapOfInteger aMapIndex; NCollection_IndexedMap<Standard_Integer> aMapIndex;
if ( getSelectedSubshapes(aMapIndex )) if ( getSelectedSubshapes(aMapIndex ))
for (int ii = 1, nn = aMapIndex.Extent(); ii <= nn; ii++) { for (int ii = 1, nn = aMapIndex.Extent(); ii <= nn; ii++) {
const int shapeID = aMapIndex( ii ); const int shapeID = aMapIndex( ii );
@ -1442,7 +1441,7 @@ void EntityGUI_FieldDlg::showCurStep()
// function : getSelectedSubshapes // function : getSelectedSubshapes
// purpose : // purpose :
//================================================================================= //=================================================================================
int EntityGUI_FieldDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex) int EntityGUI_FieldDlg::getSelectedSubshapes (NCollection_IndexedMap<Standard_Integer>& theMapIndex)
{ {
theMapIndex.Clear(); theMapIndex.Clear();

4
src/EntityGUI/EntityGUI_FieldDlg.h
View File

@ -30,7 +30,7 @@
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <TColStd_DataMapOfIntegerInteger.hxx> #include <TColStd_DataMapOfIntegerInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <QMap> #include <QMap>
@ -101,7 +101,7 @@ private:
int getNbComps() const; int getNbComps() const;
void updateShapeIDs(); void updateShapeIDs();
void updateDims(int curDim=-1); void updateDims(int curDim=-1);
int getSelectedSubshapes (TColStd_IndexedMapOfInteger& map); int getSelectedSubshapes (NCollection_IndexedMap<Standard_Integer>& map);
private: private:
bool myIsCreation; bool myIsCreation;

8
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

@ -49,8 +49,6 @@
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <QMessageBox> #include <QMessageBox>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -653,7 +651,7 @@ void EntityGUI_SubShapeDlg::showOnlySelected()
// function : getSelectedSubshapes // function : getSelectedSubshapes
// purpose : // purpose :
//================================================================================= //=================================================================================
int EntityGUI_SubShapeDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex) int EntityGUI_SubShapeDlg::getSelectedSubshapes (NCollection_IndexedMap<Standard_Integer>& theMapIndex)
{ {
theMapIndex.Clear(); theMapIndex.Clear();
@ -824,7 +822,7 @@ bool EntityGUI_SubShapeDlg::isValid (QString& msg)
if (isAllSubShapes()) if (isAllSubShapes())
isOk = true; isOk = true;
else { else {
TColStd_IndexedMapOfInteger aMapIndex; NCollection_IndexedMap<Standard_Integer> aMapIndex;
int nbSel = getSelectedSubshapes(aMapIndex); int nbSel = getSelectedSubshapes(aMapIndex);
isOk = nbSel > 0; isOk = nbSel > 0;
@ -845,7 +843,7 @@ bool EntityGUI_SubShapeDlg::execute (ObjectList& objects)
if (!isAllSubShapes()) { if (!isAllSubShapes()) {
// manual selection // manual selection
TColStd_IndexedMapOfInteger aMapIndex; NCollection_IndexedMap<Standard_Integer> aMapIndex;
int nbSel = getSelectedSubshapes(aMapIndex); int nbSel = getSelectedSubshapes(aMapIndex);
if (nbSel > 0) { if (nbSel > 0) {

4
src/EntityGUI/EntityGUI_SubShapeDlg.h
View File

@ -29,7 +29,7 @@
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
class DlgRef_1Sel1List1Check3Btn; class DlgRef_1Sel1List1Check3Btn;
@ -77,7 +77,7 @@ private:
const int) const; const int) const;
void activateSelection(); void activateSelection();
int getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex); int getSelectedSubshapes (NCollection_IndexedMap<Standard_Integer>& theMapIndex);
void updateButtonState(); void updateButtonState();
bool isAllSubShapes() const; bool isAllSubShapes() const;
int shapeType() const; int shapeType() const;

45
src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
View File

@ -74,9 +74,8 @@
#include <IntTools_Tools.hxx> #include <IntTools_Tools.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_ListOfShape.hxx> #include <NCollection_List.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
@ -632,7 +631,7 @@ void GEOMAlgo_AlgoTools::PointOnShape(const TopoDS_Shape& aS,
//======================================================================= //=======================================================================
Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
(const TopoDS_Shape& aE1, (const TopoDS_Shape& aE1,
const TopTools_ListOfShape& aLE, const NCollection_List<TopoDS_Shape>& aLE,
const Standard_Real aTol, const Standard_Real aTol,
TopTools_ListOfShape& aLESD, TopTools_ListOfShape& aLESD,
#if OCC_VERSION_LARGE > 0x06070100 #if OCC_VERSION_LARGE > 0x06070100
@ -645,7 +644,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
Standard_Boolean bIsDone; Standard_Boolean bIsDone;
Standard_Real aTol2, aD2; Standard_Real aTol2, aD2;
gp_Pnt aP1, aP2; gp_Pnt aP1, aP2;
TopTools_ListIteratorOfListOfShape aIt; NCollection_List<TopoDS_Shape>::Iterator aIt;
// //
aTol2=aTol*aTol; aTol2=aTol*aTol;
GEOMAlgo_AlgoTools::PointOnShape(aE1, aP1); GEOMAlgo_AlgoTools::PointOnShape(aE1, aP1);
@ -676,7 +675,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
(const TopTools_ListOfShape& aLE, (const NCollection_List<TopoDS_Shape>& aLE,
const Standard_Real aTol, const Standard_Real aTol,
TopTools_IndexedDataMapOfShapeListOfShape& aMEE, TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
#if OCC_VERSION_LARGE > 0x06070100 #if OCC_VERSION_LARGE > 0x06070100
@ -688,7 +687,8 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
{ {
Standard_Integer aNbE, aNbEProcessed, aNbESD, iErr; Standard_Integer aNbE, aNbEProcessed, aNbESD, iErr;
TopTools_ListOfShape aLESD; TopTools_ListOfShape aLESD;
TopTools_ListIteratorOfListOfShape aIt, aIt1; NCollection_List<TopoDS_Shape>::Iterator aIt;
TopTools_ListIteratorOfListOfShape aIt1;
TopTools_IndexedMapOfShape aMProcessed; TopTools_IndexedMapOfShape aMProcessed;
TopAbs_ShapeEnum aType; TopAbs_ShapeEnum aType;
// //
@ -766,7 +766,7 @@ Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes
// //
aNbE=aMPKLE.Extent(); aNbE=aMPKLE.Extent();
for (i=1; i<=aNbE; ++i) { for (i=1; i<=aNbE; ++i) {
TopTools_ListOfShape& aLSDE=aMPKLE.ChangeFromIndex(i); NCollection_List<TopoDS_Shape>& aLSDE=aMPKLE.ChangeFromIndex(i);
// //
aMEE.Clear(); aMEE.Clear();
iErr=GEOMAlgo_AlgoTools::FindSDShapes(aLSDE, aTol, aMEE, aCtx); iErr=GEOMAlgo_AlgoTools::FindSDShapes(aLSDE, aTol, aMEE, aCtx);
@ -780,15 +780,17 @@ Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes
} }
// //
for (j=1; j<=aNbEE; ++j) { for (j=1; j<=aNbEE; ++j) {
TopTools_ListOfShape& aLEE=aMEE.ChangeFromIndex(j); TopTools_ListOfShape& aTopToolsLEE = aMEE.ChangeFromIndex(j);
// //
if (j==1) { if (j==1) {
NCollection_List<TopoDS_Shape> aLEE;
ConvertTopToolsListOfShapeToNCollectionList( aTopToolsLEE, aLEE);
aLSDE.Clear(); aLSDE.Clear();
aLSDE.Append(aLEE); aLSDE.Append(aLEE);
} }
else { else {
const TopoDS_Shape& aE1=aLEE.First(); const TopoDS_Shape& aE1=aTopToolsLEE.First();
aMEToAdd.Add(aE1, aLEE); aMEToAdd.Add(aE1, aTopToolsLEE);
} }
} }
} }
@ -802,7 +804,9 @@ Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes
GEOMAlgo_PassKeyShape aPKE1; GEOMAlgo_PassKeyShape aPKE1;
// //
const TopoDS_Shape& aE1=aMEToAdd.FindKey(i); const TopoDS_Shape& aE1=aMEToAdd.FindKey(i);
const TopTools_ListOfShape& aLE=aMEToAdd(i); NCollection_List<TopoDS_Shape> aConvLE;
GEOMAlgo_AlgoTools::ConvertTopToolsListOfShapeToNCollectionList(aMEToAdd(i), aConvLE);
const NCollection_List<TopoDS_Shape>& aLE=aConvLE;
// //
aPKE1.SetShapes(aE1); aPKE1.SetShapes(aE1);
aMPKLE.Add(aPKE1, aLE); aMPKLE.Add(aPKE1, aLE);
@ -1022,3 +1026,22 @@ Standard_Integer GEOMAlgo_AlgoTools::PntInFace(const TopoDS_Face& aF,
// //
return iErr; return iErr;
} }
void GEOMAlgo_AlgoTools::ConvertTopToolsListOfShapeToNCollectionList(const TopTools_ListOfShape& aLS,
NCollection_List<TopoDS_Shape>& aNLS)
{
TopTools_ListIteratorOfListOfShape aIt;
aIt.Initialize(aLS);
for (; aIt.More(); aIt.Next())
aNLS.Append(aIt.Value());
}
void GEOMAlgo_AlgoTools::ConvertNCollectionListToTopToolsListOfShape(const NCollection_List<TopoDS_Shape>& aLS,
TopTools_ListOfShape& aNLS)
{
NCollection_List<TopoDS_Shape>::Iterator aIt;
aIt.Initialize(aLS);
for (; aIt.More(); aIt.Next())
aNLS.Append(aIt.Value());
}

15
src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx
View File

@ -51,9 +51,10 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <NCollection_List.hxx>
#include <TopTools_ListOfShape.hxx> #include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeShape.hxx> #include <TopTools_IndexedDataMapOfShapeShape.hxx>
#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx> #include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
@ -102,7 +103,7 @@ class GEOMAlgo_AlgoTools {
) ; ) ;
Standard_EXPORT Standard_EXPORT
static Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE, static Standard_Integer FindSDShapes(const NCollection_List<TopoDS_Shape>& aLE,
const Standard_Real aTol, const Standard_Real aTol,
TopTools_IndexedDataMapOfShapeListOfShape& aMEE, TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
#if OCC_VERSION_LARGE > 0x06070100 #if OCC_VERSION_LARGE > 0x06070100
@ -113,7 +114,7 @@ class GEOMAlgo_AlgoTools {
) ; ) ;
Standard_EXPORT Standard_EXPORT
static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1, static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1,
const TopTools_ListOfShape& aLE, const NCollection_List<TopoDS_Shape>& aLE,
const Standard_Real aTol, const Standard_Real aTol,
TopTools_ListOfShape& aLESD, TopTools_ListOfShape& aLESD,
#if OCC_VERSION_LARGE > 0x06070100 #if OCC_VERSION_LARGE > 0x06070100
@ -247,5 +248,13 @@ class GEOMAlgo_AlgoTools {
static void CopyShape(const TopoDS_Shape& aS, static void CopyShape(const TopoDS_Shape& aS,
TopoDS_Shape& aSC, TopoDS_Shape& aSC,
TopTools_IndexedDataMapOfShapeShape& aMSS) ; TopTools_IndexedDataMapOfShapeShape& aMSS) ;
Standard_EXPORT
static void ConvertTopToolsListOfShapeToNCollectionList(const TopTools_ListOfShape&,
NCollection_List<TopoDS_Shape>&) ;
Standard_EXPORT
static void ConvertNCollectionListToTopToolsListOfShape(const NCollection_List<TopoDS_Shape>&,
TopTools_ListOfShape&) ;
}; };
#endif #endif

23
src/GEOMAlgo/GEOMAlgo_AlgoTools_1.cxx
View File

@ -30,15 +30,14 @@
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <GEOMAlgo_CoupleOfShapes.hxx> #include <GEOMAlgo_CoupleOfShapes.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
static static
void ProcessBlock(const TopoDS_Shape& aF, void ProcessBlock(const TopoDS_Shape& aF,
const GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape& aMCV, const GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape& aMCV,
TopTools_IndexedMapOfShape& aProcessed, NCollection_IndexedMap<TopoDS_Shape>& aProcessed,
TopTools_IndexedMapOfShape& aChain); NCollection_IndexedMap<TopoDS_Shape>& aChain);
//======================================================================= //=======================================================================
// function: FindChains // function: FindChains
@ -59,24 +58,24 @@ void GEOMAlgo_AlgoTools::FindChains(const GEOMAlgo_ListOfCoupleOfShapes& aLCS,
// //
// //
if (aMCV.Contains(aF1)) { if (aMCV.Contains(aF1)) {
TopTools_IndexedMapOfShape& aMV=aMCV.ChangeFromKey(aF1); NCollection_IndexedMap<TopoDS_Shape>& aMV=aMCV.ChangeFromKey(aF1);
aMV.Add(aF1); aMV.Add(aF1);
aMV.Add(aF2); aMV.Add(aF2);
} }
else { else {
TopTools_IndexedMapOfShape aMV; NCollection_IndexedMap<TopoDS_Shape> aMV;
aMV.Add(aF1); aMV.Add(aF1);
aMV.Add(aF2); aMV.Add(aF2);
aMCV.Add(aF1, aMV); aMCV.Add(aF1, aMV);
} }
// //
if (aMCV.Contains(aF2)) { if (aMCV.Contains(aF2)) {
TopTools_IndexedMapOfShape& aMV=aMCV.ChangeFromKey(aF2); NCollection_IndexedMap<TopoDS_Shape>& aMV=aMCV.ChangeFromKey(aF2);
aMV.Add(aF1); aMV.Add(aF1);
aMV.Add(aF2); aMV.Add(aF2);
} }
else { else {
TopTools_IndexedMapOfShape aMV; NCollection_IndexedMap<TopoDS_Shape> aMV;
aMV.Add(aF1); aMV.Add(aF1);
aMV.Add(aF2); aMV.Add(aF2);
aMCV.Add(aF2, aMV); aMCV.Add(aF2, aMV);
@ -92,7 +91,7 @@ void GEOMAlgo_AlgoTools::FindChains(const GEOMAlgo_IndexedDataMapOfShapeIndexedM
GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape& aMapChains) GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape& aMapChains)
{ {
Standard_Integer i, j, aNbCV, aNbV; Standard_Integer i, j, aNbCV, aNbV;
TopTools_IndexedMapOfShape aProcessed, aChain; NCollection_IndexedMap<TopoDS_Shape> aProcessed, aChain;
// //
aNbCV=aMCV.Extent(); aNbCV=aMCV.Extent();
for (i=1; i<=aNbCV; ++i) { for (i=1; i<=aNbCV; ++i) {
@ -104,7 +103,7 @@ void GEOMAlgo_AlgoTools::FindChains(const GEOMAlgo_IndexedDataMapOfShapeIndexedM
aProcessed.Add(aF); aProcessed.Add(aF);
aChain.Add(aF); aChain.Add(aF);
// //
const TopTools_IndexedMapOfShape& aMV=aMCV(i); const NCollection_IndexedMap<TopoDS_Shape>& aMV=aMCV(i);
aNbV=aMV.Extent(); aNbV=aMV.Extent();
for (j=1; j<=aNbV; ++j) { for (j=1; j<=aNbV; ++j) {
const TopoDS_Shape& aFx=aMV(j); const TopoDS_Shape& aFx=aMV(j);
@ -120,8 +119,8 @@ void GEOMAlgo_AlgoTools::FindChains(const GEOMAlgo_IndexedDataMapOfShapeIndexedM
//======================================================================= //=======================================================================
void ProcessBlock(const TopoDS_Shape& aF, void ProcessBlock(const TopoDS_Shape& aF,
const GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape& aMCV, const GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape& aMCV,
TopTools_IndexedMapOfShape& aProcessed, NCollection_IndexedMap<TopoDS_Shape>& aProcessed,
TopTools_IndexedMapOfShape& aChain) NCollection_IndexedMap<TopoDS_Shape>& aChain)
{ {
Standard_Integer j, aNbV; Standard_Integer j, aNbV;
// //
@ -131,7 +130,7 @@ void ProcessBlock(const TopoDS_Shape& aF,
aProcessed.Add(aF); aProcessed.Add(aF);
aChain.Add(aF); aChain.Add(aF);
// //
const TopTools_IndexedMapOfShape& aMV=aMCV.FindFromKey(aF); const NCollection_IndexedMap<TopoDS_Shape>& aMV=aMCV.FindFromKey(aF);
aNbV=aMV.Extent(); aNbV=aMV.Extent();
for (j=1; j<=aNbV; ++j) { for (j=1; j<=aNbV; ++j) {
const TopoDS_Shape& aFx=aMV(j); const TopoDS_Shape& aFx=aMV(j);

3
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
View File

@ -32,9 +32,10 @@
#define _NCollection_MapHasher #define _NCollection_MapHasher
#include <NCollection_DataMap.hxx> #include <NCollection_DataMap.hxx>
#include <NCollection_Map.hxx>
typedef NCollection_DataMap<TopoDS_Shape, TopTools_MapOfShape, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeMapOfShape; typedef NCollection_DataMap<TopoDS_Shape, NCollection_Map<TopoDS_Shape>, TopTools_ShapeMapHasher> GEOMAlgo_DataMapOfShapeMapOfShape;
typedef GEOMAlgo_DataMapOfShapeMapOfShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape; typedef GEOMAlgo_DataMapOfShapeMapOfShape::Iterator GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape;
#undef _NCollection_MapHasher #undef _NCollection_MapHasher

73
src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx
View File

@ -55,8 +55,7 @@
#include <TopTools_DataMapOfShapeListOfShape.hxx> #include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <NCollection_Map.hxx>
#include <TopTools_MapIteratorOfMapOfShape.hxx>
#include <GEOMAlgo_BoxBndTree.hxx> #include <GEOMAlgo_BoxBndTree.hxx>
#include <GEOMAlgo_CoupleOfShapes.hxx> #include <GEOMAlgo_CoupleOfShapes.hxx>
@ -412,7 +411,7 @@ void GEOMAlgo_GetInPlace::FillEdgesOn(const TopoDS_Shape &theShape)
Standard_Integer i, aNbE; Standard_Integer i, aNbE;
TopoDS_Iterator aIt; TopoDS_Iterator aIt;
TopTools_IndexedMapOfShape aME; TopTools_IndexedMapOfShape aME;
TopTools_MapIteratorOfMapOfShape aItMS; NCollection_Map<TopoDS_Shape>::Iterator aItMS;
// //
TopExp::MapShapes(theShape, TopAbs_EDGE, aME); TopExp::MapShapes(theShape, TopAbs_EDGE, aME);
aNbE=aME.Extent(); aNbE=aME.Extent();
@ -426,7 +425,7 @@ void GEOMAlgo_GetInPlace::FillEdgesOn(const TopoDS_Shape &theShape)
for (; aIt.More(); aIt.Next()) { for (; aIt.More(); aIt.Next()) {
const TopoDS_Shape& aV1=aIt.Value(); const TopoDS_Shape& aV1=aIt.Value();
if (myShapesOn.IsBound(aV1)) { if (myShapesOn.IsBound(aV1)) {
const TopTools_MapOfShape& aMSOn=myShapesOn.Find(aV1); const NCollection_Map<TopoDS_Shape>& aMSOn=myShapesOn.Find(aV1);
//aNbSOn=aMSOn.Extent(); //aNbSOn=aMSOn.Extent();
aItMS.Initialize(aMSOn); aItMS.Initialize(aMSOn);
for (; aItMS.More(); aItMS.Next()) { for (; aItMS.More(); aItMS.Next()) {
@ -456,7 +455,7 @@ void GEOMAlgo_GetInPlace::PerformVE()
const TopoDS_Shape& aV2=aCS.Shape2(); const TopoDS_Shape& aV2=aCS.Shape2();
// //
if (myShapesOn.IsBound(aE1)) { if (myShapesOn.IsBound(aE1)) {
const TopTools_MapOfShape& aMSOn=myShapesOn.Find(aE1); const NCollection_Map<TopoDS_Shape>& aMSOn=myShapesOn.Find(aE1);
if (aMSOn.Contains(aV2)) { if (aMSOn.Contains(aV2)) {
continue; continue;
} }
@ -508,12 +507,12 @@ void GEOMAlgo_GetInPlace::PerformEE(const TopoDS_Shape &theE1,
{ {
Standard_Boolean bHasOn, bHasIn, bFound; Standard_Boolean bHasOn, bHasIn, bFound;
TopoDS_Iterator aIt; TopoDS_Iterator aIt;
TopTools_MapOfShape aMSX; NCollection_Map<TopoDS_Shape> aMSX;
// //
bHasOn=myShapesOn.IsBound(theE1); bHasOn=myShapesOn.IsBound(theE1);
bHasIn=myShapesIn.IsBound(theE1); bHasIn=myShapesIn.IsBound(theE1);
const TopTools_MapOfShape& aMSOn=(bHasOn) ? myShapesOn.Find(theE1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSOn=(bHasOn) ? myShapesOn.Find(theE1) : aMSX;
const TopTools_MapOfShape& aMSIn=(bHasIn) ? myShapesIn.Find(theE1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSIn=(bHasIn) ? myShapesIn.Find(theE1) : aMSX;
// //
bFound=Standard_True; bFound=Standard_True;
aIt.Initialize(theE2); aIt.Initialize(theE2);
@ -544,7 +543,7 @@ void GEOMAlgo_GetInPlace::PerformVF()
{ {
Standard_Boolean bHasOn, bHasIn, bFound; Standard_Boolean bHasOn, bHasIn, bFound;
Standard_Integer i, aNbE; Standard_Integer i, aNbE;
TopTools_MapOfShape aMSX; NCollection_Map<TopoDS_Shape> aMSX;
TopTools_IndexedMapOfShape aME; TopTools_IndexedMapOfShape aME;
// //
myErrorStatus=0; myErrorStatus=0;
@ -569,8 +568,8 @@ void GEOMAlgo_GetInPlace::PerformVF()
// //
bHasOn=myShapesOn.IsBound(aE1); bHasOn=myShapesOn.IsBound(aE1);
bHasIn=myShapesIn.IsBound(aE1); bHasIn=myShapesIn.IsBound(aE1);
const TopTools_MapOfShape& aMSOn=(bHasOn) ? myShapesOn.Find(aE1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSOn=(bHasOn) ? myShapesOn.Find(aE1) : aMSX;
const TopTools_MapOfShape& aMSIn=(bHasIn) ? myShapesIn.Find(aE1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSIn=(bHasIn) ? myShapesIn.Find(aE1) : aMSX;
bFound= (aMSOn.Contains(aV2) || aMSIn.Contains(aV2)); bFound= (aMSOn.Contains(aV2) || aMSIn.Contains(aV2));
if (bFound) { if (bFound) {
break; break;
@ -599,7 +598,7 @@ void GEOMAlgo_GetInPlace::FillFacesOn(const TopoDS_Shape &theShape)
Standard_Integer i, j, aNbF, aNbE; Standard_Integer i, j, aNbF, aNbE;
TopoDS_Iterator aIt; TopoDS_Iterator aIt;
TopTools_IndexedMapOfShape aMF, aME; TopTools_IndexedMapOfShape aMF, aME;
TopTools_MapIteratorOfMapOfShape aItMS; NCollection_Map<TopoDS_Shape>::Iterator aItMS;
// //
TopExp::MapShapes(theShape, TopAbs_FACE, aMF); TopExp::MapShapes(theShape, TopAbs_FACE, aMF);
aNbF=aMF.Extent(); aNbF=aMF.Extent();
@ -616,7 +615,7 @@ void GEOMAlgo_GetInPlace::FillFacesOn(const TopoDS_Shape &theShape)
} }
// //
if (myShapesOn.IsBound(aE1)) { if (myShapesOn.IsBound(aE1)) {
const TopTools_MapOfShape& aMSOn=myShapesOn.Find(aE1); const NCollection_Map<TopoDS_Shape>& aMSOn=myShapesOn.Find(aE1);
aItMS.Initialize(aMSOn); aItMS.Initialize(aMSOn);
for (; aItMS.More(); aItMS.Next()) { for (; aItMS.More(); aItMS.Next()) {
const TopoDS_Shape& aS2=aItMS.Key(); const TopoDS_Shape& aS2=aItMS.Key();
@ -625,7 +624,7 @@ void GEOMAlgo_GetInPlace::FillFacesOn(const TopoDS_Shape &theShape)
} }
// //
if (myShapesIn.IsBound(aE1)) { if (myShapesIn.IsBound(aE1)) {
const TopTools_MapOfShape& aMSIn=myShapesIn.Find(aE1); const NCollection_Map<TopoDS_Shape>& aMSIn=myShapesIn.Find(aE1);
aItMS.Initialize(aMSIn); aItMS.Initialize(aMSIn);
for (; aItMS.More(); aItMS.Next()) { for (; aItMS.More(); aItMS.Next()) {
const TopoDS_Shape& aS2=aItMS.Key(); const TopoDS_Shape& aS2=aItMS.Key();
@ -643,7 +642,7 @@ void GEOMAlgo_GetInPlace::PerformEF()
{ {
Standard_Boolean bFound, bHasOnF, bHasInF; Standard_Boolean bFound, bHasOnF, bHasInF;
TopoDS_Iterator aIt; TopoDS_Iterator aIt;
TopTools_MapOfShape aMSX; NCollection_Map<TopoDS_Shape> aMSX;
// //
myErrorStatus=0; myErrorStatus=0;
myWarningStatus=0; myWarningStatus=0;
@ -656,7 +655,7 @@ void GEOMAlgo_GetInPlace::PerformEF()
// //
// 1. // 1.
bHasOnF=myShapesOn.IsBound(aF1); bHasOnF=myShapesOn.IsBound(aF1);
const TopTools_MapOfShape& aMSOnF=(bHasOnF) ? myShapesOn.Find(aF1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSOnF=(bHasOnF) ? myShapesOn.Find(aF1) : aMSX;
bFound=aMSOnF.Contains(aE2); bFound=aMSOnF.Contains(aE2);
if (bFound) { if (bFound) {
continue; continue;
@ -664,7 +663,7 @@ void GEOMAlgo_GetInPlace::PerformEF()
// //
// 2. // 2.
bHasInF=myShapesIn.IsBound(aF1); bHasInF=myShapesIn.IsBound(aF1);
const TopTools_MapOfShape& aMSInF=(bHasInF) ? myShapesIn.Find(aF1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSInF=(bHasInF) ? myShapesIn.Find(aF1) : aMSX;
// //
aIt.Initialize(aE2); aIt.Initialize(aE2);
for (; aIt.More(); aIt.Next()) { for (; aIt.More(); aIt.Next()) {
@ -724,14 +723,14 @@ void GEOMAlgo_GetInPlace::PerformFF(const TopoDS_Shape &theF1,
{ {
Standard_Boolean bFound, bHasOnF, bHasInF; Standard_Boolean bFound, bHasOnF, bHasInF;
Standard_Integer i, aNbS2; Standard_Integer i, aNbS2;
TopTools_MapOfShape aMSX; NCollection_Map<TopoDS_Shape> aMSX;
TopTools_IndexedMapOfShape aMS2; TopTools_IndexedMapOfShape aMS2;
// //
bHasOnF=myShapesOn.IsBound(theF1); bHasOnF=myShapesOn.IsBound(theF1);
const TopTools_MapOfShape& aMSOnF=(bHasOnF) ? myShapesOn.Find(theF1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSOnF=(bHasOnF) ? myShapesOn.Find(theF1) : aMSX;
// //
bHasInF=myShapesIn.IsBound(theF1); bHasInF=myShapesIn.IsBound(theF1);
const TopTools_MapOfShape& aMSInF=(bHasInF) ? myShapesIn.Find(theF1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSInF=(bHasInF) ? myShapesIn.Find(theF1) : aMSX;
// //
MapBRepShapes(theF2, aMS2); MapBRepShapes(theF2, aMS2);
// //
@ -767,7 +766,7 @@ void GEOMAlgo_GetInPlace::FillSolidsOn(const TopoDS_Shape &theShape)
{ {
Standard_Integer i, j, aNbS, aNbF; Standard_Integer i, j, aNbS, aNbF;
TopTools_IndexedMapOfShape aMS, aMF; TopTools_IndexedMapOfShape aMS, aMF;
TopTools_MapIteratorOfMapOfShape aItMS; NCollection_Map<TopoDS_Shape>::Iterator aItMS;
// //
TopExp::MapShapes(theShape, TopAbs_SOLID, aMS); TopExp::MapShapes(theShape, TopAbs_SOLID, aMS);
// //
@ -782,7 +781,7 @@ void GEOMAlgo_GetInPlace::FillSolidsOn(const TopoDS_Shape &theShape)
const TopoDS_Shape& aF1=aMF(j); const TopoDS_Shape& aF1=aMF(j);
// //
if (myShapesOn.IsBound(aF1)) { if (myShapesOn.IsBound(aF1)) {
const TopTools_MapOfShape& aMSOn=myShapesOn.Find(aF1); const NCollection_Map<TopoDS_Shape>& aMSOn=myShapesOn.Find(aF1);
aItMS.Initialize(aMSOn); aItMS.Initialize(aMSOn);
for (; aItMS.More(); aItMS.Next()) { for (; aItMS.More(); aItMS.Next()) {
const TopoDS_Shape& aS2=aItMS.Key(); const TopoDS_Shape& aS2=aItMS.Key();
@ -791,7 +790,7 @@ void GEOMAlgo_GetInPlace::FillSolidsOn(const TopoDS_Shape &theShape)
} }
// //
if (myShapesIn.IsBound(aF1)) { if (myShapesIn.IsBound(aF1)) {
const TopTools_MapOfShape& aMSIn=myShapesIn.Find(aF1); const NCollection_Map<TopoDS_Shape>& aMSIn=myShapesIn.Find(aF1);
aItMS.Initialize(aMSIn); aItMS.Initialize(aMSIn);
for (; aItMS.More(); aItMS.Next()) { for (; aItMS.More(); aItMS.Next()) {
const TopoDS_Shape& aS2=aItMS.Key(); const TopoDS_Shape& aS2=aItMS.Key();
@ -808,7 +807,7 @@ void GEOMAlgo_GetInPlace::FillSolidsOn(const TopoDS_Shape &theShape)
void GEOMAlgo_GetInPlace::PerformZF() void GEOMAlgo_GetInPlace::PerformZF()
{ {
Standard_Boolean bFound, bHasOnF; Standard_Boolean bFound, bHasOnF;
TopTools_MapOfShape aMSX; NCollection_Map<TopoDS_Shape> aMSX;
// //
myErrorStatus=0; myErrorStatus=0;
myWarningStatus=0; myWarningStatus=0;
@ -820,7 +819,7 @@ void GEOMAlgo_GetInPlace::PerformZF()
const TopoDS_Shape& aF2=aCS.Shape2(); const TopoDS_Shape& aF2=aCS.Shape2();
// //
bHasOnF=myShapesOn.IsBound(aSo1); bHasOnF=myShapesOn.IsBound(aSo1);
const TopTools_MapOfShape& aMSOnF=(bHasOnF) ? myShapesOn.Find(aSo1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSOnF=(bHasOnF) ? myShapesOn.Find(aSo1) : aMSX;
bFound=aMSOnF.Contains(aF2); bFound=aMSOnF.Contains(aF2);
if (bFound) { if (bFound) {
continue; continue;
@ -872,14 +871,14 @@ void GEOMAlgo_GetInPlace::PerformZZ(const TopoDS_Shape &theSo1,
{ {
Standard_Boolean bFound, bHasOn, bHasIn; Standard_Boolean bFound, bHasOn, bHasIn;
Standard_Integer i, aNbS2, iCntOn, iCntIn, iCntOut; Standard_Integer i, aNbS2, iCntOn, iCntIn, iCntOut;
TopTools_MapOfShape aMSX; NCollection_Map<TopoDS_Shape> aMSX;
TopTools_IndexedMapOfShape aMS2; TopTools_IndexedMapOfShape aMS2;
// //
bHasOn=myShapesOn.IsBound(theSo1); bHasOn=myShapesOn.IsBound(theSo1);
const TopTools_MapOfShape& aMSOn=(bHasOn) ? myShapesOn.Find(theSo1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSOn=(bHasOn) ? myShapesOn.Find(theSo1) : aMSX;
// //
bHasIn=myShapesIn.IsBound(theSo1); bHasIn=myShapesIn.IsBound(theSo1);
const TopTools_MapOfShape& aMSIn=(bHasIn) ? myShapesIn.Find(theSo1) : aMSX; const NCollection_Map<TopoDS_Shape>& aMSIn=(bHasIn) ? myShapesIn.Find(theSo1) : aMSX;
// //
TopExp::MapShapes(theSo2, TopAbs_FACE, aMS2); TopExp::MapShapes(theSo2, TopAbs_FACE, aMS2);
// //
@ -982,9 +981,9 @@ void GEOMAlgo_GetInPlace::FillImgSimple
const TopoDS_Shape& aS = aMS(i); const TopoDS_Shape& aS = aMS(i);
if (aShapesInOn.IsBound(aS)) { if (aShapesInOn.IsBound(aS)) {
const TopTools_MapOfShape& aMSx = aShapesInOn.Find(aS); const NCollection_Map<TopoDS_Shape>& aMSx = aShapesInOn.Find(aS);
TopTools_ListOfShape aLSx; TopTools_ListOfShape aLSx;
TopTools_MapIteratorOfMapOfShape aItMS(aMSx); NCollection_Map<TopoDS_Shape>::Iterator aItMS(aMSx);
for (; aItMS.More(); aItMS.Next()) { for (; aItMS.More(); aItMS.Next()) {
const TopoDS_Shape& aSx = aItMS.Key(); const TopoDS_Shape& aSx = aItMS.Key();
@ -1011,10 +1010,10 @@ void GEOMAlgo_GetInPlace::FillImgSimple
void GEOMAlgo_GetInPlace::FillImgComplex(const TopoDS_Shape &theShape, void GEOMAlgo_GetInPlace::FillImgComplex(const TopoDS_Shape &theShape,
const Standard_Boolean IsWhere) const Standard_Boolean IsWhere)
{ {
TopTools_MapOfShape aMapRemaining; NCollection_Map<TopoDS_Shape> aMapRemaining;
TopoDS_Iterator aIt(theShape); TopoDS_Iterator aIt(theShape);
TopTools_ListOfShape aLSx; TopTools_ListOfShape aLSx;
TopTools_MapOfShape aMSx; NCollection_Map<TopoDS_Shape> aMSx;
for(; aIt.More(); aIt.Next()) { for(; aIt.More(); aIt.Next()) {
const TopoDS_Shape &aSubS = aIt.Value(); const TopoDS_Shape &aSubS = aIt.Value();
@ -1044,7 +1043,7 @@ void GEOMAlgo_GetInPlace::FillImgComplex(const TopoDS_Shape &theShape,
if (!(IsWhere || aMapRemaining.IsEmpty())) { if (!(IsWhere || aMapRemaining.IsEmpty())) {
// Find the whole from parts. // Find the whole from parts.
while (!aMapRemaining.IsEmpty()) { while (!aMapRemaining.IsEmpty()) {
TopTools_MapIteratorOfMapOfShape anIter(aMapRemaining); NCollection_Map<TopoDS_Shape>::Iterator anIter(aMapRemaining);
const TopoDS_Shape &aShape = anIter.Key(); const TopoDS_Shape &aShape = anIter.Key();
if (myShapesInclusive.IsBound(aShape)) { if (myShapesInclusive.IsBound(aShape)) {
@ -1109,11 +1108,11 @@ void GEOMAlgo_GetInPlace::FillShapesIn(const TopoDS_Shape& aS1,
const TopoDS_Shape& aS2) const TopoDS_Shape& aS2)
{ {
if (myShapesIn.IsBound(aS1)) { if (myShapesIn.IsBound(aS1)) {
TopTools_MapOfShape& aMS=myShapesIn.ChangeFind(aS1); NCollection_Map<TopoDS_Shape>& aMS=myShapesIn.ChangeFind(aS1);
aMS.Add(aS2); aMS.Add(aS2);
} }
else { else {
TopTools_MapOfShape aMS; NCollection_Map<TopoDS_Shape> aMS;
// //
aMS.Add(aS2); aMS.Add(aS2);
myShapesIn.Bind(aS1, aMS); myShapesIn.Bind(aS1, aMS);
@ -1127,11 +1126,11 @@ void GEOMAlgo_GetInPlace::FillShapesOn(const TopoDS_Shape& aS1,
const TopoDS_Shape& aS2) const TopoDS_Shape& aS2)
{ {
if (myShapesOn.IsBound(aS1)) { if (myShapesOn.IsBound(aS1)) {
TopTools_MapOfShape& aMS=myShapesOn.ChangeFind(aS1); NCollection_Map<TopoDS_Shape>& aMS=myShapesOn.ChangeFind(aS1);
aMS.Add(aS2); aMS.Add(aS2);
} }
else { else {
TopTools_MapOfShape aMS; NCollection_Map<TopoDS_Shape> aMS;
// //
aMS.Add(aS2); aMS.Add(aS2);
myShapesOn.Bind(aS1, aMS); myShapesOn.Bind(aS1, aMS);

16
src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx
View File

@ -266,7 +266,7 @@
Standard_Integer i, aNbF, aNbSDF, iErr; Standard_Integer i, aNbF, aNbSDF, iErr;
TopoDS_Shape aNewShape; TopoDS_Shape aNewShape;
TopTools_IndexedMapOfShape aMF; TopTools_IndexedMapOfShape aMF;
TopTools_ListIteratorOfListOfShape aItS; NCollection_List<TopoDS_Shape>::Iterator aItS;
GEOMAlgo_PassKeyShape aPKF; GEOMAlgo_PassKeyShape aPKF;
GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF; GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF;
// //
@ -291,11 +291,11 @@
} }
// //
if (aMPKLF.Contains(aPKF)) { if (aMPKLF.Contains(aPKF)) {
TopTools_ListOfShape& aLSDF=aMPKLF.ChangeFromKey(aPKF); NCollection_List<TopoDS_Shape>& aLSDF=aMPKLF.ChangeFromKey(aPKF);
aLSDF.Append(aS); aLSDF.Append(aS);
} }
else { else {
TopTools_ListOfShape aLSDF; NCollection_List<TopoDS_Shape> aLSDF;
// //
aLSDF.Append(aS); aLSDF.Append(aS);
aMPKLF.Add(aPKF, aLSDF); aMPKLF.Add(aPKF, aLSDF);
@ -313,7 +313,7 @@
// Images/Origins // Images/Origins
aNbF=aMPKLF.Extent(); aNbF=aMPKLF.Extent();
for (i=1; i<=aNbF; ++i) { for (i=1; i<=aNbF; ++i) {
const TopTools_ListOfShape& aLSDF=aMPKLF(i); const NCollection_List<TopoDS_Shape>& aLSDF=aMPKLF(i);
aNbSDF=aLSDF.Extent(); aNbSDF=aLSDF.Extent();
if (!aNbSDF) { if (!aNbSDF) {
myErrorStatus=4; // it must not be myErrorStatus=4; // it must not be
@ -322,7 +322,9 @@
const TopoDS_Shape& aS1=aLSDF.First(); const TopoDS_Shape& aS1=aLSDF.First();
aNewShape=aS1; aNewShape=aS1;
// //
myImages.Bind(aNewShape, aLSDF); TopTools_ListOfShape aConvLSDF;
GEOMAlgo_AlgoTools::ConvertNCollectionListToTopToolsListOfShape(aLSDF, aConvLSDF);
myImages.Bind(aNewShape, aConvLSDF);
// origins // origins
aItS.Initialize(aLSDF); aItS.Initialize(aLSDF);
for (; aItS.More(); aItS.Next()) { for (; aItS.More(); aItS.Next()) {
@ -397,7 +399,7 @@
//qt //qt
// //
if (!aMPKLS.Contains(aPKSx)) { if (!aMPKLS.Contains(aPKSx)) {
TopTools_ListOfShape aLSx; NCollection_List<TopoDS_Shape> aLSx;
// //
aLSx.Append(aSx[0]); aLSx.Append(aSx[0]);
aLSx.Append(aSx[1]); aLSx.Append(aSx[1]);
@ -416,7 +418,7 @@
} }
// //
for (i=1; i<=aNbC; ++i) { for (i=1; i<=aNbC; ++i) {
const TopTools_ListOfShape& aLSx=aMPKLS(i); const NCollection_List<TopoDS_Shape>& aLSx=aMPKLS(i);
const TopoDS_Shape& aSx1=aLSx.First(); const TopoDS_Shape& aSx1=aLSx.First();
const TopoDS_Shape& aSx2=aLSx.Last(); const TopoDS_Shape& aSx2=aLSx.Last();
aCS.SetShape1(aSx1); aCS.SetShape1(aSx1);

18
src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
View File

@ -41,8 +41,6 @@
#include <TopoDS_Compound.hxx> #include <TopoDS_Compound.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopTools_MapIteratorOfMapOfShape.hxx> #include <TopTools_MapIteratorOfMapOfShape.hxx>
@ -318,7 +316,7 @@ void GEOMAlgo_GlueDetector::DetectShapes(const TopAbs_ShapeEnum aType)
Standard_Boolean bDegenerated; Standard_Boolean bDegenerated;
Standard_Integer i, aNbF, aNbSDF, iErr; Standard_Integer i, aNbF, aNbSDF, iErr;
TopTools_IndexedMapOfShape aMF; TopTools_IndexedMapOfShape aMF;
TopTools_ListIteratorOfListOfShape aItLS; NCollection_List<TopoDS_Shape>::Iterator aItLS;
GEOMAlgo_PassKeyShape aPKF; GEOMAlgo_PassKeyShape aPKF;
GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF; GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF;
// //
@ -344,11 +342,11 @@ void GEOMAlgo_GlueDetector::DetectShapes(const TopAbs_ShapeEnum aType)
} }
// //
if (aMPKLF.Contains(aPKF)) { if (aMPKLF.Contains(aPKF)) {
TopTools_ListOfShape& aLSDF=aMPKLF.ChangeFromKey(aPKF); NCollection_List<TopoDS_Shape>& aLSDF=aMPKLF.ChangeFromKey(aPKF);
aLSDF.Append(aS); aLSDF.Append(aS);
} }
else { else {
TopTools_ListOfShape aLSDF; NCollection_List<TopoDS_Shape> aLSDF;
// //
aLSDF.Append(aS); aLSDF.Append(aS);
aMPKLF.Add(aPKF, aLSDF); aMPKLF.Add(aPKF, aLSDF);
@ -366,7 +364,7 @@ void GEOMAlgo_GlueDetector::DetectShapes(const TopAbs_ShapeEnum aType)
// Images/Origins // Images/Origins
aNbF=aMPKLF.Extent(); aNbF=aMPKLF.Extent();
for (i=1; i<=aNbF; ++i) { for (i=1; i<=aNbF; ++i) {
const TopTools_ListOfShape& aLSDF=aMPKLF(i); const NCollection_List<TopoDS_Shape>& aLSDF=aMPKLF(i);
aNbSDF=aLSDF.Extent(); aNbSDF=aLSDF.Extent();
if (!aNbSDF) { if (!aNbSDF) {
myErrorStatus=4; // it must not be myErrorStatus=4; // it must not be
@ -386,7 +384,9 @@ void GEOMAlgo_GlueDetector::DetectShapes(const TopAbs_ShapeEnum aType)
} }
} }
// //
myImages.Bind(aS1, aLSDF); TopTools_ListOfShape aConvLSDF;
GEOMAlgo_AlgoTools::ConvertNCollectionListToTopToolsListOfShape(aLSDF, aConvLSDF);
myImages.Bind(aS1, aConvLSDF);
// //
// origins // origins
aItLS.Initialize(aLSDF); aItLS.Initialize(aLSDF);
@ -407,7 +407,7 @@ void GEOMAlgo_GlueDetector::FacePassKey(const TopoDS_Face& aF,
{ {
Standard_Integer i, aNbE; Standard_Integer i, aNbE;
TopoDS_Shape aER; TopoDS_Shape aER;
TopTools_ListOfShape aLE; NCollection_List<TopoDS_Shape> aLE;
TopTools_IndexedMapOfShape aME; TopTools_IndexedMapOfShape aME;
// //
TopExp::MapShapes(aF, TopAbs_EDGE, aME); TopExp::MapShapes(aF, TopAbs_EDGE, aME);
@ -441,7 +441,7 @@ void GEOMAlgo_GlueDetector::EdgePassKey(const TopoDS_Edge& aE,
TopAbs_Orientation aOr; TopAbs_Orientation aOr;
TopoDS_Shape aVR; TopoDS_Shape aVR;
TopoDS_Iterator aIt; TopoDS_Iterator aIt;
TopTools_ListOfShape aLV; NCollection_List<TopoDS_Shape> aLV;
// //
aIt.Initialize(aE); aIt.Initialize(aE);
for (; aIt.More(); aIt.Next()) { for (; aIt.More(); aIt.Next()) {

3
src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx
View File

@ -30,9 +30,8 @@
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <NCollection_List.hxx>
#include <GEOMAlgo_GluerAlgo.hxx> #include <GEOMAlgo_GluerAlgo.hxx>
#include <GEOMAlgo_Algo.hxx> #include <GEOMAlgo_Algo.hxx>

14
src/GEOMAlgo/GEOMAlgo_Gluer.cxx
View File

@ -599,7 +599,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
Standard_Integer i, aNbF, aNbSDF, iErr; Standard_Integer i, aNbF, aNbSDF, iErr;
TopoDS_Shape aNewShape; TopoDS_Shape aNewShape;
TopTools_IndexedMapOfShape aMF; TopTools_IndexedMapOfShape aMF;
TopTools_ListIteratorOfListOfShape aItS; NCollection_List<TopoDS_Shape>::Iterator aItS;
GEOMAlgo_PassKeyShape aPKF; GEOMAlgo_PassKeyShape aPKF;
GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF; GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF;
// //
@ -623,11 +623,11 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
} }
// //
if (aMPKLF.Contains(aPKF)) { if (aMPKLF.Contains(aPKF)) {
TopTools_ListOfShape& aLSDF=aMPKLF.ChangeFromKey(aPKF); NCollection_List<TopoDS_Shape>& aLSDF=aMPKLF.ChangeFromKey(aPKF);
aLSDF.Append(aS); aLSDF.Append(aS);
} }
else { else {
TopTools_ListOfShape aLSDF; NCollection_List<TopoDS_Shape> aLSDF;
// //
aLSDF.Append(aS); aLSDF.Append(aS);
aMPKLF.Add(aPKF, aLSDF); aMPKLF.Add(aPKF, aLSDF);
@ -646,7 +646,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
// //
aNbF=aMPKLF.Extent(); aNbF=aMPKLF.Extent();
for (i=1; i<=aNbF; ++i) { for (i=1; i<=aNbF; ++i) {
const TopTools_ListOfShape& aLSDF=aMPKLF(i); const NCollection_List<TopoDS_Shape>& aLSDF=aMPKLF(i);
aNbSDF=aLSDF.Extent(); aNbSDF=aLSDF.Extent();
if (!aNbSDF) { if (!aNbSDF) {
myErrorStatus=4; // it must not be myErrorStatus=4; // it must not be
@ -682,7 +682,9 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
} }
} }
// //
myImages.Bind(aNewShape, aLSDF); TopTools_ListOfShape aConvLSDF;
GEOMAlgo_AlgoTools::ConvertNCollectionListToTopToolsListOfShape(aLSDF, aConvLSDF);
myImages.Bind(aNewShape, aConvLSDF);
// origins // origins
aItS.Initialize(aLSDF); aItS.Initialize(aLSDF);
for (; aItS.More(); aItS.Next()) { for (; aItS.More(); aItS.Next()) {
@ -798,7 +800,7 @@ void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF,
GEOMAlgo_PassKeyShape& aPK) GEOMAlgo_PassKeyShape& aPK)
{ {
Standard_Integer i, aNbE; Standard_Integer i, aNbE;
TopTools_ListOfShape aLE; NCollection_List<TopoDS_Shape> aLE;
TopTools_IndexedMapOfShape aME; TopTools_IndexedMapOfShape aME;
// //
TopExp::MapShapes(aF, TopAbs_EDGE, aME); TopExp::MapShapes(aF, TopAbs_EDGE, aME);

2
src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx
View File

@ -194,7 +194,7 @@ void GEOMAlgo_Gluer2::PerformShapesToWork()
aNbC=aMC.Extent(); aNbC=aMC.Extent();
for (i=1; i<=aNbC; ++i) { for (i=1; i<=aNbC; ++i) {
const TopoDS_Shape& aSkey=aMC.FindKey(i); const TopoDS_Shape& aSkey=aMC.FindKey(i);
const TopTools_IndexedMapOfShape& aM=aMC(i); const NCollection_IndexedMap<TopoDS_Shape>& aM=aMC(i);
aLSX.Clear(); aLSX.Clear();
aNb=aM.Extent(); aNb=aM.Extent();
for (j=1; j<=aNb; ++j) { for (j=1; j<=aNb; ++j) {

4
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
View File

@ -26,15 +26,15 @@
#define GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile #define GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
#include <GEOMAlgo_PassKeyShape.hxx> #include <GEOMAlgo_PassKeyShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <GEOMAlgo_PassKeyShapeMapHasher.hxx> #include <GEOMAlgo_PassKeyShapeMapHasher.hxx>
#define _NCollection_MapHasher #define _NCollection_MapHasher
#include <NCollection_IndexedDataMap.hxx> #include <NCollection_IndexedDataMap.hxx>
#include <NCollection_List.hxx>
typedef NCollection_IndexedDataMap<GEOMAlgo_PassKeyShape, TopTools_ListOfShape, GEOMAlgo_PassKeyShapeMapHasher> GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape; typedef NCollection_IndexedDataMap<GEOMAlgo_PassKeyShape, NCollection_List<TopoDS_Shape>, GEOMAlgo_PassKeyShapeMapHasher> GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape;
#undef _NCollection_MapHasher #undef _NCollection_MapHasher

5
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape.hxx
View File

@ -32,13 +32,14 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopTools_ShapeMapHasher.hxx> #include <TopTools_ShapeMapHasher.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#define _NCollection_MapHasher #define _NCollection_MapHasher
#include <NCollection_IndexedDataMap.hxx> #include <NCollection_IndexedDataMap.hxx>
#include <NCollection_IndexedMap.hxx>
typedef NCollection_IndexedDataMap <TopoDS_Shape, TopTools_IndexedMapOfShape, TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape; typedef NCollection_IndexedDataMap <TopoDS_Shape, NCollection_IndexedMap<TopoDS_Shape>,
TopTools_ShapeMapHasher> GEOMAlgo_IndexedDataMapOfShapeIndexedMapOfShape;
#undef _NCollection_MapHasher #undef _NCollection_MapHasher

4
src/GEOMAlgo/GEOMAlgo_PassKey.hxx
View File

@ -34,7 +34,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <TColStd_ListOfInteger.hxx> #include <TColStd_ListOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
//======================================================================= //=======================================================================
//class : GEOMAlgo_PassKey //class : GEOMAlgo_PassKey
@ -100,6 +100,6 @@ class GEOMAlgo_PassKey {
protected: protected:
Standard_Integer myNbIds; Standard_Integer myNbIds;
Standard_Integer mySum; Standard_Integer mySum;
TColStd_IndexedMapOfInteger myMap; NCollection_IndexedMap<Standard_Integer> myMap;
}; };
#endif #endif

11
src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx
View File

@ -27,7 +27,6 @@
// //
#include <GEOMAlgo_PassKeyShape.hxx> #include <GEOMAlgo_PassKeyShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
@ -104,7 +103,7 @@ static
void GEOMAlgo_PassKeyShape::SetShapes(const TopoDS_Shape& aS1, void GEOMAlgo_PassKeyShape::SetShapes(const TopoDS_Shape& aS1,
const TopoDS_Shape& aS2) const TopoDS_Shape& aS2)
{ {
TopTools_ListOfShape aLS; NCollection_List<TopoDS_Shape> aLS;
// //
aLS.Append(aS1); aLS.Append(aS1);
aLS.Append(aS2); aLS.Append(aS2);
@ -118,7 +117,7 @@ static
const TopoDS_Shape& aS2, const TopoDS_Shape& aS2,
const TopoDS_Shape& aS3) const TopoDS_Shape& aS3)
{ {
TopTools_ListOfShape aLS; NCollection_List<TopoDS_Shape> aLS;
// //
aLS.Append(aS1); aLS.Append(aS1);
aLS.Append(aS2); aLS.Append(aS2);
@ -134,7 +133,7 @@ static
const TopoDS_Shape& aS3, const TopoDS_Shape& aS3,
const TopoDS_Shape& aS4) const TopoDS_Shape& aS4)
{ {
TopTools_ListOfShape aLS; NCollection_List<TopoDS_Shape> aLS;
// //
aLS.Append(aS1); aLS.Append(aS1);
aLS.Append(aS2); aLS.Append(aS2);
@ -146,10 +145,10 @@ static
//function :SetShapes //function :SetShapes
//purpose : //purpose :
//======================================================================= //=======================================================================
void GEOMAlgo_PassKeyShape::SetShapes(const TopTools_ListOfShape& aLS) void GEOMAlgo_PassKeyShape::SetShapes(const NCollection_List<TopoDS_Shape>& aLS)
{ {
Standard_Integer i, aId, aIdN; Standard_Integer i, aId, aIdN;
TopTools_ListIteratorOfListOfShape aIt; NCollection_List<TopoDS_Shape>::Iterator aIt;
// //
Clear(); Clear();
aIt.Initialize(aLS); aIt.Initialize(aLS);

4
src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx
View File

@ -35,7 +35,7 @@
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopTools_ListOfShape.hxx> #include <NCollection_List.hxx>
//======================================================================= //=======================================================================
@ -79,7 +79,7 @@ class GEOMAlgo_PassKeyShape {
const TopoDS_Shape& aS4) ; const TopoDS_Shape& aS4) ;
Standard_EXPORT Standard_EXPORT
void SetShapes(const TopTools_ListOfShape& aLS) ; void SetShapes(const NCollection_List<TopoDS_Shape>& aLS) ;
Standard_EXPORT Standard_EXPORT
void Clear() ; void Clear() ;

4
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
View File

@ -21,7 +21,7 @@
#include <Precision.hxx> #include <Precision.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <gp_Lin.hxx> #include <gp_Lin.hxx>
#include <gp_XYZ.hxx> #include <gp_XYZ.hxx>
@ -188,7 +188,7 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Solid& aSd)
gp_Pnt aPi, aPc; gp_Pnt aPi, aPc;
gp_Dir aDir[3]; gp_Dir aDir[3];
gp_XYZ aXYZc; gp_XYZ aXYZc;
TColStd_IndexedMapOfInteger aMp; NCollection_IndexedMap<Standard_Integer> aMp;
TopTools_IndexedMapOfShape aMV, aMFi; TopTools_IndexedMapOfShape aMV, aMFi;
// //
// barycenter aPc // barycenter aPc

4
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -54,7 +54,7 @@
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
//To disable automatic genericobj management, the following line should be commented. //To disable automatic genericobj management, the following line should be commented.
//Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx //Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
@ -1274,7 +1274,7 @@ QList<GEOM::GeomObjPtr> GEOMBase_Helper::getSelected( const QList<TopAbs_ShapeEn
Handle(SALOME_InteractiveObject) IO = it.Value(); Handle(SALOME_InteractiveObject) IO = it.Value();
GEOM::GeomObjPtr object = GEOMBase::ConvertIOinGEOMObject( IO ); GEOM::GeomObjPtr object = GEOMBase::ConvertIOinGEOMObject( IO );
if ( object ) { if ( object ) {
TColStd_IndexedMapOfInteger subShapes; NCollection_IndexedMap<Standard_Integer> subShapes;
selMgr->GetIndexes( IO, subShapes ); selMgr->GetIndexes( IO, subShapes );
int nbSubShapes = subShapes.Extent(); int nbSubShapes = subShapes.Extent();
if ( nbSubShapes == 0 ) { if ( nbSubShapes == 0 ) {

12
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
View File

@ -46,7 +46,7 @@
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx> #include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <NCollection_DataMap.hxx> #include <NCollection_DataMap.hxx>
@ -204,7 +204,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
Handle(AIS_InteractiveContext) ic = vw->getAISContext(); Handle(AIS_InteractiveContext) ic = vw->getAISContext();
// "entry - list_of_int" map for LOCAL selection // "entry - list_of_int" map for LOCAL selection
NCollection_DataMap<TCollection_AsciiString, TColStd_IndexedMapOfInteger> indexesMap; NCollection_DataMap<TCollection_AsciiString, NCollection_IndexedMap<Standard_Integer> > indexesMap;
QMap<QString,int> globalSelMap; // only Key=entry from this map is used. value(int) is NOT used at all. QMap<QString,int> globalSelMap; // only Key=entry from this map is used. value(int) is NOT used at all.
SelectMgr_IndexedMapOfOwner ownersmap; // map of owners to be selected SelectMgr_IndexedMapOfOwner ownersmap; // map of owners to be selected
@ -222,13 +222,13 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
QString entry = subOwner->entry(); QString entry = subOwner->entry();
if ( indexesMap.IsBound( TCollection_AsciiString(entry.toLatin1().data()))) if ( indexesMap.IsBound( TCollection_AsciiString(entry.toLatin1().data())))
{ {
TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind(entry.toLatin1().data()); NCollection_IndexedMap<Standard_Integer>& subIndexes = indexesMap.ChangeFind(entry.toLatin1().data());
subIndexes.Add( subOwner->index() ); subIndexes.Add( subOwner->index() );
//indexesMap.replace( entry, subIndexes ); //indexesMap.replace( entry, subIndexes );
} }
else else
{ {
TColStd_IndexedMapOfInteger subIndexes; NCollection_IndexedMap<Standard_Integer> subIndexes;
subIndexes.Add( subOwner->index() ); subIndexes.Add( subOwner->index() );
indexesMap.Bind(entry.toLatin1().data(), subIndexes); indexesMap.Bind(entry.toLatin1().data(), subIndexes);
} }
@ -304,7 +304,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
{ {
if (isLocal) if (isLocal)
{ {
const TColStd_IndexedMapOfInteger& subIndexes = const NCollection_IndexedMap<Standard_Integer>& subIndexes =
indexesMap.ChangeFind(entryStr.toLatin1().data()); indexesMap.ChangeFind(entryStr.toLatin1().data());
const TopoDS_Shape& aSubShape = anOwner->Shape(); const TopoDS_Shape& aSubShape = anOwner->Shape();
@ -364,7 +364,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
SalomeApp_Study* appStudy = SalomeApp_Study* appStudy =
dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() ); dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
QString anEntry = appStudy->referencedToEntry( owner->entry() ); QString anEntry = appStudy->referencedToEntry( owner->entry() );
if (globalSelMap[anEntry] == 1) mySelectedExternals.append(*itr2); if (globalSelMap[anEntry] == 1) mySelectedExternals.append(*itr2) ;
} }
} }
} }

1
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
View File

@ -38,7 +38,6 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

7
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -62,7 +62,6 @@
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx> #include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
@ -567,7 +566,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
myIdList->blockSignals(true); myIdList->blockSignals(true);
myIdList->clearSelection(); myIdList->clearSelection();
TColStd_IndexedMapOfInteger aMapIndex; NCollection_IndexedMap<Standard_Integer> aMapIndex;
int nbSel = getSelectedSubshapes(aMapIndex); int nbSel = getSelectedSubshapes(aMapIndex);
if (nbSel) { if (nbSel) {
@ -763,7 +762,7 @@ void GroupGUI_GroupDlg::showOnlySelected()
// function : getSelectedSubshapes // function : getSelectedSubshapes
// purpose : // purpose :
//================================================================================= //=================================================================================
int GroupGUI_GroupDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex) int GroupGUI_GroupDlg::getSelectedSubshapes (NCollection_IndexedMap<Standard_Integer>& theMapIndex)
{ {
theMapIndex.Clear(); theMapIndex.Clear();
@ -842,7 +841,7 @@ int GroupGUI_GroupDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMap
//================================================================================= //=================================================================================
void GroupGUI_GroupDlg::add() void GroupGUI_GroupDlg::add()
{ {
TColStd_IndexedMapOfInteger aMapIndex; NCollection_IndexedMap<Standard_Integer> aMapIndex;
int nbSel = getSelectedSubshapes(aMapIndex); int nbSel = getSelectedSubshapes(aMapIndex);
TColStd_MapOfInteger aMap; TColStd_MapOfInteger aMap;

4
src/GroupGUI/GroupGUI_GroupDlg.h
View File

@ -31,7 +31,7 @@
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <TColStd_DataMapOfIntegerInteger.hxx> #include <TColStd_DataMapOfIntegerInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
class QGroupBox; class QGroupBox;
class QLineEdit; class QLineEdit;
@ -90,7 +90,7 @@ private:
void highlightSubShapes(); void highlightSubShapes();
void onGetInPlace(); void onGetInPlace();
void setInPlaceObj (GEOM::GEOM_Object_var, const bool isVisible=1); void setInPlaceObj (GEOM::GEOM_Object_var, const bool isVisible=1);
int getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex); int getSelectedSubshapes (NCollection_IndexedMap<Standard_Integer>& theMapIndex);
private: private:
Mode myMode; Mode myMode;

4
src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
View File

@ -38,7 +38,7 @@
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
@ -595,7 +595,7 @@ bool MeasureGUI_CheckShapeDlg::execute( ObjectList& objects )
const bool isPublishAllErrors = (aNbErrsSelected < 1); const bool isPublishAllErrors = (aNbErrsSelected < 1);
const bool isPublishAllShapes = const bool isPublishAllShapes =
(aNbErrsSelected != 1 || myGrp->ListBox2->selectedItems().empty()); (aNbErrsSelected != 1 || myGrp->ListBox2->selectedItems().empty());
TColStd_IndexedMapOfInteger aMapIndex; NCollection_IndexedMap<Standard_Integer> aMapIndex;
const int aNbErrs = aErrs.length(); const int aNbErrs = aErrs.length();
int i; int i;

6
src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
View File

@ -37,7 +37,7 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -184,7 +184,7 @@ void MeasureGUI_NormaleDlg::SelectionIntoArgument()
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
{ {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(aSelList.First(), aMap); aSelMgr->GetIndexes(aSelList.First(), aMap);
if (aMap.Extent() == 1) // Local Selection if (aMap.Extent() == 1) // Local Selection
{ {
@ -217,7 +217,7 @@ void MeasureGUI_NormaleDlg::SelectionIntoArgument()
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
{ {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(aSelList.First(), aMap); aSelMgr->GetIndexes(aSelList.First(), aMap);
if (aMap.Extent() == 1) // Local Selection if (aMap.Extent() == 1) // Local Selection
{ {

4
src/MeasureGUI/MeasureGUI_PointDlg.cxx
View File

@ -43,7 +43,7 @@
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
//================================================================================= //=================================================================================
@ -143,7 +143,7 @@ void MeasureGUI_PointDlg::SelectionIntoArgument()
myObj = aSelectedObject; myObj = aSelectedObject;
TColStd_IndexedMapOfInteger anIndexes; NCollection_IndexedMap<Standard_Integer> anIndexes;
aSelMgr->GetIndexes(aSelList.First(), anIndexes); aSelMgr->GetIndexes(aSelList.First(), anIndexes);
TopoDS_Shape aShape; TopoDS_Shape aShape;

8
src/OBJECT/GEOM_AISShape.cxx
View File

@ -63,7 +63,7 @@
#include <StdPrs_ShadedShape.hxx> #include <StdPrs_ShadedShape.hxx>
#include <StdPrs_WFDeflectionShape.hxx> #include <StdPrs_WFDeflectionShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx> #include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <TColStd_ListOfInteger.hxx> #include <TColStd_ListOfInteger.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
@ -120,7 +120,7 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
} }
} }
static void indicesToOwners( const TColStd_IndexedMapOfInteger& aIndexMap, static void indicesToOwners( const NCollection_IndexedMap<Standard_Integer>& aIndexMap,
const TopoDS_Shape& aMainShape, const TopoDS_Shape& aMainShape,
const SelectMgr_IndexedMapOfOwner& anAllMap, const SelectMgr_IndexedMapOfOwner& anAllMap,
SelectMgr_IndexedMapOfOwner& aToHiliteMap ) SelectMgr_IndexedMapOfOwner& aToHiliteMap )
@ -357,7 +357,7 @@ void GEOM_AISShape::SetEdgesInShadingColor(const Quantity_Color &aCol)
myEdgesInShadingColor = aCol; myEdgesInShadingColor = aCol;
} }
void GEOM_AISShape::highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, void GEOM_AISShape::highlightSubShapes(const NCollection_IndexedMap<Standard_Integer>& aIndexMap,
const Standard_Boolean aHighlight ) const Standard_Boolean aHighlight )
{ {
Handle(AIS_InteractiveObject) anObj = this; Handle(AIS_InteractiveObject) anObj = this;
@ -585,7 +585,7 @@ void GEOM_AISShape::drawField( const Handle(Prs3d_Presentation)& thePrs,
TopTools_IndexedMapOfShape aShapeMap; TopTools_IndexedMapOfShape aShapeMap;
TopExp::MapShapes( myshape, aShapeMap ); TopExp::MapShapes( myshape, aShapeMap );
TColStd_IndexedMapOfInteger anIndexMap; NCollection_IndexedMap<Standard_Integer> anIndexMap;
TopExp_Explorer anExp; TopExp_Explorer anExp;
for( anExp.Init( myshape, aShapeType ); anExp.More(); anExp.Next() ) for( anExp.Init( myshape, aShapeType ); anExp.More(); anExp.Next() )

2
src/OBJECT/GEOM_AISShape.hxx
View File

@ -118,7 +118,7 @@ public:
Standard_Boolean isTopLevel(); Standard_Boolean isTopLevel();
void setTopLevel(Standard_Boolean); void setTopLevel(Standard_Boolean);
Handle_SALOME_InteractiveObject getIO() ; Handle_SALOME_InteractiveObject getIO() ;
void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ); void highlightSubShapes(const NCollection_IndexedMap<Standard_Integer>& aIndexMap, const Standard_Boolean aHighlight );
~GEOM_AISShape(); ~GEOM_AISShape();
void SetShadingColor(const Quantity_Color &aCol); void SetShadingColor(const Quantity_Color &aCol);

2
src/OBJECT/GEOM_TopWireframeShape.cxx
View File

@ -80,7 +80,7 @@ Standard_CString GEOM_TopWireframeShape::getName(){
} }
void GEOM_TopWireframeShape::highlightSubShapes(const TColStd_IndexedMapOfInteger& /*aIndexMap*/, void GEOM_TopWireframeShape::highlightSubShapes(const NCollection_IndexedMap<Standard_Integer>& /*aIndexMap*/,
const Standard_Boolean /*aHighlight*/ ) const Standard_Boolean /*aHighlight*/ )
{ {
} }

2
src/OBJECT/GEOM_TopWireframeShape.hxx
View File

@ -75,7 +75,7 @@ public:
virtual void setTopLevel(Standard_Boolean); virtual void setTopLevel(Standard_Boolean);
virtual Standard_CString getName(); virtual Standard_CString getName();
virtual void setName(const Standard_CString aName); virtual void setName(const Standard_CString aName);
virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ); virtual void highlightSubShapes(const NCollection_IndexedMap<Standard_Integer>& aIndexMap, const Standard_Boolean aHighlight );
~GEOM_TopWireframeShape(); ~GEOM_TopWireframeShape();
// Type management // Type management

28
src/OCC2VTK/OCC2VTK_internal.h
View File

@ -1,18 +1,15 @@
#ifndef OCC2VTK_INTERNAL_H #ifndef OCC2VTK_INTERNAL_H
#define OCC2VTK_INTERNAL_H #define OCC2VTK_INTERNAL_H
#include <NCollection_BaseCollection.hxx>
#include <NCollection_BaseList.hxx> #include <NCollection_BaseList.hxx>
#include <NCollection_TListNode.hxx> #include <NCollection_TListNode.hxx>
#include <NCollection_TListIterator.hxx> #include <NCollection_TListIterator.hxx>
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx> #include <TopoDS_Face.hxx>
template <class TheItemType> class GEOM_Set template <class TheItemType>
: public NCollection_BaseCollection<TheItemType>, class GEOM_Set : public NCollection_BaseList
public NCollection_BaseList
{ {
public: public:
typedef NCollection_TListNode<TheItemType> SetNode; typedef NCollection_TListNode<TheItemType> SetNode;
@ -21,12 +18,10 @@ public:
public: public:
//! Constructor //! Constructor
GEOM_Set(const Handle(NCollection_BaseAllocator)& theAllocator=0L) : GEOM_Set(const Handle(NCollection_BaseAllocator)& theAllocator=0L) :
NCollection_BaseCollection<TheItemType>(theAllocator),
NCollection_BaseList() {} NCollection_BaseList() {}
//! Copy constructor //! Copy constructor
GEOM_Set (const GEOM_Set& theOther) : GEOM_Set (const GEOM_Set& theOther) :
NCollection_BaseCollection<TheItemType>(theOther.myAllocator),
NCollection_BaseList() NCollection_BaseList()
{ *this = theOther; } { *this = theOther; }
@ -35,18 +30,19 @@ public:
{ return Extent(); } { return Extent(); }
//! Replace this list by the items of theOther collection //! Replace this list by the items of theOther collection
virtual void Assign (const NCollection_BaseCollection<TheItemType>& theOther) GEOM_Set& Assign (const GEOM_Set& theOther)
{ {
if (this == &theOther) if (this == &theOther)
return; return *this;
Clear();
TYPENAME NCollection_BaseCollection<TheItemType>::Iterator& anIter = Clear( theOther.myAllocator );
theOther.CreateIterator(); Iterator anIter( theOther );
for (; anIter.More(); anIter.Next()) for (; anIter.More(); anIter.Next())
{ {
SetNode* pNew = new (this->myAllocator) SetNode(anIter.Value()); SetNode* pNew = new (this->myAllocator) SetNode(anIter.Value());
PAppend (pNew); PAppend (pNew);
} }
return *this;
} }
//! Replace this list by the items of theOther Set //! Replace this list by the items of theOther Set
@ -67,7 +63,7 @@ public:
//! Clear this set //! Clear this set
void Clear (void) void Clear (void)
{ PClear (SetNode::delNode, this->myAllocator); } { PClear ( SetNode::delNode ); }
//! Add item //! Add item
Standard_Boolean Add (const TheItemType& theItem) Standard_Boolean Add (const TheItemType& theItem)
@ -195,12 +191,6 @@ public:
~GEOM_Set (void) ~GEOM_Set (void)
{ Clear(); } { Clear(); }
private:
//! Creates Iterator for use on BaseCollection
virtual TYPENAME NCollection_BaseCollection<TheItemType>::Iterator&
CreateIterator(void) const
{ return *(new (this->IterAllocator()) Iterator(*this)); }
}; };
typedef GEOM_Set<TopoDS_Vertex> TVertexSet; typedef GEOM_Set<TopoDS_Vertex> TVertexSet;

4
src/OperationGUI/OperationGUI_ChamferDlg.cxx
View File

@ -439,7 +439,7 @@ void OperationGUI_ChamferDlg::SelectionIntoArgument()
GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
if ( !anObj->_is_nil() ) { if ( !anObj->_is_nil() ) {
TColStd_IndexedMapOfInteger anIndexes; NCollection_IndexedMap<Standard_Integer> anIndexes;
aSelMgr->GetIndexes(aSelList.First(), anIndexes); aSelMgr->GetIndexes(aSelList.First(), anIndexes);
if (anIndexes.Extent() == 1) { if (anIndexes.Extent() == 1) {
@ -461,7 +461,7 @@ void OperationGUI_ChamferDlg::SelectionIntoArgument()
GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
if ( !anObj->_is_nil() ) { if ( !anObj->_is_nil() ) {
TColStd_IndexedMapOfInteger anIndexes; NCollection_IndexedMap<Standard_Integer> anIndexes;
aSelMgr->GetIndexes(aSelList.First(), anIndexes); aSelMgr->GetIndexes(aSelList.First(), anIndexes);
if (anIndexes.Extent() > 0) { if (anIndexes.Extent() > 0) {

8
src/OperationGUI/OperationGUI_ChamferDlg.h
View File

@ -29,7 +29,7 @@
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <QMap> #include <QMap>
@ -93,11 +93,11 @@ private:
GEOM::GEOM_Object_var myShape; GEOM::GEOM_Object_var myShape;
QMap< int, int > myFace; // indexes of faces from second tab ( Face1,2 ) QMap< int, int > myFace; // indexes of faces from second tab ( Face1,2 )
TColStd_IndexedMapOfInteger myFaces; // indexes of faces from first tab ( Faces ) NCollection_IndexedMap<Standard_Integer> myFaces; // indexes of faces from first tab ( Faces )
TColStd_IndexedMapOfInteger myEdges; // indexes of edges from fourth tab (Edges) NCollection_IndexedMap<Standard_Integer> myEdges; // indexes of edges from fourth tab (Edges)
// to initialize the first selection field with a selected object on the dialog creation // to initialize the first selection field with a selected object on the dialog creation
bool myInitial; bool myInitial;
QGroupBox* myGrp1; QGroupBox* myGrp1;
QGroupBox* myGrp2; QGroupBox* myGrp2;

5
src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
View File

@ -38,7 +38,6 @@
// OCCT Includes // OCCT Includes
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -205,7 +204,7 @@ void OperationGUI_Fillet1d2dDlg::SelectionIntoArgument()
QString aName = GEOMBase::GetName( anObj ); QString aName = GEOMBase::GetName( anObj );
TopoDS_Shape aShape; TopoDS_Shape aShape;
if ( GEOMBase::GetShape( anObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) { if ( GEOMBase::GetShape( anObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(aSelList.First(), aMap); aSelMgr->GetIndexes(aSelList.First(), aMap);
if ( aMap.Extent() == 1 ) { // Local Selection if ( aMap.Extent() == 1 ) { // Local Selection
int anIndex = aMap( 1 ); int anIndex = aMap( 1 );
@ -243,7 +242,7 @@ void OperationGUI_Fillet1d2dDlg::SelectionIntoArgument()
GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
if ( !anObj->_is_nil() ) { if ( !anObj->_is_nil() ) {
TColStd_IndexedMapOfInteger anIndexes; NCollection_IndexedMap<Standard_Integer> anIndexes;
aSelMgr->GetIndexes(aSelList.First(), anIndexes); aSelMgr->GetIndexes(aSelList.First(), anIndexes);
if (anIndexes.Extent() > 0) { if (anIndexes.Extent() > 0) {

10
src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
View File

@ -26,7 +26,7 @@
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
class DlgRef_2Sel1Spin2Check; class DlgRef_2Sel1Spin2Check;
@ -64,11 +64,11 @@ private:
double getRadius() const; double getRadius() const;
private: private:
bool myIs1D; bool myIs1D;
GEOM::GEOM_Object_var myShape; GEOM::GEOM_Object_var myShape;
TColStd_IndexedMapOfInteger myVertexes; NCollection_IndexedMap<Standard_Integer> myVertexes;
DlgRef_2Sel1Spin2Check* GroupVertexes; DlgRef_2Sel1Spin2Check* GroupVertexes;
}; };
#endif // OPERATIONGUI_Fillet1d2dDLG_H #endif // OPERATIONGUI_Fillet1d2dDLG_H

3
src/OperationGUI/OperationGUI_FilletDlg.cxx
View File

@ -41,7 +41,6 @@
// OCCT Includes // OCCT Includes
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -371,7 +370,7 @@ void OperationGUI_FilletDlg::SelectionIntoArgument()
GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
if ( !anObj->_is_nil() ) { if ( !anObj->_is_nil() ) {
TColStd_IndexedMapOfInteger anIndexes; NCollection_IndexedMap<Standard_Integer> anIndexes;
aSelMgr->GetIndexes(aSelList.First(), anIndexes); aSelMgr->GetIndexes(aSelList.First(), anIndexes);
if (anIndexes.Extent() > 0) { if (anIndexes.Extent() > 0) {

6
src/OperationGUI/OperationGUI_FilletDlg.h
View File

@ -29,7 +29,7 @@
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
class DlgRef_1Sel1Spin; class DlgRef_1Sel1Spin;
class DlgRef_2Sel3Spin2Rb; class DlgRef_2Sel3Spin2Rb;
@ -74,8 +74,8 @@ private:
int myConstructorId; int myConstructorId;
GEOM::GEOM_Object_var myShape; GEOM::GEOM_Object_var myShape;
TColStd_IndexedMapOfInteger myEdges; NCollection_IndexedMap<Standard_Integer> myEdges;
TColStd_IndexedMapOfInteger myFaces; NCollection_IndexedMap<Standard_Integer> myFaces;
// to initialize the first selection field with a selected object on the dialog creation // to initialize the first selection field with a selected object on the dialog creation
bool myInitial; bool myInitial;

4
src/RepairGUI/RepairGUI_CloseContourDlg.cxx
View File

@ -38,7 +38,7 @@
// OCCT Includes // OCCT Includes
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -204,7 +204,7 @@ void RepairGUI_CloseContourDlg::SelectionIntoArgument()
myObject = GEOM::GEOM_Object::_nil(); myObject = GEOM::GEOM_Object::_nil();
} }
else if (myEditCurrentArgument == GroupPoints->LineEdit2) { else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(anIO, aMap); aSelMgr->GetIndexes(anIO, aMap);
const int n = aMap.Extent(); const int n = aMap.Extent();
myWiresInd->length(n); myWiresInd->length(n);

4
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
View File

@ -47,7 +47,7 @@
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx> #include <BRepBuilderAPI_MakeVertex.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
//================================================================================= //=================================================================================
// class : RepairGUI_DivideEdgeDlg() // class : RepairGUI_DivideEdgeDlg()
@ -256,7 +256,7 @@ void RepairGUI_DivideEdgeDlg::SelectionIntoArgument()
{ {
GEOM::short_array anIndexes; GEOM::short_array anIndexes;
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
SalomeApp_Application* anApp = SalomeApp_Application* anApp =
(SalomeApp_Application*)(SUIT_Session::session()->activeApplication()); (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
anApp->selectionMgr()->GetIndexes( anIO, aMap ); anApp->selectionMgr()->GetIndexes( anIO, aMap );

4
src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
View File

@ -34,7 +34,7 @@
// OCCT Includes // OCCT Includes
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -176,7 +176,7 @@ void RepairGUI_FuseEdgesDlg::SelectionIntoArgument()
QString aName = GEOMBase::GetName(anObj); QString aName = GEOMBase::GetName(anObj);
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (GEOMBase::GetShape(anObj, aShape, TopAbs_SHAPE) && !aShape.IsNull()) { if (GEOMBase::GetShape(anObj, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(aSelList.First(), aMap); aSelMgr->GetIndexes(aSelList.First(), aMap);
if (aMap.Extent() == 1) { // Local Selection if (aMap.Extent() == 1) { // Local Selection
int anIndex = aMap(1); int anIndex = aMap(1);

4
src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
View File

@ -39,7 +39,7 @@
// OCCT Includes // OCCT Includes
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -205,7 +205,7 @@ void RepairGUI_RemoveHolesDlg::SelectionIntoArgument()
} }
else if (myEditCurrentArgument == GroupPoints->LineEdit2 && else if (myEditCurrentArgument == GroupPoints->LineEdit2 &&
!GroupPoints->CheckButton1->isChecked()) { !GroupPoints->CheckButton1->isChecked()) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(anIO, aMap); aSelMgr->GetIndexes(anIO, aMap);
const int n = aMap.Extent(); const int n = aMap.Extent();
myWiresInd->length(n); myWiresInd->length(n);

4
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
View File

@ -38,7 +38,7 @@
// OCCT Includes // OCCT Includes
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -192,7 +192,7 @@ void RepairGUI_RemoveIntWiresDlg::SelectionIntoArgument()
} }
else if (myEditCurrentArgument == GroupPoints->LineEdit2 && else if (myEditCurrentArgument == GroupPoints->LineEdit2 &&
!GroupPoints->CheckButton1->isChecked()) { !GroupPoints->CheckButton1->isChecked()) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
aSelMgr->GetIndexes(anIO, aMap); aSelMgr->GetIndexes(anIO, aMap);
const int n = aMap.Extent(); const int n = aMap.Extent();
myWiresInd->length(n); myWiresInd->length(n);

4
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
View File

@ -41,7 +41,7 @@
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <NCollection_IndexedMap.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -199,7 +199,7 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
} }
} }
else if (myEditCurrentArgument == GroupArgs->LineEdit2) { else if (myEditCurrentArgument == GroupArgs->LineEdit2) {
TColStd_IndexedMapOfInteger aMap; NCollection_IndexedMap<Standard_Integer> aMap;
if (aSelList.Extent() == 1) { if (aSelList.Extent() == 1) {
Handle(SALOME_InteractiveObject) anIO = aSelList.First(); Handle(SALOME_InteractiveObject) anIO = aSelList.First();