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

0029754: Coding Rules - replace Standard_Integer with Graphic3d_ZLayerId for consistency

Browse Source
This commit is contained in:
kgv 2018-05-14 08:54:08 +03:00 committed by abv
parent 57f84042ff
commit 8f1384072c
10 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AIS/AIS_InteractiveContext.cxx
View File

@ -2810,7 +2810,7 @@ Standard_Boolean AIS_InteractiveContext::PlaneSize (Standard_Real& theX,
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_InteractiveContext::SetZLayer (const Handle(AIS_InteractiveObject)& theIObj, void AIS_InteractiveContext::SetZLayer (const Handle(AIS_InteractiveObject)& theIObj,
const Standard_Integer theLayerId) const Graphic3d_ZLayerId theLayerId)
{ {
if (theIObj.IsNull()) if (theIObj.IsNull())
return; return;
@ -2822,7 +2822,7 @@ void AIS_InteractiveContext::SetZLayer (const Handle(AIS_InteractiveObject)& the
//function : GetZLayer //function : GetZLayer
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Integer AIS_InteractiveContext::GetZLayer (const Handle(AIS_InteractiveObject)& theIObj) const Graphic3d_ZLayerId AIS_InteractiveContext::GetZLayer (const Handle(AIS_InteractiveObject)& theIObj) const
{ {
return !theIObj.IsNull() return !theIObj.IsNull()
? theIObj->ZLayer() ? theIObj->ZLayer()

4
src/AIS/AIS_InteractiveContext.hxx
View File

@ -264,12 +264,12 @@ public: //! @name object presence management (View affinity, Layer, Priority)
Standard_EXPORT void SetDisplayPriority (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Integer thePriority); Standard_EXPORT void SetDisplayPriority (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Integer thePriority);
//! Get Z layer id set for displayed interactive object. //! Get Z layer id set for displayed interactive object.
Standard_EXPORT Standard_Integer GetZLayer (const Handle(AIS_InteractiveObject)& theIObj) const; Standard_EXPORT Graphic3d_ZLayerId GetZLayer (const Handle(AIS_InteractiveObject)& theIObj) const;
//! Set Z layer id for interactive object. //! Set Z layer id for interactive object.
//! The Z layers can be used to display temporarily presentations of some object in front of the other objects in the scene. //! The Z layers can be used to display temporarily presentations of some object in front of the other objects in the scene.
//! The ids for Z layers are generated by V3d_Viewer. //! The ids for Z layers are generated by V3d_Viewer.
Standard_EXPORT void SetZLayer (const Handle(AIS_InteractiveObject)& theIObj, const Standard_Integer theLayerId); Standard_EXPORT void SetZLayer (const Handle(AIS_InteractiveObject)& theIObj, const Graphic3d_ZLayerId theLayerId);
//! Setup object visibility in specified view. //! Setup object visibility in specified view.
//! Has no effect if object is not displayed in this context. //! Has no effect if object is not displayed in this context.

2
src/Graphic3d/Graphic3d_CView.hxx
View File

@ -280,7 +280,7 @@ public:
const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree) = 0; const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree) = 0;
//! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated. //! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated.
virtual void InvalidateBVHData (const Standard_Integer theLayerId) = 0; virtual void InvalidateBVHData (const Graphic3d_ZLayerId theLayerId) = 0;
//! Add a new top-level z layer with ID <theLayerId> for //! Add a new top-level z layer with ID <theLayerId> for
//! the view. Z layers allow drawing structures in higher layers //! the view. Z layers allow drawing structures in higher layers

2
src/OpenGl/OpenGl_View.hxx
View File

@ -157,7 +157,7 @@ public:
const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree) Standard_OVERRIDE; const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree) Standard_OVERRIDE;
//! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated. //! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated.
Standard_EXPORT virtual void InvalidateBVHData (const Standard_Integer theLayerId) Standard_OVERRIDE; Standard_EXPORT virtual void InvalidateBVHData (const Graphic3d_ZLayerId theLayerId) Standard_OVERRIDE;
//! Insert a new top-level z layer with the given ID. //! Insert a new top-level z layer with the given ID.
Standard_EXPORT virtual void AddZLayer (const Graphic3d_ZLayerId theLayerId) Standard_OVERRIDE; Standard_EXPORT virtual void AddZLayer (const Graphic3d_ZLayerId theLayerId) Standard_OVERRIDE;

4
src/PrsMgr/PrsMgr_Presentation.cxx
View File

@ -336,7 +336,7 @@ PrsMgr_Presentation::~PrsMgr_Presentation()
//function : SetZLayer //function : SetZLayer
//purpose : //purpose :
//======================================================================= //=======================================================================
void PrsMgr_Presentation::SetZLayer (Standard_Integer theLayerId) void PrsMgr_Presentation::SetZLayer (Graphic3d_ZLayerId theLayerId)
{ {
myStructure->SetZLayer (theLayerId); myStructure->SetZLayer (theLayerId);
} }
@ -345,7 +345,7 @@ void PrsMgr_Presentation::SetZLayer (Standard_Integer theLayerId)
//function : GetZLayer //function : GetZLayer
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Integer PrsMgr_Presentation::GetZLayer() const Graphic3d_ZLayerId PrsMgr_Presentation::GetZLayer() const
{ {
return myStructure->GetZLayer(); return myStructure->GetZLayer();
} }

5
src/PrsMgr/PrsMgr_Presentation.hxx
View File

@ -17,6 +17,7 @@
#ifndef _PrsMgr_Presentation_HeaderFile #ifndef _PrsMgr_Presentation_HeaderFile
#define _PrsMgr_Presentation_HeaderFile #define _PrsMgr_Presentation_HeaderFile
#include <Graphic3d_ZLayerId.hxx>
#include <PrsMgr_PresentableObjectPointer.hxx> #include <PrsMgr_PresentableObjectPointer.hxx>
#include <Standard.hxx> #include <Standard.hxx>
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
@ -84,10 +85,10 @@ private:
Standard_EXPORT void SetDisplayPriority (const Standard_Integer aNewPrior); Standard_EXPORT void SetDisplayPriority (const Standard_Integer aNewPrior);
//! Set Z layer ID for the presentation //! Set Z layer ID for the presentation
Standard_EXPORT void SetZLayer (const Standard_Integer theLayerId); Standard_EXPORT void SetZLayer (const Graphic3d_ZLayerId theLayerId);
//! Get Z layer ID for the presentation //! Get Z layer ID for the presentation
Standard_EXPORT Standard_Integer GetZLayer() const; Standard_EXPORT Graphic3d_ZLayerId GetZLayer() const;
//! removes the whole content of the presentation. //! removes the whole content of the presentation.
//! Does not remove the other connected presentations. //! Does not remove the other connected presentations.

4
src/PrsMgr/PrsMgr_PresentationManager.cxx
View File

@ -524,7 +524,7 @@ Standard_Boolean PrsMgr_PresentationManager::RemovePresentation (const Handle(Pr
// purpose : // purpose :
// ======================================================================= // =======================================================================
void PrsMgr_PresentationManager::SetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObj, void PrsMgr_PresentationManager::SetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObj,
const Standard_Integer theLayerId) const Graphic3d_ZLayerId theLayerId)
{ {
for (PrsMgr_ListOfPresentableObjectsIter anIter (thePrsObj->Children()); anIter.More(); anIter.Next()) for (PrsMgr_ListOfPresentableObjectsIter anIter (thePrsObj->Children()); anIter.More(); anIter.Next())
{ {
@ -542,7 +542,7 @@ void PrsMgr_PresentationManager::SetZLayer (const Handle(PrsMgr_PresentableObjec
// function : GetZLayer // function : GetZLayer
// purpose : // purpose :
// ======================================================================= // =======================================================================
Standard_Integer PrsMgr_PresentationManager::GetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObj) const Graphic3d_ZLayerId PrsMgr_PresentationManager::GetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObj) const
{ {
return thePrsObj->ZLayer(); return thePrsObj->ZLayer();
} }

4
src/PrsMgr/PrsMgr_PresentationManager.hxx
View File

@ -83,12 +83,12 @@ public:
Standard_EXPORT Standard_Integer DisplayPriority (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode) const; Standard_EXPORT Standard_Integer DisplayPriority (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode) const;
//! Set Z layer ID for all presentations of the object. //! Set Z layer ID for all presentations of the object.
Standard_EXPORT void SetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theLayerId); Standard_EXPORT void SetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Graphic3d_ZLayerId theLayerId);
//! Get Z layer ID assigned to all presentations of the object. //! Get Z layer ID assigned to all presentations of the object.
//! Method returns -1 value if object has no presentations and is //! Method returns -1 value if object has no presentations and is
//! impossible to get layer index. //! impossible to get layer index.
Standard_EXPORT Standard_Integer GetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObject) const; Standard_EXPORT Graphic3d_ZLayerId GetZLayer (const Handle(PrsMgr_PresentableObject)& thePrsObject) const;
Standard_EXPORT Standard_Boolean IsDisplayed (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode = 0) const; Standard_EXPORT Standard_Boolean IsDisplayed (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode = 0) const;

8
src/V3d/V3d_Viewer.cxx
View File

@ -274,7 +274,7 @@ void V3d_Viewer::DelView (const Handle(V3d_View)& theView)
//function : AddZLayer //function : AddZLayer
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean V3d_Viewer::AddZLayer (Standard_Integer& theLayerId) Standard_Boolean V3d_Viewer::AddZLayer (Graphic3d_ZLayerId& theLayerId)
{ {
try try
{ {
@ -297,7 +297,7 @@ Standard_Boolean V3d_Viewer::AddZLayer (Standard_Integer& theLayerId)
//function : RemoveZLayer //function : RemoveZLayer
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean V3d_Viewer::RemoveZLayer (const Standard_Integer theLayerId) Standard_Boolean V3d_Viewer::RemoveZLayer (const Graphic3d_ZLayerId theLayerId)
{ {
if (!myLayerIds.Contains (theLayerId) if (!myLayerIds.Contains (theLayerId)
|| theLayerId < myZLayerGenId.Lower() || theLayerId < myZLayerGenId.Lower()
@ -326,7 +326,7 @@ void V3d_Viewer::GetAllZLayers (TColStd_SequenceOfInteger& theLayerSeq) const
//function : SetZLayerSettings //function : SetZLayerSettings
//purpose : //purpose :
//======================================================================= //=======================================================================
void V3d_Viewer::SetZLayerSettings (const Standard_Integer theLayerId, const Graphic3d_ZLayerSettings& theSettings) void V3d_Viewer::SetZLayerSettings (const Graphic3d_ZLayerId theLayerId, const Graphic3d_ZLayerSettings& theSettings)
{ {
myDriver->SetZLayerSettings (theLayerId, theSettings); myDriver->SetZLayerSettings (theLayerId, theSettings);
} }
@ -335,7 +335,7 @@ void V3d_Viewer::SetZLayerSettings (const Standard_Integer theLayerId, const Gra
//function : ZLayerSettings //function : ZLayerSettings
//purpose : //purpose :
//======================================================================= //=======================================================================
Graphic3d_ZLayerSettings V3d_Viewer::ZLayerSettings (const Standard_Integer theLayerId) Graphic3d_ZLayerSettings V3d_Viewer::ZLayerSettings (const Graphic3d_ZLayerId theLayerId)
{ {
return myDriver->ZLayerSettings (theLayerId); return myDriver->ZLayerSettings (theLayerId);
} }

8
src/V3d/V3d_Viewer.hxx
View File

@ -192,18 +192,18 @@ public:
//! The Z layers are controlled entirely by viewer, it is not possible to add a layer to a particular view. //! The Z layers are controlled entirely by viewer, it is not possible to add a layer to a particular view.
//! The method returns Standard_False if the layer can not be created. //! The method returns Standard_False if the layer can not be created.
//! The layer mechanism allows to display structures in higher layers in overlay of structures in lower layers. //! The layer mechanism allows to display structures in higher layers in overlay of structures in lower layers.
Standard_EXPORT Standard_Boolean AddZLayer (Standard_Integer& theLayerId); Standard_EXPORT Standard_Boolean AddZLayer (Graphic3d_ZLayerId& theLayerId);
//! Remove Z layer with ID <theLayerId>. //! Remove Z layer with ID <theLayerId>.
//! Method returns Standard_False if the layer can not be removed or doesn't exists. //! Method returns Standard_False if the layer can not be removed or doesn't exists.
//! By default, there are always default bottom-level layer that can't be removed. //! By default, there are always default bottom-level layer that can't be removed.
Standard_EXPORT Standard_Boolean RemoveZLayer (const Standard_Integer theLayerId); Standard_EXPORT Standard_Boolean RemoveZLayer (const Graphic3d_ZLayerId theLayerId);
//! Returns the settings of a single Z layer. //! Returns the settings of a single Z layer.
Standard_EXPORT Graphic3d_ZLayerSettings ZLayerSettings (const Standard_Integer theLayerId); Standard_EXPORT Graphic3d_ZLayerSettings ZLayerSettings (const Graphic3d_ZLayerId theLayerId);
//! Sets the settings for a single Z layer. //! Sets the settings for a single Z layer.
Standard_EXPORT void SetZLayerSettings (const Standard_Integer theLayerId, const Graphic3d_ZLayerSettings& theSettings); Standard_EXPORT void SetZLayerSettings (const Graphic3d_ZLayerId theLayerId, const Graphic3d_ZLayerSettings& theSettings);
public: public: