0029754: Coding Rules - replace Standard_Integer with Graphic3d_ZLayerId for consistency

diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index 4e74d54b0a167247c745f8009803f893624afa89..314e6229cd9d6e31a54fd91d54889b484f08c800 100644 (file)
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -2810,7 +2810,7 @@ Standard_Boolean AIS_InteractiveContext::PlaneSize (Standard_Real& theX,
 //purpose  :
 //=======================================================================
 void AIS_InteractiveContext::SetZLayer (const Handle(AIS_InteractiveObject)& theIObj,
-                                        const Standard_Integer theLayerId)
+                                        const Graphic3d_ZLayerId theLayerId)
 {
   if (theIObj.IsNull())
     return;
@@ -2822,7 +2822,7 @@ void AIS_InteractiveContext::SetZLayer (const Handle(AIS_InteractiveObject)& the
 //function : GetZLayer
 //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()
        ?  theIObj->ZLayer()

diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx
index 734969266b135371d0227a28102559ab2690e592..02435d710643bd3f70888a01629282c473c1e555 100644 (file)
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -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);
 
   //! 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.
   //! 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.
-  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.
   //! Has no effect if object is not displayed in this context.

diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx
index 078058caaa791b760790d2821b94f6cd553ddc64..11f788e7995a5a7f2c91137d63649bb025192e53 100644 (file)
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -280,7 +280,7 @@ public:
                                    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.
-  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
   //! the view. Z layers allow drawing structures in higher layers

diff --git a/src/OpenGl/OpenGl_View.hxx b/src/OpenGl/OpenGl_View.hxx
index 71bcbfa2db619bea03f38f6c06aa29d2e2ff5933..db0544b81690721d5a1b4c1ce33f97d07c38c1ae 100644 (file)
--- a/src/OpenGl/OpenGl_View.hxx
+++ b/src/OpenGl/OpenGl_View.hxx
@@ -157,7 +157,7 @@ public:
                                                    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.
-  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.
   Standard_EXPORT virtual void AddZLayer (const Graphic3d_ZLayerId theLayerId) Standard_OVERRIDE;

diff --git a/src/PrsMgr/PrsMgr_Presentation.cxx b/src/PrsMgr/PrsMgr_Presentation.cxx
index 17ff1c225eb2cbc3a6e8be48096109ff84b0ff5e..ff8b5ee8dce41c044df5f795a8c3b4e7b14e8b48 100644 (file)
--- a/src/PrsMgr/PrsMgr_Presentation.cxx
+++ b/src/PrsMgr/PrsMgr_Presentation.cxx
@@ -336,7 +336,7 @@ PrsMgr_Presentation::~PrsMgr_Presentation()
 //function : SetZLayer
 //purpose  :
 //=======================================================================
-void PrsMgr_Presentation::SetZLayer (Standard_Integer theLayerId)
+void PrsMgr_Presentation::SetZLayer (Graphic3d_ZLayerId theLayerId)
 {
   myStructure->SetZLayer (theLayerId);
 }
@@ -345,7 +345,7 @@ void PrsMgr_Presentation::SetZLayer (Standard_Integer theLayerId)
 //function : GetZLayer
 //purpose  :
 //=======================================================================
-Standard_Integer PrsMgr_Presentation::GetZLayer() const
+Graphic3d_ZLayerId PrsMgr_Presentation::GetZLayer() const
 {
   return myStructure->GetZLayer();
 }

diff --git a/src/PrsMgr/PrsMgr_Presentation.hxx b/src/PrsMgr/PrsMgr_Presentation.hxx
index 789cd6ab72ca819f5408526290976eed89f679a0..fc42b22c53da0c935c9508112c40500aa21ef098 100644 (file)
--- a/src/PrsMgr/PrsMgr_Presentation.hxx
+++ b/src/PrsMgr/PrsMgr_Presentation.hxx
@@ -17,6 +17,7 @@
 #ifndef _PrsMgr_Presentation_HeaderFile
 #define _PrsMgr_Presentation_HeaderFile
 
+#include <Graphic3d_ZLayerId.hxx>
 #include <PrsMgr_PresentableObjectPointer.hxx>
 #include <Standard.hxx>
 #include <Standard_Boolean.hxx>
@@ -84,10 +85,10 @@ private:
   Standard_EXPORT void SetDisplayPriority (const Standard_Integer aNewPrior);
   
   //! 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
-  Standard_EXPORT Standard_Integer GetZLayer() const;
+  Standard_EXPORT Graphic3d_ZLayerId GetZLayer() const;
   
   //! removes the whole content of the presentation.
   //! Does not remove the other connected presentations.

diff --git a/src/PrsMgr/PrsMgr_PresentationManager.cxx b/src/PrsMgr/PrsMgr_PresentationManager.cxx
index 9a0aee8cfc7a345e8663beb6bd6c7f4179c1cda3..e237fe16013eeed0c39e4e19f805119905cabf5e 100644 (file)
--- a/src/PrsMgr/PrsMgr_PresentationManager.cxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager.cxx
@@ -524,7 +524,7 @@ Standard_Boolean PrsMgr_PresentationManager::RemovePresentation (const Handle(Pr
 // purpose  :
 // =======================================================================
 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())
   {
@@ -542,7 +542,7 @@ void PrsMgr_PresentationManager::SetZLayer (const Handle(PrsMgr_PresentableObjec
 // function : GetZLayer
 // 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();
 }

diff --git a/src/PrsMgr/PrsMgr_PresentationManager.hxx b/src/PrsMgr/PrsMgr_PresentationManager.hxx
index 2d0b3634d221a5e785dbd1b26d80e4af7431cef0..70a8dd22c245b4e07f7ef58c9e5133eec7406689 100644 (file)
--- a/src/PrsMgr/PrsMgr_PresentationManager.hxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager.hxx
@@ -83,12 +83,12 @@ public:
   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.
-  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.
   //! Method returns -1 value if object has no presentations and is
   //! 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;
   

diff --git a/src/V3d/V3d_Viewer.cxx b/src/V3d/V3d_Viewer.cxx
index 742d5a507f0515e5244236fdc52ad88b3f8b4086..3e9e49221b15275b1669eb06face798b4704ea08 100644 (file)
--- a/src/V3d/V3d_Viewer.cxx
+++ b/src/V3d/V3d_Viewer.cxx
@@ -274,7 +274,7 @@ void V3d_Viewer::DelView (const Handle(V3d_View)& theView)
 //function : AddZLayer
 //purpose  :
 //=======================================================================
-Standard_Boolean V3d_Viewer::AddZLayer (Standard_Integer& theLayerId)
+Standard_Boolean V3d_Viewer::AddZLayer (Graphic3d_ZLayerId& theLayerId)
 {
   try
   {
@@ -297,7 +297,7 @@ Standard_Boolean V3d_Viewer::AddZLayer (Standard_Integer& theLayerId)
 //function : RemoveZLayer
 //purpose  : 
 //=======================================================================
-Standard_Boolean V3d_Viewer::RemoveZLayer (const Standard_Integer theLayerId)
+Standard_Boolean V3d_Viewer::RemoveZLayer (const Graphic3d_ZLayerId theLayerId)
 {
   if (!myLayerIds.Contains (theLayerId)
     || theLayerId < myZLayerGenId.Lower()
@@ -326,7 +326,7 @@ void V3d_Viewer::GetAllZLayers (TColStd_SequenceOfInteger& theLayerSeq) const
 //function : SetZLayerSettings
 //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);
 }
@@ -335,7 +335,7 @@ void V3d_Viewer::SetZLayerSettings (const Standard_Integer theLayerId, const Gra
 //function : ZLayerSettings
 //purpose  :
 //=======================================================================
-Graphic3d_ZLayerSettings V3d_Viewer::ZLayerSettings (const Standard_Integer theLayerId)
+Graphic3d_ZLayerSettings V3d_Viewer::ZLayerSettings (const Graphic3d_ZLayerId theLayerId)
 {
   return myDriver->ZLayerSettings (theLayerId);
 }

diff --git a/src/V3d/V3d_Viewer.hxx b/src/V3d/V3d_Viewer.hxx
index 306ed9f9549b2b8686dd44d40aad34c6b27d7b73..7413a2a5b9df7a65ee78afa8d41cf91ffd884103 100644 (file)
--- a/src/V3d/V3d_Viewer.hxx
+++ b/src/V3d/V3d_Viewer.hxx
@@ -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 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.
-  Standard_EXPORT Standard_Boolean AddZLayer (Standard_Integer& theLayerId);
+  Standard_EXPORT Standard_Boolean AddZLayer (Graphic3d_ZLayerId& theLayerId);
 
   //! Remove Z layer with ID <theLayerId>.
   //! 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.
-  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.
-  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.
-  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: