0030268: Inspectors - improvements in VInspector plugin

# dump for curve/surface 2d brep structures

diff --git a/src/BRep/BRep_PointOnCurveOnSurface.cxx b/src/BRep/BRep_PointOnCurveOnSurface.cxx
index 63d609a36543f6b8e27702c76ac0453aaa1ac011..5372b18b2aef2606747d2a5fea8e67c30a3d31c4 100644 (file)
--- a/src/BRep/BRep_PointOnCurveOnSurface.cxx
+++ b/src/BRep/BRep_PointOnCurveOnSurface.cxx
@@ -95,6 +95,6 @@ void BRep_PointOnCurveOnSurface::DumpJson (Standard_OStream& theOStream, const S
 
   OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PointRepresentation);
 
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySurface.get());
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPCurve.get());
 }
 

diff --git a/src/BRep/BRep_PointOnCurveOnSurface.hxx b/src/BRep/BRep_PointOnCurveOnSurface.hxx
index 73eeec83611cd4b29f59d992ef37a2965a8c108e..c833658177942af83f893d642fa028aee351d4b8 100644 (file)
--- a/src/BRep/BRep_PointOnCurveOnSurface.hxx
+++ b/src/BRep/BRep_PointOnCurveOnSurface.hxx
@@ -50,6 +50,8 @@ public:
   
   Standard_EXPORT virtual void PCurve (const Handle(Geom2d_Curve)& C) Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/BRep/BRep_PointsOnSurface.cxx b/src/BRep/BRep_PointsOnSurface.cxx
index 740a09abc633866192fb047848b5a1202dcc80bf..c2189a424bb52bcdbc577573596c713271d16998 100644 (file)
--- a/src/BRep/BRep_PointsOnSurface.cxx
+++ b/src/BRep/BRep_PointsOnSurface.cxx
@@ -56,4 +56,18 @@ void  BRep_PointsOnSurface::Surface(const Handle(Geom_Surface)& S)
   mySurface = S;
 }
 
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void BRep_PointsOnSurface::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, BRep_PointsOnSurface);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PointRepresentation);
+
+  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface.get());
+}
+
 

diff --git a/src/BRep/BRep_TVertex.cxx b/src/BRep/BRep_TVertex.cxx
index ff5fb6a5233f73aa7fc713285af201a26967258c..73e59fd1d38378a42472e93768288cc90a8fc7ac 100644 (file)
--- a/src/BRep/BRep_TVertex.cxx
+++ b/src/BRep/BRep_TVertex.cxx
@@ -56,19 +56,7 @@ void BRep_TVertex::DumpJson (Standard_OStream& theOStream, const Standard_Intege
 {
   OCCT_DUMP_CLASS_BEGIN (theOStream, BRep_TVertex);
 
-  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TopoDS_TEdge);
-
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerance);
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFlags);
-
-  BRep_ListIteratorOfListOfCurveRepresentation itr(myCurves);
-  while (itr.More())
-  {
-    Handle(BRep_CurveRepresentation) aCurveRepresentation = itr.Value();
-    OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aCurveRepresentation.get());
-
-    itr.Next();
-  }
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TopoDS_TVertex);
 
   OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPnt);
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerance);

diff --git a/src/Geom2d/Geom2d_BSplineCurve.cxx b/src/Geom2d/Geom2d_BSplineCurve.cxx
index 1cca78c900cb7d66747d7bdc22bbc2a50221f6f1..bc8ca8f30a5f454132f2610f31becff758221960 100644 (file)
--- a/src/Geom2d/Geom2d_BSplineCurve.cxx
+++ b/src/Geom2d/Geom2d_BSplineCurve.cxx
@@ -1238,3 +1238,35 @@ void Geom2d_BSplineCurve::PeriodicNormalization(Standard_Real&  Parameter) const
   }
 }
 
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_BSplineCurve::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_BSplineCurve);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_BoundedCurve);
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, rational);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, periodic);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, knotSet);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, smooth);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, deg);
+  if (!poles.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, poles->Size());
+
+  if (!weights.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, weights->Size());
+  if (!flatknots.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, flatknots->Size());
+  if (!knots.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, knots->Size());
+  if (!mults.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mults->Size());
+
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, maxderivinv);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, maxderivinvok);
+}

diff --git a/src/Geom2d/Geom2d_BSplineCurve.hxx b/src/Geom2d/Geom2d_BSplineCurve.hxx
index 822ded7de1edd6dcc6a764ea02dc3f02e2a906ef..f6d023fdf9bd7c7db45ac6671d7d61b1b74ca45b 100644 (file)
--- a/src/Geom2d/Geom2d_BSplineCurve.hxx
+++ b/src/Geom2d/Geom2d_BSplineCurve.hxx
@@ -817,6 +817,8 @@ public:
   //! Creates a new object which is a copy of this BSpline curve.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_BezierCurve.cxx b/src/Geom2d/Geom2d_BezierCurve.cxx
index 38250afe4474a81109e12bdfe6de7d448aa90475..9d8841ca1a18762dcf25cfa0a47c428ed6561ec0 100644 (file)
--- a/src/Geom2d/Geom2d_BezierCurve.cxx
+++ b/src/Geom2d/Geom2d_BezierCurve.cxx
@@ -822,3 +822,24 @@ void Geom2d_BezierCurve::Init
     weights.Nullify();
 }
 
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_BezierCurve::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_BezierCurve);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_BoundedCurve);
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, rational);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, closed);
+  if (!poles.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, poles->Size());
+  if (!weights.IsNull())
+    OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, weights->Size());
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, maxderivinv);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, maxderivinvok);
+}

diff --git a/src/Geom2d/Geom2d_BezierCurve.hxx b/src/Geom2d/Geom2d_BezierCurve.hxx
index 0d61dc4b45881f9daca8e9559b8348dd6f94da3f..162bd876389bb4bc5e1d6f9247fbf4e9afd6de90 100644 (file)
--- a/src/Geom2d/Geom2d_BezierCurve.hxx
+++ b/src/Geom2d/Geom2d_BezierCurve.hxx
@@ -320,6 +320,8 @@ public:
   //! Creates a new object which is a copy of this Bezier curve.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_BoundedCurve.cxx b/src/Geom2d/Geom2d_BoundedCurve.cxx
index eebd15e9a2462cf3eed4d3faa1e0a5f94cc4c700..2bc706663a9f1dc4bf89ef10f8671f452b71494c 100644 (file)
--- a/src/Geom2d/Geom2d_BoundedCurve.cxx
+++ b/src/Geom2d/Geom2d_BoundedCurve.cxx
@@ -19,4 +19,16 @@
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(Geom2d_BoundedCurve,Geom2d_Curve)
\ No newline at end of file
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_BoundedCurve,Geom2d_Curve)
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_BoundedCurve::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_BoundedCurve);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Curve);
+}

diff --git a/src/Geom2d/Geom2d_BoundedCurve.hxx b/src/Geom2d/Geom2d_BoundedCurve.hxx
index fae7b0ea01f7235d3be5fe284cb270d35617e9f7..43029d698a614b4f52ac168a8d9006f436bef2cc 100644 (file)
--- a/src/Geom2d/Geom2d_BoundedCurve.hxx
+++ b/src/Geom2d/Geom2d_BoundedCurve.hxx
@@ -61,6 +61,8 @@ public:
   //! "FirstParameter" of the curve.
   Standard_EXPORT virtual gp_Pnt2d StartPoint() const = 0;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_CartesianPoint.cxx b/src/Geom2d/Geom2d_CartesianPoint.cxx
index f643c7f2ff240d7621c507414631bed4cacdef2b..da9f87eeee9dbbba62a3662c777b4b27eddf5756 100644 (file)
--- a/src/Geom2d/Geom2d_CartesianPoint.cxx
+++ b/src/Geom2d/Geom2d_CartesianPoint.cxx
@@ -72,3 +72,11 @@ void Geom2d_CartesianPoint::Transform (const Trsf2d& T) {
 
   gpPnt2d.Transform (T);
 }
+
+void Geom2d_CartesianPoint::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_CartesianPoint);
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Point);
+
+  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &gpPnt2d);
+}

diff --git a/src/Geom2d/Geom2d_CartesianPoint.hxx b/src/Geom2d/Geom2d_CartesianPoint.hxx
index c4929f6103963728e06e77c4f07991d67319c913..4164289fd4516643cbf69be91b25c5d0bbc5fb30 100644 (file)
--- a/src/Geom2d/Geom2d_CartesianPoint.hxx
+++ b/src/Geom2d/Geom2d_CartesianPoint.hxx
@@ -76,6 +76,8 @@ public:
   
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Circle.cxx b/src/Geom2d/Geom2d_Circle.cxx
index 3bac3eb3ec9ebb43b8f7ade51a90993af71c8bf8..ea6b13c915d3ce71318f8c56ddcf5d41b4690e71 100644 (file)
--- a/src/Geom2d/Geom2d_Circle.cxx
+++ b/src/Geom2d/Geom2d_Circle.cxx
@@ -263,3 +263,16 @@ void Geom2d_Circle::Transform (const Trsf2d& T)
    radius = radius * Abs(T.ScaleFactor());
    pos.Transform (T);
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Circle::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Circle);
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Conic);
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, radius);
+}

diff --git a/src/Geom2d/Geom2d_Circle.hxx b/src/Geom2d/Geom2d_Circle.hxx
index 76e55766e4d752a0deb44407dc782840e4c89195..c1c69b9a4b71b98cee6a0bfdf36c28ac33919724 100644 (file)
--- a/src/Geom2d/Geom2d_Circle.hxx
+++ b/src/Geom2d/Geom2d_Circle.hxx
@@ -155,6 +155,8 @@ public:
   //! Creates a new object which is a copy of this circle.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Conic.cxx b/src/Geom2d/Geom2d_Conic.cxx
index 51eeea6c3800abbc03648609ecb01c06e0c8df47..424e7a7fb89c5e897b642451c6764066dcd86837 100644 (file)
--- a/src/Geom2d/Geom2d_Conic.cxx
+++ b/src/Geom2d/Geom2d_Conic.cxx
@@ -145,3 +145,17 @@ Standard_Boolean Geom2d_Conic::IsCN (const Standard_Integer ) const
 {
   return Standard_True; 
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Conic::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Conic);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Curve);
+
+  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos);
+}

diff --git a/src/Geom2d/Geom2d_Conic.hxx b/src/Geom2d/Geom2d_Conic.hxx
index d37eb9a84149a02ba454226412c50dcb26887a1c..048e9edcde43d156f7d66d1fa96184778a138ba5 100644 (file)
--- a/src/Geom2d/Geom2d_Conic.hxx
+++ b/src/Geom2d/Geom2d_Conic.hxx
@@ -124,6 +124,8 @@ public:
   //! Returns True, the order of continuity of a conic is infinite.
   Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Curve.cxx b/src/Geom2d/Geom2d_Curve.cxx
index 59ed0848ebcca04d753791d018c3457b9c2221ea..21e629c83bb9b203a8eef292da9df0c2e3dba081 100644 (file)
--- a/src/Geom2d/Geom2d_Curve.cxx
+++ b/src/Geom2d/Geom2d_Curve.cxx
@@ -88,3 +88,15 @@ gp_Pnt2d  Geom2d_Curve::Value(const Standard_Real U)const
   D0(U,P);
   return P;
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Curve::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Curve);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Geometry);
+}

diff --git a/src/Geom2d/Geom2d_Curve.hxx b/src/Geom2d/Geom2d_Curve.hxx
index f12036a6592e0032eb4ddf66911bc1f884da1853..19bba621518e008a86dd886e1c108faa7265ffc4 100644 (file)
--- a/src/Geom2d/Geom2d_Curve.hxx
+++ b/src/Geom2d/Geom2d_Curve.hxx
@@ -224,6 +224,8 @@ public:
   //! are parallel.
   Standard_EXPORT gp_Pnt2d Value (const Standard_Real U) const;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Ellipse.cxx b/src/Geom2d/Geom2d_Ellipse.cxx
index e9dbbbc6fb12c68eaeee290ae8e0d093b1005920..19158cf1592a189239dc9ce420b549f28c628ab0 100644 (file)
--- a/src/Geom2d/Geom2d_Ellipse.cxx
+++ b/src/Geom2d/Geom2d_Ellipse.cxx
@@ -383,3 +383,18 @@ void Geom2d_Ellipse::Transform (const Trsf2d& T)
   minorRadius = minorRadius * Abs(T.ScaleFactor());
   pos.Transform(T);
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Ellipse::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Ellipse);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Conic);
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, majorRadius);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, minorRadius);
+}

diff --git a/src/Geom2d/Geom2d_Ellipse.hxx b/src/Geom2d/Geom2d_Ellipse.hxx
index 78ff674e61d353aaf8d4776f414a15f0cb8be3f2..f6eef1f934984117dcadde9e35b6bc21e0525ad2 100644 (file)
--- a/src/Geom2d/Geom2d_Ellipse.hxx
+++ b/src/Geom2d/Geom2d_Ellipse.hxx
@@ -241,6 +241,8 @@ public:
   //! Creates a new object which is a copy of this ellipse.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Hyperbola.cxx b/src/Geom2d/Geom2d_Hyperbola.cxx
index ef357a88c108d746b3fcf82b888f521cd410117a..9d6a7b6c30780334db03341a3b4db8903b64569e 100644 (file)
--- a/src/Geom2d/Geom2d_Hyperbola.cxx
+++ b/src/Geom2d/Geom2d_Hyperbola.cxx
@@ -436,3 +436,18 @@ void Geom2d_Hyperbola::Transform (const Trsf2d& T)
   minorRadius = minorRadius * Abs (T.ScaleFactor());
   pos.Transform(T);
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Hyperbola::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Hyperbola);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Conic);
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, majorRadius);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, minorRadius);
+}

diff --git a/src/Geom2d/Geom2d_Hyperbola.hxx b/src/Geom2d/Geom2d_Hyperbola.hxx
index 02e341d9a78f77f44544400c4dcc654676589c8d..f1d431afe62bf87a458aa53999ca9997a0aa0e85 100644 (file)
--- a/src/Geom2d/Geom2d_Hyperbola.hxx
+++ b/src/Geom2d/Geom2d_Hyperbola.hxx
@@ -294,6 +294,8 @@ public:
   //! Creates a new object which is a copy of this hyperbola.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Line.cxx b/src/Geom2d/Geom2d_Line.cxx
index 6ac9b7b77438527c0df4bc1c72827eeec894b067..4062c13b78b0d52fd7506f3363787b1b32782d5a 100644 (file)
--- a/src/Geom2d/Geom2d_Line.cxx
+++ b/src/Geom2d/Geom2d_Line.cxx
@@ -293,3 +293,15 @@ Standard_Real Geom2d_Line::Distance (const gp_Pnt2d& P) const {
   return L.Distance (P);
 }
 
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Line::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Line);
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Curve);
+
+  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos);
+}

diff --git a/src/Geom2d/Geom2d_Line.hxx b/src/Geom2d/Geom2d_Line.hxx
index ed74a2052286efedfe0c0699961291b3cb6666be..be79fa21902d989aa126149f19c0f0aec0eed4a8 100644 (file)
--- a/src/Geom2d/Geom2d_Line.hxx
+++ b/src/Geom2d/Geom2d_Line.hxx
@@ -181,6 +181,8 @@ public:
   //! Creates a new object, which is a copy of this line.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_OffsetCurve.cxx b/src/Geom2d/Geom2d_OffsetCurve.cxx
index 2c4ea9536c2695af6bd1844995c79979f73f4e25..1ab6ad5f6e7b44fd9fdf38e8801e42a95c694f25 100644 (file)
--- a/src/Geom2d/Geom2d_OffsetCurve.cxx
+++ b/src/Geom2d/Geom2d_OffsetCurve.cxx
@@ -388,3 +388,21 @@ GeomAbs_Shape Geom2d_OffsetCurve::GetBasisCurveContinuity() const
 {
   return myBasisCurveContinuity;
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_OffsetCurve::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_OffsetCurve);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Curve);
+
+  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisCurve.get());
+  //OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myEvaluator.get());
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, offsetValue);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBasisCurveContinuity);
+}

diff --git a/src/Geom2d/Geom2d_OffsetCurve.hxx b/src/Geom2d/Geom2d_OffsetCurve.hxx
index 0886f46baafc6d5528167963780bb6d66dab99ad..99cf1a3d422d295f0ffbc6e9b3dd55f8f52ba89e 100644 (file)
--- a/src/Geom2d/Geom2d_OffsetCurve.hxx
+++ b/src/Geom2d/Geom2d_OffsetCurve.hxx
@@ -285,6 +285,8 @@ public:
   //! Returns continuity of the basis curve.
   Standard_EXPORT GeomAbs_Shape GetBasisCurveContinuity() const;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Parabola.cxx b/src/Geom2d/Geom2d_Parabola.cxx
index f7bfd21d64faea7323be25b75c18162d67479947..2b002253a2b0ab4267598960d714810184ae5d7e 100644 (file)
--- a/src/Geom2d/Geom2d_Parabola.cxx
+++ b/src/Geom2d/Geom2d_Parabola.cxx
@@ -335,4 +335,16 @@ Standard_Real Geom2d_Parabola::ParametricTransformation(const gp_Trsf2d& T) cons
   return Abs(T.ScaleFactor());
 }
 
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Parabola::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Parabola);
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Conic);
+
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, focalLength);
+}
 

diff --git a/src/Geom2d/Geom2d_Parabola.hxx b/src/Geom2d/Geom2d_Parabola.hxx
index fa5f2a76c6eee920006b2f87f404099328bd3c6e..4486945f0af4c67a63160cec497bdb3a5abb2d78 100644 (file)
--- a/src/Geom2d/Geom2d_Parabola.hxx
+++ b/src/Geom2d/Geom2d_Parabola.hxx
@@ -205,6 +205,8 @@ public:
   //! Creates a new object, which is a copy of this parabola.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_Point.cxx b/src/Geom2d/Geom2d_Point.cxx
index e3dacd91a3c1d94b0fc69acfd97143fa9a8b4057..c5da2acc99c4308ac81a2f0d736e6975bf41bc9e 100644 (file)
--- a/src/Geom2d/Geom2d_Point.cxx
+++ b/src/Geom2d/Geom2d_Point.cxx
@@ -37,3 +37,15 @@ Standard_Real Geom2d_Point::SquareDistance (const Handle(Geom2d_Point)& Other) c
   gp_Pnt2d P2 = Other->Pnt2d ();
   return P1.SquareDistance (P2);
 }
+
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_Point::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_Point);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Geometry);
+}

diff --git a/src/Geom2d/Geom2d_Point.hxx b/src/Geom2d/Geom2d_Point.hxx
index ea3e9d1a565c14c7e8e97bf15dfcf7cfc6c64bb5..324087ec6c1196150d33b949518a64a999564c80 100644 (file)
--- a/src/Geom2d/Geom2d_Point.hxx
+++ b/src/Geom2d/Geom2d_Point.hxx
@@ -56,6 +56,8 @@ public:
   //! computes the square distance between <me> and <Other>.
   Standard_EXPORT Standard_Real SquareDistance (const Handle(Geom2d_Point)& Other) const;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/Geom2d/Geom2d_TrimmedCurve.cxx b/src/Geom2d/Geom2d_TrimmedCurve.cxx
index 9cbfa698585994e817a80ec1a98b22a6885bde3b..c1061b8f38f83ae2be77e9d2e50bfc1a3c51445b 100644 (file)
--- a/src/Geom2d/Geom2d_TrimmedCurve.cxx
+++ b/src/Geom2d/Geom2d_TrimmedCurve.cxx
@@ -345,3 +345,18 @@ Standard_Real Geom2d_TrimmedCurve::ParametricTransformation(const gp_Trsf2d& T)
   return basisCurve->ParametricTransformation(T);
 }
 
+//=======================================================================
+//function : DumpJson
+//purpose  : 
+//=======================================================================
+
+void Geom2d_TrimmedCurve::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
+{
+  OCCT_DUMP_CLASS_BEGIN (theOStream, Geom2d_TrimmedCurve);
+
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_BoundedCurve);
+
+  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisCurve.get());
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, uTrim1);
+  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, uTrim2);
+}

diff --git a/src/Geom2d/Geom2d_TrimmedCurve.hxx b/src/Geom2d/Geom2d_TrimmedCurve.hxx
index 57e905fb25f72cbd93efa943c914461dac85de18..8a835dc6aa23808339d1e9427ceae67b0efee20c 100644 (file)
--- a/src/Geom2d/Geom2d_TrimmedCurve.hxx
+++ b/src/Geom2d/Geom2d_TrimmedCurve.hxx
@@ -256,6 +256,8 @@ public:
   //! Creates a new object, which is a copy of this trimmed curve.
   Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 
 

diff --git a/src/gp/gp_Ax22d.cxx b/src/gp/gp_Ax22d.cxx
index 40ea9ac5cb5cc80e6c07223c1a3805103d680033..35007cc23867d4b95159f02061af9d3be59db584 100644 (file)
--- a/src/gp/gp_Ax22d.cxx
+++ b/src/gp/gp_Ax22d.cxx
@@ -24,6 +24,7 @@
 #include <gp_Trsf2d.hxx>
 #include <gp_Vec2d.hxx>
 #include <Standard_ConstructionError.hxx>
+#include <Standard_Dump.hxx>
 
 void gp_Ax22d::Mirror (const gp_Pnt2d& P)
 {
@@ -57,3 +58,10 @@ gp_Ax22d gp_Ax22d::Mirrored(const gp_Ax2d& A1) const
   return Temp;
 }
 
+void gp_Ax22d::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const
+{
+  OCCT_DUMP_VECTOR_CLASS (theOStream, "Location", 2, point.X(), point.Y())
+
+  OCCT_DUMP_VECTOR_CLASS (theOStream, "XAxis", 2, vxdir.X(), vxdir.Y())
+  OCCT_DUMP_VECTOR_CLASS (theOStream, "YAxis", 2, vydir.X(), vydir.Y())
+}

diff --git a/src/gp/gp_Ax22d.hxx b/src/gp/gp_Ax22d.hxx
index b8371998537cf2da004ecc5998e75fc5c890263b..0ae5bada7f4416e583b96ac3dfa204dc88d373d8 100644 (file)
--- a/src/gp/gp_Ax22d.hxx
+++ b/src/gp/gp_Ax22d.hxx
@@ -210,6 +210,8 @@ public:
   //! point <P2>.
     Standard_NODISCARD gp_Ax22d Translated (const gp_Pnt2d& P1, const gp_Pnt2d& P2) const;
 
+  //! Dumps the content of me into the stream
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;