0031354: Visualization - Dump improvement for V3d, Graphic3d, Aspect

# warnings, virtual corrections

(cherry picked from commit 1cf2847de7a03aee6b169be1c7b9b37c0979e2a8)

diff --git a/src/Aspect/Aspect_CircularGrid.hxx b/src/Aspect/Aspect_CircularGrid.hxx
index a915bcaa9410ecd2c4531b24b980aeb1914525ea..b8bb709ef96b4833ffa58fdfc1f866f129f9147f 100644 (file)
--- a/src/Aspect/Aspect_CircularGrid.hxx
+++ b/src/Aspect/Aspect_CircularGrid.hxx
@@ -57,7 +57,7 @@ public:
   Standard_EXPORT virtual void Init() Standard_OVERRIDE;
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 private:
 

diff --git a/src/Aspect/Aspect_GenId.cxx b/src/Aspect/Aspect_GenId.cxx
index 85069e0b25713cff950f5648336c7f2797b6595e..ea4937551d81656b33c4ac6382e4cfd1bfd6bba1 100644 (file)
--- a/src/Aspect/Aspect_GenId.cxx
+++ b/src/Aspect/Aspect_GenId.cxx
@@ -121,7 +121,7 @@ Standard_Boolean Aspect_GenId::Next (Standard_Integer& theId)
 // function : DumpJson
 // purpose  :
 // =======================================================================
-void Aspect_GenId::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
+void Aspect_GenId::DumpJson (Standard_OStream& theOStream, Standard_Integer) const
 {
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFreeCount)
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLength)

diff --git a/src/Aspect/Aspect_GradientBackground.hxx b/src/Aspect/Aspect_GradientBackground.hxx
index 2bc111e7318ebccaa7394ab8bf034518280960f7..049e2a9a0b65305f0f84fbe2d2fd765576203d4f 100644 (file)
--- a/src/Aspect/Aspect_GradientBackground.hxx
+++ b/src/Aspect/Aspect_GradientBackground.hxx
@@ -53,7 +53,7 @@ public:
   Standard_EXPORT Aspect_GradientFillMethod BgGradientFillMethod() const;
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Aspect/Aspect_RectangularGrid.hxx b/src/Aspect/Aspect_RectangularGrid.hxx
index 79513d35d530fef88e937fc1bc711bcbfd0d47c0..8e4146e95dc2424cd27394b69725c14cacb8e33b 100644 (file)
--- a/src/Aspect/Aspect_RectangularGrid.hxx
+++ b/src/Aspect/Aspect_RectangularGrid.hxx
@@ -69,7 +69,7 @@ public:
   Standard_EXPORT virtual void Init() Standard_OVERRIDE;
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 private:
 

diff --git a/src/Graphic3d/Graphic3d_AspectText3d.cxx b/src/Graphic3d/Graphic3d_AspectText3d.cxx
index c2d7312ca939ba7323a0213174fe8edeffd88393..22ace08ffb3179815cbfba4a2cb7f01b219bfd82 100644 (file)
--- a/src/Graphic3d/Graphic3d_AspectText3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.cxx
@@ -56,6 +56,10 @@ Graphic3d_AspectText3d::Graphic3d_AspectText3d (const Quantity_Color& theColor,
   }
 }
 
+// =======================================================================
+// function : DumpJson
+// purpose  :
+// =======================================================================
 void Graphic3d_AspectText3d::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
 {
   OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)

diff --git a/src/Graphic3d/Graphic3d_AspectText3d.hxx b/src/Graphic3d/Graphic3d_AspectText3d.hxx
index f2e09c02f099cbafb7b139e3be9c0fe76de61f34..70a558123f3f31bdb147e136eec5a23575327a45 100644 (file)
--- a/src/Graphic3d/Graphic3d_AspectText3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.hxx
@@ -112,7 +112,7 @@ public:
   Font_FontAspect GetTextFontAspect() const { return myTextFontAspect; }
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 };
 

diff --git a/src/Graphic3d/Graphic3d_Aspects.hxx b/src/Graphic3d/Graphic3d_Aspects.hxx
index fc519efb0d5c836e0ba3a2bf25ed982c99c8add9..a058eb5ee66062d330cefeb212cf6992548b5545 100644 (file)
--- a/src/Graphic3d/Graphic3d_Aspects.hxx
+++ b/src/Graphic3d/Graphic3d_Aspects.hxx
@@ -523,7 +523,7 @@ public:
   }
 
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
 
 
 protected:

diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx
index a9c06b9a0f5d61488d46f411330af678547ec131..420c9b0a7da300766f7e251099f856bf882cd371 100644 (file)
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -457,7 +457,7 @@ public: //! @name obsolete Graduated Trihedron functionality
   }
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 private:
 

diff --git a/src/Graphic3d/Graphic3d_Vertex.cxx b/src/Graphic3d/Graphic3d_Vertex.cxx
index b810225902eab39ddf66a0d6b2a55bf648fb4141..c8e6a6f81b20022c341b21c14ba858d9cdb6927b 100644 (file)
--- a/src/Graphic3d/Graphic3d_Vertex.cxx
+++ b/src/Graphic3d/Graphic3d_Vertex.cxx
@@ -28,7 +28,7 @@ Standard_ShortReal Graphic3d_Vertex::Distance(const Graphic3d_Vertex& AOther) co
 // function : DumpJson
 // purpose  :
 // =======================================================================
-void Graphic3d_Vertex::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
+void Graphic3d_Vertex::DumpJson (Standard_OStream& theOStream, Standard_Integer) const
 {
   OCCT_DUMP_VECTOR_CLASS (theOStream, "Graphic3d_Vertex", 3, xyz[0], xyz[1], xyz[2])
 }

diff --git a/src/Graphic3d/Graphic3d_Vertex.hxx b/src/Graphic3d/Graphic3d_Vertex.hxx
index 85d2b221b27cdbe9d52cdabbc0df2fb6fa071867..f48c419ca41c9706209942f74d4b396d132143b9 100644 (file)
--- a/src/Graphic3d/Graphic3d_Vertex.hxx
+++ b/src/Graphic3d/Graphic3d_Vertex.hxx
@@ -110,7 +110,7 @@ public:
   Standard_EXPORT Standard_ShortReal Distance (const Graphic3d_Vertex& theOther) const;
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
 
   float xyz[3];
 

diff --git a/src/V3d/V3d_CircularGrid.hxx b/src/V3d/V3d_CircularGrid.hxx
index f797d0a69a26747ffc814da65fdc307fcb48e0bc..b18b414d371e8fdcca389d395315eb80f3557621 100644 (file)
--- a/src/V3d/V3d_CircularGrid.hxx
+++ b/src/V3d/V3d_CircularGrid.hxx
@@ -52,7 +52,7 @@ public:
   Standard_EXPORT void SetGraphicValues (const Standard_Real Radius, const Standard_Real OffSet);
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 protected:
 

diff --git a/src/V3d/V3d_RectangularGrid.hxx b/src/V3d/V3d_RectangularGrid.hxx
index f75f8305c905fafa9f5581caa7c18936af6af046..33594bb43d8275dd6b6fcc8b077e2dd74ee3fb7a 100644 (file)
--- a/src/V3d/V3d_RectangularGrid.hxx
+++ b/src/V3d/V3d_RectangularGrid.hxx
@@ -51,7 +51,7 @@ public:
   Standard_EXPORT void SetGraphicValues (const Standard_Real XSize, const Standard_Real YSize, const Standard_Real OffSet);
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 protected:
   

diff --git a/src/gp/gp_Vec.cxx b/src/gp/gp_Vec.cxx
index ab42126d3e6bc321cf49f084f3fc0573fdeb5ba8..5b6d0662f2ad2222a132ae99f331a1d77ccc0366 100644 (file)
--- a/src/gp/gp_Vec.cxx
+++ b/src/gp/gp_Vec.cxx
@@ -132,7 +132,7 @@ gp_Vec gp_Vec::Mirrored (const gp_Ax2& A2) const
 // function : DumpJson
 // purpose  :
 // =======================================================================
-void gp_Vec::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
+void gp_Vec::DumpJson (Standard_OStream& theOStream, Standard_Integer) const
 {
   OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_Vec", 3, coord.X(), coord.Y(), coord.Z())
 }

diff --git a/src/gp/gp_Vec.hxx b/src/gp/gp_Vec.hxx
index 5d5df609c470f8cf88b0975f4d41c76847b06901..b537f560b062125a537d9ff1bc51cfbc3bce4fe6 100644 (file)
--- a/src/gp/gp_Vec.hxx
+++ b/src/gp/gp_Vec.hxx
@@ -356,7 +356,7 @@ public:
   Standard_NODISCARD gp_Vec Transformed (const gp_Trsf& T) const;
   
   //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
+  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;