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

0031322: Visualization, Select3D_SensitiveEntity - method NbSubElements() should be const

Browse Source 
Set constant state for the method NbSubElement to be able to call it from other constant methods (e.g. DumpJson of Select3D_SensitiveEntity).
This commit is contained in:
nds 2020-01-30 10:47:55 +03:00 committed by bugmaster
parent 8811d6f2aa
commit fe758dbe2c
31 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1888,3 +1888,7 @@ Unexpected const-ness of Aspect_Window::DoResize() method has been removed, so t
@subsection upgrade_750_rename Renaming of types
Enumeration BRepOffset_Type is renamed to ChFiDS_TypeOfConcavity.
@subsection upgrade_750_sensitiveEntity Select3D_SensitiveEntity interface change
The method Select3D_SensitiveEntity::NbSubElements() has been changed to be constant. Select3D_SensitiveEntity subclasses at application level should be updated accordingly.

2
src/MeshVS/MeshVS_CommonSensitiveEntity.cxx
View File

@ -118,7 +118,7 @@ MeshVS_CommonSensitiveEntity::~MeshVS_CommonSensitiveEntity()
//function : NbSubElements
//purpose :
//=======================================================================
Standard_Integer MeshVS_CommonSensitiveEntity::NbSubElements()
Standard_Integer MeshVS_CommonSensitiveEntity::NbSubElements() const
{
return myItemIndexes.Size();
}

2
src/MeshVS/MeshVS_CommonSensitiveEntity.hxx
View File

@ -36,7 +36,7 @@ public:
Standard_EXPORT virtual ~MeshVS_CommonSensitiveEntity();
//! Number of elements.
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
//! Returns the amount of sub-entities of the complex entity
Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE;

2
src/MeshVS/MeshVS_DummySensitiveEntity.cxx
View File

@ -29,7 +29,7 @@ MeshVS_DummySensitiveEntity::MeshVS_DummySensitiveEntity (const Handle(SelectMgr
// Function : NbSubElements
// Purpose :
//================================================================
Standard_Integer MeshVS_DummySensitiveEntity::NbSubElements()
Standard_Integer MeshVS_DummySensitiveEntity::NbSubElements() const
{
return -1;
}

2
src/MeshVS/MeshVS_DummySensitiveEntity.hxx
View File

@ -36,7 +36,7 @@ public:
Standard_EXPORT virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;

2
src/MeshVS/MeshVS_SensitiveMesh.cxx
View File

@ -77,7 +77,7 @@ Handle(Select3D_SensitiveEntity) MeshVS_SensitiveMesh::GetConnected()
// function : NbSubElements
// purpose : Returns the amount of mesh nodes
//=======================================================================
Standard_Integer MeshVS_SensitiveMesh::NbSubElements()
Standard_Integer MeshVS_SensitiveMesh::NbSubElements() const
{
Handle(MeshVS_MeshOwner) anOwner = Handle(MeshVS_MeshOwner)::DownCast (OwnerId());
if (anOwner.IsNull())

2
src/MeshVS/MeshVS_SensitiveMesh.hxx
View File

@ -48,7 +48,7 @@ public:
}
//! Returns the amount of mesh nodes
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
//! Returns bounding box of mesh
Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;

2
src/MeshVS/MeshVS_SensitivePolyhedron.cxx
View File

@ -104,7 +104,7 @@ Standard_Boolean MeshVS_SensitivePolyhedron::Matches (SelectBasics_SelectingVolu
// function : NbSubElements
// purpose : Returns the amount of nodes of polyhedron
//=======================================================================
Standard_Integer MeshVS_SensitivePolyhedron::NbSubElements()
Standard_Integer MeshVS_SensitivePolyhedron::NbSubElements() const
{
return myNodes->Length();
}

2
src/MeshVS/MeshVS_SensitivePolyhedron.hxx
View File

@ -55,7 +55,7 @@ public:
SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;
//! Returns the amount of nodes of polyhedron
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;

2
src/MeshVS/MeshVS_SensitiveQuad.hxx
View File

@ -38,7 +38,7 @@ public:
const gp_Pnt& thePnt4);
//! Returns the amount of sub-entities in sensitive
virtual Standard_Integer NbSubElements() Standard_OVERRIDE
virtual Standard_Integer NbSubElements() const Standard_OVERRIDE
{
return 1;
};

2
src/Select3D/Select3D_InteriorSensitivePointSet.cxx
View File

@ -319,7 +319,7 @@ gp_Pnt Select3D_InteriorSensitivePointSet::CenterOfGeometry() const
// function : NbSubElements
// purpose : Returns the amount of points in set
//=======================================================================
Standard_Integer Select3D_InteriorSensitivePointSet::NbSubElements()
Standard_Integer Select3D_InteriorSensitivePointSet::NbSubElements() const
{
return myPlanarPolygons.Length();
}

2
src/Select3D/Select3D_InteriorSensitivePointSet.hxx
View File

@ -68,7 +68,7 @@ public:
Standard_EXPORT virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE;
//! Returns the amount of points in set
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(Select3D_InteriorSensitivePointSet,Select3D_SensitiveSet)

2
src/Select3D/Select3D_SensitiveBox.cxx
View File

@ -59,7 +59,7 @@ Select3D_SensitiveBox::Select3D_SensitiveBox (const Handle(SelectMgr_EntityOwner
// function : NbSubElements
// purpose : Returns the amount of sub-entities in sensitive
//=======================================================================
Standard_Integer Select3D_SensitiveBox::NbSubElements()
Standard_Integer Select3D_SensitiveBox::NbSubElements() const
{
return 1;
}

2
src/Select3D/Select3D_SensitiveBox.hxx
View File

@ -45,7 +45,7 @@ public:
const Standard_Real theZMax);
//! Returns the amount of sub-entities in sensitive
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;

2
src/Select3D/Select3D_SensitiveEntity.hxx
View File

@ -70,7 +70,7 @@ public:
//! Returns the number of sub-entities or elements in sensitive entity.
//! Is used to determine if entity is complex and needs to pre-build BVH at the creation of sensitive entity step
//! or is light-weighted so the tree can be build on demand with unnoticeable delay.
virtual Standard_Integer NbSubElements() = 0;
virtual Standard_Integer NbSubElements() const = 0;
//! Returns bounding box of a sensitive with transformation applied
virtual Select3D_BndBox3d BoundingBox() = 0;

2
src/Select3D/Select3D_SensitiveFace.cxx
View File

@ -139,7 +139,7 @@ gp_Pnt Select3D_SensitiveFace::CenterOfGeometry() const
// purpose : Returns the amount of sub-entities (points or planar convex
// polygons)
//=======================================================================
Standard_Integer Select3D_SensitiveFace::NbSubElements()
Standard_Integer Select3D_SensitiveFace::NbSubElements() const
{
return myFacePoints->NbSubElements();
}

2
src/Select3D/Select3D_SensitiveFace.hxx
View File

@ -71,7 +71,7 @@ public:
Standard_EXPORT virtual void BVH() Standard_OVERRIDE;
//! Returns the amount of sub-entities (points or planar convex polygons)
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
private:

2
src/Select3D/Select3D_SensitiveGroup.cxx
View File

@ -164,7 +164,7 @@ void Select3D_SensitiveGroup::Clear()
// function : NbSubElements
// purpose : Returns the amount of sub-entities
//=======================================================================
Standard_Integer Select3D_SensitiveGroup::NbSubElements()
Standard_Integer Select3D_SensitiveGroup::NbSubElements() const
{
return myEntities.Size();
}

2
src/Select3D/Select3D_SensitiveGroup.hxx
View File

@ -113,7 +113,7 @@ public:
SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;
//! Returns the amount of sub-entities
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;

2
src/Select3D/Select3D_SensitivePoint.cxx
View File

@ -81,7 +81,7 @@ Select3D_BndBox3d Select3D_SensitivePoint::BoundingBox()
// function : NbSubElements
// purpose : Returns the amount of sub-entities in sensitive
//=======================================================================
Standard_Integer Select3D_SensitivePoint::NbSubElements()
Standard_Integer Select3D_SensitivePoint::NbSubElements() const
{
return 1;
}

2
src/Select3D/Select3D_SensitivePoint.hxx
View File

@ -31,7 +31,7 @@ public:
Standard_EXPORT Select3D_SensitivePoint (const Handle(SelectMgr_EntityOwner)& theOwnerId, const gp_Pnt& thePoint);
//! Returns the amount of sub-entities in sensitive
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;

2
src/Select3D/Select3D_SensitivePoly.cxx
View File

@ -284,7 +284,7 @@ Standard_Real Select3D_SensitivePoly::distanceToCOG (SelectBasics_SelectingVolum
// Function: NbSubElements
// Purpose : Returns the amount of segments in poly
//==================================================
Standard_Integer Select3D_SensitivePoly::NbSubElements()
Standard_Integer Select3D_SensitivePoly::NbSubElements() const
{
return myPolyg.Size();
}

2
src/Select3D/Select3D_SensitivePoly.hxx
View File

@ -56,7 +56,7 @@ public:
const Standard_Integer theNbPnts = 6);
//! Returns the amount of segments in poly
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
//! Returns the 3D points of the array used at construction time.
void Points3D (Handle(TColgp_HArray1OfPnt)& theHArrayOfPnt)

2
src/Select3D/Select3D_SensitivePrimitiveArray.hxx
View File

@ -209,7 +209,7 @@ public:
Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE;
//! Returns the amount of nodes in triangulation
virtual Standard_Integer NbSubElements() Standard_OVERRIDE
virtual Standard_Integer NbSubElements() const Standard_OVERRIDE
{
return !myGroups.IsNull() ? myGroups->Size() : myBvhIndices.NbElements;
}

2
src/Select3D/Select3D_SensitiveSegment.cxx
View File

@ -98,7 +98,7 @@ Select3D_BndBox3d Select3D_SensitiveSegment::BoundingBox()
// function : NbSubElements
// purpose : Returns the amount of points
//=======================================================================
Standard_Integer Select3D_SensitiveSegment::NbSubElements()
Standard_Integer Select3D_SensitiveSegment::NbSubElements() const
{
return 2;
}

2
src/Select3D/Select3D_SensitiveSegment.hxx
View File

@ -46,7 +46,7 @@ public:
const gp_Pnt& EndPoint() const { return myEnd; }
//! Returns the amount of points
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;

2
src/Select3D/Select3D_SensitiveTriangle.hxx
View File

@ -63,7 +63,7 @@ public:
Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;
//! Returns the amount of points
virtual Standard_Integer NbSubElements() Standard_OVERRIDE { return 3; }
virtual Standard_Integer NbSubElements() const Standard_OVERRIDE { return 3; }
virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE { return myCentroid; }

2
src/Select3D/Select3D_SensitiveTriangulation.cxx
View File

@ -421,7 +421,7 @@ gp_Pnt Select3D_SensitiveTriangulation::CenterOfGeometry() const
// function : NbSubElements
// purpose : Returns the amount of nodes in triangulation
//=======================================================================
Standard_Integer Select3D_SensitiveTriangulation::NbSubElements()
Standard_Integer Select3D_SensitiveTriangulation::NbSubElements() const
{
return myTriangul->Nodes().Length();
}

2
src/Select3D/Select3D_SensitiveTriangulation.hxx
View File

@ -55,7 +55,7 @@ public:
const Standard_Boolean theIsInterior);
//! Returns the amount of nodes in triangulation
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;

2
src/Select3D/Select3D_SensitiveWire.cxx
View File

@ -54,7 +54,7 @@ void Select3D_SensitiveWire::Add (const Handle(Select3D_SensitiveEntity)& theSen
// function : NbSubElements
// purpose : Returns the amount of sub-entities
//=======================================================================
Standard_Integer Select3D_SensitiveWire::NbSubElements()
Standard_Integer Select3D_SensitiveWire::NbSubElements() const
{
return myEntities.Length();
}

2
src/Select3D/Select3D_SensitiveWire.hxx
View File

@ -33,7 +33,7 @@ public:
Standard_EXPORT void Add (const Handle(Select3D_SensitiveEntity)& theSensitive);
//! Returns the amount of sub-entities
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE;
Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;