From bc73b00672a218a1301520a3562ece96f72a679c Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 28 Jan 2020 12:03:38 +0300 Subject: [PATCH] 0031313: Foundation Classes - Dump improvement for classes - Provide DumpJson for geometrical, ocaf and visualization classes; - Change depth parameter of DumpJson (constant is not obligate here) - Introduce a new macro for transient objects to be called as the first row in DumpJson: OCCT_DUMP_TRANSIENT_CLASS_BEGIN. We need not put the class name in the macro, using get_type_name of Standard_Transient for it. - change implementation of OCCT_DUMP_CLASS_BEGIN and OCCT_DUMP_TRANSIENT_CLASS_BEGIN. It is not an sentry more and it does not create a new hierarchy level. It appends a new row into the output stream: "className": - OCCT_DUMP_* does not require semicolon - class header is included first in source files of TDataStd, TDocStd, TCAFDoc --- dox/dev_guides/debug/debug.md | 3 +- src/AIS/AIS_InteractiveContext.hxx | 3 + src/AIS/AIS_InteractiveContext_3.cxx | 39 +++ src/AIS/AIS_InteractiveObject.cxx | 10 +- src/AIS/AIS_InteractiveObject.hxx | 2 +- src/AIS/AIS_Shape.cxx | 16 + src/AIS/AIS_Shape.hxx | 3 + src/AIS/AIS_Trihedron.cxx | 17 + src/AIS/AIS_Trihedron.hxx | 3 + src/AppStd/AppStd_Application.cxx | 11 + src/AppStd/AppStd_Application.hxx | 3 + src/AppStdL/AppStdL_Application.cxx | 11 + src/AppStdL/AppStdL_Application.hxx | 3 + src/BRep/BRep_Curve3D.cxx | 13 + src/BRep/BRep_Curve3D.hxx | 3 + src/BRep/BRep_CurveOn2Surfaces.cxx | 17 + src/BRep/BRep_CurveOn2Surfaces.hxx | 3 + src/BRep/BRep_CurveOnClosedSurface.cxx | 16 + src/BRep/BRep_CurveOnClosedSurface.hxx | 3 + src/BRep/BRep_CurveOnSurface.cxx | 16 + src/BRep/BRep_CurveOnSurface.hxx | 3 + src/BRep/BRep_CurveRepresentation.cxx | 10 + src/BRep/BRep_CurveRepresentation.hxx | 3 + src/BRep/BRep_GCurve.cxx | 13 + src/BRep/BRep_GCurve.hxx | 3 + src/BRep/BRep_PointOnCurve.cxx | 12 + src/BRep/BRep_PointOnCurve.hxx | 3 + src/BRep/BRep_PointOnCurveOnSurface.cxx | 12 + src/BRep/BRep_PointOnCurveOnSurface.hxx | 3 + src/BRep/BRep_PointRepresentation.cxx | 11 + src/BRep/BRep_PointRepresentation.hxx | 3 + src/BRep/BRep_PointsOnSurface.cxx | 13 + src/BRep/BRep_PointsOnSurface.hxx | 3 + src/BRep/BRep_Polygon3D.cxx | 12 + src/BRep/BRep_Polygon3D.hxx | 3 + src/BRep/BRep_PolygonOnClosedSurface.cxx | 13 + src/BRep/BRep_PolygonOnClosedSurface.hxx | 3 + .../BRep_PolygonOnClosedTriangulation.cxx | 12 + .../BRep_PolygonOnClosedTriangulation.hxx | 3 + src/BRep/BRep_PolygonOnSurface.cxx | 13 + src/BRep/BRep_PolygonOnSurface.hxx | 3 + src/BRep/BRep_PolygonOnTriangulation.cxx | 14 + src/BRep/BRep_PolygonOnTriangulation.hxx | 3 + src/BRep/BRep_TEdge.cxx | 19 + src/BRep/BRep_TEdge.hxx | 3 + src/BRep/BRep_TFace.cxx | 18 + src/BRep/BRep_TFace.hxx | 3 + src/BRep/BRep_TVertex.cxx | 18 + src/BRep/BRep_TVertex.hxx | 3 + src/BVH/BVH_Box.hxx | 25 +- src/BVH/BVH_Tree.hxx | 28 +- src/Bnd/Bnd_Box.cxx | 8 +- src/Bnd/Bnd_Box.hxx | 2 +- src/Bnd/Bnd_OBB.cxx | 20 +- src/Bnd/Bnd_OBB.hxx | 2 +- src/Bnd/Bnd_Range.cxx | 8 +- src/Bnd/Bnd_Range.hxx | 2 +- src/CDM/CDM_Application.cxx | 10 + src/CDM/CDM_Application.hxx | 3 + src/CDM/CDM_Document.cxx | 52 +++ src/CDM/CDM_Document.hxx | 3 + src/CDM/CDM_MetaData.cxx | 22 ++ src/CDM/CDM_MetaData.hxx | 3 + src/CDM/CDM_Reference.cxx | 21 ++ src/CDM/CDM_Reference.hxx | 3 + src/Font/Font_Rect.hxx | 11 + src/Geom/Geom_BSplineCurve.cxx | 30 ++ src/Geom/Geom_BSplineCurve.hxx | 3 + src/Geom/Geom_BSplineSurface.cxx | 43 +++ src/Geom/Geom_BSplineSurface.hxx | 3 + src/Geom/Geom_BezierCurve.cxx | 21 ++ src/Geom/Geom_BezierCurve.hxx | 3 + src/Geom/Geom_BezierSurface.cxx | 20 ++ src/Geom/Geom_BezierSurface.hxx | 3 + src/Geom/Geom_BoundedCurve.cxx | 13 +- src/Geom/Geom_BoundedCurve.hxx | 3 + src/Geom/Geom_Circle.cxx | 13 + src/Geom/Geom_Circle.hxx | 3 + src/Geom/Geom_Conic.cxx | 11 + src/Geom/Geom_Conic.hxx | 3 + src/Geom/Geom_ConicalSurface.cxx | 13 + src/Geom/Geom_ConicalSurface.hxx | 3 + src/Geom/Geom_Curve.cxx | 10 + src/Geom/Geom_Curve.hxx | 3 + src/Geom/Geom_CylindricalSurface.cxx | 13 + src/Geom/Geom_CylindricalSurface.hxx | 3 + src/Geom/Geom_ElementarySurface.cxx | 13 + src/Geom/Geom_ElementarySurface.hxx | 3 + src/Geom/Geom_Ellipse.cxx | 14 + src/Geom/Geom_Ellipse.hxx | 3 + src/Geom/Geom_Geometry.cxx | 4 + src/Geom/Geom_Geometry.hxx | 3 + src/Geom/Geom_Hyperbola.cxx | 14 + src/Geom/Geom_Hyperbola.hxx | 3 + src/Geom/Geom_Line.cxx | 11 + src/Geom/Geom_Line.hxx | 3 + src/Geom/Geom_OffsetCurve.cxx | 17 + src/Geom/Geom_OffsetCurve.hxx | 3 + src/Geom/Geom_OffsetSurface.cxx | 18 + src/Geom/Geom_OffsetSurface.hxx | 3 + src/Geom/Geom_OsculatingSurface.cxx | 18 + src/Geom/Geom_OsculatingSurface.hxx | 3 + src/Geom/Geom_Parabola.cxx | 11 + src/Geom/Geom_Parabola.hxx | 3 + src/Geom/Geom_Plane.cxx | 11 + src/Geom/Geom_Plane.hxx | 3 + src/Geom/Geom_RectangularTrimmedSurface.cxx | 19 + src/Geom/Geom_RectangularTrimmedSurface.hxx | 3 + src/Geom/Geom_SphericalSurface.cxx | 13 + src/Geom/Geom_SphericalSurface.hxx | 3 + src/Geom/Geom_Surface.cxx | 11 + src/Geom/Geom_Surface.hxx | 3 + src/Geom/Geom_SurfaceOfLinearExtrusion.cxx | 11 + src/Geom/Geom_SurfaceOfLinearExtrusion.hxx | 3 + src/Geom/Geom_SurfaceOfRevolution.cxx | 11 + src/Geom/Geom_SurfaceOfRevolution.hxx | 3 + src/Geom/Geom_SweptSurface.cxx | 15 + src/Geom/Geom_SweptSurface.hxx | 3 + src/Geom/Geom_ToroidalSurface.cxx | 14 + src/Geom/Geom_ToroidalSurface.hxx | 3 + src/Geom/Geom_Transformation.cxx | 7 + src/Geom/Geom_Transformation.hxx | 3 + src/Geom/Geom_TrimmedCurve.cxx | 15 + src/Geom/Geom_TrimmedCurve.hxx | 3 + src/Geom2d/Geom2d_BSplineCurve.cxx | 30 ++ src/Geom2d/Geom2d_BSplineCurve.hxx | 3 + src/Geom2d/Geom2d_BezierCurve.cxx | 20 ++ src/Geom2d/Geom2d_BezierCurve.hxx | 3 + src/Geom2d/Geom2d_BoundedCurve.cxx | 13 +- src/Geom2d/Geom2d_BoundedCurve.hxx | 3 + src/Geom2d/Geom2d_CartesianPoint.cxx | 8 + src/Geom2d/Geom2d_CartesianPoint.hxx | 3 + src/Geom2d/Geom2d_Circle.cxx | 12 + src/Geom2d/Geom2d_Circle.hxx | 3 + src/Geom2d/Geom2d_Conic.cxx | 13 + src/Geom2d/Geom2d_Conic.hxx | 3 + src/Geom2d/Geom2d_Curve.cxx | 11 + src/Geom2d/Geom2d_Curve.hxx | 3 + src/Geom2d/Geom2d_Ellipse.cxx | 14 + src/Geom2d/Geom2d_Ellipse.hxx | 3 + src/Geom2d/Geom2d_Geometry.cxx | 5 + src/Geom2d/Geom2d_Geometry.hxx | 3 + src/Geom2d/Geom2d_Hyperbola.cxx | 14 + src/Geom2d/Geom2d_Hyperbola.hxx | 3 + src/Geom2d/Geom2d_Line.cxx | 11 + src/Geom2d/Geom2d_Line.hxx | 3 + src/Geom2d/Geom2d_OffsetCurve.cxx | 16 + src/Geom2d/Geom2d_OffsetCurve.hxx | 3 + src/Geom2d/Geom2d_Parabola.cxx | 11 + src/Geom2d/Geom2d_Parabola.hxx | 3 + src/Geom2d/Geom2d_Point.cxx | 11 + src/Geom2d/Geom2d_Point.hxx | 3 + src/Geom2d/Geom2d_TrimmedCurve.cxx | 14 + src/Geom2d/Geom2d_TrimmedCurve.hxx | 3 + src/Graphic3d/Graphic3d_Aspects.cxx | 39 ++- src/Graphic3d/Graphic3d_Aspects.hxx | 3 +- src/Graphic3d/Graphic3d_BSDF.cxx | 31 ++ src/Graphic3d/Graphic3d_BSDF.hxx | 6 + src/Graphic3d/Graphic3d_BoundBuffer.hxx | 13 + src/Graphic3d/Graphic3d_Buffer.cxx | 14 + src/Graphic3d/Graphic3d_Buffer.hxx | 3 + src/Graphic3d/Graphic3d_CStructure.cxx | 42 +++ src/Graphic3d/Graphic3d_CStructure.hxx | 3 + src/Graphic3d/Graphic3d_Camera.cxx | 15 + src/Graphic3d/Graphic3d_Camera.hxx | 3 + src/Graphic3d/Graphic3d_ClipPlane.cxx | 29 ++ src/Graphic3d/Graphic3d_ClipPlane.hxx | 3 + src/Graphic3d/Graphic3d_Group.cxx | 9 +- src/Graphic3d/Graphic3d_Group.hxx | 2 +- src/Graphic3d/Graphic3d_HatchStyle.cxx | 12 + src/Graphic3d/Graphic3d_HatchStyle.hxx | 3 + src/Graphic3d/Graphic3d_IndexBuffer.hxx | 6 + src/Graphic3d/Graphic3d_Layer.cxx | 35 ++ src/Graphic3d/Graphic3d_Layer.hxx | 3 + src/Graphic3d/Graphic3d_MaterialAspect.cxx | 26 ++ src/Graphic3d/Graphic3d_MaterialAspect.hxx | 3 + src/Graphic3d/Graphic3d_PBRMaterial.cxx | 16 + src/Graphic3d/Graphic3d_PBRMaterial.hxx | 3 + src/Graphic3d/Graphic3d_PolygonOffset.cxx | 10 +- src/Graphic3d/Graphic3d_PolygonOffset.hxx | 2 +- .../Graphic3d_PresentationAttributes.cxx | 17 + .../Graphic3d_PresentationAttributes.hxx | 3 + .../Graphic3d_SequenceOfHClipPlane.cxx | 15 + .../Graphic3d_SequenceOfHClipPlane.hxx | 3 + src/Graphic3d/Graphic3d_Structure.cxx | 16 + src/Graphic3d/Graphic3d_Structure.hxx | 3 + src/Graphic3d/Graphic3d_TransformPers.cxx | 35 ++ src/Graphic3d/Graphic3d_TransformPers.hxx | 9 + src/Graphic3d/Graphic3d_ViewAffinity.cxx | 13 +- src/Graphic3d/Graphic3d_ViewAffinity.hxx | 3 + src/Graphic3d/Graphic3d_ZLayerSettings.hxx | 24 ++ src/Image/Image_Texture.cxx | 17 + src/Image/Image_Texture.hxx | 3 + src/NCollection/NCollection_Buffer.hxx | 10 + src/NCollection/NCollection_Mat4.hxx | 12 + src/NCollection/NCollection_Vec3.hxx | 8 + src/NCollection/NCollection_Vec4.hxx | 8 + src/OpenGl/OpenGl_Aspects.cxx | 9 +- src/OpenGl/OpenGl_Aspects.hxx | 2 +- src/OpenGl/OpenGl_Context.cxx | 81 +++++ src/OpenGl/OpenGl_Context.hxx | 24 +- src/OpenGl/OpenGl_Element.cxx | 12 + src/OpenGl/OpenGl_Element.hxx | 3 + src/OpenGl/OpenGl_Flipper.cxx | 11 + src/OpenGl/OpenGl_Flipper.hxx | 7 +- src/OpenGl/OpenGl_FrameStatsPrs.cxx | 11 + src/OpenGl/OpenGl_FrameStatsPrs.hxx | 3 + src/OpenGl/OpenGl_GraduatedTrihedron.cxx | 11 + src/OpenGl/OpenGl_GraduatedTrihedron.hxx | 7 +- src/OpenGl/OpenGl_Group.cxx | 16 +- src/OpenGl/OpenGl_Group.hxx | 2 +- src/OpenGl/OpenGl_IndexBuffer.cxx | 10 + src/OpenGl/OpenGl_IndexBuffer.hxx | 3 + src/OpenGl/OpenGl_LayerList.cxx | 20 ++ src/OpenGl/OpenGl_LayerList.hxx | 4 + src/OpenGl/OpenGl_MatrixState.hxx | 15 + src/OpenGl/OpenGl_PrimitiveArray.cxx | 23 ++ src/OpenGl/OpenGl_PrimitiveArray.hxx | 3 + src/OpenGl/OpenGl_Resource.hxx | 4 + src/OpenGl/OpenGl_StencilTest.cxx | 13 + src/OpenGl/OpenGl_StencilTest.hxx | 7 +- src/OpenGl/OpenGl_Structure.cxx | 17 + src/OpenGl/OpenGl_Structure.hxx | 3 + src/OpenGl/OpenGl_Text.cxx | 20 ++ src/OpenGl/OpenGl_Text.hxx | 7 +- src/OpenGl/OpenGl_VertexBuffer.cxx | 18 + src/OpenGl/OpenGl_VertexBuffer.hxx | 3 + src/OpenGl/OpenGl_Workspace.cxx | 27 ++ src/OpenGl/OpenGl_Workspace.hxx | 3 + src/Poly/Poly_Polygon2D.cxx | 12 + src/Poly/Poly_Polygon2D.hxx | 3 + src/Poly/Poly_Polygon3D.cxx | 14 + src/Poly/Poly_Polygon3D.hxx | 3 + src/Poly/Poly_PolygonOnTriangulation.cxx | 15 + src/Poly/Poly_PolygonOnTriangulation.hxx | 3 + src/Poly/Poly_Triangulation.cxx | 19 + src/Poly/Poly_Triangulation.hxx | 3 + src/Prs3d/Prs3d_ArrowAspect.cxx | 10 +- src/Prs3d/Prs3d_ArrowAspect.hxx | 2 +- src/Prs3d/Prs3d_BasicAspect.hxx | 2 +- src/Prs3d/Prs3d_DatumAspect.cxx | 17 +- src/Prs3d/Prs3d_DatumAspect.hxx | 2 +- src/Prs3d/Prs3d_DimensionAspect.cxx | 31 +- src/Prs3d/Prs3d_DimensionAspect.hxx | 2 +- src/Prs3d/Prs3d_Drawer.cxx | 89 ++++- src/Prs3d/Prs3d_Drawer.hxx | 2 +- src/Prs3d/Prs3d_LineAspect.cxx | 7 +- src/Prs3d/Prs3d_LineAspect.hxx | 2 +- src/Prs3d/Prs3d_PlaneAspect.cxx | 31 +- src/Prs3d/Prs3d_PlaneAspect.hxx | 2 +- src/Prs3d/Prs3d_PointAspect.cxx | 7 +- src/Prs3d/Prs3d_PointAspect.hxx | 2 +- src/Prs3d/Prs3d_PresentationShadow.cxx | 14 + src/Prs3d/Prs3d_PresentationShadow.hxx | 3 + src/Prs3d/Prs3d_ShadingAspect.cxx | 6 +- src/Prs3d/Prs3d_ShadingAspect.hxx | 2 +- src/Prs3d/Prs3d_TextAspect.cxx | 15 +- src/Prs3d/Prs3d_TextAspect.hxx | 2 +- src/PrsMgr/PrsMgr_PresentableObject.cxx | 49 ++- src/PrsMgr/PrsMgr_PresentableObject.hxx | 2 +- src/PrsMgr/PrsMgr_Presentation.cxx | 16 + src/PrsMgr/PrsMgr_Presentation.hxx | 3 + src/QABugs/QABugs_19.cxx | 7 + src/Quantity/Quantity_Color.cxx | 3 +- src/Quantity/Quantity_Color.hxx | 2 +- src/Quantity/Quantity_ColorRGBA.cxx | 7 +- src/Quantity/Quantity_ColorRGBA.hxx | 2 +- .../Select3D_InteriorSensitivePointSet.cxx | 12 + .../Select3D_InteriorSensitivePointSet.hxx | 3 + src/Select3D/Select3D_SensitiveBox.cxx | 12 + src/Select3D/Select3D_SensitiveBox.hxx | 3 + src/Select3D/Select3D_SensitiveEntity.cxx | 23 ++ src/Select3D/Select3D_SensitiveEntity.hxx | 3 + src/Select3D/Select3D_SensitiveFace.cxx | 13 + src/Select3D/Select3D_SensitiveFace.hxx | 3 + src/Select3D/Select3D_SensitiveGroup.cxx | 21 ++ src/Select3D/Select3D_SensitiveGroup.hxx | 3 + src/Select3D/Select3D_SensitivePoint.cxx | 10 + src/Select3D/Select3D_SensitivePoint.hxx | 3 + src/Select3D/Select3D_SensitivePoly.cxx | 13 + src/Select3D/Select3D_SensitivePoly.hxx | 3 + .../Select3D_SensitivePrimitiveArray.cxx | 32 ++ .../Select3D_SensitivePrimitiveArray.hxx | 3 + src/Select3D/Select3D_SensitiveSegment.cxx | 16 + src/Select3D/Select3D_SensitiveSegment.hxx | 3 + src/Select3D/Select3D_SensitiveSet.cxx | 17 + src/Select3D/Select3D_SensitiveSet.hxx | 7 + src/Select3D/Select3D_SensitiveTriangle.cxx | 19 + src/Select3D/Select3D_SensitiveTriangle.hxx | 3 + .../Select3D_SensitiveTriangulation.cxx | 16 + .../Select3D_SensitiveTriangulation.hxx | 3 + src/Select3D/Select3D_SensitiveWire.cxx | 17 + src/Select3D/Select3D_SensitiveWire.hxx | 3 + .../SelectBasics_SelectingVolumeManager.hxx | 5 + src/SelectMgr/SelectMgr_BaseFrustum.cxx | 12 +- src/SelectMgr/SelectMgr_BaseFrustum.hxx | 2 +- src/SelectMgr/SelectMgr_EntityOwner.cxx | 14 +- src/SelectMgr/SelectMgr_EntityOwner.hxx | 2 +- src/SelectMgr/SelectMgr_SelectableObject.cxx | 20 +- src/SelectMgr/SelectMgr_SelectableObject.hxx | 2 +- .../SelectMgr_SelectableObjectSet.cxx | 26 ++ .../SelectMgr_SelectableObjectSet.hxx | 3 + .../SelectMgr_SelectingVolumeManager.cxx | 22 ++ .../SelectMgr_SelectingVolumeManager.hxx | 3 + src/SelectMgr/SelectMgr_Selection.cxx | 22 ++ src/SelectMgr/SelectMgr_Selection.hxx | 3 + src/SelectMgr/SelectMgr_SensitiveEntity.cxx | 12 + src/SelectMgr/SelectMgr_SensitiveEntity.hxx | 3 + src/SelectMgr/SelectMgr_ViewClipRange.cxx | 9 +- src/SelectMgr/SelectMgr_ViewClipRange.hxx | 2 +- src/SelectMgr/SelectMgr_ViewerSelector.cxx | 39 ++- src/SelectMgr/SelectMgr_ViewerSelector.hxx | 2 +- src/Standard/Standard_Dump.cxx | 325 ++++++++++++++++-- src/Standard/Standard_Dump.hxx | 148 ++++++-- src/StdSelect/StdSelect_BRepOwner.cxx | 14 + src/StdSelect/StdSelect_BRepOwner.hxx | 3 + src/StdSelect/StdSelect_Shape.cxx | 9 + src/StdSelect/StdSelect_Shape.hxx | 3 + src/StdSelect/StdSelect_ViewerSelector3d.cxx | 16 + src/StdSelect/StdSelect_ViewerSelector3d.hxx | 3 + src/TDF/TDF_Attribute.cxx | 20 ++ src/TDF/TDF_Attribute.hxx | 3 + src/TDF/TDF_AttributeDelta.cxx | 19 +- src/TDF/TDF_AttributeDelta.hxx | 3 + src/TDF/TDF_Data.cxx | 25 ++ src/TDF/TDF_Data.hxx | 3 + src/TDF/TDF_Delta.cxx | 21 ++ src/TDF/TDF_Delta.hxx | 3 + src/TDF/TDF_DeltaOnResume.cxx | 15 +- src/TDF/TDF_DeltaOnResume.hxx | 3 + src/TDF/TDF_Reference.cxx | 17 +- src/TDF/TDF_Reference.hxx | 3 + src/TDF/TDF_TagSource.cxx | 16 +- src/TDF/TDF_TagSource.hxx | 3 + src/TDF/TDF_Transaction.cxx | 13 + src/TDF/TDF_Transaction.hxx | 3 + src/TDataStd/TDataStd.cxx | 2 +- src/TDataStd/TDataStd_AsciiString.cxx | 17 +- src/TDataStd/TDataStd_AsciiString.hxx | 3 + src/TDataStd/TDataStd_BooleanArray.cxx | 23 +- src/TDataStd/TDataStd_BooleanArray.hxx | 3 + src/TDataStd/TDataStd_BooleanList.cxx | 21 +- src/TDataStd/TDataStd_BooleanList.hxx | 3 + src/TDataStd/TDataStd_ByteArray.cxx | 21 +- src/TDataStd/TDataStd_ByteArray.hxx | 3 + src/TDataStd/TDataStd_ChildNodeIterator.cxx | 2 +- src/TDataStd/TDataStd_Comment.cxx | 16 +- src/TDataStd/TDataStd_Comment.hxx | 3 + src/TDataStd/TDataStd_Current.cxx | 18 +- src/TDataStd/TDataStd_Current.hxx | 3 + ...DataStd_DeltaOnModificationOfByteArray.cxx | 2 +- ...td_DeltaOnModificationOfExtStringArray.cxx | 2 +- ...TDataStd_DeltaOnModificationOfIntArray.cxx | 2 +- ...aStd_DeltaOnModificationOfIntPackedMap.cxx | 2 +- ...DataStd_DeltaOnModificationOfRealArray.cxx | 2 +- src/TDataStd/TDataStd_Directory.cxx | 12 +- src/TDataStd/TDataStd_Directory.hxx | 3 + src/TDataStd/TDataStd_Expression.cxx | 21 +- src/TDataStd/TDataStd_Expression.hxx | 3 + src/TDataStd/TDataStd_ExtStringArray.cxx | 20 +- src/TDataStd/TDataStd_ExtStringArray.hxx | 3 + src/TDataStd/TDataStd_ExtStringList.cxx | 20 +- src/TDataStd/TDataStd_ExtStringList.hxx | 3 + .../TDataStd_HDataMapOfStringByte.cxx | 2 +- ...taStd_HDataMapOfStringHArray1OfInteger.cxx | 2 +- ...TDataStd_HDataMapOfStringHArray1OfReal.cxx | 2 +- .../TDataStd_HDataMapOfStringInteger.cxx | 2 +- .../TDataStd_HDataMapOfStringReal.cxx | 2 +- .../TDataStd_HDataMapOfStringString.cxx | 2 +- src/TDataStd/TDataStd_IntPackedMap.cxx | 20 +- src/TDataStd/TDataStd_IntPackedMap.hxx | 3 + src/TDataStd/TDataStd_Integer.cxx | 16 +- src/TDataStd/TDataStd_Integer.hxx | 3 + src/TDataStd/TDataStd_IntegerArray.cxx | 23 +- src/TDataStd/TDataStd_IntegerArray.hxx | 3 + src/TDataStd/TDataStd_IntegerList.cxx | 21 +- src/TDataStd/TDataStd_IntegerList.hxx | 3 + src/TDataStd/TDataStd_Name.cxx | 17 +- src/TDataStd/TDataStd_Name.hxx | 3 + src/TDataStd/TDataStd_NamedData.cxx | 25 ++ src/TDataStd/TDataStd_NamedData.hxx | 3 + src/TDataStd/TDataStd_NoteBook.cxx | 12 +- src/TDataStd/TDataStd_NoteBook.hxx | 3 + src/TDataStd/TDataStd_Real.cxx | 19 +- src/TDataStd/TDataStd_Real.hxx | 3 + src/TDataStd/TDataStd_RealArray.cxx | 23 +- src/TDataStd/TDataStd_RealArray.hxx | 3 + src/TDataStd/TDataStd_RealList.cxx | 22 +- src/TDataStd/TDataStd_RealList.hxx | 3 + src/TDataStd/TDataStd_ReferenceArray.cxx | 25 +- src/TDataStd/TDataStd_ReferenceArray.hxx | 3 + src/TDataStd/TDataStd_ReferenceList.cxx | 25 +- src/TDataStd/TDataStd_ReferenceList.hxx | 3 + src/TDataStd/TDataStd_Relation.cxx | 21 +- src/TDataStd/TDataStd_Relation.hxx | 3 + src/TDataStd/TDataStd_Tick.cxx | 14 +- src/TDataStd/TDataStd_Tick.hxx | 3 + src/TDataStd/TDataStd_TreeNode.cxx | 46 +++ src/TDataStd/TDataStd_TreeNode.hxx | 3 + src/TDataStd/TDataStd_UAttribute.cxx | 14 +- src/TDataStd/TDataStd_UAttribute.hxx | 3 + src/TDataStd/TDataStd_Variable.cxx | 16 +- src/TDataStd/TDataStd_Variable.hxx | 3 + src/TDocStd/TDocStd.cxx | 3 +- src/TDocStd/TDocStd_Application.cxx | 14 +- src/TDocStd/TDocStd_Application.hxx | 3 + src/TDocStd/TDocStd_ApplicationDelta.cxx | 2 +- src/TDocStd/TDocStd_CompoundDelta.cxx | 3 +- src/TDocStd/TDocStd_Document.cxx | 45 ++- src/TDocStd/TDocStd_Document.hxx | 3 + src/TDocStd/TDocStd_Modified.cxx | 2 +- .../TDocStd_MultiTransactionManager.cxx | 2 +- src/TDocStd/TDocStd_Owner.cxx | 14 +- src/TDocStd/TDocStd_Owner.hxx | 3 + src/TDocStd/TDocStd_PathParser.cxx | 2 +- src/TDocStd/TDocStd_XLink.cxx | 3 +- src/TDocStd/TDocStd_XLinkIterator.cxx | 3 +- src/TDocStd/TDocStd_XLinkRoot.cxx | 3 +- src/TDocStd/TDocStd_XLinkTool.cxx | 2 +- src/TNaming/TNaming_Name.cxx | 26 ++ src/TNaming/TNaming_Name.hxx | 3 + src/TNaming/TNaming_NamedShape.cxx | 49 +++ src/TNaming/TNaming_NamedShape.hxx | 3 + src/TNaming/TNaming_Naming.cxx | 12 + src/TNaming/TNaming_Naming.hxx | 3 + src/TNaming/TNaming_RefShape.hxx | 3 + src/TNaming/TNaming_UsedShapes.cxx | 26 ++ src/TNaming/TNaming_UsedShapes.hxx | 3 + src/TObj/TObj_Application.cxx | 11 + src/TObj/TObj_Application.hxx | 3 + src/TopLoc/TopLoc_Datum3D.cxx | 6 +- src/TopLoc/TopLoc_Datum3D.hxx | 2 +- src/TopLoc/TopLoc_ItemLocation.cxx | 10 +- src/TopLoc/TopLoc_ItemLocation.hxx | 2 +- src/TopLoc/TopLoc_Location.cxx | 8 +- src/TopLoc/TopLoc_Location.hxx | 2 +- src/TopoDS/TopoDS_Shape.cxx | 10 +- src/TopoDS/TopoDS_Shape.hxx | 2 +- src/TopoDS/TopoDS_TShape.cxx | 24 +- src/TopoDS/TopoDS_TShape.hxx | 2 +- src/V3d/V3d_Viewer.cxx | 11 + src/V3d/V3d_Viewer.hxx | 3 + src/XCAFApp/XCAFApp_Application.cxx | 12 + src/XCAFApp/XCAFApp_Application.hxx | 3 + src/XCAFDoc/XCAFDoc_Area.cxx | 16 +- src/XCAFDoc/XCAFDoc_Area.hxx | 3 + src/XCAFDoc/XCAFDoc_AssemblyItemId.cxx | 17 + src/XCAFDoc/XCAFDoc_AssemblyItemId.hxx | 3 + src/XCAFDoc/XCAFDoc_AssemblyItemRef.cxx | 19 +- src/XCAFDoc/XCAFDoc_AssemblyItemRef.hxx | 3 + src/XCAFDoc/XCAFDoc_Centroid.cxx | 15 +- src/XCAFDoc/XCAFDoc_Centroid.hxx | 3 + src/XCAFDoc/XCAFDoc_ClippingPlaneTool.cxx | 13 +- src/XCAFDoc/XCAFDoc_ClippingPlaneTool.hxx | 3 + src/XCAFDoc/XCAFDoc_Color.cxx | 15 +- src/XCAFDoc/XCAFDoc_Color.hxx | 3 + src/XCAFDoc/XCAFDoc_ColorTool.cxx | 16 +- src/XCAFDoc/XCAFDoc_ColorTool.hxx | 3 + src/XCAFDoc/XCAFDoc_Datum.cxx | 16 +- src/XCAFDoc/XCAFDoc_Datum.hxx | 3 + src/XCAFDoc/XCAFDoc_DimTol.cxx | 24 +- src/XCAFDoc/XCAFDoc_DimTol.hxx | 3 + src/XCAFDoc/XCAFDoc_DimTolTool.cxx | 16 +- src/XCAFDoc/XCAFDoc_DimTolTool.hxx | 3 + src/XCAFDoc/XCAFDoc_Dimension.cxx | 11 + src/XCAFDoc/XCAFDoc_Dimension.hxx | 3 + src/XCAFDoc/XCAFDoc_DocumentTool.cxx | 11 + src/XCAFDoc/XCAFDoc_DocumentTool.hxx | 3 + src/XCAFDoc/XCAFDoc_GeomTolerance.cxx | 11 + src/XCAFDoc/XCAFDoc_GeomTolerance.hxx | 3 + src/XCAFDoc/XCAFDoc_GraphNode.cxx | 28 +- src/XCAFDoc/XCAFDoc_GraphNode.hxx | 3 + src/XCAFDoc/XCAFDoc_LayerTool.cxx | 14 +- src/XCAFDoc/XCAFDoc_LayerTool.hxx | 3 + src/XCAFDoc/XCAFDoc_Location.cxx | 14 +- src/XCAFDoc/XCAFDoc_Location.hxx | 3 + src/XCAFDoc/XCAFDoc_Material.cxx | 19 +- src/XCAFDoc/XCAFDoc_Material.hxx | 3 + src/XCAFDoc/XCAFDoc_MaterialTool.cxx | 14 +- src/XCAFDoc/XCAFDoc_MaterialTool.hxx | 3 + src/XCAFDoc/XCAFDoc_Note.cxx | 14 + src/XCAFDoc/XCAFDoc_Note.hxx | 3 + src/XCAFDoc/XCAFDoc_NoteBalloon.cxx | 3 +- src/XCAFDoc/XCAFDoc_NoteBinData.cxx | 3 +- src/XCAFDoc/XCAFDoc_NoteComment.cxx | 3 +- src/XCAFDoc/XCAFDoc_NotesTool.cxx | 14 +- src/XCAFDoc/XCAFDoc_NotesTool.hxx | 3 + src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx | 19 +- src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx | 3 + src/XCAFDoc/XCAFDoc_ShapeTool.cxx | 42 ++- src/XCAFDoc/XCAFDoc_ShapeTool.hxx | 3 + src/XCAFDoc/XCAFDoc_View.cxx | 11 + src/XCAFDoc/XCAFDoc_View.hxx | 3 + src/XCAFDoc/XCAFDoc_ViewTool.cxx | 14 +- src/XCAFDoc/XCAFDoc_ViewTool.hxx | 3 + src/XCAFDoc/XCAFDoc_VisMaterial.cxx | 20 ++ src/XCAFDoc/XCAFDoc_VisMaterial.hxx | 3 + src/XCAFDoc/XCAFDoc_VisMaterialCommon.hxx | 20 +- src/XCAFDoc/XCAFDoc_VisMaterialPBR.hxx | 21 ++ src/XCAFDoc/XCAFDoc_Volume.cxx | 16 +- src/XCAFDoc/XCAFDoc_Volume.hxx | 3 + src/XCAFPrs/XCAFPrs_Style.cxx | 12 +- src/XCAFPrs/XCAFPrs_Style.hxx | 2 +- src/gp/gp_Ax1.cxx | 6 + src/gp/gp_Ax1.hxx | 3 + src/gp/gp_Ax2.cxx | 9 + src/gp/gp_Ax2.hxx | 3 + src/gp/gp_Ax22d.cxx | 8 + src/gp/gp_Ax22d.hxx | 3 + src/gp/gp_Ax2d.cxx | 8 + src/gp/gp_Ax2d.hxx | 3 + src/gp/gp_Ax3.cxx | 10 + src/gp/gp_Ax3.hxx | 3 + src/gp/gp_Dir.cxx | 5 + src/gp/gp_Dir.hxx | 3 + src/gp/gp_Dir2d.cxx | 5 + src/gp/gp_Dir2d.hxx | 3 + src/gp/gp_GTrsf.cxx | 16 + src/gp/gp_GTrsf.hxx | 3 + src/gp/gp_Mat.cxx | 4 +- src/gp/gp_Mat.hxx | 2 +- src/gp/gp_Pln.cxx | 5 + src/gp/gp_Pln.hxx | 3 + src/gp/gp_Pnt.cxx | 5 + src/gp/gp_Pnt.hxx | 3 + src/gp/gp_Pnt2d.cxx | 5 + src/gp/gp_Pnt2d.hxx | 3 + src/gp/gp_Trsf.cxx | 15 +- src/gp/gp_Trsf.hxx | 2 +- src/gp/gp_XYZ.cxx | 4 +- src/gp/gp_XYZ.hxx | 3 +- tests/bugs/vis/bug30949 | 4 +- 532 files changed, 5237 insertions(+), 419 deletions(-) diff --git a/dox/dev_guides/debug/debug.md b/dox/dev_guides/debug/debug.md index 70b511e3ed..f511636f58 100644 --- a/dox/dev_guides/debug/debug.md +++ b/dox/dev_guides/debug/debug.md @@ -150,7 +150,8 @@ Steps to prepare dump of the object into json: 1. Create method DumpJson. The method should accept the output stream and the depth for the fields dump. Depth, equal to zero means that only fields of this class should be dumped. Default value -1 means that whole tree of dump will be built recursively calling dump of all fields. -2. Put into the first row of the method OCCT_DUMP_CLASS_BEGIN. This macro creates a local variable, that will open Json structure on start, and close on exit from this method. +2. Put into the first row of the method OCCT_DUMP_CLASS_BEGIN or OCCT_DUMP_TRANSIENT_CLASS_BEGIN (for Standard_Transient objects). +This macro appends class name into output stream. 3. Add several macro to store field values. diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx index aaa794cd0d..0e1b56d8ff 100644 --- a/src/AIS/AIS_InteractiveContext.hxx +++ b/src/AIS/AIS_InteractiveContext.hxx @@ -1216,6 +1216,9 @@ public: //! @name sub-intensity management (deprecated) //! @param theSelection an instance of the selection void SetSelection (const Handle(AIS_Selection)& theSelection) { mySelection = theSelection; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: //! @name internal methods Standard_EXPORT void GetDefModes (const Handle(AIS_InteractiveObject)& anIobj, Standard_Integer& Dmode, Standard_Integer& HiMod, Standard_Integer& SelMode) const; diff --git a/src/AIS/AIS_InteractiveContext_3.cxx b/src/AIS/AIS_InteractiveContext_3.cxx index 6f7840e5fd..b0a070f632 100644 --- a/src/AIS/AIS_InteractiveContext_3.cxx +++ b/src/AIS/AIS_InteractiveContext_3.cxx @@ -86,3 +86,42 @@ void AIS_InteractiveContext::PolygonOffsets( anObj->PolygonOffsets( aMode, aFactor, aUnits ); } // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void AIS_InteractiveContext::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myObjects.Size()) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, mgrSelector.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myMainPM.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myMainVwr.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myMainSel.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myLastActiveView) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myLastPicked.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToHilightSelected) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, mySelection.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myFilters.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myDefaultDrawer.get()) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_Selected]) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_Dynamic]) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_LocalSelected]) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_LocalDynamic]) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_SubIntensity]) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedSeq.Size()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurDetected) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurHighlighted) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPickingStrategy) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAutoHilight) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsAutoActivateSelMode) +} diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx index 2fcd2bdd88..79139abe4d 100644 --- a/src/AIS/AIS_InteractiveObject.cxx +++ b/src/AIS/AIS_InteractiveObject.cxx @@ -148,11 +148,11 @@ void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& theAspect //function : DumpJson //purpose : //======================================================================= -void AIS_InteractiveObject::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void AIS_InteractiveObject::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, AIS_InteractiveObject); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_BASE_CLASS (theOStream, theDepth, SelectMgr_SelectableObject); - OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myCTXPtr); - OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myOwner); + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, SelectMgr_SelectableObject) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myCTXPtr) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myOwner) } diff --git a/src/AIS/AIS_InteractiveObject.hxx b/src/AIS/AIS_InteractiveObject.hxx index ec9b48de08..e66043f966 100644 --- a/src/AIS/AIS_InteractiveObject.hxx +++ b/src/AIS/AIS_InteractiveObject.hxx @@ -119,7 +119,7 @@ public: Standard_EXPORT void SetAspect (const Handle(Prs3d_BasicAspect)& anAspect); //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: //! The TypeOfPresention3d means that the interactive object diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx index 72674e733d..44b7a5a351 100644 --- a/src/AIS/AIS_Shape.cxx +++ b/src/AIS/AIS_Shape.cxx @@ -990,3 +990,19 @@ Standard_Boolean AIS_Shape::OwnHLRDeviationAngle ( Standard_Real & anAngle, aPreviousAngle = myDrawer->PreviousHLRDeviationAngle (); return myDrawer->HasOwnHLRDeviationAngle(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void AIS_Shape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, AIS_InteractiveObject) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myshape) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBB) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myInitAng) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCompBB) +} diff --git a/src/AIS/AIS_Shape.hxx b/src/AIS/AIS_Shape.hxx index f648228c3c..1b2ce0fcd5 100644 --- a/src/AIS/AIS_Shape.hxx +++ b/src/AIS/AIS_Shape.hxx @@ -325,6 +325,9 @@ public: const TopoDS_Shape& theShape, const Handle(Prs3d_Drawer)& theDrawer); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: TopoDS_Shape myshape; //!< shape to display diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx index f6ed7e1f3e..d31538ee25 100644 --- a/src/AIS/AIS_Trihedron.cxx +++ b/src/AIS/AIS_Trihedron.cxx @@ -926,3 +926,20 @@ void AIS_Trihedron::updatePrimitives(const Handle(Prs3d_DatumAspect)& theAspect, myPrimitives.Bind(aPart, aPrims); } } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void AIS_Trihedron::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, AIS_InteractiveObject) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnSize) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnTextColor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnArrowColor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDatumAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTrihDispMode) +} diff --git a/src/AIS/AIS_Trihedron.hxx b/src/AIS/AIS_Trihedron.hxx index 06ed48bc95..9d635df2cf 100644 --- a/src/AIS/AIS_Trihedron.hxx +++ b/src/AIS/AIS_Trihedron.hxx @@ -219,6 +219,9 @@ protected: Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, const Standard_Integer theMode) Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Creates a sensitive entity for the datum part that will be used in selection owner creation. diff --git a/src/AppStd/AppStd_Application.cxx b/src/AppStd/AppStd_Application.cxx index 039a50dcd1..61da27c491 100644 --- a/src/AppStd/AppStd_Application.cxx +++ b/src/AppStd/AppStd_Application.cxx @@ -16,6 +16,7 @@ //AGV 15/10/01 : Add XmlOcaf support; add MessageDriver support #include +#include IMPLEMENT_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application) @@ -29,3 +30,13 @@ Standard_CString AppStd_Application::ResourcesName() { return aRes; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void AppStd_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application) +} diff --git a/src/AppStd/AppStd_Application.hxx b/src/AppStd/AppStd_Application.hxx index bf9b64aa09..b4e17d85eb 100644 --- a/src/AppStd/AppStd_Application.hxx +++ b/src/AppStd/AppStd_Application.hxx @@ -35,6 +35,9 @@ public: //! resources Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application) }; diff --git a/src/AppStdL/AppStdL_Application.cxx b/src/AppStdL/AppStdL_Application.cxx index 9cead1f5d1..22f9f13c1f 100644 --- a/src/AppStdL/AppStdL_Application.cxx +++ b/src/AppStdL/AppStdL_Application.cxx @@ -16,6 +16,7 @@ //AGV 15/10/01 : Add XmlOcaf support; add MessageDriver support #include +#include IMPLEMENT_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application) @@ -30,3 +31,13 @@ Standard_CString AppStdL_Application::ResourcesName() return aRes; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void AppStdL_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application) +} diff --git a/src/AppStdL/AppStdL_Application.hxx b/src/AppStdL/AppStdL_Application.hxx index a7f7aeb005..d9b2e898f3 100644 --- a/src/AppStdL/AppStdL_Application.hxx +++ b/src/AppStdL/AppStdL_Application.hxx @@ -34,6 +34,9 @@ public: //! resources Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application) }; diff --git a/src/BRep/BRep_Curve3D.cxx b/src/BRep/BRep_Curve3D.cxx index 86a06deab8..b462b8ae51 100644 --- a/src/BRep/BRep_Curve3D.cxx +++ b/src/BRep/BRep_Curve3D.cxx @@ -92,3 +92,16 @@ Handle(BRep_CurveRepresentation) BRep_Curve3D::Copy() const C->SetRange(First(), Last()); return C; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_Curve3D::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_GCurve) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myCurve.get()) +} diff --git a/src/BRep/BRep_Curve3D.hxx b/src/BRep/BRep_Curve3D.hxx index e459d1ddff..39183cec3f 100644 --- a/src/BRep/BRep_Curve3D.hxx +++ b/src/BRep/BRep_Curve3D.hxx @@ -54,6 +54,9 @@ public: //! Return a copy of this representation. Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_CurveOn2Surfaces.cxx b/src/BRep/BRep_CurveOn2Surfaces.cxx index 1ce978e466..a39a309182 100644 --- a/src/BRep/BRep_CurveOn2Surfaces.cxx +++ b/src/BRep/BRep_CurveOn2Surfaces.cxx @@ -147,3 +147,20 @@ Handle(BRep_CurveRepresentation) BRep_CurveOn2Surfaces::Copy() const myContinuity); return C; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_CurveOn2Surfaces::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_CurveRepresentation) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface2.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation2) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myContinuity) +} diff --git a/src/BRep/BRep_CurveOn2Surfaces.hxx b/src/BRep/BRep_CurveOn2Surfaces.hxx index 867423ff24..37356a92d2 100644 --- a/src/BRep/BRep_CurveOn2Surfaces.hxx +++ b/src/BRep/BRep_CurveOn2Surfaces.hxx @@ -66,6 +66,9 @@ public: //! Return a copy of this representation. Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_CurveOnClosedSurface.cxx b/src/BRep/BRep_CurveOnClosedSurface.cxx index 5f0b028931..e1c6c57838 100644 --- a/src/BRep/BRep_CurveOnClosedSurface.cxx +++ b/src/BRep/BRep_CurveOnClosedSurface.cxx @@ -180,4 +180,20 @@ void BRep_CurveOnClosedSurface::Update() BRep_CurveOnSurface::Update(); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_CurveOnClosedSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_CurveOnSurface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPCurve2.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myContinuity) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUV21) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUV22) +} diff --git a/src/BRep/BRep_CurveOnClosedSurface.hxx b/src/BRep/BRep_CurveOnClosedSurface.hxx index 5bed28216b..e418f2fab4 100644 --- a/src/BRep/BRep_CurveOnClosedSurface.hxx +++ b/src/BRep/BRep_CurveOnClosedSurface.hxx @@ -78,6 +78,9 @@ public: //! This is called when the range is modified. Standard_EXPORT virtual void Update() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_CurveOnSurface.cxx b/src/BRep/BRep_CurveOnSurface.cxx index f5f6cd377b..7ff94396d6 100644 --- a/src/BRep/BRep_CurveOnSurface.cxx +++ b/src/BRep/BRep_CurveOnSurface.cxx @@ -146,4 +146,20 @@ void BRep_CurveOnSurface::Update() } } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_CurveOnSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_GCurve) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUV1) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUV2) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPCurve.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface.get()) +} diff --git a/src/BRep/BRep_CurveOnSurface.hxx b/src/BRep/BRep_CurveOnSurface.hxx index baece2ff34..6f6c49026e 100644 --- a/src/BRep/BRep_CurveOnSurface.hxx +++ b/src/BRep/BRep_CurveOnSurface.hxx @@ -71,6 +71,9 @@ public: //! This is called when the range is modified. Standard_EXPORT virtual void Update() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_CurveRepresentation.cxx b/src/BRep/BRep_CurveRepresentation.cxx index 63ed95bf11..a8d05237e5 100644 --- a/src/BRep/BRep_CurveRepresentation.cxx +++ b/src/BRep/BRep_CurveRepresentation.cxx @@ -426,3 +426,13 @@ void BRep_CurveRepresentation::Polygon2(const Handle(Poly_Polygon2D)&) throw Standard_DomainError("BRep_CurveRepresentation"); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_CurveRepresentation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation) +} diff --git a/src/BRep/BRep_CurveRepresentation.hxx b/src/BRep/BRep_CurveRepresentation.hxx index 354eaa395f..f1dcf6226c 100644 --- a/src/BRep/BRep_CurveRepresentation.hxx +++ b/src/BRep/BRep_CurveRepresentation.hxx @@ -144,6 +144,9 @@ public: //! Return a copy of this representation. Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const = 0; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/BRep/BRep_GCurve.cxx b/src/BRep/BRep_GCurve.cxx index 22c36ccfe4..c5851057de 100644 --- a/src/BRep/BRep_GCurve.cxx +++ b/src/BRep/BRep_GCurve.cxx @@ -46,3 +46,16 @@ void BRep_GCurve::Update() } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_GCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_CurveRepresentation) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFirst) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLast) +} diff --git a/src/BRep/BRep_GCurve.hxx b/src/BRep/BRep_GCurve.hxx index 1d2c4d5433..6e7eb7ab9f 100644 --- a/src/BRep/BRep_GCurve.hxx +++ b/src/BRep/BRep_GCurve.hxx @@ -57,6 +57,9 @@ public: //! This is called when the range is modified. Standard_EXPORT virtual void Update(); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PointOnCurve.cxx b/src/BRep/BRep_PointOnCurve.cxx index 737c7c1f2b..f88baae812 100644 --- a/src/BRep/BRep_PointOnCurve.cxx +++ b/src/BRep/BRep_PointOnCurve.cxx @@ -80,4 +80,16 @@ void BRep_PointOnCurve::Curve(const Handle(Geom_Curve)& C) myCurve = C; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PointOnCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PointRepresentation) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurve.get()) +} diff --git a/src/BRep/BRep_PointOnCurve.hxx b/src/BRep/BRep_PointOnCurve.hxx index 3e22ee967c..c8a483abc3 100644 --- a/src/BRep/BRep_PointOnCurve.hxx +++ b/src/BRep/BRep_PointOnCurve.hxx @@ -48,6 +48,9 @@ public: Standard_EXPORT virtual void Curve (const Handle(Geom_Curve)& C) Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PointOnCurveOnSurface.cxx b/src/BRep/BRep_PointOnCurveOnSurface.cxx index d82010bd17..3514d93c71 100644 --- a/src/BRep/BRep_PointOnCurveOnSurface.cxx +++ b/src/BRep/BRep_PointOnCurveOnSurface.cxx @@ -84,4 +84,16 @@ void BRep_PointOnCurveOnSurface::PCurve(const Handle(Geom2d_Curve)& C) myPCurve = C; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PointOnCurveOnSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PointRepresentation) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPCurve.get()) +} diff --git a/src/BRep/BRep_PointOnCurveOnSurface.hxx b/src/BRep/BRep_PointOnCurveOnSurface.hxx index 73eeec8361..53f976114a 100644 --- a/src/BRep/BRep_PointOnCurveOnSurface.hxx +++ b/src/BRep/BRep_PointOnCurveOnSurface.hxx @@ -50,6 +50,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PointRepresentation.cxx b/src/BRep/BRep_PointRepresentation.cxx index 397320651a..45dac877cf 100644 --- a/src/BRep/BRep_PointRepresentation.cxx +++ b/src/BRep/BRep_PointRepresentation.cxx @@ -197,4 +197,15 @@ void BRep_PointRepresentation::Surface(const Handle(Geom_Surface)& ) throw Standard_DomainError("BRep_PointRepresentation"); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PointRepresentation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myParameter) +} diff --git a/src/BRep/BRep_PointRepresentation.hxx b/src/BRep/BRep_PointRepresentation.hxx index 22c24b0d63..ed8ba9983d 100644 --- a/src/BRep/BRep_PointRepresentation.hxx +++ b/src/BRep/BRep_PointRepresentation.hxx @@ -84,6 +84,9 @@ public: Standard_EXPORT virtual void Surface (const Handle(Geom_Surface)& S); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/BRep/BRep_PointsOnSurface.cxx b/src/BRep/BRep_PointsOnSurface.cxx index 740a09abc6..76ce4c306b 100644 --- a/src/BRep/BRep_PointsOnSurface.cxx +++ b/src/BRep/BRep_PointsOnSurface.cxx @@ -56,4 +56,17 @@ void BRep_PointsOnSurface::Surface(const Handle(Geom_Surface)& S) mySurface = S; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PointsOnSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PointRepresentation) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface.get()) +} + diff --git a/src/BRep/BRep_PointsOnSurface.hxx b/src/BRep/BRep_PointsOnSurface.hxx index 83f23f64ed..4dff6c0df2 100644 --- a/src/BRep/BRep_PointsOnSurface.hxx +++ b/src/BRep/BRep_PointsOnSurface.hxx @@ -40,6 +40,9 @@ public: Standard_EXPORT virtual void Surface (const Handle(Geom_Surface)& S) Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_Polygon3D.cxx b/src/BRep/BRep_Polygon3D.cxx index 921a4ed1f9..28d4015519 100644 --- a/src/BRep/BRep_Polygon3D.cxx +++ b/src/BRep/BRep_Polygon3D.cxx @@ -76,3 +76,15 @@ Handle(BRep_CurveRepresentation) BRep_Polygon3D::Copy() const return P; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_Polygon3D::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_CurveRepresentation) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPolygon3D.get()) +} diff --git a/src/BRep/BRep_Polygon3D.hxx b/src/BRep/BRep_Polygon3D.hxx index ff5e6d8d95..4a4abfc932 100644 --- a/src/BRep/BRep_Polygon3D.hxx +++ b/src/BRep/BRep_Polygon3D.hxx @@ -50,6 +50,9 @@ public: //! Return a copy of this representation. Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PolygonOnClosedSurface.cxx b/src/BRep/BRep_PolygonOnClosedSurface.cxx index 8696bb8164..76ff9419b4 100644 --- a/src/BRep/BRep_PolygonOnClosedSurface.cxx +++ b/src/BRep/BRep_PolygonOnClosedSurface.cxx @@ -79,3 +79,16 @@ Handle(BRep_CurveRepresentation) BRep_PolygonOnClosedSurface::Copy() const return P; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PolygonOnClosedSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PolygonOnSurface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPolygon2.get()) +} + diff --git a/src/BRep/BRep_PolygonOnClosedSurface.hxx b/src/BRep/BRep_PolygonOnClosedSurface.hxx index 79ee1ec633..fb2954bc4f 100644 --- a/src/BRep/BRep_PolygonOnClosedSurface.hxx +++ b/src/BRep/BRep_PolygonOnClosedSurface.hxx @@ -51,6 +51,9 @@ public: //! Return a copy of this representation. Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PolygonOnClosedTriangulation.cxx b/src/BRep/BRep_PolygonOnClosedTriangulation.cxx index 83bcc2bac5..01533c0fba 100644 --- a/src/BRep/BRep_PolygonOnClosedTriangulation.cxx +++ b/src/BRep/BRep_PolygonOnClosedTriangulation.cxx @@ -84,3 +84,15 @@ Handle(BRep_CurveRepresentation) BRep_PolygonOnClosedTriangulation::Copy() const return P; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PolygonOnClosedTriangulation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_PolygonOnTriangulation) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPolygon2.get()) +} diff --git a/src/BRep/BRep_PolygonOnClosedTriangulation.hxx b/src/BRep/BRep_PolygonOnClosedTriangulation.hxx index bc9eba85a5..332cd5270b 100644 --- a/src/BRep/BRep_PolygonOnClosedTriangulation.hxx +++ b/src/BRep/BRep_PolygonOnClosedTriangulation.hxx @@ -51,6 +51,9 @@ public: //! Return a copy of this representation. Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PolygonOnSurface.cxx b/src/BRep/BRep_PolygonOnSurface.cxx index 197b5b8fa4..63e56b057e 100644 --- a/src/BRep/BRep_PolygonOnSurface.cxx +++ b/src/BRep/BRep_PolygonOnSurface.cxx @@ -102,3 +102,16 @@ Handle(BRep_CurveRepresentation) BRep_PolygonOnSurface::Copy() const return P; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PolygonOnSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_CurveRepresentation) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPolygon2D.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface.get()) +} diff --git a/src/BRep/BRep_PolygonOnSurface.hxx b/src/BRep/BRep_PolygonOnSurface.hxx index b0c165798e..38e8d7ec0a 100644 --- a/src/BRep/BRep_PolygonOnSurface.hxx +++ b/src/BRep/BRep_PolygonOnSurface.hxx @@ -59,6 +59,9 @@ public: //! Return a copy of this representation. Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_PolygonOnTriangulation.cxx b/src/BRep/BRep_PolygonOnTriangulation.cxx index 24beb3dc9a..21eb0dddcb 100644 --- a/src/BRep/BRep_PolygonOnTriangulation.cxx +++ b/src/BRep/BRep_PolygonOnTriangulation.cxx @@ -104,3 +104,17 @@ Handle(BRep_CurveRepresentation) BRep_PolygonOnTriangulation::Copy() const return P; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_PolygonOnTriangulation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, BRep_CurveRepresentation) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPolygon.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTriangulation.get()) +} diff --git a/src/BRep/BRep_PolygonOnTriangulation.hxx b/src/BRep/BRep_PolygonOnTriangulation.hxx index b400ea9d74..cf64767457 100644 --- a/src/BRep/BRep_PolygonOnTriangulation.hxx +++ b/src/BRep/BRep_PolygonOnTriangulation.hxx @@ -58,6 +58,9 @@ public: //! Return a copy of this representation. Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_TEdge.cxx b/src/BRep/BRep_TEdge.cxx index e8d3be2ed7..484cf800a4 100644 --- a/src/BRep/BRep_TEdge.cxx +++ b/src/BRep/BRep_TEdge.cxx @@ -141,3 +141,22 @@ Handle(TopoDS_TShape) BRep_TEdge::EmptyCopy() const return TE; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_TEdge::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TopoDS_TEdge) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFlags) + + for (BRep_ListIteratorOfListOfCurveRepresentation itr(myCurves); itr.More(); itr.Next()) + { + const Handle(BRep_CurveRepresentation)& aCurveRepresentation = itr.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aCurveRepresentation.get()) + } +} diff --git a/src/BRep/BRep_TEdge.hxx b/src/BRep/BRep_TEdge.hxx index 2bd0642fb8..65be265785 100644 --- a/src/BRep/BRep_TEdge.hxx +++ b/src/BRep/BRep_TEdge.hxx @@ -81,6 +81,9 @@ public: //! Returns a copy of the TShape with no sub-shapes. Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_TFace.cxx b/src/BRep/BRep_TFace.cxx index 30c2b3c952..8e9c88e49f 100644 --- a/src/BRep/BRep_TFace.cxx +++ b/src/BRep/BRep_TFace.cxx @@ -50,3 +50,21 @@ Handle(TopoDS_TShape) BRep_TFace::EmptyCopy() const TF->Tolerance(myTolerance); return TF; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_TFace::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TopoDS_TFace) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySurface.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTriangulation.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNaturalRestriction) +} diff --git a/src/BRep/BRep_TFace.hxx b/src/BRep/BRep_TFace.hxx index c24337de47..d77c472d11 100644 --- a/src/BRep/BRep_TFace.hxx +++ b/src/BRep/BRep_TFace.hxx @@ -88,6 +88,9 @@ public: //! The new Face has no triangulation. Standard_EXPORT virtual Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BRep/BRep_TVertex.cxx b/src/BRep/BRep_TVertex.cxx index 86145ced1a..7190a49375 100644 --- a/src/BRep/BRep_TVertex.cxx +++ b/src/BRep/BRep_TVertex.cxx @@ -47,3 +47,21 @@ Handle(TopoDS_TShape) BRep_TVertex::EmptyCopy() const return TV; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void BRep_TVertex::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TopoDS_TVertex) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPnt) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerance) + for (BRep_ListIteratorOfListOfPointRepresentation itr(myPoints); itr.More(); itr.Next()) + { + const Handle(BRep_PointRepresentation)& aPointRepresentation = itr.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aPointRepresentation.get()) + } +} diff --git a/src/BRep/BRep_TVertex.hxx b/src/BRep/BRep_TVertex.hxx index 9729fb52f6..edd9c10362 100644 --- a/src/BRep/BRep_TVertex.hxx +++ b/src/BRep/BRep_TVertex.hxx @@ -62,6 +62,9 @@ public: //! Returns a copy of the TShape with no sub-shapes. Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/BVH/BVH_Box.hxx b/src/BVH/BVH_Box.hxx index 52ab9bb8a2..4d70b9e998 100644 --- a/src/BVH/BVH_Box.hxx +++ b/src/BVH/BVH_Box.hxx @@ -18,8 +18,9 @@ #include #include -#include +#include #include +#include #include @@ -183,11 +184,27 @@ public: T Center (const Standard_Integer theAxis) const; //! Dumps the content of me into the stream - void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const { (void)theDepth; - OCCT_DUMP_CLASS_BEGIN (theOStream, BVH_Box); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsValid()); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsInited) + + int n = Min (N, 3); + if (n == 1) + { + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMinPoint[0]) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMinPoint[0]) + } + if (n == 2) + { + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "MinPoint", n, myMinPoint[0], myMinPoint[1]) + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "MaxPoint", n, myMaxPoint[0], myMaxPoint[1]) + } + if (n == 3) + { + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "MinPoint", n, myMinPoint[0], myMinPoint[1], myMinPoint[2]) + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "MaxPoint", n, myMaxPoint[0], myMaxPoint[1], myMaxPoint[2]) + } } public: diff --git a/src/BVH/BVH_Tree.hxx b/src/BVH/BVH_Tree.hxx index 0f500c7286..b56dfc220b 100644 --- a/src/BVH/BVH_Tree.hxx +++ b/src/BVH/BVH_Tree.hxx @@ -29,10 +29,10 @@ protected: BVH_TreeBaseTransient() {} //! Dumps the content of me into the stream - virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const { (void)theOStream; (void)theDepth; } + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const { (void)theOStream; (void)theDepth; } //! Dumps the content of me into the stream - virtual void DumpNode (const int theNodeIndex, Standard_OStream& theOStream, const Standard_Integer theDepth) const + virtual void DumpNode (const int theNodeIndex, Standard_OStream& theOStream, Standard_Integer theDepth) const { (void)theNodeIndex; (void)theOStream; (void)theDepth; } }; @@ -186,11 +186,11 @@ public: //! @name methods for accessing serialized tree data } //! Dumps the content of me into the stream - virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE { - OCCT_DUMP_CLASS_BEGIN (theOStream, BVH_TreeBase); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDepth); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Length()); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDepth) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Length()) for (Standard_Integer aNodeIdx = 0; aNodeIdx < Length(); ++aNodeIdx) { @@ -199,20 +199,20 @@ public: //! @name methods for accessing serialized tree data } //! Dumps the content of node into the stream - virtual void DumpNode (const int theNodeIndex, Standard_OStream& theOStream, const Standard_Integer theDepth) const Standard_OVERRIDE + virtual void DumpNode (const int theNodeIndex, Standard_OStream& theOStream, Standard_Integer theDepth) const Standard_OVERRIDE { - OCCT_DUMP_CLASS_BEGIN (theOStream, BVH_TreeNode); + OCCT_DUMP_CLASS_BEGIN (theOStream, BVH_TreeNode) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, theNodeIndex); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, theNodeIndex) Bnd_Box aBndBox = BVH::ToBndBox (MinPoint (theNodeIndex), MaxPoint (theNodeIndex)); Bnd_Box* aPointer = &aBndBox; - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aPointer); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aPointer) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, BegPrimitive (theNodeIndex)); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, EndPrimitive (theNodeIndex)); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Level (theNodeIndex)); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsOuter (theNodeIndex)); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, BegPrimitive (theNodeIndex)) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, EndPrimitive (theNodeIndex)) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Level (theNodeIndex)) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsOuter (theNodeIndex)) } public: //! @name protected fields diff --git a/src/Bnd/Bnd_Box.cxx b/src/Bnd/Bnd_Box.cxx index 2942963a73..cb4fbedad9 100644 --- a/src/Bnd/Bnd_Box.cxx +++ b/src/Bnd/Bnd_Box.cxx @@ -975,13 +975,11 @@ void Bnd_Box::Dump () const //function : DumpJson //purpose : //======================================================================= -void Bnd_Box::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void Bnd_Box::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Bnd_Box); - OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "CornerMin", 3, Xmin, Ymin, Zmin) OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "CornerMax", 3, Xmax, Ymax, Zmax) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Gap); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Flags); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Gap) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Flags) } diff --git a/src/Bnd/Bnd_Box.hxx b/src/Bnd/Bnd_Box.hxx index 5467e5520f..b716902f07 100644 --- a/src/Bnd/Bnd_Box.hxx +++ b/src/Bnd/Bnd_Box.hxx @@ -303,7 +303,7 @@ public: } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; protected: diff --git a/src/Bnd/Bnd_OBB.cxx b/src/Bnd/Bnd_OBB.cxx index b3b9ebb677..e723464cb9 100644 --- a/src/Bnd/Bnd_OBB.cxx +++ b/src/Bnd/Bnd_OBB.cxx @@ -1027,17 +1027,17 @@ void Bnd_OBB::Add(const Bnd_OBB& theOther) //function : DumpJson //purpose : //======================================================================= -void Bnd_OBB::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Bnd_OBB::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Bnd_OBB); + OCCT_DUMP_CLASS_BEGIN (theOStream, Bnd_OBB) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCenter); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAxes[0]); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAxes[1]); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAxes[2]); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCenter) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAxes[0]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAxes[1]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAxes[2]) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHDims[0]); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHDims[1]); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHDims[2]); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsAABox); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHDims[0]) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHDims[1]) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHDims[2]) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsAABox) } diff --git a/src/Bnd/Bnd_OBB.hxx b/src/Bnd/Bnd_OBB.hxx index 7844eaecfd..54b65f87ee 100644 --- a/src/Bnd/Bnd_OBB.hxx +++ b/src/Bnd/Bnd_OBB.hxx @@ -283,7 +283,7 @@ public: Standard_EXPORT void Add(const gp_Pnt& theP); //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; protected: diff --git a/src/Bnd/Bnd_Range.cxx b/src/Bnd/Bnd_Range.cxx index ba8f5de6ab..4337287a96 100644 --- a/src/Bnd/Bnd_Range.cxx +++ b/src/Bnd/Bnd_Range.cxx @@ -181,10 +181,10 @@ void Bnd_Range::Split(const Standard_Real theVal, // function : DumpJson // purpose : // ======================================================================= -void Bnd_Range::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void Bnd_Range::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Bnd_Range); + OCCT_DUMP_CLASS_BEGIN (theOStream, Bnd_Range) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFirst); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLast); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFirst) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLast) } diff --git a/src/Bnd/Bnd_Range.hxx b/src/Bnd/Bnd_Range.hxx index 74767ec08e..660fbe5ee0 100644 --- a/src/Bnd/Bnd_Range.hxx +++ b/src/Bnd/Bnd_Range.hxx @@ -257,7 +257,7 @@ public: } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; private: diff --git a/src/CDM/CDM_Application.cxx b/src/CDM/CDM_Application.cxx index 627960aa82..c9f9984eca 100644 --- a/src/CDM/CDM_Application.cxx +++ b/src/CDM/CDM_Application.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -126,3 +127,12 @@ TCollection_AsciiString CDM_Application::Version() const // Default: empty return TCollection_AsciiString(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void CDM_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer /*theDepth*/) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) +} diff --git a/src/CDM/CDM_Application.hxx b/src/CDM/CDM_Application.hxx index 05269990a4..f23f0cbdf8 100644 --- a/src/CDM/CDM_Application.hxx +++ b/src/CDM/CDM_Application.hxx @@ -66,6 +66,9 @@ public: //! Returns the application version. Standard_EXPORT virtual TCollection_AsciiString Version() const; + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class CDM_Reference; friend class CDM_MetaData; diff --git a/src/CDM/CDM_Document.cxx b/src/CDM/CDM_Document.cxx index 0b5eb1d927..0ec0acc66d 100644 --- a/src/CDM/CDM_Document.cxx +++ b/src/CDM/CDM_Document.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1284,3 +1285,54 @@ void CDM_Document::ChangeStorageFormatVersion(const Standard_Integer theVersion) { myStorageFormatVersion = theVersion; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void CDM_Document::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + for (TColStd_SequenceOfExtendedString::Iterator aCommentIt (myComments); aCommentIt.More(); aCommentIt.Next()) + { + const TCollection_ExtendedString& aComment = aCommentIt.Value(); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aComment) + } + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myPresentation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValidPresentation) + + for (CDM_ListOfReferences::Iterator aFromReferenceIt (myFromReferences); aFromReferenceIt.More(); aFromReferenceIt.Next()) + { + const Handle(CDM_Reference)& aFromReference = aFromReferenceIt.Value().get(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aFromReference.get()) + } + + for (CDM_ListOfReferences::Iterator aToReferenceIt (myToReferences); aToReferenceIt.More(); aToReferenceIt.Next()) + { + const Handle(CDM_Reference)& aToReference = aToReferenceIt.Value().get(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aToReference.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVersion) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myActualReferenceIdentifier) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myStorageVersion) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myMetaData.get()) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myRequestedComment) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myRequestedFolder) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRequestedFolderIsDefined) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myRequestedName) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRequestedNameIsDefined) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRequestedPreviousVersionIsDefined) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myRequestedPreviousVersion) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myFileExtension) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myDescription) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFileExtensionWasFound) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDescriptionWasFound) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myApplication.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myStorageFormatVersion) +} diff --git a/src/CDM/CDM_Document.hxx b/src/CDM/CDM_Document.hxx index e8892cf15d..fcecd90b49 100644 --- a/src/CDM/CDM_Document.hxx +++ b/src/CDM/CDM_Document.hxx @@ -349,6 +349,9 @@ Standard_OStream& operator << (Standard_OStream& anOStream); //! Sets of the format to be used to store the document Standard_EXPORT void ChangeStorageFormatVersion(const Standard_Integer theVersion); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + friend class CDM_Reference; friend class CDM_ReferenceIterator; friend class CDM_Application; diff --git a/src/CDM/CDM_MetaData.cxx b/src/CDM/CDM_MetaData.cxx index 090b6d28b9..160c2cdc88 100644 --- a/src/CDM/CDM_MetaData.cxx +++ b/src/CDM/CDM_MetaData.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -144,3 +145,24 @@ void CDM_MetaData::SetIsReadOnly() { void CDM_MetaData::UnsetIsReadOnly() { myIsReadOnly=Standard_False; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void CDM_MetaData::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsRetrieved) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDocument) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myFolder) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myName) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myVersion) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasVersion) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myFileName) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myPath) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDocumentVersion) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsReadOnly) +} diff --git a/src/CDM/CDM_MetaData.hxx b/src/CDM/CDM_MetaData.hxx index 5b76e637fa..76c783494e 100644 --- a/src/CDM/CDM_MetaData.hxx +++ b/src/CDM/CDM_MetaData.hxx @@ -84,6 +84,9 @@ Standard_OStream& operator << (Standard_OStream& anOStream); Standard_EXPORT void SetIsReadOnly(); Standard_EXPORT void UnsetIsReadOnly(); + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class CDM_Reference; diff --git a/src/CDM/CDM_Reference.cxx b/src/CDM/CDM_Reference.cxx index f9234a7538..cddfbafde3 100644 --- a/src/CDM/CDM_Reference.cxx +++ b/src/CDM/CDM_Reference.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(CDM_Reference,Standard_Transient) @@ -120,3 +121,23 @@ Standard_Boolean CDM_Reference::IsInSession() const { Standard_Boolean CDM_Reference::IsStored() const { return !myMetaData.IsNull(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void CDM_Reference::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myToDocument.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myFromDocument) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myReferenceIdentifier) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myApplication.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myMetaData.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDocumentVersion) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUseStorageConfiguration) +} diff --git a/src/CDM/CDM_Reference.hxx b/src/CDM/CDM_Reference.hxx index c8746fd3d7..3a9c00f2ed 100644 --- a/src/CDM/CDM_Reference.hxx +++ b/src/CDM/CDM_Reference.hxx @@ -48,6 +48,9 @@ public: Standard_EXPORT Standard_Integer DocumentVersion() const; Standard_EXPORT Standard_Boolean IsReadOnly() const; + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class CDM_Document; diff --git a/src/Font/Font_Rect.hxx b/src/Font/Font_Rect.hxx index 50c598a8dd..59ba16845a 100644 --- a/src/Font/Font_Rect.hxx +++ b/src/Font/Font_Rect.hxx @@ -16,6 +16,7 @@ #define _Font_Rect_H__ #include +#include //! Auxiliary POD structure - 2D rectangle definition. struct Font_Rect @@ -76,6 +77,16 @@ struct Font_Rect return Top - Bottom; } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer) const + { + OCCT_DUMP_CLASS_BEGIN (theOStream, Font_Rect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Left) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Right) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Top) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Bottom) + } }; #endif // _Font_Rect_H__ diff --git a/src/Geom/Geom_BSplineCurve.cxx b/src/Geom/Geom_BSplineCurve.cxx index 87e6c9fe5f..7b4b7d5bad 100644 --- a/src/Geom/Geom_BSplineCurve.cxx +++ b/src/Geom/Geom_BSplineCurve.cxx @@ -1120,3 +1120,33 @@ void Geom_BSplineCurve::PeriodicNormalization(Standard_Real& Parameter) const } } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_BSplineCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_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/Geom/Geom_BSplineCurve.hxx b/src/Geom/Geom_BSplineCurve.hxx index ae036654ea..865cefca79 100644 --- a/src/Geom/Geom_BSplineCurve.hxx +++ b/src/Geom/Geom_BSplineCurve.hxx @@ -786,6 +786,9 @@ public: //! Comapare two Bspline curve on identity; Standard_EXPORT Standard_Boolean IsEqual (const Handle(Geom_BSplineCurve)& theOther, const Standard_Real thePreci) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_BSplineSurface.cxx b/src/Geom/Geom_BSplineSurface.cxx index f4dbe4f150..262b3d7ecd 100644 --- a/src/Geom/Geom_BSplineSurface.cxx +++ b/src/Geom/Geom_BSplineSurface.cxx @@ -1272,3 +1272,46 @@ void Geom_BSplineSurface::SetWeightRow Rational(Weights, urational, vrational); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_BSplineSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_BoundedSurface) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, urational) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vrational) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, uperiodic) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vperiodic) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, uknotSet) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vknotSet) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Usmooth) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Vsmooth) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, udeg) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vdeg) + + if (!poles.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, poles->Size()) + if (!weights.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, weights->Size()) + if (!ufknots.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, ufknots->Size()) + if (!vfknots.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vfknots->Size()) + + if (!uknots.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, uknots->Size()) + if (!vknots.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vknots->Size()) + if (!umults.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, umults->Size()) + if (!vmults.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vmults->Size()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, umaxderivinv) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vmaxderivinv) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, maxderivinvok) +} diff --git a/src/Geom/Geom_BSplineSurface.hxx b/src/Geom/Geom_BSplineSurface.hxx index 40decdef99..ed7ae38321 100644 --- a/src/Geom/Geom_BSplineSurface.hxx +++ b/src/Geom/Geom_BSplineSurface.hxx @@ -1189,6 +1189,9 @@ public: //! Creates a new object which is a copy of this BSpline surface. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_BezierCurve.cxx b/src/Geom/Geom_BezierCurve.cxx index e25133dcad..dcc5881a46 100644 --- a/src/Geom/Geom_BezierCurve.cxx +++ b/src/Geom/Geom_BezierCurve.cxx @@ -812,3 +812,24 @@ void Geom_BezierCurve::Init weights.Nullify(); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_BezierCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_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/Geom/Geom_BezierCurve.hxx b/src/Geom/Geom_BezierCurve.hxx index 38cf013566..6d2c8c197e 100644 --- a/src/Geom/Geom_BezierCurve.hxx +++ b/src/Geom/Geom_BezierCurve.hxx @@ -333,6 +333,9 @@ public: //! Creates a new object which is a copy of this Bezier curve. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_BezierSurface.cxx b/src/Geom/Geom_BezierSurface.cxx index c6ede954d4..9e14f232a3 100644 --- a/src/Geom/Geom_BezierSurface.cxx +++ b/src/Geom/Geom_BezierSurface.cxx @@ -1937,3 +1937,23 @@ void Geom_BezierSurface::Init weights.Nullify(); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_BezierSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_BoundedSurface) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, urational) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vrational) + 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, umaxderivinv) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vmaxderivinv) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, maxderivinvok) +} diff --git a/src/Geom/Geom_BezierSurface.hxx b/src/Geom/Geom_BezierSurface.hxx index 0519edf9bc..ac78de5c5a 100644 --- a/src/Geom/Geom_BezierSurface.hxx +++ b/src/Geom/Geom_BezierSurface.hxx @@ -583,6 +583,9 @@ public: //! Creates a new object which is a copy of this Bezier surface. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_BoundedCurve.cxx b/src/Geom/Geom_BoundedCurve.cxx index 8dffe7a043..d09f08e357 100644 --- a/src/Geom/Geom_BoundedCurve.cxx +++ b/src/Geom/Geom_BoundedCurve.cxx @@ -19,4 +19,15 @@ #include #include -IMPLEMENT_STANDARD_RTTIEXT(Geom_BoundedCurve,Geom_Curve) \ No newline at end of file +IMPLEMENT_STANDARD_RTTIEXT(Geom_BoundedCurve,Geom_Curve) + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_BoundedCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Curve) +} diff --git a/src/Geom/Geom_BoundedCurve.hxx b/src/Geom/Geom_BoundedCurve.hxx index 7af31bd6d2..b472752d51 100644 --- a/src/Geom/Geom_BoundedCurve.hxx +++ b/src/Geom/Geom_BoundedCurve.hxx @@ -54,6 +54,9 @@ public: //! Returns the start point of the curve. Standard_EXPORT virtual gp_Pnt StartPoint() const = 0; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Circle.cxx b/src/Geom/Geom_Circle.cxx index 2ed3d420c9..5227186ccc 100644 --- a/src/Geom/Geom_Circle.cxx +++ b/src/Geom/Geom_Circle.cxx @@ -234,3 +234,16 @@ void Geom_Circle::Transform (const Trsf& T) { radius = radius * Abs(T.ScaleFactor()); pos.Transform (T); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Circle::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Conic) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, radius) +} diff --git a/src/Geom/Geom_Circle.hxx b/src/Geom/Geom_Circle.hxx index 4b75cb1f35..b7736dd39d 100644 --- a/src/Geom/Geom_Circle.hxx +++ b/src/Geom/Geom_Circle.hxx @@ -158,6 +158,9 @@ public: //! Creates a new object which is a copy of this circle. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Conic.cxx b/src/Geom/Geom_Conic.cxx index 3b0356e912..60b319747f 100644 --- a/src/Geom/Geom_Conic.cxx +++ b/src/Geom/Geom_Conic.cxx @@ -69,3 +69,14 @@ Standard_Boolean Geom_Conic::IsCN (const Standard_Integer ) const { return Standard_True; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Conic::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Curve) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos) +} diff --git a/src/Geom/Geom_Conic.hxx b/src/Geom/Geom_Conic.hxx index 78d053a476..3958a10aa1 100644 --- a/src/Geom/Geom_Conic.hxx +++ b/src/Geom/Geom_Conic.hxx @@ -116,6 +116,9 @@ public: //! Raised if N < 0. 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Geom_Conic,Geom_Curve) protected: diff --git a/src/Geom/Geom_ConicalSurface.cxx b/src/Geom/Geom_ConicalSurface.cxx index 5dd0e7029b..e52e4cc8fd 100644 --- a/src/Geom/Geom_ConicalSurface.cxx +++ b/src/Geom/Geom_ConicalSurface.cxx @@ -433,3 +433,16 @@ const return T2; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_ConicalSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_ElementarySurface) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, radius) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, semiAngle) +} diff --git a/src/Geom/Geom_ConicalSurface.hxx b/src/Geom/Geom_ConicalSurface.hxx index 5db22203b8..f8ee543ed4 100644 --- a/src/Geom/Geom_ConicalSurface.hxx +++ b/src/Geom/Geom_ConicalSurface.hxx @@ -283,6 +283,9 @@ public: //! Creates a new object which is a copy of this cone. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Curve.cxx b/src/Geom/Geom_Curve.cxx index 6f0ba329a5..b70753015e 100644 --- a/src/Geom/Geom_Curve.cxx +++ b/src/Geom/Geom_Curve.cxx @@ -88,4 +88,14 @@ Standard_Real Geom_Curve::ParametricTransformation(const gp_Trsf& ) const return 1.; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Curve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Geometry) +} diff --git a/src/Geom/Geom_Curve.hxx b/src/Geom/Geom_Curve.hxx index ab28dde1ef..2dc9141b11 100644 --- a/src/Geom/Geom_Curve.hxx +++ b/src/Geom/Geom_Curve.hxx @@ -225,6 +225,9 @@ public: //! derivative on the basis curve and the offset direction are parallel. Standard_EXPORT gp_Pnt Value (const Standard_Real U) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_CylindricalSurface.cxx b/src/Geom/Geom_CylindricalSurface.cxx index dd500cb319..9e0cb6c8c0 100644 --- a/src/Geom/Geom_CylindricalSurface.cxx +++ b/src/Geom/Geom_CylindricalSurface.cxx @@ -374,3 +374,16 @@ const T2.SetAffinity(Axis, Abs(T.ScaleFactor())); return T2; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_CylindricalSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_ElementarySurface) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, radius) +} diff --git a/src/Geom/Geom_CylindricalSurface.hxx b/src/Geom/Geom_CylindricalSurface.hxx index 8f4ae4dabc..f26af99379 100644 --- a/src/Geom/Geom_CylindricalSurface.hxx +++ b/src/Geom/Geom_CylindricalSurface.hxx @@ -212,6 +212,9 @@ public: //! Creates a new object which is a copy of this cylinder. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_ElementarySurface.cxx b/src/Geom/Geom_ElementarySurface.cxx index 76f94bf3b9..89af05cc04 100644 --- a/src/Geom/Geom_ElementarySurface.cxx +++ b/src/Geom/Geom_ElementarySurface.cxx @@ -67,3 +67,16 @@ void Geom_ElementarySurface::VReverse () { pos.ZReverse(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_ElementarySurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Surface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos) +} \ No newline at end of file diff --git a/src/Geom/Geom_ElementarySurface.hxx b/src/Geom/Geom_ElementarySurface.hxx index f29771933a..9790d98713 100644 --- a/src/Geom/Geom_ElementarySurface.hxx +++ b/src/Geom/Geom_ElementarySurface.hxx @@ -118,6 +118,9 @@ public: //! Returns True. Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Geom_ElementarySurface,Geom_Surface) protected: diff --git a/src/Geom/Geom_Ellipse.cxx b/src/Geom/Geom_Ellipse.cxx index f272490102..8e4c7cccbd 100644 --- a/src/Geom/Geom_Ellipse.cxx +++ b/src/Geom/Geom_Ellipse.cxx @@ -343,3 +343,17 @@ void Geom_Ellipse::Transform (const Trsf& T) { minorRadius = minorRadius * Abs(T.ScaleFactor()); pos.Transform(T); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Ellipse::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Conic) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, majorRadius) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, minorRadius) +} diff --git a/src/Geom/Geom_Ellipse.hxx b/src/Geom/Geom_Ellipse.hxx index 845c1a76b6..6a946331c9 100644 --- a/src/Geom/Geom_Ellipse.hxx +++ b/src/Geom/Geom_Ellipse.hxx @@ -220,6 +220,9 @@ public: //! Creates a new object which is a copy of this ellipse. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Geometry.cxx b/src/Geom/Geom_Geometry.cxx index 955bd5942d..61bb8403d8 100644 --- a/src/Geom/Geom_Geometry.cxx +++ b/src/Geom/Geom_Geometry.cxx @@ -165,3 +165,7 @@ Handle(Geom_Geometry) Geom_Geometry::Translated (const gp_Pnt& P1, const gp_Pnt& } +void Geom_Geometry::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) +} diff --git a/src/Geom/Geom_Geometry.hxx b/src/Geom/Geom_Geometry.hxx index 1049773383..3387f1fb6f 100644 --- a/src/Geom/Geom_Geometry.hxx +++ b/src/Geom/Geom_Geometry.hxx @@ -118,6 +118,9 @@ public: //! Creates a new object which is a copy of this geometric object. Standard_EXPORT virtual Handle(Geom_Geometry) Copy() const = 0; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/Geom/Geom_Hyperbola.cxx b/src/Geom/Geom_Hyperbola.cxx index 9c06858b5b..81bae59597 100644 --- a/src/Geom/Geom_Hyperbola.cxx +++ b/src/Geom/Geom_Hyperbola.cxx @@ -388,3 +388,17 @@ void Geom_Hyperbola::Transform (const Trsf& T) { minorRadius = minorRadius * Abs(T.ScaleFactor()); pos.Transform(T); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Hyperbola::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Conic) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, majorRadius) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, minorRadius) +} diff --git a/src/Geom/Geom_Hyperbola.hxx b/src/Geom/Geom_Hyperbola.hxx index 19023092b0..3d055be408 100644 --- a/src/Geom/Geom_Hyperbola.hxx +++ b/src/Geom/Geom_Hyperbola.hxx @@ -276,6 +276,9 @@ public: //! Creates a new object which is a copy of this hyperbola. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Line.cxx b/src/Geom/Geom_Line.cxx index de103abf45..047e6d7ba1 100644 --- a/src/Geom/Geom_Line.cxx +++ b/src/Geom/Geom_Line.cxx @@ -251,4 +251,15 @@ Standard_Real Geom_Line::ParametricTransformation(const gp_Trsf& T) const return Abs(T.ScaleFactor()); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Line::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Curve) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos) +} diff --git a/src/Geom/Geom_Line.hxx b/src/Geom/Geom_Line.hxx index 77355dbec8..ab0b638a39 100644 --- a/src/Geom/Geom_Line.hxx +++ b/src/Geom/Geom_Line.hxx @@ -179,6 +179,9 @@ public: //! Creates a new object which is a copy of this line. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_OffsetCurve.cxx b/src/Geom/Geom_OffsetCurve.cxx index 5bdffddbf0..7ec994565c 100644 --- a/src/Geom/Geom_OffsetCurve.cxx +++ b/src/Geom/Geom_OffsetCurve.cxx @@ -444,3 +444,20 @@ GeomAbs_Shape Geom_OffsetCurve::GetBasisCurveContinuity() const { return myBasisCurveContinuity; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_OffsetCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Curve) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisCurve.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &direction) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, offsetValue) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBasisCurveContinuity) +} diff --git a/src/Geom/Geom_OffsetCurve.hxx b/src/Geom/Geom_OffsetCurve.hxx index a195a85e92..8eb0219de9 100644 --- a/src/Geom/Geom_OffsetCurve.hxx +++ b/src/Geom/Geom_OffsetCurve.hxx @@ -281,6 +281,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_OffsetSurface.cxx b/src/Geom/Geom_OffsetSurface.cxx index 207deca32d..114f953510 100644 --- a/src/Geom/Geom_OffsetSurface.cxx +++ b/src/Geom/Geom_OffsetSurface.cxx @@ -966,3 +966,21 @@ Standard_Boolean Geom_OffsetSurface::VOsculatingSurface(const Standard_Real U, c { return !myOscSurf.IsNull() && myOscSurf->VOscSurf(U, V, t, L); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_OffsetSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Surface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisSurf.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, equivSurf.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, offsetValue) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myOscSurf.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBasisSurfContinuity) +} diff --git a/src/Geom/Geom_OffsetSurface.hxx b/src/Geom/Geom_OffsetSurface.hxx index c568f3abac..fcaa7362ff 100644 --- a/src/Geom/Geom_OffsetSurface.hxx +++ b/src/Geom/Geom_OffsetSurface.hxx @@ -357,6 +357,9 @@ public: inline GeomAbs_Shape GetBasisSurfContinuity() const { return myBasisSurfContinuity; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Geom_OffsetSurface,Geom_Surface) private: diff --git a/src/Geom/Geom_OsculatingSurface.cxx b/src/Geom/Geom_OsculatingSurface.cxx index 665d97b760..2db608d9bf 100644 --- a/src/Geom/Geom_OsculatingSurface.cxx +++ b/src/Geom/Geom_OsculatingSurface.cxx @@ -796,5 +796,23 @@ void Geom_OsculatingSurface::ClearOsculFlags() } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_OsculatingSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myBasisSurf.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTol) + if (!myOsculSurf1.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOsculSurf1->Size()) + if (!myOsculSurf2.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOsculSurf2->Size()) + if (!myKdeg.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myKdeg->Size()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlong.Size()) +} diff --git a/src/Geom/Geom_OsculatingSurface.hxx b/src/Geom/Geom_OsculatingSurface.hxx index b96fcd2f2c..ab15e84581 100644 --- a/src/Geom/Geom_OsculatingSurface.hxx +++ b/src/Geom/Geom_OsculatingSurface.hxx @@ -65,6 +65,9 @@ public: //! along V at the point U,V. Standard_EXPORT Standard_Boolean VOscSurf (const Standard_Real U, const Standard_Real V, Standard_Boolean& t, Handle(Geom_BSplineSurface)& L) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(Geom_OsculatingSurface,Standard_Transient) diff --git a/src/Geom/Geom_Parabola.cxx b/src/Geom/Geom_Parabola.cxx index 4115c294b3..1167691430 100644 --- a/src/Geom/Geom_Parabola.cxx +++ b/src/Geom/Geom_Parabola.cxx @@ -306,4 +306,15 @@ Standard_Real Geom_Parabola::ParametricTransformation(const gp_Trsf& T) const return Abs(T.ScaleFactor()); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Parabola::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Conic) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, focalLength) +} diff --git a/src/Geom/Geom_Parabola.hxx b/src/Geom/Geom_Parabola.hxx index 8757c5594b..78defeea20 100644 --- a/src/Geom/Geom_Parabola.hxx +++ b/src/Geom/Geom_Parabola.hxx @@ -223,6 +223,9 @@ public: //! Creates a new object which is a copy of this parabola. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Plane.cxx b/src/Geom/Geom_Plane.cxx index 65188e4f4c..f151e682ff 100644 --- a/src/Geom/Geom_Plane.cxx +++ b/src/Geom/Geom_Plane.cxx @@ -381,3 +381,14 @@ gp_GTrsf2d Geom_Plane::ParametricTransformation(const gp_Trsf& T) const T2.SetScale(gp::Origin2d(), Abs(T.ScaleFactor())); return gp_GTrsf2d(T2); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Plane::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_ElementarySurface) +} diff --git a/src/Geom/Geom_Plane.hxx b/src/Geom/Geom_Plane.hxx index 07caac2445..690ebf497f 100644 --- a/src/Geom/Geom_Plane.hxx +++ b/src/Geom/Geom_Plane.hxx @@ -218,6 +218,9 @@ public: //! Creates a new object which is a copy of this plane. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_RectangularTrimmedSurface.cxx b/src/Geom/Geom_RectangularTrimmedSurface.cxx index eec0b8aeca..e7ff92fe8f 100644 --- a/src/Geom/Geom_RectangularTrimmedSurface.cxx +++ b/src/Geom/Geom_RectangularTrimmedSurface.cxx @@ -653,3 +653,22 @@ gp_GTrsf2d Geom_RectangularTrimmedSurface::ParametricTransformation return basisSurf->ParametricTransformation(T); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_RectangularTrimmedSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_BoundedSurface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisSurf.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, utrim1) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vtrim1) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, utrim2) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, vtrim2) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, isutrimmed) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, isvtrimmed) +} diff --git a/src/Geom/Geom_RectangularTrimmedSurface.hxx b/src/Geom/Geom_RectangularTrimmedSurface.hxx index 857797370b..1d4bc3c3e8 100644 --- a/src/Geom/Geom_RectangularTrimmedSurface.hxx +++ b/src/Geom/Geom_RectangularTrimmedSurface.hxx @@ -305,6 +305,9 @@ public: //! Creates a new object which is a copy of this patch. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_SphericalSurface.cxx b/src/Geom/Geom_SphericalSurface.cxx index a373e59b7a..5cca0aab91 100644 --- a/src/Geom/Geom_SphericalSurface.cxx +++ b/src/Geom/Geom_SphericalSurface.cxx @@ -360,3 +360,16 @@ void Geom_SphericalSurface::Transform (const Trsf& T) { radius = radius * Abs(T.ScaleFactor()); pos.Transform (T); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_SphericalSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_ElementarySurface) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, radius) +} diff --git a/src/Geom/Geom_SphericalSurface.hxx b/src/Geom/Geom_SphericalSurface.hxx index 827a468673..9baab5a731 100644 --- a/src/Geom/Geom_SphericalSurface.hxx +++ b/src/Geom/Geom_SphericalSurface.hxx @@ -221,6 +221,9 @@ public: //! Creates a new object which is a copy of this sphere. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Surface.cxx b/src/Geom/Geom_Surface.cxx index d01f1a9979..a29226a6b1 100644 --- a/src/Geom/Geom_Surface.cxx +++ b/src/Geom/Geom_Surface.cxx @@ -122,3 +122,14 @@ gp_Pnt Geom_Surface::Value(const Standard_Real U, D0(U,V,P); return P; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_Surface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Geometry) +} diff --git a/src/Geom/Geom_Surface.hxx b/src/Geom/Geom_Surface.hxx index 2bf81cacee..657c1ce48c 100644 --- a/src/Geom/Geom_Surface.hxx +++ b/src/Geom/Geom_Surface.hxx @@ -265,6 +265,9 @@ public: //! compute the current point. Standard_EXPORT gp_Pnt Value (const Standard_Real U, const Standard_Real V) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx b/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx index 62d816d994..b4b8f40a47 100644 --- a/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx +++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx @@ -391,3 +391,14 @@ gp_GTrsf2d Geom_SurfaceOfLinearExtrusion::ParametricTransformation return TU * TV; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_SurfaceOfLinearExtrusion::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_SweptSurface) +} diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx b/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx index e0fb9d2f2f..f95db4bd74 100644 --- a/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx +++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx @@ -249,6 +249,9 @@ public: //! Creates a new object which is a copy of this surface of linear extrusion. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_SurfaceOfRevolution.cxx b/src/Geom/Geom_SurfaceOfRevolution.cxx index d1b86e43e9..8a6431608a 100644 --- a/src/Geom/Geom_SurfaceOfRevolution.cxx +++ b/src/Geom/Geom_SurfaceOfRevolution.cxx @@ -457,3 +457,14 @@ gp_GTrsf2d Geom_SurfaceOfRevolution::ParametricTransformation return T2; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_SurfaceOfRevolution::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_SweptSurface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &loc) +} diff --git a/src/Geom/Geom_SurfaceOfRevolution.hxx b/src/Geom/Geom_SurfaceOfRevolution.hxx index e83528e732..b0370e6ebc 100644 --- a/src/Geom/Geom_SurfaceOfRevolution.hxx +++ b/src/Geom/Geom_SurfaceOfRevolution.hxx @@ -303,6 +303,9 @@ public: //! Creates a new object which is a copy of this surface of revolution. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Geom_SurfaceOfRevolution,Geom_SweptSurface) diff --git a/src/Geom/Geom_SweptSurface.cxx b/src/Geom/Geom_SweptSurface.cxx index d3c921f13a..6d80ca5bed 100644 --- a/src/Geom/Geom_SweptSurface.cxx +++ b/src/Geom/Geom_SweptSurface.cxx @@ -44,3 +44,18 @@ Handle(Geom_Curve) Geom_SweptSurface::BasisCurve () const { return basisCurve; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_SweptSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_Surface) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisCurve.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &direction) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, smooth) +} diff --git a/src/Geom/Geom_SweptSurface.hxx b/src/Geom/Geom_SweptSurface.hxx index f7be27b3d1..2a06e9810d 100644 --- a/src/Geom/Geom_SweptSurface.hxx +++ b/src/Geom/Geom_SweptSurface.hxx @@ -65,6 +65,9 @@ public: //! for a surface of linear extrusion it is the extruded curve. Standard_EXPORT Handle(Geom_Curve) BasisCurve() const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_ToroidalSurface.cxx b/src/Geom/Geom_ToroidalSurface.cxx index 2cba526d8d..fd37691c45 100644 --- a/src/Geom/Geom_ToroidalSurface.cxx +++ b/src/Geom/Geom_ToroidalSurface.cxx @@ -397,3 +397,17 @@ void Geom_ToroidalSurface::Transform (const Trsf& T) { minorRadius = minorRadius * Abs(T.ScaleFactor()); pos.Transform (T); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_ToroidalSurface::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_ElementarySurface) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, majorRadius) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, minorRadius) +} diff --git a/src/Geom/Geom_ToroidalSurface.hxx b/src/Geom/Geom_ToroidalSurface.hxx index 6c22fcafdb..f199d57034 100644 --- a/src/Geom/Geom_ToroidalSurface.hxx +++ b/src/Geom/Geom_ToroidalSurface.hxx @@ -245,6 +245,9 @@ public: //! Creates a new object which is a copy of this torus. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom/Geom_Transformation.cxx b/src/Geom/Geom_Transformation.cxx index 480717b5b0..f03f521d40 100644 --- a/src/Geom/Geom_Transformation.cxx +++ b/src/Geom/Geom_Transformation.cxx @@ -16,6 +16,8 @@ #include +#include + IMPLEMENT_STANDARD_RTTIEXT(Geom_Transformation, Standard_Transient) Geom_Transformation::Geom_Transformation () { } @@ -56,3 +58,8 @@ void Geom_Transformation::PreMultiply (const Handle(Geom_Transformation)& Other) gpTrsf.PreMultiply (Other->Trsf()); } + +void Geom_Transformation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &gpTrsf) +} diff --git a/src/Geom/Geom_Transformation.hxx b/src/Geom/Geom_Transformation.hxx index bfa3af47c6..f78f0b967c 100644 --- a/src/Geom/Geom_Transformation.hxx +++ b/src/Geom/Geom_Transformation.hxx @@ -192,6 +192,9 @@ public: //! Creates a new object which is a copy of this transformation. Standard_EXPORT Handle(Geom_Transformation) Copy() const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: gp_Trsf gpTrsf; diff --git a/src/Geom/Geom_TrimmedCurve.cxx b/src/Geom/Geom_TrimmedCurve.cxx index 7fc934707b..b77b2f3b78 100644 --- a/src/Geom/Geom_TrimmedCurve.cxx +++ b/src/Geom/Geom_TrimmedCurve.cxx @@ -368,3 +368,18 @@ const return basisCurve->ParametricTransformation(T); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom_TrimmedCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom_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/Geom/Geom_TrimmedCurve.hxx b/src/Geom/Geom_TrimmedCurve.hxx index 7656908070..55cc621eb0 100644 --- a/src/Geom/Geom_TrimmedCurve.hxx +++ b/src/Geom/Geom_TrimmedCurve.hxx @@ -252,6 +252,9 @@ public: //! Creates a new object which is a copy of this trimmed curve. Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_BSplineCurve.cxx b/src/Geom2d/Geom2d_BSplineCurve.cxx index 1cca78c900..7dca8a3f69 100644 --- a/src/Geom2d/Geom2d_BSplineCurve.cxx +++ b/src/Geom2d/Geom2d_BSplineCurve.cxx @@ -1238,3 +1238,33 @@ void Geom2d_BSplineCurve::PeriodicNormalization(Standard_Real& Parameter) const } } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_BSplineCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + 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 822ded7de1..91504a89a4 100644 --- a/src/Geom2d/Geom2d_BSplineCurve.hxx +++ b/src/Geom2d/Geom2d_BSplineCurve.hxx @@ -817,6 +817,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_BezierCurve.cxx b/src/Geom2d/Geom2d_BezierCurve.cxx index 38250afe44..968d46df98 100644 --- a/src/Geom2d/Geom2d_BezierCurve.cxx +++ b/src/Geom2d/Geom2d_BezierCurve.cxx @@ -822,3 +822,23 @@ void Geom2d_BezierCurve::Init weights.Nullify(); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_BezierCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + 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 0d61dc4b45..97f830c81d 100644 --- a/src/Geom2d/Geom2d_BezierCurve.hxx +++ b/src/Geom2d/Geom2d_BezierCurve.hxx @@ -320,6 +320,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_BoundedCurve.cxx b/src/Geom2d/Geom2d_BoundedCurve.cxx index eebd15e9a2..9adce8f701 100644 --- a/src/Geom2d/Geom2d_BoundedCurve.cxx +++ b/src/Geom2d/Geom2d_BoundedCurve.cxx @@ -19,4 +19,15 @@ #include #include -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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Curve) +} diff --git a/src/Geom2d/Geom2d_BoundedCurve.hxx b/src/Geom2d/Geom2d_BoundedCurve.hxx index fae7b0ea01..0d29a3683e 100644 --- a/src/Geom2d/Geom2d_BoundedCurve.hxx +++ b/src/Geom2d/Geom2d_BoundedCurve.hxx @@ -61,6 +61,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_CartesianPoint.cxx b/src/Geom2d/Geom2d_CartesianPoint.cxx index f643c7f2ff..a9da3fc680 100644 --- 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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + 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 c4929f6103..e06e880ee8 100644 --- a/src/Geom2d/Geom2d_CartesianPoint.hxx +++ b/src/Geom2d/Geom2d_CartesianPoint.hxx @@ -76,6 +76,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Circle.cxx b/src/Geom2d/Geom2d_Circle.cxx index 3bac3eb3ec..6df90ce549 100644 --- a/src/Geom2d/Geom2d_Circle.cxx +++ b/src/Geom2d/Geom2d_Circle.cxx @@ -263,3 +263,15 @@ 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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + 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 76e55766e4..b5f4ba165c 100644 --- a/src/Geom2d/Geom2d_Circle.hxx +++ b/src/Geom2d/Geom2d_Circle.hxx @@ -155,6 +155,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Conic.cxx b/src/Geom2d/Geom2d_Conic.cxx index e52ae1a35d..f9f3cc20fe 100644 --- a/src/Geom2d/Geom2d_Conic.cxx +++ b/src/Geom2d/Geom2d_Conic.cxx @@ -69,3 +69,16 @@ Standard_Boolean Geom2d_Conic::IsCN (const Standard_Integer ) const { return Standard_True; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_Conic::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + 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 edf9f4385d..869f199943 100644 --- a/src/Geom2d/Geom2d_Conic.hxx +++ b/src/Geom2d/Geom2d_Conic.hxx @@ -109,6 +109,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Geom2d_Conic,Geom2d_Curve) protected: diff --git a/src/Geom2d/Geom2d_Curve.cxx b/src/Geom2d/Geom2d_Curve.cxx index 59ed0848eb..d39e731ec9 100644 --- a/src/Geom2d/Geom2d_Curve.cxx +++ b/src/Geom2d/Geom2d_Curve.cxx @@ -88,3 +88,14 @@ 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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Geometry) +} diff --git a/src/Geom2d/Geom2d_Curve.hxx b/src/Geom2d/Geom2d_Curve.hxx index bdf2886e0c..098dd3b8c0 100644 --- a/src/Geom2d/Geom2d_Curve.hxx +++ b/src/Geom2d/Geom2d_Curve.hxx @@ -224,6 +224,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Ellipse.cxx b/src/Geom2d/Geom2d_Ellipse.cxx index e9dbbbc6fb..feb26e0011 100644 --- a/src/Geom2d/Geom2d_Ellipse.cxx +++ b/src/Geom2d/Geom2d_Ellipse.cxx @@ -383,3 +383,17 @@ 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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + 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 78ff674e61..3216bf88d6 100644 --- a/src/Geom2d/Geom2d_Ellipse.hxx +++ b/src/Geom2d/Geom2d_Ellipse.hxx @@ -241,6 +241,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Geometry.cxx b/src/Geom2d/Geom2d_Geometry.cxx index 8d83dc2699..c2515d923e 100644 --- a/src/Geom2d/Geom2d_Geometry.cxx +++ b/src/Geom2d/Geom2d_Geometry.cxx @@ -133,3 +133,8 @@ Handle(Geom2d_Geometry) Geom2d_Geometry::Translated (const gp_Pnt2d& P1, const g G->Translate (P1, P2); return G; } + +void Geom2d_Geometry::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) +} diff --git a/src/Geom2d/Geom2d_Geometry.hxx b/src/Geom2d/Geom2d_Geometry.hxx index f73a4e5bb6..c61119fed3 100644 --- a/src/Geom2d/Geom2d_Geometry.hxx +++ b/src/Geom2d/Geom2d_Geometry.hxx @@ -110,6 +110,9 @@ public: Standard_EXPORT virtual Handle(Geom2d_Geometry) Copy() const = 0; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/Geom2d/Geom2d_Hyperbola.cxx b/src/Geom2d/Geom2d_Hyperbola.cxx index ef357a88c1..6256918abd 100644 --- a/src/Geom2d/Geom2d_Hyperbola.cxx +++ b/src/Geom2d/Geom2d_Hyperbola.cxx @@ -436,3 +436,17 @@ 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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + 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 02e341d9a7..9eff8581ae 100644 --- a/src/Geom2d/Geom2d_Hyperbola.hxx +++ b/src/Geom2d/Geom2d_Hyperbola.hxx @@ -294,6 +294,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Line.cxx b/src/Geom2d/Geom2d_Line.cxx index 6ac9b7b774..dc2a7b17da 100644 --- a/src/Geom2d/Geom2d_Line.cxx +++ b/src/Geom2d/Geom2d_Line.cxx @@ -293,3 +293,14 @@ Standard_Real Geom2d_Line::Distance (const gp_Pnt2d& P) const { return L.Distance (P); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_Line::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + 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 ed74a20522..75346f57bf 100644 --- a/src/Geom2d/Geom2d_Line.hxx +++ b/src/Geom2d/Geom2d_Line.hxx @@ -181,6 +181,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_OffsetCurve.cxx b/src/Geom2d/Geom2d_OffsetCurve.cxx index 2c4ea9536c..e8e7328489 100644 --- a/src/Geom2d/Geom2d_OffsetCurve.cxx +++ b/src/Geom2d/Geom2d_OffsetCurve.cxx @@ -388,3 +388,19 @@ GeomAbs_Shape Geom2d_OffsetCurve::GetBasisCurveContinuity() const { return myBasisCurveContinuity; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_OffsetCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Curve) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, basisCurve.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 0886f46baa..3cc51d2af5 100644 --- a/src/Geom2d/Geom2d_OffsetCurve.hxx +++ b/src/Geom2d/Geom2d_OffsetCurve.hxx @@ -285,6 +285,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Parabola.cxx b/src/Geom2d/Geom2d_Parabola.cxx index f7bfd21d64..513ec27266 100644 --- a/src/Geom2d/Geom2d_Parabola.cxx +++ b/src/Geom2d/Geom2d_Parabola.cxx @@ -335,4 +335,15 @@ Standard_Real Geom2d_Parabola::ParametricTransformation(const gp_Trsf2d& T) cons return Abs(T.ScaleFactor()); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_Parabola::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + 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 fa5f2a76c6..4d05db7212 100644 --- a/src/Geom2d/Geom2d_Parabola.hxx +++ b/src/Geom2d/Geom2d_Parabola.hxx @@ -205,6 +205,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_Point.cxx b/src/Geom2d/Geom2d_Point.cxx index e3dacd91a3..9de485e707 100644 --- a/src/Geom2d/Geom2d_Point.cxx +++ b/src/Geom2d/Geom2d_Point.cxx @@ -37,3 +37,14 @@ 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, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Geom2d_Geometry) +} diff --git a/src/Geom2d/Geom2d_Point.hxx b/src/Geom2d/Geom2d_Point.hxx index ea3e9d1a56..d4b5c48081 100644 --- a/src/Geom2d/Geom2d_Point.hxx +++ b/src/Geom2d/Geom2d_Point.hxx @@ -56,6 +56,9 @@ public: //! computes the square distance between and . 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Geom2d/Geom2d_TrimmedCurve.cxx b/src/Geom2d/Geom2d_TrimmedCurve.cxx index 9cbfa69858..b4ddf93021 100644 --- a/src/Geom2d/Geom2d_TrimmedCurve.cxx +++ b/src/Geom2d/Geom2d_TrimmedCurve.cxx @@ -345,3 +345,17 @@ Standard_Real Geom2d_TrimmedCurve::ParametricTransformation(const gp_Trsf2d& T) return basisCurve->ParametricTransformation(T); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Geom2d_TrimmedCurve::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + 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 57e905fb25..096c615bf8 100644 --- a/src/Geom2d/Geom2d_TrimmedCurve.hxx +++ b/src/Geom2d/Geom2d_TrimmedCurve.hxx @@ -256,6 +256,9 @@ 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, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/Graphic3d/Graphic3d_Aspects.cxx b/src/Graphic3d/Graphic3d_Aspects.cxx index 56ddc524ba..e55e56561b 100644 --- a/src/Graphic3d/Graphic3d_Aspects.cxx +++ b/src/Graphic3d/Graphic3d_Aspects.cxx @@ -67,20 +67,33 @@ void Graphic3d_Aspects::SetTextureMap (const Handle(Graphic3d_TextureMap)& theTe //function : DumpJson //purpose : //======================================================================= -void Graphic3d_Aspects::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Graphic3d_Aspects::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_Aspects); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myInteriorColor); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBackInteriorColor); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myEdgeColor); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPolygonOffset); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myInteriorColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBackInteriorColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myEdgeColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPolygonOffset) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToSkipFirstEdge); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDistinguishMaterials); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawEdges); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawSilhouette); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToSuppressBackFaces); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToMapTexture); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsTextZoomable); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToSkipFirstEdge) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDistinguishMaterials) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawEdges) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawSilhouette) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToSuppressBackFaces) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToMapTexture) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsTextZoomable) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlphaMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlphaCutoff) + + if (!myTextFont.IsNull()) + { + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myTextFont->String()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextStyle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextDisplayType) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextFontAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextAngle) } diff --git a/src/Graphic3d/Graphic3d_Aspects.hxx b/src/Graphic3d/Graphic3d_Aspects.hxx index 0764f88569..fc519efb0d 100644 --- a/src/Graphic3d/Graphic3d_Aspects.hxx +++ b/src/Graphic3d/Graphic3d_Aspects.hxx @@ -523,7 +523,8 @@ public: } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/Graphic3d/Graphic3d_BSDF.cxx b/src/Graphic3d/Graphic3d_BSDF.cxx index 39821b7b19..1c1d39c7b5 100644 --- a/src/Graphic3d/Graphic3d_BSDF.cxx +++ b/src/Graphic3d/Graphic3d_BSDF.cxx @@ -60,6 +60,18 @@ Graphic3d_Fresnel Graphic3d_Fresnel::CreateConductor (const Graphic3d_Vec3& theR return Graphic3d_Fresnel (Graphic3d_FM_SCHLICK, aFresnel); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_Fresnel::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_Fresnel) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFresnelType) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myFresnelData) +} + // ======================================================================= // function : Graphic3d_BSDF // purpose : @@ -226,3 +238,22 @@ Graphic3d_BSDF Graphic3d_BSDF::CreateMetallicRoughness (const Graphic3d_PBRMater return aBsdf; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_BSDF::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_BSDF) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Kc) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Kd) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Ks) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Kt) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Le) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Absorption) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &FresnelCoat) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &FresnelBase) +} diff --git a/src/Graphic3d/Graphic3d_BSDF.hxx b/src/Graphic3d/Graphic3d_BSDF.hxx index 37c1f47d26..00f1e85923 100644 --- a/src/Graphic3d/Graphic3d_BSDF.hxx +++ b/src/Graphic3d/Graphic3d_BSDF.hxx @@ -89,6 +89,9 @@ public: return myFresnelType; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: //! Creates new Fresnel reflectance factor. @@ -185,6 +188,9 @@ public: //! Performs comparison of two BSDFs. Standard_EXPORT bool operator== (const Graphic3d_BSDF& theOther) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + }; #endif // _Graphic3d_BSDF_HeaderFile diff --git a/src/Graphic3d/Graphic3d_BoundBuffer.hxx b/src/Graphic3d/Graphic3d_BoundBuffer.hxx index 5aafd1cf14..b941f032ac 100644 --- a/src/Graphic3d/Graphic3d_BoundBuffer.hxx +++ b/src/Graphic3d/Graphic3d_BoundBuffer.hxx @@ -61,6 +61,19 @@ public: return true; } + //! Dumps the content of me into the stream + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE + { + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, NCollection_Buffer) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, Colors) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, Bounds) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, NbBounds) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, NbMaxBounds) + } + public: Graphic3d_Vec4* Colors; //!< pointer to facet color values diff --git a/src/Graphic3d/Graphic3d_Buffer.cxx b/src/Graphic3d/Graphic3d_Buffer.cxx index 2d46aef4f4..47a0114e02 100644 --- a/src/Graphic3d/Graphic3d_Buffer.cxx +++ b/src/Graphic3d/Graphic3d_Buffer.cxx @@ -19,3 +19,17 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Buffer, NCollection_Buffer) IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_IndexBuffer, Graphic3d_Buffer) IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_BoundBuffer, NCollection_Buffer) IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_MutableIndexBuffer, Graphic3d_IndexBuffer) + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_Buffer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, NCollection_Buffer) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Stride) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, NbElements) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, NbAttributes) +} diff --git a/src/Graphic3d/Graphic3d_Buffer.hxx b/src/Graphic3d/Graphic3d_Buffer.hxx index 103d185298..02f16313ba 100644 --- a/src/Graphic3d/Graphic3d_Buffer.hxx +++ b/src/Graphic3d/Graphic3d_Buffer.hxx @@ -315,6 +315,9 @@ public: //! Invalidate entire buffer. virtual void Invalidate() {} + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + public: Standard_Integer Stride; //!< the distance to the attributes of the next vertex within interleaved array diff --git a/src/Graphic3d/Graphic3d_CStructure.cxx b/src/Graphic3d/Graphic3d_CStructure.cxx index 2cd2928db4..7da948ff3e 100644 --- a/src/Graphic3d/Graphic3d_CStructure.cxx +++ b/src/Graphic3d/Graphic3d_CStructure.cxx @@ -18,6 +18,7 @@ #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CStructure,Standard_Transient) @@ -44,3 +45,44 @@ Graphic3d_CStructure::Graphic3d_CStructure (const Handle(Graphic3d_StructureMana { Id = myGraphicDriver->NewIdentification(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_CStructure::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + for (Graphic3d_SequenceOfGroup::Iterator anIterator (myGroups); anIterator.More(); anIterator.Next()) + { + const Handle(Graphic3d_Group)& aGroup = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aGroup.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Id) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myZLayer) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Priority) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, PreviousPriority) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, ContainsFacet) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsInfinite) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, stick) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, highlight) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, visible) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, HLRValidation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsForHighlight) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsMutable) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Is2dText) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTrsf.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTrsfPers.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myClipPlanes.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myHighlightStyle.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsCulled) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBndBoxClipCheck) +} diff --git a/src/Graphic3d/Graphic3d_CStructure.hxx b/src/Graphic3d/Graphic3d_CStructure.hxx index d7c9f7caa0..053b3ba364 100644 --- a/src/Graphic3d/Graphic3d_CStructure.hxx +++ b/src/Graphic3d/Graphic3d_CStructure.hxx @@ -194,6 +194,9 @@ public: //! Update render transformation matrix. virtual void updateLayerTransformation() {} + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + public: int Id; diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx index 916d08048b..a251811e33 100644 --- a/src/Graphic3d/Graphic3d_Camera.cxx +++ b/src/Graphic3d/Graphic3d_Camera.cxx @@ -1546,3 +1546,18 @@ void Graphic3d_Camera::FrustumPoints (NCollection_Array1& thePo aTmpPnt = anInvWorldView * aLeftBottomFar; thePoints.SetValue (FrustumVert_LeftBottomFar, aTmpPnt.xyz() / aTmpPnt.w()); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_Camera::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUp) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myDirection) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myEye) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDistance) +} diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx index 62fc9f77d8..e2f3fbef0e 100644 --- a/src/Graphic3d/Graphic3d_Camera.hxx +++ b/src/Graphic3d/Graphic3d_Camera.hxx @@ -552,6 +552,9 @@ public: //! The matrix will be updated on request. Standard_EXPORT void InvalidateOrientation(); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + //! @name Managing projection and orientation cache private: diff --git a/src/Graphic3d/Graphic3d_ClipPlane.cxx b/src/Graphic3d/Graphic3d_ClipPlane.cxx index 4cc44913e2..f248f4c523 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.cxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.cxx @@ -338,3 +338,32 @@ void Graphic3d_ClipPlane::SetChainNextPlane (const Handle(Graphic3d_ClipPlane)& } updateChainLen(); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_ClipPlane::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, this) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myNextInChain.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myPrevInChain) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myId) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPlane) + + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "Equation", 4, myEquation.x(), myEquation.y(), myEquation.z(), myEquation.w()) + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "EquationRev", 4, myEquationRev.x(), myEquationRev.y(), myEquationRev.z(), myEquationRev.w()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myChainLenFwd) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFlags) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myEquationMod) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAspectMod) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsOn) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsCapping) +} diff --git a/src/Graphic3d/Graphic3d_ClipPlane.hxx b/src/Graphic3d/Graphic3d_ClipPlane.hxx index 595034e507..cf692d11ec 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.hxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx @@ -377,6 +377,9 @@ public: return !IsPointOutHalfspace (aMinPnt); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + public: // @name modification counters //! @return modification counter for equation. diff --git a/src/Graphic3d/Graphic3d_Group.cxx b/src/Graphic3d/Graphic3d_Group.cxx index 27e4f9acff..53207a5af0 100644 --- a/src/Graphic3d/Graphic3d_Group.cxx +++ b/src/Graphic3d/Graphic3d_Group.cxx @@ -452,10 +452,11 @@ void Graphic3d_Group::AddText (const Handle(Graphic3d_Text)& theTextParams, // function : DumpJson // purpose : // ======================================================================= -void Graphic3d_Group::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void Graphic3d_Group::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_Group); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsClosed); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myContainsFacet); + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, this) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsClosed) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myContainsFacet) } diff --git a/src/Graphic3d/Graphic3d_Group.hxx b/src/Graphic3d/Graphic3d_Group.hxx index 9bff85e900..fb6748302e 100644 --- a/src/Graphic3d/Graphic3d_Group.hxx +++ b/src/Graphic3d/Graphic3d_Group.hxx @@ -277,7 +277,7 @@ public: //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const 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_HatchStyle.cxx b/src/Graphic3d/Graphic3d_HatchStyle.cxx index ebf108cfe2..6cb6476084 100644 --- a/src/Graphic3d/Graphic3d_HatchStyle.cxx +++ b/src/Graphic3d/Graphic3d_HatchStyle.cxx @@ -516,3 +516,15 @@ const Standard_Byte* Graphic3d_HatchStyle::Pattern() const ? (const Standard_Byte*)myPredefinedPatterns[myHatchType] : NULL); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_HatchStyle::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPattern.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHatchType) +} diff --git a/src/Graphic3d/Graphic3d_HatchStyle.hxx b/src/Graphic3d/Graphic3d_HatchStyle.hxx index c29a3ab03d..9c083f05c5 100644 --- a/src/Graphic3d/Graphic3d_HatchStyle.hxx +++ b/src/Graphic3d/Graphic3d_HatchStyle.hxx @@ -49,6 +49,9 @@ public: return myHatchType; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: Handle(NCollection_Buffer) myPattern; //!< Image bitmap with custom hatch pattern diff --git a/src/Graphic3d/Graphic3d_IndexBuffer.hxx b/src/Graphic3d/Graphic3d_IndexBuffer.hxx index 7e0c5a1556..3e8cf19eb4 100644 --- a/src/Graphic3d/Graphic3d_IndexBuffer.hxx +++ b/src/Graphic3d/Graphic3d_IndexBuffer.hxx @@ -77,6 +77,12 @@ public: } } + //! Dumps the content of me into the stream + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE + { + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Buffer) + } }; diff --git a/src/Graphic3d/Graphic3d_Layer.cxx b/src/Graphic3d/Graphic3d_Layer.cxx index 70a4eaf439..a94e38a17c 100644 --- a/src/Graphic3d/Graphic3d_Layer.cxx +++ b/src/Graphic3d/Graphic3d_Layer.cxx @@ -626,3 +626,38 @@ void Graphic3d_Layer::SetLayerSettings (const Graphic3d_ZLayerSettings& theSetti } } } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_Layer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, this) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLayerId) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNbStructures) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNbStructuresNotCulled) + + const Standard_Integer aNbPriorities = myArray.Length(); + for (Standard_Integer aPriorityIter = 0; aPriorityIter < aNbPriorities; ++aPriorityIter) + { + const Graphic3d_IndexedMapOfStructure& aStructures = myArray (aPriorityIter); + for (Graphic3d_IndexedMapOfStructure::Iterator aStructIter (aStructures); aStructIter.More(); aStructIter.Next()) + { + const Graphic3d_CStructure* aStructure = aStructIter.Value(); + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, aStructure) + } + } + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLayerSettings) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBVHIsLeftChildQueuedFirst) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsBVHPrimitivesNeedsReset) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsBoundingBoxNeedsReset[0]) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsBoundingBoxNeedsReset[1]) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBoundingBox[0]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBoundingBox[1]) +} diff --git a/src/Graphic3d/Graphic3d_Layer.hxx b/src/Graphic3d/Graphic3d_Layer.hxx index 820113e13f..bd5c3dca8a 100644 --- a/src/Graphic3d/Graphic3d_Layer.hxx +++ b/src/Graphic3d/Graphic3d_Layer.hxx @@ -144,6 +144,9 @@ public: //! Returns indexed map of always rendered structures. const NCollection_IndexedMap& NonCullableStructures() const { return myAlwaysRenderedMap; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: //! Updates BVH trees if their state has been invalidated. diff --git a/src/Graphic3d/Graphic3d_MaterialAspect.cxx b/src/Graphic3d/Graphic3d_MaterialAspect.cxx index 99cbf9b5c8..bc06a7c362 100644 --- a/src/Graphic3d/Graphic3d_MaterialAspect.cxx +++ b/src/Graphic3d/Graphic3d_MaterialAspect.cxx @@ -712,3 +712,29 @@ Graphic3d_TypeOfMaterial Graphic3d_MaterialAspect::MaterialType (const Standard_ const RawMaterial& aMat = THE_MATERIALS[theRank - 1]; return aMat.MaterialType; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_MaterialAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_MaterialAspect) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBSDF) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPBRMaterial) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myStringName) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColors[Graphic3d_TOR_AMBIENT]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColors[Graphic3d_TOR_DIFFUSE]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColors[Graphic3d_TOR_SPECULAR]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColors[Graphic3d_TOR_EMISSION]) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTransparencyCoef) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRefractionIndex) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShininess) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaterialType) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaterialName) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRequestedMaterialName) +} diff --git a/src/Graphic3d/Graphic3d_MaterialAspect.hxx b/src/Graphic3d/Graphic3d_MaterialAspect.hxx index 997b36e5f8..ceab484ef5 100644 --- a/src/Graphic3d/Graphic3d_MaterialAspect.hxx +++ b/src/Graphic3d/Graphic3d_MaterialAspect.hxx @@ -215,6 +215,9 @@ public: //! Returns TRUE if this material is identical to specified one. Standard_Boolean operator== (const Graphic3d_MaterialAspect& theOther) const { return IsEqual (theOther); } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + public: //! Deactivates the reflective properties of the surface with specified reflection type. diff --git a/src/Graphic3d/Graphic3d_PBRMaterial.cxx b/src/Graphic3d/Graphic3d_PBRMaterial.cxx index b1c20c517f..d87676c480 100644 --- a/src/Graphic3d/Graphic3d_PBRMaterial.cxx +++ b/src/Graphic3d/Graphic3d_PBRMaterial.cxx @@ -349,3 +349,19 @@ Graphic3d_Vec3 Graphic3d_PBRMaterial::lutGenReflect (const Graphic3d_Vec3 &theVe { return theAxis * theAxis.Dot(theVector) * 2.f - theVector; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_PBRMaterial::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_PBRMaterial) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColor) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMetallic) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRoughness) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myEmission) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIOR) +} diff --git a/src/Graphic3d/Graphic3d_PBRMaterial.hxx b/src/Graphic3d/Graphic3d_PBRMaterial.hxx index 25eff910cb..301b5b907b 100644 --- a/src/Graphic3d/Graphic3d_PBRMaterial.hxx +++ b/src/Graphic3d/Graphic3d_PBRMaterial.hxx @@ -152,6 +152,9 @@ public: Standard_EXPORT static Standard_ShortReal SpecIBLMapSamplesFactor (Standard_ShortReal theProbability, Standard_ShortReal theRoughness); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: //! Calculates geometry factor of Cook-Torrance BRDF using Smith formula. diff --git a/src/Graphic3d/Graphic3d_PolygonOffset.cxx b/src/Graphic3d/Graphic3d_PolygonOffset.cxx index f4cfe9158f..3c224b5726 100644 --- a/src/Graphic3d/Graphic3d_PolygonOffset.cxx +++ b/src/Graphic3d/Graphic3d_PolygonOffset.cxx @@ -19,11 +19,11 @@ //function : DumpJson //purpose : //======================================================================= -void Graphic3d_PolygonOffset::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void Graphic3d_PolygonOffset::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_PolygonOffset); + OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_PolygonOffset) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Mode); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Factor); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Units); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Mode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Factor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Units) } diff --git a/src/Graphic3d/Graphic3d_PolygonOffset.hxx b/src/Graphic3d/Graphic3d_PolygonOffset.hxx index 0926e2ce69..2b3c97b651 100644 --- a/src/Graphic3d/Graphic3d_PolygonOffset.hxx +++ b/src/Graphic3d/Graphic3d_PolygonOffset.hxx @@ -36,7 +36,7 @@ struct Graphic3d_PolygonOffset } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; }; diff --git a/src/Graphic3d/Graphic3d_PresentationAttributes.cxx b/src/Graphic3d/Graphic3d_PresentationAttributes.cxx index 69ce5ae07e..25f40c4bdf 100644 --- a/src/Graphic3d/Graphic3d_PresentationAttributes.cxx +++ b/src/Graphic3d/Graphic3d_PresentationAttributes.cxx @@ -15,4 +15,21 @@ #include +#include + IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_PresentationAttributes, Standard_Transient) + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_PresentationAttributes::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myBasicFillAreaAspect.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBasicColor) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHiMethod) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myZLayer) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDispMode) +} diff --git a/src/Graphic3d/Graphic3d_PresentationAttributes.hxx b/src/Graphic3d/Graphic3d_PresentationAttributes.hxx index 0e7a76913c..a0890eb52e 100644 --- a/src/Graphic3d/Graphic3d_PresentationAttributes.hxx +++ b/src/Graphic3d/Graphic3d_PresentationAttributes.hxx @@ -90,6 +90,9 @@ public: //! Sets basic presentation fill area aspect. virtual void SetBasicFillAreaAspect (const Handle(Graphic3d_AspectFillArea3d)& theAspect) { myBasicFillAreaAspect = theAspect; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: Handle(Graphic3d_AspectFillArea3d) myBasicFillAreaAspect; //!< presentation fill area aspect diff --git a/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.cxx b/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.cxx index e8cb10c32d..9879d332fb 100644 --- a/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.cxx +++ b/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.cxx @@ -58,3 +58,18 @@ bool Graphic3d_SequenceOfHClipPlane::Remove (const Handle(Graphic3d_ClipPlane)& } return false; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_SequenceOfHClipPlane::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToOverrideGlobal) + + for (NCollection_Sequence::Iterator anIterator (myItems); anIterator.More(); anIterator.Next()) + { + const Handle(Graphic3d_ClipPlane)& aClipPlane = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aClipPlane.get()) + } +} diff --git a/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.hxx b/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.hxx index 014aaebc71..16bab8d1fd 100755 --- a/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.hxx +++ b/src/Graphic3d/Graphic3d_SequenceOfHClipPlane.hxx @@ -94,6 +94,9 @@ public: //! Return the first item in sequence. const Handle(Graphic3d_ClipPlane)& First() const { return myItems.First(); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: NCollection_Sequence myItems; diff --git a/src/Graphic3d/Graphic3d_Structure.cxx b/src/Graphic3d/Graphic3d_Structure.cxx index e8a48295f3..202c0c5729 100644 --- a/src/Graphic3d/Graphic3d_Structure.cxx +++ b/src/Graphic3d/Graphic3d_Structure.cxx @@ -30,6 +30,8 @@ #include "Graphic3d_Structure.pxx" +#include + #include IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Structure,Standard_Transient) @@ -1027,3 +1029,17 @@ void Graphic3d_Structure::SetZLayer (const Graphic3d_ZLayerId theLayerId) myStructureManager->ChangeZLayer (this, theLayerId); myCStructure->SetZLayer (theLayerId); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Graphic3d_Structure::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myCStructure.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVisual) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myComputeVisual) +} diff --git a/src/Graphic3d/Graphic3d_Structure.hxx b/src/Graphic3d/Graphic3d_Structure.hxx index 3854a4389a..5c0bf76b38 100644 --- a/src/Graphic3d/Graphic3d_Structure.hxx +++ b/src/Graphic3d/Graphic3d_Structure.hxx @@ -432,6 +432,9 @@ public: //! Returns the low-level structure const Handle(Graphic3d_CStructure)& CStructure() const { return myCStructure; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: //! Transforms boundaries with transformation. diff --git a/src/Graphic3d/Graphic3d_TransformPers.cxx b/src/Graphic3d/Graphic3d_TransformPers.cxx index d171a7d890..1a73a5d988 100644 --- a/src/Graphic3d/Graphic3d_TransformPers.cxx +++ b/src/Graphic3d/Graphic3d_TransformPers.cxx @@ -51,3 +51,38 @@ Handle(Graphic3d_TransformPers) Graphic3d_TransformPers::FromDeprecatedParams (G } return aTrsfPers; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_TransformPers::PersParams3d::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + gp_Pnt anAttachPoint (PntX, PntY, PntZ); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &anAttachPoint) +} + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_TransformPers::PersParams2d::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, OffsetX) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, OffsetY) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Corner) +} + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_TransformPers::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMode) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myParams.Params3d) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myParams.Params2d) +} diff --git a/src/Graphic3d/Graphic3d_TransformPers.hxx b/src/Graphic3d/Graphic3d_TransformPers.hxx index cdc832a7f4..5fd2ffc67b 100644 --- a/src/Graphic3d/Graphic3d_TransformPers.hxx +++ b/src/Graphic3d/Graphic3d_TransformPers.hxx @@ -283,6 +283,9 @@ public: const Standard_Integer theViewportWidth, const Standard_Integer theViewportHeight) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: //! 3D anchor point for zoom/rotate transformation persistence. @@ -291,6 +294,9 @@ private: Standard_Real PntX; Standard_Real PntY; Standard_Real PntZ; + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; }; //! 2d/trihedron transformation persistence parameters. @@ -299,6 +305,9 @@ private: Standard_Integer OffsetX; Standard_Integer OffsetY; Aspect_TypeOfTriedronPosition Corner; + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; }; private: diff --git a/src/Graphic3d/Graphic3d_ViewAffinity.cxx b/src/Graphic3d/Graphic3d_ViewAffinity.cxx index 10e4206971..a1b8fd215b 100644 --- a/src/Graphic3d/Graphic3d_ViewAffinity.cxx +++ b/src/Graphic3d/Graphic3d_ViewAffinity.cxx @@ -15,6 +15,17 @@ #include +#include +IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ViewAffinity,Standard_Transient) -IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ViewAffinity,Standard_Transient) \ No newline at end of file +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Graphic3d_ViewAffinity::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMask) +} \ No newline at end of file diff --git a/src/Graphic3d/Graphic3d_ViewAffinity.hxx b/src/Graphic3d/Graphic3d_ViewAffinity.hxx index 41bd9503c8..f5164b4c88 100644 --- a/src/Graphic3d/Graphic3d_ViewAffinity.hxx +++ b/src/Graphic3d/Graphic3d_ViewAffinity.hxx @@ -59,6 +59,9 @@ public: } } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: unsigned int myMask; //!< affinity mask diff --git a/src/Graphic3d/Graphic3d_ZLayerSettings.hxx b/src/Graphic3d/Graphic3d_ZLayerSettings.hxx index b61c0a3070..1b161f0d86 100644 --- a/src/Graphic3d/Graphic3d_ZLayerSettings.hxx +++ b/src/Graphic3d/Graphic3d_ZLayerSettings.hxx @@ -19,6 +19,7 @@ #include #include #include +#include #include enum Graphic3d_ZLayerSetting @@ -208,6 +209,29 @@ struct Graphic3d_ZLayerSettings myPolygonOffset.Units =-1.0f; } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_ZLayerSettings) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myName) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myOriginTrsf.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myOrigin) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCullingDistance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCullingSize) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPolygonOffset) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsImmediate) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToRaytrace) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUseEnvironmentTexture) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToEnableDepthTest) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToEnableDepthWrite) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToClearDepth) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToRenderInDepthPrepass) + } + protected: TCollection_AsciiString myName; //!< user-provided name diff --git a/src/Image/Image_Texture.cxx b/src/Image/Image_Texture.cxx index c81f0eadd3..cae8b8be28 100644 --- a/src/Image/Image_Texture.cxx +++ b/src/Image/Image_Texture.cxx @@ -302,3 +302,20 @@ Standard_Boolean Image_Texture::WriteImage (const TCollection_AsciiString& theFi } return Standard_True; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Image_Texture::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myTextureId) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myImagePath) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myBuffer.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOffset) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLength) +} diff --git a/src/Image/Image_Texture.hxx b/src/Image/Image_Texture.hxx index f55458bcf5..688f0e11e2 100644 --- a/src/Image/Image_Texture.hxx +++ b/src/Image/Image_Texture.hxx @@ -87,6 +87,9 @@ public: //! @name hasher interface } return theTex1->myTextureId.IsEqual (theTex2->myTextureId); } + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; protected: diff --git a/src/NCollection/NCollection_Buffer.hxx b/src/NCollection/NCollection_Buffer.hxx index b51e514a4e..c98182dda4 100644 --- a/src/NCollection/NCollection_Buffer.hxx +++ b/src/NCollection/NCollection_Buffer.hxx @@ -17,6 +17,7 @@ #define _NCollection_Buffer_HeaderFile #include +#include #include //! Low-level buffer object. @@ -122,6 +123,15 @@ public: mySize = 0; } + //! Dumps the content of me into the stream + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + (void)theDepth; + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myData) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySize) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myAllocator.get()) + } + protected: Standard_Byte* myData; //!< data pointer diff --git a/src/NCollection/NCollection_Mat4.hxx b/src/NCollection/NCollection_Mat4.hxx index c0ea4fefdd..ed308f4164 100755 --- a/src/NCollection/NCollection_Mat4.hxx +++ b/src/NCollection/NCollection_Mat4.hxx @@ -17,6 +17,8 @@ #define _NCollection_Mat4_HeaderFile #include +#include +#include //! Generic matrix of 4 x 4 elements. //! To be used in conjunction with NCollection_Vec4 entities. @@ -461,6 +463,16 @@ public: return *reinterpret_cast*> (theData); } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer) const + { + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "NCollection_Mat4", 16, + GetValue (0, 0), GetValue (0, 1), GetValue (0, 2), GetValue (0, 3), + GetValue (1, 0), GetValue (1, 1), GetValue (1, 2), GetValue (1, 3), + GetValue (2, 0), GetValue (2, 1), GetValue (2, 2), GetValue (2, 3), + GetValue (3, 0), GetValue (3, 1), GetValue (3, 2), GetValue (3, 3)) + } + private: Element_t myMat[16]; diff --git a/src/NCollection/NCollection_Vec3.hxx b/src/NCollection/NCollection_Vec3.hxx index fc2b48155b..7e25b74e6d 100644 --- a/src/NCollection/NCollection_Vec3.hxx +++ b/src/NCollection/NCollection_Vec3.hxx @@ -18,6 +18,7 @@ #include #include #include +#include //! Auxiliary macros to define couple of similar access components as vector methods #define NCOLLECTION_VEC_COMPONENTS_3D(theX, theY, theZ) \ @@ -403,6 +404,13 @@ public: return NCollection_Vec3 (Element_t(0), Element_t(0), Element_t(1)); } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + (void)theDepth; + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "Vec3", 3, v[0], v[1], v[2]) + } + private: Element_t v[3]; //!< define the vector as array to avoid structure alignment issues diff --git a/src/NCollection/NCollection_Vec4.hxx b/src/NCollection/NCollection_Vec4.hxx index b3c84aea9a..52960a82a2 100644 --- a/src/NCollection/NCollection_Vec4.hxx +++ b/src/NCollection/NCollection_Vec4.hxx @@ -16,6 +16,7 @@ #define _NCollection_Vec4_H__ #include +#include //! Generic 4-components vector. //! To be used as RGBA color vector or XYZW 3D-point with special W-component @@ -375,6 +376,13 @@ public: return aResult /= theRight; } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + (void)theDepth; + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "Vec4", 4, v[0], v[1], v[2], v[3]) + } + private: Element_t v[4]; //!< define the vector as array to avoid structure alignment issues diff --git a/src/OpenGl/OpenGl_Aspects.cxx b/src/OpenGl/OpenGl_Aspects.cxx index b1c683357c..4879091e8e 100644 --- a/src/OpenGl/OpenGl_Aspects.cxx +++ b/src/OpenGl/OpenGl_Aspects.cxx @@ -115,10 +115,11 @@ void OpenGl_Aspects::Release (OpenGl_Context* theContext) // function : DumpJson // purpose : // ======================================================================= -void OpenGl_Aspects::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void OpenGl_Aspects::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Aspects); + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Aspects) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel) } diff --git a/src/OpenGl/OpenGl_Aspects.hxx b/src/OpenGl/OpenGl_Aspects.hxx index d767038689..f32f63edeb 100644 --- a/src/OpenGl/OpenGl_Aspects.hxx +++ b/src/OpenGl/OpenGl_Aspects.hxx @@ -90,7 +90,7 @@ public: virtual void SynchronizeAspects() Standard_OVERRIDE { SetAspect (myAspect); } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx index a84e125b9c..1623c3a91d 100644 --- a/src/OpenGl/OpenGl_Context.cxx +++ b/src/OpenGl/OpenGl_Context.cxx @@ -4228,3 +4228,84 @@ bool OpenGl_Context::SetSampleAlphaToCoverage (bool theToEnable) myAlphaToCoverage = toEnable; return anOldValue; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_Context::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAnisoMax) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTexClamp) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxTexDim) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxTexCombined) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxDumpSizeX) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxDumpSizeY) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxClipPlanes) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxMsaaSamples) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxDrawBuffers) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaxColorAttachments) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myGlVerMajor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myGlVerMinor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsInitialized) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsStereoBuffers) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsGlNormalizeEnabled) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasRayTracing) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasRayTracingTextures) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasRayTracingAdaptiveSampling) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasRayTracingAdaptiveSamplingAtomic) + + for (int i = 0; i < 4; i++) + { + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myViewport[i]) + } + + for (int i = 0; i < 4; i++) + { + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myViewportVirt[i]) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPointSpriteOrig) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRenderMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPolygonMode) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPolygonOffset) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToCullBackFaces) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myReadBuffer) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDefaultVao) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myColorMask) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAllowAlphaToCov) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlphaToCoverage) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsGlDebugCtx) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myResolution) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myResolutionRatio) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLineWidthScale) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLineFeather) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRenderScale) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRenderScaleInv) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &ModelWorldState) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &WorldViewState) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &ProjectionState) +} + +// ======================================================================= +// function : DumpJsonOpenGlState +// purpose : +// ======================================================================= +void OpenGl_Context::DumpJsonOpenGlState (Standard_OStream& theOStream, Standard_Integer) +{ + GLboolean isEnableBlend = glIsEnabled (GL_BLEND); + GLboolean isEnableCullFace = glIsEnabled (GL_CULL_FACE); + GLboolean isEnableDepthTest = glIsEnabled (GL_DEPTH_TEST); + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, isEnableBlend) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, isEnableCullFace) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, isEnableDepthTest) +} + diff --git a/src/OpenGl/OpenGl_Context.hxx b/src/OpenGl/OpenGl_Context.hxx index e7575266f1..9808544835 100644 --- a/src/OpenGl/OpenGl_Context.hxx +++ b/src/OpenGl/OpenGl_Context.hxx @@ -199,6 +199,13 @@ DEFINE_STANDARD_HANDLE(OpenGl_Context, Standard_Transient) //! //! Notice that some systems provide mechanisms to simultaneously incorporate with GL contexts with different capabilities. //! For this reason OpenGl_Context should be initialized and used for each GL context independently. +//! +//! Matrices of OpenGl transformations: +//! model -> world -> view -> projection +//! These matrices might be changed for local transformation, transform persistent using direct access to +//! current matrix of ModelWorldState, WorldViewState and ProjectionState +//! After, these matrices should be applyed using ApplyModelWorldMatrix, ApplyWorldViewMatrix, +//! ApplyModelViewMatrix or ApplyProjectionMatrix. class OpenGl_Context : public Standard_Transient { DEFINE_STANDARD_RTTIEXT(OpenGl_Context, Standard_Transient) @@ -658,16 +665,25 @@ public: //! Returns currently applied polygon offset parameters. const Graphic3d_PolygonOffset& PolygonOffset() const { return myPolygonOffset; } - //! Applies matrix stored in ModelWorldState to OpenGl. + //! Applies matrix into shader manager stored in ModelWorldState to OpenGl. + //! In "model -> world -> view -> projection" it performs: + //! model -> world Standard_EXPORT void ApplyModelWorldMatrix(); //! Applies matrix stored in WorldViewState to OpenGl. + //! In "model -> world -> view -> projection" it performs: + //! model -> world -> view, + //! where model -> world is identical matrix Standard_EXPORT void ApplyWorldViewMatrix(); //! Applies combination of matrices stored in ModelWorldState and WorldViewState to OpenGl. + //! In "model -> world -> view -> projection" it performs: + //! model -> world -> view Standard_EXPORT void ApplyModelViewMatrix(); //! Applies matrix stored in ProjectionState to OpenGl. + //! In "model -> world -> view -> projection" it performs: + //! view -> projection Standard_EXPORT void ApplyProjectionMatrix(); public: @@ -947,6 +963,12 @@ public: //! @name methods to alter or retrieve current state //! Return Graphics Driver's vendor. const TCollection_AsciiString& Vendor() const { return myVendor; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + + //! Dumps the content of openGL state into the stream + Standard_EXPORT static void DumpJsonOpenGlState (Standard_OStream& theOStream, Standard_Integer theDepth = -1); + private: //! Wrapper to system function to retrieve GL function pointer by name. diff --git a/src/OpenGl/OpenGl_Element.cxx b/src/OpenGl/OpenGl_Element.cxx index 0d5c53f5d5..6f8d87210e 100755 --- a/src/OpenGl/OpenGl_Element.cxx +++ b/src/OpenGl/OpenGl_Element.cxx @@ -15,6 +15,8 @@ #include +#include + // ======================================================================= // function : OpenGl_Element // purpose : @@ -32,3 +34,13 @@ OpenGl_Element::~OpenGl_Element() { // } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_Element::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Element) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, this) +} diff --git a/src/OpenGl/OpenGl_Element.hxx b/src/OpenGl/OpenGl_Element.hxx index 8a14275a1a..ab53b6146e 100644 --- a/src/OpenGl/OpenGl_Element.hxx +++ b/src/OpenGl/OpenGl_Element.hxx @@ -63,6 +63,9 @@ public: //! Update parameters of the drawable elements. virtual void SynchronizeAspects() {} + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: Standard_EXPORT virtual ~OpenGl_Element(); diff --git a/src/OpenGl/OpenGl_Flipper.cxx b/src/OpenGl/OpenGl_Flipper.cxx index 3a5a0673b1..b3322df22d 100755 --- a/src/OpenGl/OpenGl_Flipper.cxx +++ b/src/OpenGl/OpenGl_Flipper.cxx @@ -135,3 +135,14 @@ void OpenGl_Flipper::Render (const Handle(OpenGl_Workspace)& theWorkspace) const aContext->WorldViewState.SetCurrent (aMatrixMV); aContext->ApplyWorldViewMatrix(); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_Flipper::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Flipper) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) +} diff --git a/src/OpenGl/OpenGl_Flipper.hxx b/src/OpenGl/OpenGl_Flipper.hxx index 7f159c5db9..17de26e7c4 100755 --- a/src/OpenGl/OpenGl_Flipper.hxx +++ b/src/OpenGl/OpenGl_Flipper.hxx @@ -39,8 +39,11 @@ public: //! matrix modification should be set up or restored back. void SetOptions (const Standard_Boolean theIsEnabled) { myIsEnabled = theIsEnabled; } - Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const; - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const Standard_OVERRIDE; + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; public: diff --git a/src/OpenGl/OpenGl_FrameStatsPrs.cxx b/src/OpenGl/OpenGl_FrameStatsPrs.cxx index 86949791c7..066d0f1f59 100644 --- a/src/OpenGl/OpenGl_FrameStatsPrs.cxx +++ b/src/OpenGl/OpenGl_FrameStatsPrs.cxx @@ -454,3 +454,14 @@ void OpenGl_FrameStatsPrs::Render (const Handle(OpenGl_Workspace)& theWorkspace) glDepthMask (wasEnabledDepth ? GL_TRUE : GL_FALSE); } } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_FrameStatsPrs::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_FrameStatsPrs) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) +} diff --git a/src/OpenGl/OpenGl_FrameStatsPrs.hxx b/src/OpenGl/OpenGl_FrameStatsPrs.hxx index 1366879bab..67bcacfa69 100644 --- a/src/OpenGl/OpenGl_FrameStatsPrs.hxx +++ b/src/OpenGl/OpenGl_FrameStatsPrs.hxx @@ -45,6 +45,9 @@ public: //! Assign text aspect. void SetTextAspect (const Handle(Graphic3d_AspectText3d)& theAspect) { myTextAspect.SetAspect (theAspect); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Update chart presentation. diff --git a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx index c2d5b3dc54..b270c6ae03 100755 --- a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx +++ b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx @@ -838,3 +838,14 @@ void OpenGl_GraduatedTrihedron::Axis::Release (OpenGl_Context* theCtx) Line .Release (theCtx); Arrow .Release (theCtx); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_GraduatedTrihedron::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_GraduatedTrihedron) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) +} diff --git a/src/OpenGl/OpenGl_GraduatedTrihedron.hxx b/src/OpenGl/OpenGl_GraduatedTrihedron.hxx index 9e334d8889..f6b8e3149e 100755 --- a/src/OpenGl/OpenGl_GraduatedTrihedron.hxx +++ b/src/OpenGl/OpenGl_GraduatedTrihedron.hxx @@ -47,10 +47,10 @@ public: Standard_EXPORT virtual ~OpenGl_GraduatedTrihedron(); //! Draw the element. - Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const; + Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const Standard_OVERRIDE; //! Release OpenGL resources. - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; //! Setup configuration. Standard_EXPORT void SetValues (const Graphic3d_GraduatedTrihedron& theData); @@ -61,6 +61,9 @@ public: Standard_EXPORT void SetMinMax (const OpenGl_Vec3& theMin, const OpenGl_Vec3& theMax); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: //! Axis of trihedron. It incapsulates geometry and style. diff --git a/src/OpenGl/OpenGl_Group.cxx b/src/OpenGl/OpenGl_Group.cxx index 76af6816f3..9cdd80ac11 100644 --- a/src/OpenGl/OpenGl_Group.cxx +++ b/src/OpenGl/OpenGl_Group.cxx @@ -343,11 +343,17 @@ void OpenGl_Group::Release (const Handle(OpenGl_Context)& theGlCtx) // function : DumpJson // purpose : // ======================================================================= -void OpenGl_Group::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void OpenGl_Group::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Group); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Group); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspects); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsRaytracable); + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Group) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspects) + for (OpenGl_ElementNode* aNode = myFirst; aNode != NULL; aNode = aNode->next) + { + OpenGl_Element* anElement = aNode->elem; + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anElement) + } + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsRaytracable) } diff --git a/src/OpenGl/OpenGl_Group.hxx b/src/OpenGl/OpenGl_Group.hxx index 29e04ec97e..cd76dd2399 100644 --- a/src/OpenGl/OpenGl_Group.hxx +++ b/src/OpenGl/OpenGl_Group.hxx @@ -100,7 +100,7 @@ public: Standard_Boolean IsRaytracable() const { return myIsRaytracable; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/OpenGl/OpenGl_IndexBuffer.cxx b/src/OpenGl/OpenGl_IndexBuffer.cxx index 30cf5f4687..1fa4af997d 100644 --- a/src/OpenGl/OpenGl_IndexBuffer.cxx +++ b/src/OpenGl/OpenGl_IndexBuffer.cxx @@ -35,3 +35,13 @@ GLenum OpenGl_IndexBuffer::GetTarget() const { return GL_ELEMENT_ARRAY_BUFFER; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_IndexBuffer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_VertexBuffer) +} diff --git a/src/OpenGl/OpenGl_IndexBuffer.hxx b/src/OpenGl/OpenGl_IndexBuffer.hxx index 8189677c33..8747047426 100644 --- a/src/OpenGl/OpenGl_IndexBuffer.hxx +++ b/src/OpenGl/OpenGl_IndexBuffer.hxx @@ -25,6 +25,9 @@ public: Standard_EXPORT OpenGl_IndexBuffer(); Standard_EXPORT virtual GLenum GetTarget() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + public: DEFINE_STANDARD_RTTIEXT(OpenGl_IndexBuffer,OpenGl_VertexBuffer) // Type definition diff --git a/src/OpenGl/OpenGl_LayerList.cxx b/src/OpenGl/OpenGl_LayerList.cxx index f639a5840d..bd4708de1f 100644 --- a/src/OpenGl/OpenGl_LayerList.cxx +++ b/src/OpenGl/OpenGl_LayerList.cxx @@ -970,3 +970,23 @@ void OpenGl_LayerList::renderTransparent (const Handle(OpenGl_Workspace)& theW aCtx->core11fwd->glDepthMask (theGlobalSettings.DepthMask); aCtx->core11fwd->glDepthFunc (theGlobalSettings.DepthFunc); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_LayerList::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_LayerList) + + for (NCollection_List::Iterator aLayersIt (myLayers); aLayersIt.More(); aLayersIt.Next()) + { + const Handle(Graphic3d_Layer)& aLayerId = aLayersIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aLayerId.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNbPriorities) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNbStructures) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myImmediateNbStructures) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myModifStateOfRaytraceable) +} diff --git a/src/OpenGl/OpenGl_LayerList.hxx b/src/OpenGl/OpenGl_LayerList.hxx index 07c7701436..c2fc8cf66c 100644 --- a/src/OpenGl/OpenGl_LayerList.hxx +++ b/src/OpenGl/OpenGl_LayerList.hxx @@ -25,6 +25,7 @@ #include #include +class OpenGl_FrameBuffer; class OpenGl_Structure; class OpenGl_Workspace; struct OpenGl_GlobalLayerSettings; @@ -125,6 +126,9 @@ public: //! Assigns BVH tree builder for frustom culling. Standard_EXPORT void SetFrustumCullingBVHBuilder (const Handle(Select3D_BVHBuilder3d)& theBuilder); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: //! Stack of references to existing layers of predefined maximum size. diff --git a/src/OpenGl/OpenGl_MatrixState.hxx b/src/OpenGl/OpenGl_MatrixState.hxx index 00f16d0d09..ef56e6ceb4 100644 --- a/src/OpenGl/OpenGl_MatrixState.hxx +++ b/src/OpenGl/OpenGl_MatrixState.hxx @@ -18,6 +18,7 @@ #include #include +#include //! Software implementation for OpenGL matrix stack. template @@ -84,6 +85,20 @@ public: myCurrent = typename OpenGl::MatrixType::Mat4(); } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + (void)theDepth; + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "myCurrent", 16, + myCurrent.GetValue (0, 0), myCurrent.GetValue (0, 1), myCurrent.GetValue (0, 2), myCurrent.GetValue (0, 3), + myCurrent.GetValue (1, 0), myCurrent.GetValue (1, 1), myCurrent.GetValue (1, 2), myCurrent.GetValue (1, 3), + myCurrent.GetValue (2, 0), myCurrent.GetValue (2, 1), myCurrent.GetValue (2, 2), myCurrent.GetValue (2, 3), + myCurrent.GetValue (3, 0), myCurrent.GetValue (3, 1), myCurrent.GetValue (3, 2), myCurrent.GetValue (3, 3)) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myStack.Size()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myStackHead) + } + private: NCollection_Vector::Mat4> myStack; //!< Collection used to maintenance matrix stack diff --git a/src/OpenGl/OpenGl_PrimitiveArray.cxx b/src/OpenGl/OpenGl_PrimitiveArray.cxx index 9bb3274c77..d7ec29ffc9 100644 --- a/src/OpenGl/OpenGl_PrimitiveArray.cxx +++ b/src/OpenGl/OpenGl_PrimitiveArray.cxx @@ -1129,3 +1129,26 @@ void OpenGl_PrimitiveArray::InitBuffers (const Handle(OpenGl_Context)& th setDrawMode (theType); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_PrimitiveArray::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_PrimitiveArray) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myVboIndices.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myVboAttribs.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myIndices.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAttribs.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myBounds.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsFillType) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsVboInit) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUID) +} diff --git a/src/OpenGl/OpenGl_PrimitiveArray.hxx b/src/OpenGl/OpenGl_PrimitiveArray.hxx index dc4a066010..7d0c178f03 100644 --- a/src/OpenGl/OpenGl_PrimitiveArray.hxx +++ b/src/OpenGl/OpenGl_PrimitiveArray.hxx @@ -99,6 +99,9 @@ public: //! Returns attributes VBO. const Handle(OpenGl_VertexBuffer)& AttributesVbo() const { return myVboAttribs; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! VBO initialization procedures diff --git a/src/OpenGl/OpenGl_Resource.hxx b/src/OpenGl/OpenGl_Resource.hxx index 452e0182f4..cb664f5d87 100644 --- a/src/OpenGl/OpenGl_Resource.hxx +++ b/src/OpenGl/OpenGl_Resource.hxx @@ -48,6 +48,10 @@ public: //! Returns estimated GPU memory usage for holding data without considering overheads and allocation alignment rules. virtual Standard_Size EstimatedDataSize() const = 0; + //! Dumps the content of me into the stream + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { (void)theOStream; (void)theDepth; }; + private: //! Copy should be performed only within Handles! diff --git a/src/OpenGl/OpenGl_StencilTest.cxx b/src/OpenGl/OpenGl_StencilTest.cxx index ba5dab14a4..12af1e30a4 100755 --- a/src/OpenGl/OpenGl_StencilTest.cxx +++ b/src/OpenGl/OpenGl_StencilTest.cxx @@ -15,6 +15,7 @@ #include #include +#include OpenGl_StencilTest::OpenGl_StencilTest() { @@ -64,3 +65,15 @@ OpenGl_StencilTest::~OpenGl_StencilTest() { // } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_StencilTest::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_StencilTest) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsEnabled) +} diff --git a/src/OpenGl/OpenGl_StencilTest.hxx b/src/OpenGl/OpenGl_StencilTest.hxx index 5fd10e2cfb..3eef405db1 100755 --- a/src/OpenGl/OpenGl_StencilTest.hxx +++ b/src/OpenGl/OpenGl_StencilTest.hxx @@ -26,12 +26,15 @@ public: Standard_EXPORT OpenGl_StencilTest (); //! Render primitives to the window - Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const; + Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const Standard_OVERRIDE; - Standard_EXPORT virtual void Release (OpenGl_Context* theContext); + Standard_EXPORT virtual void Release (OpenGl_Context* theContext) Standard_OVERRIDE; Standard_EXPORT void SetOptions (const Standard_Boolean theIsEnabled); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Destructor diff --git a/src/OpenGl/OpenGl_Structure.cxx b/src/OpenGl/OpenGl_Structure.cxx index fdc8f36f37..b9a9f9a9e4 100644 --- a/src/OpenGl/OpenGl_Structure.cxx +++ b/src/OpenGl/OpenGl_Structure.cxx @@ -639,3 +639,20 @@ Handle(Graphic3d_CStructure) OpenGl_Structure::ShadowLink (const Handle(Graphic3 { return new OpenGl_StructureShadow (theManager, this); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void OpenGl_Structure::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_CStructure) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myInstancedStructure) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsRaytracable) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myModificationState) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsMirrored) +} diff --git a/src/OpenGl/OpenGl_Structure.hxx b/src/OpenGl/OpenGl_Structure.hxx index d09215b5d0..7efa12953f 100644 --- a/src/OpenGl/OpenGl_Structure.hxx +++ b/src/OpenGl/OpenGl_Structure.hxx @@ -128,6 +128,9 @@ public: //! Update render transformation matrix. Standard_EXPORT virtual void updateLayerTransformation() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: Standard_EXPORT virtual ~OpenGl_Structure(); diff --git a/src/OpenGl/OpenGl_Text.cxx b/src/OpenGl/OpenGl_Text.cxx index f04c0c0421..d2c0cc6eec 100644 --- a/src/OpenGl/OpenGl_Text.cxx +++ b/src/OpenGl/OpenGl_Text.cxx @@ -833,3 +833,23 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx, theCtx->WorldViewState.Pop(); theCtx->ApplyModelViewMatrix(); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_Text::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Text) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextures.Size()) + + for (NCollection_Vector::Iterator aCrdsIt (myTCrdsVbo); aCrdsIt.More(); aCrdsIt.Next()) + { + const Handle(OpenGl_VertexBuffer)& aVertexBuffer = aCrdsIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aVertexBuffer.get()) + } + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) +} diff --git a/src/OpenGl/OpenGl_Text.hxx b/src/OpenGl/OpenGl_Text.hxx index 47b12d11ec..01eab00336 100755 --- a/src/OpenGl/OpenGl_Text.hxx +++ b/src/OpenGl/OpenGl_Text.hxx @@ -65,8 +65,8 @@ public: Standard_EXPORT void SetFontSize (const Handle(OpenGl_Context)& theContext, const Standard_Integer theFontSize); - Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const; - Standard_EXPORT virtual void Release (OpenGl_Context* theContext); + Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const Standard_OVERRIDE; + Standard_EXPORT virtual void Release (OpenGl_Context* theContext) Standard_OVERRIDE; public: //! @name methods for compatibility with layers @@ -100,6 +100,9 @@ public: //! @name methods for compatibility with layers const OpenGl_Aspects& theTextAspect, unsigned int theResolution = Graphic3d_RenderingParams::THE_DEFAULT_RESOLUTION) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + //! @name obsolete methods public: diff --git a/src/OpenGl/OpenGl_VertexBuffer.cxx b/src/OpenGl/OpenGl_VertexBuffer.cxx index 560ccebd66..1727817753 100644 --- a/src/OpenGl/OpenGl_VertexBuffer.cxx +++ b/src/OpenGl/OpenGl_VertexBuffer.cxx @@ -250,3 +250,21 @@ void OpenGl_VertexBuffer::unbindFixedColor (const Handle(OpenGl_Context)& theCtx theCtx->ShaderManager()->UpdateMaterialState(); } #endif + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_VertexBuffer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Resource) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, GetTarget()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myOffset) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBufferId) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myComponentsNb) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myElemsNb) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDataType) +} diff --git a/src/OpenGl/OpenGl_VertexBuffer.hxx b/src/OpenGl/OpenGl_VertexBuffer.hxx index 5f259ef7c0..72f72327b1 100644 --- a/src/OpenGl/OpenGl_VertexBuffer.hxx +++ b/src/OpenGl/OpenGl_VertexBuffer.hxx @@ -336,6 +336,9 @@ public: //! @name methods for interleaved attributes array //! Unbind all vertex attributes. Default implementation does nothing. Standard_EXPORT virtual void UnbindAllAttributes (const Handle(OpenGl_Context)& theGlCtx) const; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: GLubyte* myOffset; //!< offset to data diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx index 476d529fee..56170b4fc5 100644 --- a/src/OpenGl/OpenGl_Workspace.cxx +++ b/src/OpenGl/OpenGl_Workspace.cxx @@ -446,3 +446,30 @@ bool OpenGl_Workspace::ShouldRender (const OpenGl_Element* theElement) } return true; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void OpenGl_Workspace::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUseZBuffer) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUseDepthWrite) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myNoneCulling) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myFrontCulling) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNbSkippedTranspElems) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myRenderFilter) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myDefaultAspects) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspectsSet) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspectsApplied.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToAllowFaceCulling) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myAspectFaceHl) +} diff --git a/src/OpenGl/OpenGl_Workspace.hxx b/src/OpenGl/OpenGl_Workspace.hxx index 6b8b6b696c..5b1b8ada13 100644 --- a/src/OpenGl/OpenGl_Workspace.hxx +++ b/src/OpenGl/OpenGl_Workspace.hxx @@ -205,6 +205,9 @@ public: //! Returns environment texture. const Handle(OpenGl_TextureSet)& EnvironmentTexture() const { return myEnvironmentTexture; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: //! @name protected fields OpenGl_View* myView; diff --git a/src/Poly/Poly_Polygon2D.cxx b/src/Poly/Poly_Polygon2D.cxx index a83fab407f..9d7af7bbea 100644 --- a/src/Poly/Poly_Polygon2D.cxx +++ b/src/Poly/Poly_Polygon2D.cxx @@ -41,3 +41,15 @@ Poly_Polygon2D::Poly_Polygon2D(const TColgp_Array1OfPnt2d& Nodes): for (i = Nodes.Lower(); i <= Nodes.Upper(); i++) myNodes(j++) = Nodes(i); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Poly_Polygon2D::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeflection) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNodes.Size()) +} diff --git a/src/Poly/Poly_Polygon2D.hxx b/src/Poly/Poly_Polygon2D.hxx index 9a91fdefcf..ee3122004e 100644 --- a/src/Poly/Poly_Polygon2D.hxx +++ b/src/Poly/Poly_Polygon2D.hxx @@ -74,6 +74,9 @@ public: //! Returns the table of nodes for this polygon. TColgp_Array1OfPnt2d& ChangeNodes() { return myNodes; } + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; DEFINE_STANDARD_RTTIEXT(Poly_Polygon2D,Standard_Transient) diff --git a/src/Poly/Poly_Polygon3D.cxx b/src/Poly/Poly_Polygon3D.cxx index b7deae9bc9..c7a2c99f4e 100644 --- a/src/Poly/Poly_Polygon3D.cxx +++ b/src/Poly/Poly_Polygon3D.cxx @@ -81,3 +81,17 @@ Handle(Poly_Polygon3D) Poly_Polygon3D::Copy() const aCopy->Deflection(myDeflection); return aCopy; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Poly_Polygon3D::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeflection) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNodes.Size()) + if (!myParameters.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myParameters->Size()) +} diff --git a/src/Poly/Poly_Polygon3D.hxx b/src/Poly/Poly_Polygon3D.hxx index e91f930a00..a241fdc7b0 100644 --- a/src/Poly/Poly_Polygon3D.hxx +++ b/src/Poly/Poly_Polygon3D.hxx @@ -88,6 +88,9 @@ public: //! the data structure of this polygon. TColStd_Array1OfReal& ChangeParameters() const { return myParameters->ChangeArray1(); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(Poly_Polygon3D,Standard_Transient) private: diff --git a/src/Poly/Poly_PolygonOnTriangulation.cxx b/src/Poly/Poly_PolygonOnTriangulation.cxx index 5dfaee96b8..19a0052372 100644 --- a/src/Poly/Poly_PolygonOnTriangulation.cxx +++ b/src/Poly/Poly_PolygonOnTriangulation.cxx @@ -15,6 +15,7 @@ // commercial license or contractual agreement. #include +#include IMPLEMENT_STANDARD_RTTIEXT(Poly_PolygonOnTriangulation,Standard_Transient) @@ -91,3 +92,17 @@ void Poly_PolygonOnTriangulation::SetParameters (const Handle(TColStd_HArray1OfR } myParameters = theParameters; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Poly_PolygonOnTriangulation::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeflection) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNodes.Size()) + if (!myParameters.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myParameters->Size()) +} diff --git a/src/Poly/Poly_PolygonOnTriangulation.hxx b/src/Poly/Poly_PolygonOnTriangulation.hxx index a95e6d2440..1ab2dc7e9b 100644 --- a/src/Poly/Poly_PolygonOnTriangulation.hxx +++ b/src/Poly/Poly_PolygonOnTriangulation.hxx @@ -104,6 +104,9 @@ public: //! Raises exception if array size doesn't much number of polygon nodes. Standard_EXPORT void SetParameters (const Handle(TColStd_HArray1OfReal)& theParameters); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(Poly_PolygonOnTriangulation,Standard_Transient) private: diff --git a/src/Poly/Poly_Triangulation.cxx b/src/Poly/Poly_Triangulation.cxx index 3a361d076a..b367b5a37d 100644 --- a/src/Poly/Poly_Triangulation.cxx +++ b/src/Poly/Poly_Triangulation.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -309,3 +310,21 @@ gp_Dir Poly_Triangulation::Normal (const Standard_Integer theIndex) const return N; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Poly_Triangulation::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeflection) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNodes.Size()) + if (!myUVNodes.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUVNodes->Size()) + if (!myNormals.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myNormals->Size()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTriangles.Size()) +} diff --git a/src/Poly/Poly_Triangulation.hxx b/src/Poly/Poly_Triangulation.hxx index a92e85ddca..0465962bba 100644 --- a/src/Poly/Poly_Triangulation.hxx +++ b/src/Poly/Poly_Triangulation.hxx @@ -196,6 +196,9 @@ public: Standard_EXPORT void SetNormal (const Standard_Integer theIndex, const gp_Dir& theNormal); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: Standard_Real myDeflection; diff --git a/src/Prs3d/Prs3d_ArrowAspect.cxx b/src/Prs3d/Prs3d_ArrowAspect.cxx index f799aeb34a..130d868900 100644 --- a/src/Prs3d/Prs3d_ArrowAspect.cxx +++ b/src/Prs3d/Prs3d_ArrowAspect.cxx @@ -71,11 +71,11 @@ void Prs3d_ArrowAspect::SetAngle (const Standard_Real theAngle) // function : DumpJson // purpose : // ======================================================================= -void Prs3d_ArrowAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_ArrowAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_ArrowAspect); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAngle); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLength); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLength) } diff --git a/src/Prs3d/Prs3d_ArrowAspect.hxx b/src/Prs3d/Prs3d_ArrowAspect.hxx index 7aeb351a51..f63e59a417 100644 --- a/src/Prs3d/Prs3d_ArrowAspect.hxx +++ b/src/Prs3d/Prs3d_ArrowAspect.hxx @@ -58,7 +58,7 @@ public: void SetAspect (const Handle(Graphic3d_AspectLine3d)& theAspect) { myArrowAspect = theAspect; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/Prs3d/Prs3d_BasicAspect.hxx b/src/Prs3d/Prs3d_BasicAspect.hxx index 604b53dacf..c93f9db328 100644 --- a/src/Prs3d/Prs3d_BasicAspect.hxx +++ b/src/Prs3d/Prs3d_BasicAspect.hxx @@ -28,7 +28,7 @@ class Prs3d_BasicAspect : public Standard_Transient DEFINE_STANDARD_RTTIEXT(Prs3d_BasicAspect, Standard_Transient) //! Dumps the content of me into the stream - virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const = 0; + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const = 0; }; diff --git a/src/Prs3d/Prs3d_DatumAspect.cxx b/src/Prs3d/Prs3d_DatumAspect.cxx index 1552124c2e..db7b7e1569 100644 --- a/src/Prs3d/Prs3d_DatumAspect.cxx +++ b/src/Prs3d/Prs3d_DatumAspect.cxx @@ -174,16 +174,15 @@ Prs3d_DatumParts Prs3d_DatumAspect::ArrowPartForAxis (Prs3d_DatumParts thePart) // function : DumpJson // purpose : // ======================================================================= -void Prs3d_DatumAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_DatumAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_DatumAspect); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPointAspect.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPointAspect.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAxes); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawLabels); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawArrows); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAxes) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawLabels) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDrawArrows) } - diff --git a/src/Prs3d/Prs3d_DatumAspect.hxx b/src/Prs3d/Prs3d_DatumAspect.hxx index 3bb247c2a2..d739c79f0b 100644 --- a/src/Prs3d/Prs3d_DatumAspect.hxx +++ b/src/Prs3d/Prs3d_DatumAspect.hxx @@ -154,7 +154,7 @@ public: Standard_EXPORT Prs3d_DatumParts ArrowPartForAxis (Prs3d_DatumParts thePart) 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; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: Prs3d_DatumAxes myAxes; diff --git a/src/Prs3d/Prs3d_DimensionAspect.cxx b/src/Prs3d/Prs3d_DimensionAspect.cxx index 46aaa318c6..5610ea7542 100755 --- a/src/Prs3d/Prs3d_DimensionAspect.cxx +++ b/src/Prs3d/Prs3d_DimensionAspect.cxx @@ -65,23 +65,22 @@ void Prs3d_DimensionAspect::SetCommonColor (const Quantity_Color& theColor) // function : DumpJson // purpose : // ======================================================================= -void Prs3d_DimensionAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_DimensionAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_DimensionAspect); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myLineAspect.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myLineAspect.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValueStringFormat); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myExtensionSize); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowTailSize); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowOrientation); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextHPosition); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextVPosition); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDisplayUnits); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsText3d); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsTextShaded); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsArrows3d); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValueStringFormat) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myExtensionSize) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowTailSize) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowOrientation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextHPosition) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTextVPosition) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDisplayUnits) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsText3d) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsTextShaded) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsArrows3d) } - diff --git a/src/Prs3d/Prs3d_DimensionAspect.hxx b/src/Prs3d/Prs3d_DimensionAspect.hxx index 9f90573eb4..2bb8e18493 100644 --- a/src/Prs3d/Prs3d_DimensionAspect.hxx +++ b/src/Prs3d/Prs3d_DimensionAspect.hxx @@ -116,7 +116,7 @@ public: const TCollection_AsciiString& ValueStringFormat() const { return myValueStringFormat; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/Prs3d/Prs3d_Drawer.cxx b/src/Prs3d/Prs3d_Drawer.cxx index 92858a2198..eb20c50e63 100644 --- a/src/Prs3d/Prs3d_Drawer.cxx +++ b/src/Prs3d/Prs3d_Drawer.cxx @@ -1415,8 +1415,91 @@ bool Prs3d_Drawer::SetShadingModel (Graphic3d_TypeOfShadingModel theModel, // function : DumpJson // purpose : // ======================================================================= -void Prs3d_Drawer::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_Drawer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_Drawer); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myShadingAspect.get()); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myLink.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnNbPoints) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMaximalParameterValue) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnMaximalParameterValue) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myChordialDeviation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnChordialDeviation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTypeOfDeflection) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnTypeOfDeflection) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTypeOfHLR) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeviationCoefficient) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPreviousDeviationCoefficient) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDeviationCoefficient) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHLRDeviationCoefficient) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnHLRDeviationCoefficient) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPreviousHLRDeviationCoefficient) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeviationAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDeviationAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPreviousDeviationAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHLRAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnHLRDeviationAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPreviousHLRDeviationAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsoOnPlane) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnIsoOnPlane) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsoOnTriangulation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnIsoOnTriangulation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsAutoTriangulated) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnIsAutoTriangulated) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnUIsoAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnVIsoAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnWireAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myWireDraw) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnWireDraw) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnPointAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnLineAspect) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myShadingAspect.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnShadingAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnPlaneAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnSeenLineAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnArrowAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLineArrowDraw) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnLineArrowDraw) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnHiddenLineAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawHiddenLine) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDrawHiddenLine) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnVectorAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVertexDrawMode) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDatumAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnSectionAspect) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnFreeBoundaryAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFreeBoundaryDraw) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnFreeBoundaryDraw) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnUnFreeBoundaryAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUnFreeBoundaryDraw) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnUnFreeBoundaryDraw) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFaceBoundaryUpperContinuity) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnFaceBoundaryAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFaceBoundaryDraw) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnFaceBoundaryDraw) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDimensionAspect) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDimLengthModelUnits) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDimAngleModelUnits) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDimLengthDisplayUnits) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDimAngleDisplayUnits) } diff --git a/src/Prs3d/Prs3d_Drawer.hxx b/src/Prs3d/Prs3d_Drawer.hxx index 967b11834b..87030ccc2b 100644 --- a/src/Prs3d/Prs3d_Drawer.hxx +++ b/src/Prs3d/Prs3d_Drawer.hxx @@ -892,7 +892,7 @@ public: bool theToOverrideDefaults = false); //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const 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/Prs3d/Prs3d_LineAspect.cxx b/src/Prs3d/Prs3d_LineAspect.cxx index adbe48fd59..90d052327a 100644 --- a/src/Prs3d/Prs3d_LineAspect.cxx +++ b/src/Prs3d/Prs3d_LineAspect.cxx @@ -34,9 +34,8 @@ Prs3d_LineAspect::Prs3d_LineAspect (const Quantity_Color& theColor, // function : DumpJson // purpose : // ======================================================================= -void Prs3d_LineAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_LineAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_LineAspect); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()) } - diff --git a/src/Prs3d/Prs3d_LineAspect.hxx b/src/Prs3d/Prs3d_LineAspect.hxx index e6e61d7626..99c2b2cb7e 100644 --- a/src/Prs3d/Prs3d_LineAspect.hxx +++ b/src/Prs3d/Prs3d_LineAspect.hxx @@ -64,7 +64,7 @@ public: void SetAspect (const Handle(Graphic3d_AspectLine3d)& theAspect) { myAspect = theAspect; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/Prs3d/Prs3d_PlaneAspect.cxx b/src/Prs3d/Prs3d_PlaneAspect.cxx index 4f6b8eb98b..5b3e158b30 100644 --- a/src/Prs3d/Prs3d_PlaneAspect.cxx +++ b/src/Prs3d/Prs3d_PlaneAspect.cxx @@ -44,23 +44,22 @@ Prs3d_PlaneAspect::Prs3d_PlaneAspect() // function : DumpJson // purpose : // ======================================================================= -void Prs3d_PlaneAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_PlaneAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_PlaneAspect); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myEdgesAspect.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myIsoAspect.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myEdgesAspect.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myIsoAspect.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myArrowAspect.get()) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowsLength); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowsSize); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowsAngle); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPlaneXLength); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPlaneYLength); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsoDistance); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawCenterArrow); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawEdgesArrows); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawEdges); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawIso); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowsLength) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowsSize) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArrowsAngle) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPlaneXLength) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPlaneYLength) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsoDistance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawCenterArrow) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawEdgesArrows) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawEdges) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDrawIso) } - diff --git a/src/Prs3d/Prs3d_PlaneAspect.hxx b/src/Prs3d/Prs3d_PlaneAspect.hxx index 35e3f6d056..0e0ecff2f6 100644 --- a/src/Prs3d/Prs3d_PlaneAspect.hxx +++ b/src/Prs3d/Prs3d_PlaneAspect.hxx @@ -97,7 +97,7 @@ public: Standard_Real IsoDistance() const { return myIsoDistance; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/Prs3d/Prs3d_PointAspect.cxx b/src/Prs3d/Prs3d_PointAspect.cxx index e3587a5fcd..f176305ac6 100644 --- a/src/Prs3d/Prs3d_PointAspect.cxx +++ b/src/Prs3d/Prs3d_PointAspect.cxx @@ -47,9 +47,8 @@ Prs3d_PointAspect::Prs3d_PointAspect (const Quantity_Color& theColor, // function : DumpJson // purpose : // ======================================================================= -void Prs3d_PointAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_PointAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_PointAspect); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()) } - diff --git a/src/Prs3d/Prs3d_PointAspect.hxx b/src/Prs3d/Prs3d_PointAspect.hxx index 0c0150b1a1..d3074e94e8 100644 --- a/src/Prs3d/Prs3d_PointAspect.hxx +++ b/src/Prs3d/Prs3d_PointAspect.hxx @@ -62,7 +62,7 @@ public: const Handle(Graphic3d_MarkerImage)& GetTexture() const { return myAspect->GetMarkerImage(); } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/Prs3d/Prs3d_PresentationShadow.cxx b/src/Prs3d/Prs3d_PresentationShadow.cxx index ab7d417b22..ebd5b3afbb 100644 --- a/src/Prs3d/Prs3d_PresentationShadow.cxx +++ b/src/Prs3d/Prs3d_PresentationShadow.cxx @@ -38,3 +38,17 @@ void Prs3d_PresentationShadow::CalculateBoundBox() { // } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Prs3d_PresentationShadow::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Structure) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myParentAffinity.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myParentStructId) +} diff --git a/src/Prs3d/Prs3d_PresentationShadow.hxx b/src/Prs3d/Prs3d_PresentationShadow.hxx index bf68cdcb0c..124d041fae 100644 --- a/src/Prs3d/Prs3d_PresentationShadow.hxx +++ b/src/Prs3d/Prs3d_PresentationShadow.hxx @@ -37,6 +37,9 @@ public: //! Do nothing - axis-aligned bounding box should be initialized from parent structure. Standard_EXPORT virtual void CalculateBoundBox() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: Handle(Graphic3d_ViewAffinity) myParentAffinity; diff --git a/src/Prs3d/Prs3d_ShadingAspect.cxx b/src/Prs3d/Prs3d_ShadingAspect.cxx index b1084922aa..611bb8ac7b 100644 --- a/src/Prs3d/Prs3d_ShadingAspect.cxx +++ b/src/Prs3d/Prs3d_ShadingAspect.cxx @@ -174,9 +174,9 @@ Standard_Real Prs3d_ShadingAspect::Transparency (const Aspect_TypeOfFacingModel // function : DumpJson // purpose : // ======================================================================= -void Prs3d_ShadingAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_ShadingAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_ShadingAspect); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get()) } diff --git a/src/Prs3d/Prs3d_ShadingAspect.hxx b/src/Prs3d/Prs3d_ShadingAspect.hxx index 202a4b740f..b51c29b4c5 100644 --- a/src/Prs3d/Prs3d_ShadingAspect.hxx +++ b/src/Prs3d/Prs3d_ShadingAspect.hxx @@ -63,7 +63,7 @@ public: void SetAspect (const Handle(Graphic3d_AspectFillArea3d)& theAspect) { myAspect = theAspect; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/Prs3d/Prs3d_TextAspect.cxx b/src/Prs3d/Prs3d_TextAspect.cxx index 3614473b31..3ff268d0bf 100644 --- a/src/Prs3d/Prs3d_TextAspect.cxx +++ b/src/Prs3d/Prs3d_TextAspect.cxx @@ -53,15 +53,14 @@ Prs3d_TextAspect::Prs3d_TextAspect (const Handle(Graphic3d_AspectText3d)& theAsp // function : DumpJson // purpose : // ======================================================================= -void Prs3d_TextAspect::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Prs3d_TextAspect::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Prs3d_TextAspect); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTextAspect.get()) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHeight); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHorizontalJustification); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVerticalJustification); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOrientation); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHeight) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHorizontalJustification) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVerticalJustification) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOrientation) } - diff --git a/src/Prs3d/Prs3d_TextAspect.hxx b/src/Prs3d/Prs3d_TextAspect.hxx index 185a37f21f..2fc811112b 100644 --- a/src/Prs3d/Prs3d_TextAspect.hxx +++ b/src/Prs3d/Prs3d_TextAspect.hxx @@ -98,7 +98,7 @@ public: void SetAspect (const Handle(Graphic3d_AspectText3d)& theAspect) { myTextAspect = theAspect; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/PrsMgr/PrsMgr_PresentableObject.cxx b/src/PrsMgr/PrsMgr_PresentableObject.cxx index 1322d5c8b4..64d689a0e3 100644 --- a/src/PrsMgr/PrsMgr_PresentableObject.cxx +++ b/src/PrsMgr/PrsMgr_PresentableObject.cxx @@ -842,17 +842,48 @@ void PrsMgr_PresentableObject::PolygonOffsets (Standard_Integer& theMode, // function : DumpJson // purpose : // ======================================================================= -void PrsMgr_PresentableObject::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void PrsMgr_PresentableObject::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, PrsMgr_PresentableObject); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myParent); + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myParent) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOwnWidth); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, hasOwnColor); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, hasOwnMaterial); + for (PrsMgr_Presentations::Iterator anIterator (myPresentations); anIterator.More(); anIterator.Next()) + { + const Handle(PrsMgr_Presentation)& aPresentation = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aPresentation.get()) + } - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myInfiniteState); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsMutable); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnPresentations); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myClipPlanes.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDrawer.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myHilightDrawer.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDynHilightDrawer.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTransformPersistence.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myLocalTransformation.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTransformation.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myCombinedParentTransform.get()) + + for (PrsMgr_ListOfPresentableObjects::Iterator anIterator (myChildren); anIterator.More(); anIterator.Next()) + { + const Handle(PrsMgr_PresentableObject)& aChildObject = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aChildObject.get()) + } + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myInvTransformation) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTypeOfPresentation3d) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurrentFacingModel) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOwnWidth) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, hasOwnColor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, hasOwnMaterial) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myInfiniteState) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsMutable) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnPresentations) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToPropagateVisualState) } diff --git a/src/PrsMgr/PrsMgr_PresentableObject.hxx b/src/PrsMgr/PrsMgr_PresentableObject.hxx index 5d657189ee..6fda97c954 100644 --- a/src/PrsMgr/PrsMgr_PresentableObject.hxx +++ b/src/PrsMgr/PrsMgr_PresentableObject.hxx @@ -480,7 +480,7 @@ public: //! @name simplified presentation properties API Standard_EXPORT virtual void UnsetAttributes(); //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; public: //! @name deprecated methods diff --git a/src/PrsMgr/PrsMgr_Presentation.cxx b/src/PrsMgr/PrsMgr_Presentation.cxx index 190fc3b7e3..fe14f583e0 100644 --- a/src/PrsMgr/PrsMgr_Presentation.cxx +++ b/src/PrsMgr/PrsMgr_Presentation.cxx @@ -263,3 +263,19 @@ PrsMgr_Presentation::~PrsMgr_Presentation() { Erase(); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void PrsMgr_Presentation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Structure) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myPresentableObject) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBeforeHighlightState) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMustBeUpdated) +} diff --git a/src/PrsMgr/PrsMgr_Presentation.hxx b/src/PrsMgr/PrsMgr_Presentation.hxx index b91c2802c5..85763463b4 100644 --- a/src/PrsMgr/PrsMgr_Presentation.hxx +++ b/src/PrsMgr/PrsMgr_Presentation.hxx @@ -80,6 +80,9 @@ public: //! Compute structure using presentation manager. Standard_EXPORT virtual void Compute() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Main constructor. diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 7a25f78b30..9c88619e13 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -2230,6 +2230,13 @@ public: return new XmlDrivers_DocumentStorageDriver ("Test"); } virtual Standard_CString ResourcesName() Standard_OVERRIDE { return ""; } + + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const + { + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application) + } }; //======================================================================= diff --git a/src/Quantity/Quantity_Color.cxx b/src/Quantity/Quantity_Color.cxx index c059e10397..d61a6097d1 100644 --- a/src/Quantity/Quantity_Color.cxx +++ b/src/Quantity/Quantity_Color.cxx @@ -605,8 +605,7 @@ void Quantity_Color::Test() //function : DumpJson //purpose : //======================================================================= -void Quantity_Color::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void Quantity_Color::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Quantity_Color); OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "RGB", 3, myRgb.r(), myRgb.g(), myRgb.b()) } diff --git a/src/Quantity/Quantity_Color.hxx b/src/Quantity/Quantity_Color.hxx index 6fcfe73b29..a413e2f23d 100644 --- a/src/Quantity/Quantity_Color.hxx +++ b/src/Quantity/Quantity_Color.hxx @@ -343,7 +343,7 @@ public: Standard_EXPORT static void Test(); //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; private: diff --git a/src/Quantity/Quantity_ColorRGBA.cxx b/src/Quantity/Quantity_ColorRGBA.cxx index 10ad6164ac..80016d8b7e 100644 --- a/src/Quantity/Quantity_ColorRGBA.cxx +++ b/src/Quantity/Quantity_ColorRGBA.cxx @@ -204,10 +204,7 @@ bool Quantity_ColorRGBA::ColorFromHex (const char* const theHexColorString, //function : DumpJson //purpose : //======================================================================= -void Quantity_ColorRGBA::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void Quantity_ColorRGBA::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, Quantity_ColorRGBA); - - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myRgb); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlpha); + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "RGBA", 4, myRgb.Red(), myRgb.Green(), myRgb.Blue(), myAlpha) } diff --git a/src/Quantity/Quantity_ColorRGBA.hxx b/src/Quantity/Quantity_ColorRGBA.hxx index 9b55587792..bf4e47b211 100644 --- a/src/Quantity/Quantity_ColorRGBA.hxx +++ b/src/Quantity/Quantity_ColorRGBA.hxx @@ -156,7 +156,7 @@ public: public: //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; private: diff --git a/src/Select3D/Select3D_InteriorSensitivePointSet.cxx b/src/Select3D/Select3D_InteriorSensitivePointSet.cxx index 80640779bd..564e3f7995 100644 --- a/src/Select3D/Select3D_InteriorSensitivePointSet.cxx +++ b/src/Select3D/Select3D_InteriorSensitivePointSet.cxx @@ -323,3 +323,15 @@ Standard_Integer Select3D_InteriorSensitivePointSet::NbSubElements() const { return myPlanarPolygons.Length(); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Select3D_InteriorSensitivePointSet::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) +} diff --git a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx index 614fce9ca0..a43040509d 100644 --- a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx +++ b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx @@ -70,6 +70,9 @@ public: //! Returns the amount of points in set Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Select3D_InteriorSensitivePointSet,Select3D_SensitiveSet) protected: diff --git a/src/Select3D/Select3D_SensitiveBox.cxx b/src/Select3D/Select3D_SensitiveBox.cxx index 989e127fe2..a9bc457d96 100644 --- a/src/Select3D/Select3D_SensitiveBox.cxx +++ b/src/Select3D/Select3D_SensitiveBox.cxx @@ -120,3 +120,15 @@ Select3D_BndBox3d Select3D_SensitiveBox::BoundingBox() { return myBox; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitiveBox::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveEntity) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBox) +} diff --git a/src/Select3D/Select3D_SensitiveBox.hxx b/src/Select3D/Select3D_SensitiveBox.hxx index c2a578d5ed..ac5264f25f 100644 --- a/src/Select3D/Select3D_SensitiveBox.hxx +++ b/src/Select3D/Select3D_SensitiveBox.hxx @@ -70,6 +70,9 @@ public: //! transformation is set, it will be applied Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: Select3D_BndBox3d myBox; //!< 3d coordinates of box corners diff --git a/src/Select3D/Select3D_SensitiveEntity.cxx b/src/Select3D/Select3D_SensitiveEntity.cxx index c9550a6b24..95d94d6300 100644 --- a/src/Select3D/Select3D_SensitiveEntity.cxx +++ b/src/Select3D/Select3D_SensitiveEntity.cxx @@ -30,3 +30,26 @@ Select3D_SensitiveEntity::Select3D_SensitiveEntity (const Handle(SelectMgr_Entit { // } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitiveEntity::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myOwnerId.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySFactor) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, NbSubElements()); + + gp_Pnt aCenterOfGeometry = CenterOfGeometry(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aCenterOfGeometry) + + Standard_Boolean aHasInitLocation = HasInitLocation(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aHasInitLocation) + + gp_GTrsf anInvInitLocation = InvInitLocation(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &anInvInitLocation) +} diff --git a/src/Select3D/Select3D_SensitiveEntity.hxx b/src/Select3D/Select3D_SensitiveEntity.hxx index b19cd5dfca..19b039eafd 100644 --- a/src/Select3D/Select3D_SensitiveEntity.hxx +++ b/src/Select3D/Select3D_SensitiveEntity.hxx @@ -91,6 +91,9 @@ public: //! Otherwise, returns identity matrix. virtual gp_GTrsf InvInitLocation() const { return gp_GTrsf(); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: Standard_EXPORT Select3D_SensitiveEntity (const Handle(SelectMgr_EntityOwner)& theOwnerId); diff --git a/src/Select3D/Select3D_SensitiveFace.cxx b/src/Select3D/Select3D_SensitiveFace.cxx index 710a6546a0..4312780322 100644 --- a/src/Select3D/Select3D_SensitiveFace.cxx +++ b/src/Select3D/Select3D_SensitiveFace.cxx @@ -143,3 +143,16 @@ Standard_Integer Select3D_SensitiveFace::NbSubElements() const { return myFacePoints->NbSubElements(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitiveFace::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveEntity) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensType) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myFacePoints.get()) +} diff --git a/src/Select3D/Select3D_SensitiveFace.hxx b/src/Select3D/Select3D_SensitiveFace.hxx index b4075425ec..b8d7ca5436 100644 --- a/src/Select3D/Select3D_SensitiveFace.hxx +++ b/src/Select3D/Select3D_SensitiveFace.hxx @@ -73,6 +73,9 @@ public: //! Returns the amount of sub-entities (points or planar convex polygons) Standard_EXPORT virtual Standard_Integer NbSubElements() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: Select3D_TypeOfSensitivity mySensType; //!< Type of sensitivity: interior or boundary diff --git a/src/Select3D/Select3D_SensitiveGroup.cxx b/src/Select3D/Select3D_SensitiveGroup.cxx index 85fce6b7ce..a89fd931bf 100644 --- a/src/Select3D/Select3D_SensitiveGroup.cxx +++ b/src/Select3D/Select3D_SensitiveGroup.cxx @@ -361,3 +361,24 @@ Standard_Real Select3D_SensitiveGroup::distanceToCOG (SelectBasics_SelectingVolu { return theMgr.DistToGeometryCenter (CenterOfGeometry()); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Select3D_SensitiveGroup::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet) + + for (Select3D_IndexedMapOfEntity::Iterator anIterator (myEntities); anIterator.More(); anIterator.Next()) + { + const Handle(Select3D_SensitiveEntity)& anEntity = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anEntity.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMustMatchAll) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToCheckOverlapAll) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) +} diff --git a/src/Select3D/Select3D_SensitiveGroup.hxx b/src/Select3D/Select3D_SensitiveGroup.hxx index a2194af278..460600f2ff 100644 --- a/src/Select3D/Select3D_SensitiveGroup.hxx +++ b/src/Select3D/Select3D_SensitiveGroup.hxx @@ -143,6 +143,9 @@ public: //! Returns the length of vector of sensitive entities Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Checks whether the entity with index theIdx overlaps the current selecting volume diff --git a/src/Select3D/Select3D_SensitivePoint.cxx b/src/Select3D/Select3D_SensitivePoint.cxx index a486c7560c..a4a68c06df 100644 --- a/src/Select3D/Select3D_SensitivePoint.cxx +++ b/src/Select3D/Select3D_SensitivePoint.cxx @@ -85,3 +85,13 @@ Standard_Integer Select3D_SensitivePoint::NbSubElements() const { return 1; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitivePoint::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveEntity) +} diff --git a/src/Select3D/Select3D_SensitivePoint.hxx b/src/Select3D/Select3D_SensitivePoint.hxx index 8a451b0cda..f5332c8e04 100644 --- a/src/Select3D/Select3D_SensitivePoint.hxx +++ b/src/Select3D/Select3D_SensitivePoint.hxx @@ -50,6 +50,9 @@ public: //! transformation is set, it will be applied Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: gp_Pnt myPoint; //!< 3d coordinates of the point diff --git a/src/Select3D/Select3D_SensitivePoly.cxx b/src/Select3D/Select3D_SensitivePoly.cxx index df133efa75..bca131d685 100644 --- a/src/Select3D/Select3D_SensitivePoly.cxx +++ b/src/Select3D/Select3D_SensitivePoly.cxx @@ -310,3 +310,16 @@ gp_Pnt Select3D_SensitivePoly::CenterOfGeometry() const return myCOG; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Select3D_SensitivePoly::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsComputed) +} diff --git a/src/Select3D/Select3D_SensitivePoly.hxx b/src/Select3D/Select3D_SensitivePoly.hxx index a035d9b4e1..5e88b4dbb6 100644 --- a/src/Select3D/Select3D_SensitivePoly.hxx +++ b/src/Select3D/Select3D_SensitivePoly.hxx @@ -92,6 +92,9 @@ public: Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1, const Standard_Integer theIdx2) Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Checks whether the segment with index theIdx overlaps the current selecting volume diff --git a/src/Select3D/Select3D_SensitivePrimitiveArray.cxx b/src/Select3D/Select3D_SensitivePrimitiveArray.cxx index 0671d58690..96e9922087 100644 --- a/src/Select3D/Select3D_SensitivePrimitiveArray.cxx +++ b/src/Select3D/Select3D_SensitivePrimitiveArray.cxx @@ -1218,3 +1218,35 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::elementIsInside (SelectBasics } } } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Select3D_SensitivePrimitiveArray::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPosStride) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPrimType) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIndexLower) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIndexUpper) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPatchSizeMax) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPatchDistance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIs3d) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myInitLocation) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMinDepthElem) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMinDepthNode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMinDepthEdge) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedElem) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedNode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedEdgeNode1) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedEdgeNode2) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDetectElem) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDetectNode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToDetectEdge) +} diff --git a/src/Select3D/Select3D_SensitivePrimitiveArray.hxx b/src/Select3D/Select3D_SensitivePrimitiveArray.hxx index ebeb913b0d..07445a6817 100644 --- a/src/Select3D/Select3D_SensitivePrimitiveArray.hxx +++ b/src/Select3D/Select3D_SensitivePrimitiveArray.hxx @@ -197,6 +197,9 @@ public: //! Return the second node of last topmost detected edge or -1 if undefined (axis picking). Standard_Integer LastDetectedEdgeNode2() const { return myDetectedEdgeNode2; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + public: //! Checks whether the sensitive entity is overlapped by current selecting volume. diff --git a/src/Select3D/Select3D_SensitiveSegment.cxx b/src/Select3D/Select3D_SensitiveSegment.cxx index b43b271e53..8a0051ded0 100644 --- a/src/Select3D/Select3D_SensitiveSegment.cxx +++ b/src/Select3D/Select3D_SensitiveSegment.cxx @@ -102,3 +102,19 @@ Standard_Integer Select3D_SensitiveSegment::NbSubElements() const { return 2; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitiveSegment::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveEntity) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myStart) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myEnd) + + Select3D_BndBox3d aBoundingBox = ((Select3D_SensitiveSegment*)this)->BoundingBox(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aBoundingBox) +} diff --git a/src/Select3D/Select3D_SensitiveSegment.hxx b/src/Select3D/Select3D_SensitiveSegment.hxx index 81dfe78ffd..abe00a3fa2 100644 --- a/src/Select3D/Select3D_SensitiveSegment.hxx +++ b/src/Select3D/Select3D_SensitiveSegment.hxx @@ -70,6 +70,9 @@ public: //! changes the end point of the segment void EndPoint (const gp_Pnt& thePnt) { myEnd = thePnt; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: gp_Pnt myStart; //!< Start point diff --git a/src/Select3D/Select3D_SensitiveSet.cxx b/src/Select3D/Select3D_SensitiveSet.cxx index e5e40aacd0..dfffbbea1f 100644 --- a/src/Select3D/Select3D_SensitiveSet.cxx +++ b/src/Select3D/Select3D_SensitiveSet.cxx @@ -232,3 +232,20 @@ void Select3D_SensitiveSet::Clear() { // } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitiveSet::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveEntity) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myContent) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedIdx) + + Select3D_BndBox3d aBoundingBox = ((Select3D_SensitiveSet*)this)->BoundingBox(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aBoundingBox) +} diff --git a/src/Select3D/Select3D_SensitiveSet.hxx b/src/Select3D/Select3D_SensitiveSet.hxx index 029880ab8d..33b82cd98a 100644 --- a/src/Select3D/Select3D_SensitiveSet.hxx +++ b/src/Select3D/Select3D_SensitiveSet.hxx @@ -96,6 +96,9 @@ public: //! Returns a number of nodes in 1 BVH leaf Standard_Integer GetLeafNodeSize() const { return myContent.Builder()->LeafNodeSize(); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Checks whether one or more entities of the set overlap current selecting volume. @@ -173,6 +176,10 @@ protected: //! Returns the tree built for set of sensitives const opencascade::handle >& GetBVH() { return BVH(); } + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { (void)theOStream; (void)theDepth; } + protected: Select3D_SensitiveSet* mySensitiveSet; //!< Set of sensitive entities }; diff --git a/src/Select3D/Select3D_SensitiveTriangle.cxx b/src/Select3D/Select3D_SensitiveTriangle.cxx index e5828bc9bc..2b14690632 100644 --- a/src/Select3D/Select3D_SensitiveTriangle.cxx +++ b/src/Select3D/Select3D_SensitiveTriangle.cxx @@ -93,3 +93,22 @@ Select3D_BndBox3d Select3D_SensitiveTriangle::BoundingBox() Max (myPoints[0].Z(), Max (myPoints[1].Z(), myPoints[2].Z()))); return Select3D_BndBox3d (aMinPnt, aMaxPnt); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void Select3D_SensitiveTriangle::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveEntity) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensType) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPoints[0]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPoints[1]) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPoints[2]) + + Select3D_BndBox3d aBoundingBox = ((Select3D_SensitiveTriangle*)this)->BoundingBox(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aBoundingBox) +} diff --git a/src/Select3D/Select3D_SensitiveTriangle.hxx b/src/Select3D/Select3D_SensitiveTriangle.hxx index bfcd84848f..76c066d76b 100644 --- a/src/Select3D/Select3D_SensitiveTriangle.hxx +++ b/src/Select3D/Select3D_SensitiveTriangle.hxx @@ -67,6 +67,9 @@ public: virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE { return myCentroid; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveTriangle,Select3D_SensitiveEntity) private: diff --git a/src/Select3D/Select3D_SensitiveTriangulation.cxx b/src/Select3D/Select3D_SensitiveTriangulation.cxx index 284ad200fd..e80dbc6470 100644 --- a/src/Select3D/Select3D_SensitiveTriangulation.cxx +++ b/src/Select3D/Select3D_SensitiveTriangulation.cxx @@ -443,3 +443,19 @@ gp_GTrsf Select3D_SensitiveTriangulation::InvInitLocation() const { return myInvInitLocation; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Select3D_SensitiveTriangulation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTriangul.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myInitLocation) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensType) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPrimitivesNb) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) +} diff --git a/src/Select3D/Select3D_SensitiveTriangulation.hxx b/src/Select3D/Select3D_SensitiveTriangulation.hxx index 7232978926..4afabf5e54 100644 --- a/src/Select3D/Select3D_SensitiveTriangulation.hxx +++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx @@ -93,6 +93,9 @@ public: const TopLoc_Location& GetInitLocation() const { return myInitLocation; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: //! Inner function for transformation application to bounding diff --git a/src/Select3D/Select3D_SensitiveWire.cxx b/src/Select3D/Select3D_SensitiveWire.cxx index f902f0318b..4a1101f532 100644 --- a/src/Select3D/Select3D_SensitiveWire.cxx +++ b/src/Select3D/Select3D_SensitiveWire.cxx @@ -226,3 +226,20 @@ gp_Pnt Select3D_SensitiveWire::CenterOfGeometry() const { return myCenter; } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void Select3D_SensitiveWire::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet) + + for (NCollection_Vector::Iterator anIterator (myEntities); anIterator.More(); anIterator.Next()) + { + const Handle(Select3D_SensitiveEntity)& anEntity = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anEntity.get()) + } + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox) +} diff --git a/src/Select3D/Select3D_SensitiveWire.hxx b/src/Select3D/Select3D_SensitiveWire.hxx index 539330f54d..5c9a6e8dba 100644 --- a/src/Select3D/Select3D_SensitiveWire.hxx +++ b/src/Select3D/Select3D_SensitiveWire.hxx @@ -68,6 +68,9 @@ public: Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1, const Standard_Integer theIdx2) Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveWire,Select3D_SensitiveSet) protected: diff --git a/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx b/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx index bf9c96a78a..1b89fcfa7f 100644 --- a/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx +++ b/src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx @@ -20,6 +20,7 @@ #include #include #include +#include class Bnd_Box; class gp_Pnt; @@ -116,6 +117,10 @@ public: //! Ax + By + Cz + D = 0) to the given vector virtual void GetPlanes (NCollection_Vector >& thePlaneEquations) const = 0; + //! Dumps the content of me into the stream + virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { (void)theDepth; OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myActiveSelectionType) } + protected: SelectionType myActiveSelectionType; //!< Active selection type: point, box or polyline }; diff --git a/src/SelectMgr/SelectMgr_BaseFrustum.cxx b/src/SelectMgr/SelectMgr_BaseFrustum.cxx index 3a1c3643b6..ffc984f77a 100644 --- a/src/SelectMgr/SelectMgr_BaseFrustum.cxx +++ b/src/SelectMgr/SelectMgr_BaseFrustum.cxx @@ -254,12 +254,12 @@ gp_Pnt SelectMgr_BaseFrustum::DetectedPoint (const Standard_Real /*theDepth*/) c //function : DumpJson //purpose : //======================================================================= -void SelectMgr_BaseFrustum::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void SelectMgr_BaseFrustum::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_BaseFrustum); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPixelTolerance); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsOrthographic); - OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myBuilder); - OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myCamera); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPixelTolerance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsOrthographic) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myBuilder) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myCamera) } diff --git a/src/SelectMgr/SelectMgr_BaseFrustum.hxx b/src/SelectMgr/SelectMgr_BaseFrustum.hxx index 9295db486d..05e82ebad9 100644 --- a/src/SelectMgr/SelectMgr_BaseFrustum.hxx +++ b/src/SelectMgr/SelectMgr_BaseFrustum.hxx @@ -174,7 +174,7 @@ public: } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; DEFINE_STANDARD_RTTIEXT(SelectMgr_BaseFrustum,Standard_Transient) diff --git a/src/SelectMgr/SelectMgr_EntityOwner.cxx b/src/SelectMgr/SelectMgr_EntityOwner.cxx index ed1cedb3c5..357684c0c8 100644 --- a/src/SelectMgr/SelectMgr_EntityOwner.cxx +++ b/src/SelectMgr/SelectMgr_EntityOwner.cxx @@ -87,12 +87,14 @@ void SelectMgr_EntityOwner::HilightWithColor (const Handle(PrsMgr_PresentationMa // function : DumpJson // purpose : // ======================================================================= -void SelectMgr_EntityOwner::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void SelectMgr_EntityOwner::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_EntityOwner); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, mySelectable); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mypriority); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsSelected); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFromDecomposition); + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, this) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, mySelectable) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mypriority) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsSelected) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFromDecomposition) } diff --git a/src/SelectMgr/SelectMgr_EntityOwner.hxx b/src/SelectMgr/SelectMgr_EntityOwner.hxx index 8e59aa12cf..dfe1bbb7f8 100644 --- a/src/SelectMgr/SelectMgr_EntityOwner.hxx +++ b/src/SelectMgr/SelectMgr_EntityOwner.hxx @@ -188,7 +188,7 @@ public: void SetComesFromDecomposition (const Standard_Boolean theIsFromDecomposition) { myFromDecomposition = theIsFromDecomposition; } //! Dumps the content of me into the stream - Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; public: diff --git a/src/SelectMgr/SelectMgr_SelectableObject.cxx b/src/SelectMgr/SelectMgr_SelectableObject.cxx index 992f814329..d20c30f904 100644 --- a/src/SelectMgr/SelectMgr_SelectableObject.cxx +++ b/src/SelectMgr/SelectMgr_SelectableObject.cxx @@ -552,11 +552,21 @@ const Handle(SelectMgr_EntityOwner)& SelectMgr_SelectableObject::GetAssemblyOwne // function : DumpJson // purpose : // ======================================================================= -void SelectMgr_SelectableObject::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void SelectMgr_SelectableObject::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_SelectableObject); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_BASE_CLASS (theOStream, theDepth, PrsMgr_PresentableObject); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myGlobalSelMode); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAutoHilight); + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, PrsMgr_PresentableObject) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySelectionPrs.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myHilightPrs.get()) + + for (SelectMgr_SequenceOfSelection::Iterator anIterator (myselections); anIterator.More(); anIterator.Next()) + { + const Handle(SelectMgr_Selection)& aSelection = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aSelection.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myGlobalSelMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAutoHilight) } diff --git a/src/SelectMgr/SelectMgr_SelectableObject.hxx b/src/SelectMgr/SelectMgr_SelectableObject.hxx index 1d3566b15e..b1cc11be5b 100644 --- a/src/SelectMgr/SelectMgr_SelectableObject.hxx +++ b/src/SelectMgr/SelectMgr_SelectableObject.hxx @@ -170,7 +170,7 @@ public: Standard_EXPORT virtual const Handle(SelectMgr_EntityOwner)& GetAssemblyOwner() 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; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx b/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx index 68c8060da9..15be832ffd 100644 --- a/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx +++ b/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx @@ -389,3 +389,29 @@ void SelectMgr_SelectableObjectSet::MarkDirty() myIsDirty[BVHSubset_3dPersistent] = Standard_True; myIsDirty[BVHSubset_2dPersistent] = Standard_True; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void SelectMgr_SelectableObjectSet::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + for (Standard_Integer aSubsetIdx = 0; aSubsetIdx < BVHSubsetNb; ++aSubsetIdx) + { + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aSubsetIdx) + + Standard_Boolean IsDirty = myIsDirty[aSubsetIdx]; + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsDirty) + + for (NCollection_IndexedMap::Iterator anObjectIt (myObjects[aSubsetIdx]); + anObjectIt.More(); anObjectIt.Next()) + { + const Handle(SelectMgr_SelectableObject)& SelectableObject = anObjectIt.Value(); + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, SelectableObject.get()) + } + + TCollection_AsciiString separator; + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, separator) + } + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLastWidth) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLastHeight) +} diff --git a/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx b/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx index 242abdc7e3..2925e42b42 100644 --- a/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx +++ b/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx @@ -180,6 +180,9 @@ public: return myBVH[theSubset]; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: //! Returns an appropriate subset of theObject given depending on its persistence type. diff --git a/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx b/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx index 2ef7b60606..03cbffa88f 100644 --- a/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx +++ b/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx @@ -14,6 +14,7 @@ // commercial license or contractual agreement. #include +#include //======================================================================= // function : SelectMgr_SelectingVolumeManager @@ -482,3 +483,24 @@ void SelectMgr_SelectingVolumeManager::SetViewClipping (const SelectMgr_Selectin myObjectClipPlanes = theOther.myObjectClipPlanes; myViewClipRange = theOther.myViewClipRange; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void SelectMgr_SelectingVolumeManager::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_SelectingVolumeManager) + + for (Standard_Integer anIdx = 0; anIdx < VolumeTypesNb; ++anIdx) + { + const Handle(SelectMgr_BaseFrustum)& aSelectingVolume = mySelectingVolumes[anIdx]; + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, aSelectingVolume.get()) + } + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myViewClipPlanes.get()) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myObjectClipPlanes.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myViewClipRange) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToAllowOverlap) +} diff --git a/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx b/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx index b463561409..5b89bbdd92 100644 --- a/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx +++ b/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx @@ -236,6 +236,9 @@ public: return mySelectingVolumes[myActiveSelectionType / 2]->GetPlanes (thePlaneEquations); } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: enum { Frustum, FrustumSet, VolumeTypesNb }; //!< Defines the amount of available selecting volumes diff --git a/src/SelectMgr/SelectMgr_Selection.cxx b/src/SelectMgr/SelectMgr_Selection.cxx index 8109a3dbd9..d31eeafd3b 100644 --- a/src/SelectMgr/SelectMgr_Selection.cxx +++ b/src/SelectMgr/SelectMgr_Selection.cxx @@ -115,3 +115,25 @@ void SelectMgr_Selection::SetSensitivity (const Standard_Integer theNewSens) anEntity->BaseSensitive()->SetSensitivityFactor (theNewSens); } } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void SelectMgr_Selection::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + for (NCollection_Vector::Iterator anIterator (myEntities); anIterator.More(); anIterator.Next()) + { + const Handle(SelectMgr_SensitiveEntity)& anEntity = anIterator.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anEntity.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySelectionState) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensFactor) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUpdateStatus) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBVHUpdateStatus) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsCustomSens) +} diff --git a/src/SelectMgr/SelectMgr_Selection.hxx b/src/SelectMgr/SelectMgr_Selection.hxx index 500b2d6f14..77130ec2c9 100644 --- a/src/SelectMgr/SelectMgr_Selection.hxx +++ b/src/SelectMgr/SelectMgr_Selection.hxx @@ -120,6 +120,9 @@ public: //! proper updates use SelectMgr_SelectionManager::SetSelectionSensitivity method. Standard_EXPORT void SetSensitivity (const Standard_Integer theNewSens); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: NCollection_Vector myEntities; diff --git a/src/SelectMgr/SelectMgr_SensitiveEntity.cxx b/src/SelectMgr/SelectMgr_SensitiveEntity.cxx index bad38d0619..18eb572f8a 100644 --- a/src/SelectMgr/SelectMgr_SensitiveEntity.cxx +++ b/src/SelectMgr/SelectMgr_SensitiveEntity.cxx @@ -39,3 +39,15 @@ void SelectMgr_SensitiveEntity::Clear() mySensitive->Clear(); mySensitive.Nullify(); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void SelectMgr_SensitiveEntity::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySensitive.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsActiveForSelection) +} diff --git a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx index 02e084f857..eacf12b605 100644 --- a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx +++ b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx @@ -47,6 +47,9 @@ public: //! Marks entity as active for selection void SetActiveForSelection() const { myIsActiveForSelection = Standard_True; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(SelectMgr_SensitiveEntity,Standard_Transient) // Type definition private: diff --git a/src/SelectMgr/SelectMgr_ViewClipRange.cxx b/src/SelectMgr/SelectMgr_ViewClipRange.cxx index 57fd7680b9..c42f2c98e5 100644 --- a/src/SelectMgr/SelectMgr_ViewClipRange.cxx +++ b/src/SelectMgr/SelectMgr_ViewClipRange.cxx @@ -107,13 +107,14 @@ void SelectMgr_ViewClipRange::AddClippingPlanes (const Graphic3d_SequenceOfHClip // function : DumpJson // purpose : // ======================================================================= -void SelectMgr_ViewClipRange::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void SelectMgr_ViewClipRange::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_ViewClipRange); + OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_ViewClipRange) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUnclipRange); for (size_t aRangeIter = 0; aRangeIter < myClipRanges.size(); ++aRangeIter) { - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myClipRanges[aRangeIter]); + Bnd_Range aClipRange = myClipRanges[aRangeIter]; + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aClipRange) } + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUnclipRange) } diff --git a/src/SelectMgr/SelectMgr_ViewClipRange.hxx b/src/SelectMgr/SelectMgr_ViewClipRange.hxx index 16e5949778..8030d37a31 100644 --- a/src/SelectMgr/SelectMgr_ViewClipRange.hxx +++ b/src/SelectMgr/SelectMgr_ViewClipRange.hxx @@ -120,7 +120,7 @@ public: void AddClipSubRange (const Bnd_Range& theRange) { myClipRanges.push_back (theRange); } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; private: diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.cxx b/src/SelectMgr/SelectMgr_ViewerSelector.cxx index 97471d557e..f42d368d36 100644 --- a/src/SelectMgr/SelectMgr_ViewerSelector.cxx +++ b/src/SelectMgr/SelectMgr_ViewerSelector.cxx @@ -1051,21 +1051,38 @@ void SelectMgr_ViewerSelector::AllowOverlapDetection (const Standard_Boolean the //function : DumpJson //purpose : //======================================================================= -void SelectMgr_ViewerSelector::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void SelectMgr_ViewerSelector::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_ViewerSelector); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, preferclosest); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToUpdateTolerance); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mystored.Extent()); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, preferclosest) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToUpdateTolerance) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mystored.Extent()) - Standard_Integer aNbOfSelected = 0; + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, &mySelectingVolumeMgr) + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, &mySelectableObjects) + + Standard_Integer aNbOfSelectableObjects = 0; for (SelectMgr_SelectableObjectSet::Iterator aSelectableIt (mySelectableObjects); aSelectableIt.More(); aSelectableIt.Next()) { - aNbOfSelected++; + aNbOfSelectableObjects++; } - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aNbOfSelected); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerances.Tolerance()); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerances.CustomTolerance()); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myZLayerOrderMap.Size()); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aNbOfSelectableObjects) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerances.Tolerance()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTolerances.CustomTolerance()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myZLayerOrderMap.Extent()) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myEntitySetBuilder.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCameraEye) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCameraDir) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCameraScale) + + if (!myIndexes.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIndexes->Size()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurRank) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsLeftChildQueuedFirst) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myEntityIdx) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMapOfObjectSensitives.Extent()) } diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.hxx b/src/SelectMgr/SelectMgr_ViewerSelector.hxx index b23098ff74..57d50ddc20 100644 --- a/src/SelectMgr/SelectMgr_ViewerSelector.hxx +++ b/src/SelectMgr/SelectMgr_ViewerSelector.hxx @@ -210,7 +210,7 @@ public: Standard_EXPORT void AllowOverlapDetection (const Standard_Boolean theIsToAllow); //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; public: diff --git a/src/Standard/Standard_Dump.cxx b/src/Standard/Standard_Dump.cxx index c440561a24..e897901d97 100644 --- a/src/Standard/Standard_Dump.cxx +++ b/src/Standard/Standard_Dump.cxx @@ -15,25 +15,6 @@ #include -// ======================================================================= -// function : Constructor -// purpose : -// ======================================================================= -Standard_DumpSentry::Standard_DumpSentry (Standard_OStream& theOStream, const char* theClassName) -: myOStream (&theOStream) -{ - (*myOStream) << "\"" << theClassName << "\": {"; -} - -// ======================================================================= -// function : Destructor -// purpose : -// ======================================================================= -Standard_DumpSentry::~Standard_DumpSentry() -{ - (*myOStream) << "}"; -} - // ======================================================================= // function : AddValuesSeparator // purpose : @@ -43,7 +24,7 @@ void Standard_Dump::AddValuesSeparator (Standard_OStream& theOStream) Standard_SStream aStream; aStream << theOStream.rdbuf(); TCollection_AsciiString aStreamStr = Standard_Dump::Text (aStream); - if (!aStreamStr.EndsWith ("{")) + if (!aStreamStr.IsEmpty() && !aStreamStr.EndsWith ("{")) theOStream << ", "; } @@ -52,7 +33,7 @@ void Standard_Dump::AddValuesSeparator (Standard_OStream& theOStream) //purpose : //======================================================================= void Standard_Dump::DumpKeyToClass (Standard_OStream& theOStream, - const char* theKey, + const TCollection_AsciiString& theKey, const TCollection_AsciiString& theField) { AddValuesSeparator (theOStream); @@ -112,6 +93,9 @@ TCollection_AsciiString Standard_Dump::GetPointerInfo (const Handle(Standard_Tra // ======================================================================= TCollection_AsciiString Standard_Dump::GetPointerInfo (const void* thePointer, const bool isShortInfo) { + if (!thePointer) + return TCollection_AsciiString(); + std::ostringstream aPtrStr; aPtrStr << thePointer; if (!isShortInfo) @@ -133,17 +117,35 @@ TCollection_AsciiString Standard_Dump::GetPointerInfo (const void* thePointer, c // ======================================================================= // DumpFieldToName // ======================================================================= -const char* Standard_Dump::DumpFieldToName (const char* theField) +TCollection_AsciiString Standard_Dump::DumpFieldToName (const TCollection_AsciiString& theField) { - const char* aName = theField; - - if (aName[0] == '&') + TCollection_AsciiString aName = theField; + if (theField.StartsWith ('&')) { - aName = aName + 1; + aName.Remove (1, 1); } - if (::LowerCase (aName[0]) == 'm' && aName[1] == 'y') + + if (aName.Length() > 1 && aName.Value (1) == 'a') { - aName = aName + 2; + if (aName.Length() > 2 && aName.Value (2) == 'n') + { + aName.Remove (1, 2); + } + else + aName.Remove (1, 1); + } + else if (aName.Length() > 2 && ::LowerCase (aName.Value (1)) == 'm' && aName.Value (2) == 'y') + { + aName.Remove (1, 2); + } + + if (aName.EndsWith (".get()")) + { + aName = aName.SubString (1, aName.Length() - TCollection_AsciiString (".get()").Length()); + } + else if (aName.EndsWith ("()")) + { + aName = aName.SubString (1, aName.Length() - TCollection_AsciiString ("()").Length()); } return aName; } @@ -222,3 +224,270 @@ TCollection_AsciiString Standard_Dump::FormatJson (const Standard_SStream& theSt } return aText; } + +// ======================================================================= +// SplitJson +// ======================================================================= +Standard_Boolean Standard_Dump::SplitJson (const TCollection_AsciiString& theStreamStr, + NCollection_IndexedDataMap& theKeyToValues) +{ + Standard_Integer aNextIndex = 1; + while (aNextIndex < theStreamStr.Length()) + { + Standard_JsonKey aKey = Standard_JsonKey_None; + if (!jsonKey (theStreamStr, aNextIndex, aNextIndex, aKey)) + return Standard_False; + + Standard_Boolean aProcessed = Standard_False; + switch (aKey) + { + case Standard_JsonKey_Quote: + { + aProcessed = splitKeyToValue (theStreamStr, aNextIndex, aNextIndex, theKeyToValues); + break; + } + case Standard_JsonKey_OpenChild: + { + Standard_Integer aStartIndex = aNextIndex; + Standard_Integer aClosePos = nextClosePosition (theStreamStr, aStartIndex, Standard_JsonKey_OpenChild, Standard_JsonKey_CloseChild); + if (aClosePos == 0) + return Standard_False; + + TCollection_AsciiString aSubStreamStr = theStreamStr.SubString (aStartIndex + JsonKeyLength (aKey), aNextIndex - 2); + if (!SplitJson (aSubStreamStr, theKeyToValues)) + return Standard_False; + + aNextIndex = aClosePos + Standard_Integer (JsonKeyLength (Standard_JsonKey_CloseChild)); + break; + } + case Standard_JsonKey_SeparatorValueToValue: + { + continue; + } + default: + break; + } + if (!aProcessed) + return Standard_False; + } + return Standard_True; +} + +// ======================================================================= +// HierarchicalValueIndices +// ======================================================================= +NCollection_List Standard_Dump::HierarchicalValueIndices ( + const NCollection_IndexedDataMap& theValues) +{ + NCollection_List anIndices; + + for (Standard_Integer anIndex = 1; anIndex <= theValues.Extent(); anIndex++) + { + if (HasChildKey (theValues.FindFromIndex (anIndex))) + anIndices.Append (anIndex); + } + return anIndices; +} + +// ======================================================================= +// splitKeyToValue +// ======================================================================= +Standard_Boolean Standard_Dump::splitKeyToValue (const TCollection_AsciiString& theStreamStr, + Standard_Integer theStartIndex, + Standard_Integer& theNextIndex, + NCollection_IndexedDataMap& theValues) +{ + // find key value: "key" + Standard_Integer aStartIndex = theStartIndex; + Standard_Integer aCloseIndex = nextClosePosition (theStreamStr, aStartIndex + 1, Standard_JsonKey_None, Standard_JsonKey_Quote); + if (aCloseIndex == 0) + return Standard_False; + + TCollection_AsciiString aSplitKey = theStreamStr.SubString (aStartIndex, aCloseIndex - 1); + + // key to value + aStartIndex = aCloseIndex + 1; + Standard_JsonKey aKey = Standard_JsonKey_None; + if (!jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey)) + return Standard_False; + + // find value + aStartIndex = aCloseIndex; + aKey = Standard_JsonKey_None; + jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey); + aStartIndex = aCloseIndex; + + TCollection_AsciiString aSplitValue; + theNextIndex = -1; + switch (aKey) + { + case Standard_JsonKey_OpenChild: + { + aCloseIndex = nextClosePosition (theStreamStr, aStartIndex, Standard_JsonKey_OpenChild, Standard_JsonKey_CloseChild); + if (aCloseIndex > aStartIndex) + aSplitValue = theStreamStr.SubString (aStartIndex, aCloseIndex); + theNextIndex = aCloseIndex + 1; + break; + } + case Standard_JsonKey_OpenContainer: + { + aCloseIndex = nextClosePosition (theStreamStr, aStartIndex, Standard_JsonKey_OpenContainer, Standard_JsonKey_CloseContainer); + if (aCloseIndex > aStartIndex) + aSplitValue = theStreamStr.SubString (aStartIndex, aCloseIndex - 1); + theNextIndex = aCloseIndex + 1; + break; + } + case Standard_JsonKey_Quote: + { + Standard_JsonKey aKeyTmp = Standard_JsonKey_None; + if (jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKeyTmp) && aKeyTmp == Standard_JsonKey_Quote) // emptyValue + { + aSplitValue = ""; + theNextIndex = aCloseIndex; + } + else + { + aCloseIndex = nextClosePosition (theStreamStr, aStartIndex + 1, Standard_JsonKey_None, Standard_JsonKey_Quote); + aSplitValue = theStreamStr.SubString (aStartIndex, aCloseIndex - 1); + theNextIndex = aCloseIndex + 1; + } + break; + } + case Standard_JsonKey_None: + { + if (aStartIndex == theStreamStr.Length()) + { + aSplitValue = aStartIndex <= aCloseIndex ? theStreamStr.SubString (aStartIndex, aCloseIndex) : ""; + aSplitValue = theStreamStr.SubString (aStartIndex, aCloseIndex); + aCloseIndex = aStartIndex; + } + else + { + Standard_Integer aCloseIndex1 = nextClosePosition (theStreamStr, aStartIndex, Standard_JsonKey_None, Standard_JsonKey_CloseChild) - 1; + Standard_Integer aCloseIndex2 = nextClosePosition (theStreamStr, aStartIndex, Standard_JsonKey_None, Standard_JsonKey_SeparatorValueToValue) - 1; + aCloseIndex = aCloseIndex1 < aCloseIndex2 ? aCloseIndex1 : aCloseIndex2; + aSplitValue = aStartIndex <= aCloseIndex ? theStreamStr.SubString (aStartIndex, aCloseIndex) : ""; + } + theNextIndex = aCloseIndex + 1; + break; + } + default: + return Standard_False; + } + + Standard_DumpValue aValue; + if (theValues.FindFromKey (aSplitKey, aValue)) + { + Standard_Integer anIndex = 1; + // increment key until the new key does not exist in the container + TCollection_AsciiString anIndexedSuffix = TCollection_AsciiString ("_") + TCollection_AsciiString (anIndex); + while (theValues.FindFromKey (TCollection_AsciiString (aSplitKey + anIndexedSuffix), aValue)) + { + anIndex++; + anIndexedSuffix = TCollection_AsciiString ("_") + TCollection_AsciiString (anIndex); + } + aSplitKey = aSplitKey + anIndexedSuffix; + } + + theValues.Add (aSplitKey, Standard_DumpValue (aSplitValue, aStartIndex)); + return Standard_True; +} + +// ======================================================================= +// jsonKey +// ======================================================================= +Standard_Boolean Standard_Dump::jsonKey (const TCollection_AsciiString& theStreamStr, + Standard_Integer theStartIndex, + Standard_Integer& theNextIndex, + Standard_JsonKey& theKey) +{ + TCollection_AsciiString aSubStreamStr = theStreamStr.SubString (theStartIndex, theStreamStr.Length()); + for (Standard_Integer aKeyId = (Standard_Integer)Standard_JsonKey_OpenChild; aKeyId <= Standard_JsonKey_SeparatorValueToValue; aKeyId++) + { + Standard_JsonKey aKey = (Standard_JsonKey)aKeyId; + Standard_CString aKeyToStr = JsonKeyToString (aKey); + if (!aSubStreamStr.StartsWith (aKeyToStr)) + continue; + + theNextIndex = theStartIndex + Standard_Integer (JsonKeyLength (aKey)); + theKey = aKey; + return Standard_True; + } + return Standard_False; +} + +// ======================================================================= +// HasChildKey +// ======================================================================= +Standard_Boolean Standard_Dump::HasChildKey (const TCollection_AsciiString& theSourceValue) +{ + return theSourceValue.Search (JsonKeyToString (Standard_JsonKey_SeparatorKeyToValue)) >= 0; +} + +// ======================================================================= +// JsonKeyToString +// ======================================================================= +Standard_CString Standard_Dump::JsonKeyToString (const Standard_JsonKey theKey) +{ + switch (theKey) + { + case Standard_JsonKey_None: return ""; + case Standard_JsonKey_OpenChild: return "{"; + case Standard_JsonKey_CloseChild: return "}"; + case Standard_JsonKey_OpenContainer: return "["; + case Standard_JsonKey_CloseContainer: return "]"; + case Standard_JsonKey_Quote: return "\""; + case Standard_JsonKey_SeparatorKeyToValue: return ": "; + case Standard_JsonKey_SeparatorValueToValue: return ", "; + } + + return ""; +} + +// ======================================================================= +// JsonKeyLength +// ======================================================================= +Standard_Integer Standard_Dump::JsonKeyLength (const Standard_JsonKey theKey) +{ + return (Standard_Integer)strlen (JsonKeyToString (theKey)); +} + +// ======================================================================= +// nextClosePosition +// ======================================================================= +Standard_Integer Standard_Dump::nextClosePosition (const TCollection_AsciiString& theSourceValue, + const Standard_Integer theStartPosition, + const Standard_JsonKey theOpenKey, + const Standard_JsonKey theCloseKey) +{ + Standard_CString anOpenKey = JsonKeyToString (theOpenKey); + Standard_CString aCloseKeyStr = JsonKeyToString (theCloseKey); + + Standard_Integer aStartPos = theStartPosition; + Standard_Integer aDepthKey = 0; + + while (aStartPos < theSourceValue.Length()) + { + Standard_Integer anOpenKeyPos = theSourceValue.Location (anOpenKey, aStartPos, theSourceValue.Length()); + Standard_Integer aCloseKeyPos = theSourceValue.Location (aCloseKeyStr, aStartPos, theSourceValue.Length()); + if (aCloseKeyPos == 0) + break; + + if (anOpenKeyPos != 0 && anOpenKeyPos <= aCloseKeyPos) + { + aDepthKey++; + aStartPos = anOpenKeyPos + 1; + } + else + { + if (aDepthKey == 0) + return aCloseKeyPos; + else + { + aDepthKey--; + aStartPos = aCloseKeyPos + 1; + } + } + } + return theSourceValue.Length(); +} diff --git a/src/Standard/Standard_Dump.hxx b/src/Standard/Standard_Dump.hxx index ba5d4ae878..d9b56c824a 100644 --- a/src/Standard/Standard_Dump.hxx +++ b/src/Standard/Standard_Dump.hxx @@ -14,11 +14,11 @@ #ifndef _Standard_Dump_HeaderFile #define _Standard_Dump_HeaderFile +#include +#include #include #include -class Standard_DumpSentry; - //! The file contains interface to prepare dump output for OCCT objects. Format of the dump is JSON. //! To prepare this output, implement method DumpJson in the object and use macro functions from this file. //! Macros have one parameter for both, key and the value. It is a field of the current class. Macro has internal analyzer that @@ -50,14 +50,27 @@ class Standard_DumpSentry; //! Creates an instance of Sentry to cover the current Dump implementation with keys of start and end. //! This row should be inserted before other macros. The end key will be added by the sentry remove, //! (exit of the method). -#define OCCT_DUMP_CLASS_BEGIN(theOStream, theName) \ - Standard_DumpSentry aSentry (theOStream, OCCT_CLASS_NAME(theName)); +#define OCCT_DUMP_CLASS_BEGIN(theOStream, theField) \ +{ \ + const char* className = OCCT_CLASS_NAME(theField); \ + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, className) \ +} + +//! @def OCCT_DUMP_TRANSIENT_CLASS_BEGIN +//! Creates an instance of Sentry to cover the current Dump implementation with keys of start and end. +//! This row should be inserted before other macros. The end key will be added by the sentry remove, +//! (exit of the method). +#define OCCT_DUMP_TRANSIENT_CLASS_BEGIN(theOStream) \ +{ \ + const char* className = get_type_name(); \ + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, className) \ +} //! @def OCCT_DUMP_FIELD_VALUE_NUMERICAL //! Append into output value: "Name": Field #define OCCT_DUMP_FIELD_VALUE_NUMERICAL(theOStream, theField) \ { \ - const char* aName = Standard_Dump::DumpFieldToName (#theField); \ + TCollection_AsciiString aName = Standard_Dump::DumpFieldToName (#theField); \ Standard_Dump::AddValuesSeparator (theOStream); \ theOStream << "\"" << aName << "\": " << theField; \ } @@ -66,7 +79,7 @@ class Standard_DumpSentry; //! Append into output value: "Name": "Field" #define OCCT_DUMP_FIELD_VALUE_STRING(theOStream, theField) \ { \ - const char* aName = Standard_Dump::DumpFieldToName (#theField); \ + TCollection_AsciiString aName = Standard_Dump::DumpFieldToName (#theField); \ Standard_Dump::AddValuesSeparator (theOStream); \ theOStream << "\"" << aName << "\": \"" << theField << "\""; \ } @@ -75,11 +88,22 @@ class Standard_DumpSentry; //! Append into output value: "Name": "address of the pointer" #define OCCT_DUMP_FIELD_VALUE_POINTER(theOStream, theField) \ { \ - const char* aName = Standard_Dump::DumpFieldToName (#theField); \ + TCollection_AsciiString aName = Standard_Dump::DumpFieldToName (#theField); \ Standard_Dump::AddValuesSeparator (theOStream); \ theOStream << "\"" << aName << "\": \"" << Standard_Dump::GetPointerInfo (theField) << "\""; \ } +//! @def OCCT_DUMP_FIELD_VALUE_STRING +//! Append into output value: "Name": "Field" +#define OCCT_DUMP_FIELD_VALUE_GUID(theOStream, theField) \ +{ \ + TCollection_AsciiString aName = Standard_Dump::DumpFieldToName (#theField); \ + Standard_Dump::AddValuesSeparator (theOStream); \ + char aStr[Standard_GUID_SIZE_ALLOC]; \ + theField.ToCString (aStr); \ + theOStream << "\"" << aName << "\": \"" << aStr << "\""; \ +} + //! @def OCCT_DUMP_FIELD_VALUES_DUMPED //! Append into output value: "Name": { field dumped values } //! It computes Dump of the fields. The expected field is a pointer. @@ -88,12 +112,11 @@ class Standard_DumpSentry; //! Depth = -1 is the default value, dump here is unlimited. #define OCCT_DUMP_FIELD_VALUES_DUMPED(theOStream, theDepth, theField) \ { \ - if (theDepth != 0) \ + if (theDepth != 0 && (void*)(theField) != NULL) \ { \ Standard_SStream aFieldStream; \ - if ((theField) != NULL) \ - (theField)->DumpJson (aFieldStream, theDepth - 1); \ - const char* aName = Standard_Dump::DumpFieldToName (#theField); \ + (theField)->DumpJson (aFieldStream, theDepth - 1); \ + TCollection_AsciiString aName = Standard_Dump::DumpFieldToName (#theField); \ Standard_Dump::DumpKeyToClass (theOStream, aName, Standard_Dump::Text (aFieldStream)); \ } \ } @@ -130,10 +153,8 @@ class Standard_DumpSentry; { \ if (theDepth != 0) \ { \ - Standard_SStream aFieldStream; \ - theField::DumpJson (aFieldStream, theDepth - 1); \ - const char* aName = Standard_Dump::DumpFieldToName (#theField); \ - Standard_Dump::DumpKeyToClass (theOStream, aName, Standard_Dump::Text (aFieldStream)); \ + Standard_Dump::AddValuesSeparator (theOStream); \ + theField::DumpJson (theOStream, theDepth - 1); \ } \ } @@ -143,26 +164,34 @@ class Standard_DumpSentry; //! It's possible to use it without necessity of OCCT_DUMP_CLASS_BEGIN call, but pay attention that it should be only one row in the object dump. #define OCCT_DUMP_VECTOR_CLASS(theOStream, theName, theCount, ...) \ { \ - theOStream << "\"" << OCCT_CLASS_NAME(theName) << "\": ["; \ + Standard_Dump::AddValuesSeparator (theOStream); \ + theOStream << "\"" << theName << "\": ["; \ Standard_Dump::DumpRealValues (theOStream, theCount, __VA_ARGS__);\ theOStream << "]"; \ } -//! @brief Simple sentry class providing convenient interface to dump. -//! Appends start and last rows in dump with class name key. -//! An example of the using: for ClassName, the result is: "ClassName" { ... } -//! Create instance of that class in the first row of Dump. -class Standard_DumpSentry +//! Kind of key in Json string +enum Standard_JsonKey { -public: - //! Constructor - add parameters of start class name definition in the stream - Standard_EXPORT Standard_DumpSentry (Standard_OStream& theOStream, const char* theClassName); + Standard_JsonKey_None, //!< no key + Standard_JsonKey_OpenChild, //!< "{" + Standard_JsonKey_CloseChild, //!< "}" + Standard_JsonKey_OpenContainer, //!< "[" + Standard_JsonKey_CloseContainer, //!< "]" + Standard_JsonKey_Quote, //!< "\"" + Standard_JsonKey_SeparatorKeyToValue, //!< ": " + Standard_JsonKey_SeparatorValueToValue //!< ", " +}; - //! Destructor - add parameters of stop class name definition in the stream - Standard_EXPORT ~Standard_DumpSentry(); +//! Type for storing a dump value with the stream position +struct Standard_DumpValue +{ + Standard_DumpValue() : myStartPosition (0) {} + Standard_DumpValue (const TCollection_AsciiString& theValue, const Standard_Integer theStartPos) + : myValue (theValue), myStartPosition (theStartPos) {} -private: - Standard_OStream* myOStream; //!< modified stream + TCollection_AsciiString myValue; //!< current string value + Standard_Integer myStartPosition; //!< position of the value first char in the whole stream }; //! This interface has some tool methods for stream (in JSON format) processing. @@ -183,12 +212,39 @@ public: //! @return text presentation Standard_EXPORT static TCollection_AsciiString FormatJson (const Standard_SStream& theStream, const Standard_Integer theIndent = 3); - //! Add Json values separator if the stream last symbol is not an open brace. + //! Converts stream into map of values. Values are not empty if the stream contains at least two values. + //! + //! The one level stream example: key_1\value_1\key_2\value_2 + //! In output: theStreamKey equals class_name, theValues contains key_1, value_1, key_2, and value_2. + //! + //! Two level stream example: key_1\value_1\key_2\value_2\key_3subclass_key_1\subclass_value1 + //! In output: theStreamKey equals class_name, theValues contains key_1, value_1, key_2, and value_2, key_3 and + //! subclass_key_1\subclass_value1. + //! The last value might be processed later using the same method. + //! + //! @param theStream stream value + //! @param theKeyToValues [out] container of split values + Standard_EXPORT static Standard_Boolean SplitJson (const TCollection_AsciiString& theStreamStr, + NCollection_IndexedDataMap& theKeyToValues); + + //! Returns container of indices in values, that has hierarchical value + Standard_EXPORT static NCollection_List HierarchicalValueIndices ( + const NCollection_IndexedDataMap& theValues); + + //! Returns true if the value has bracket key + Standard_EXPORT static Standard_Boolean HasChildKey (const TCollection_AsciiString& theSourceValue); + + //! Returns key value for enum type + Standard_EXPORT static Standard_CString JsonKeyToString (const Standard_JsonKey theKey); + + //! Returns length value for enum type + Standard_EXPORT static Standard_Integer JsonKeyLength (const Standard_JsonKey theKey); + //! @param theStream source value static Standard_EXPORT void AddValuesSeparator (Standard_OStream& theOStream); //! Returns default prefix added for each pointer info string if short presentation of pointer used - Standard_EXPORT static TCollection_AsciiString GetPointerPrefix() { return "0x"; } + static TCollection_AsciiString GetPointerPrefix() { return "0x"; } //! Convert handle pointer to address of the pointer. If the handle is NULL, the result is an empty string. //! @param thePointer a pointer @@ -209,7 +265,7 @@ public: //! @param theKey a source value //! @param theField stream value Standard_EXPORT static void DumpKeyToClass (Standard_OStream& theOStream, - const char* theKey, + const TCollection_AsciiString& theKey, const TCollection_AsciiString& theField); //! Unite values in one value using template: "value_1", "value_2", ..., "value_n" @@ -226,7 +282,35 @@ public: //! An example, for field myValue, theName is Value, for &myCLass, the name is Class //! @param theField a source value //! @param theName [out] an updated name - Standard_EXPORT static const char* DumpFieldToName (const char* theField); + Standard_EXPORT static TCollection_AsciiString DumpFieldToName (const TCollection_AsciiString& theField); + +private: + //! Extracts from the string value a pair (key, value), add it into output container, update index value + //! Example: + //! stream string starting the index position contains: ..."key": ... + //! a pair key, value will be added into theValues + //! at beginning theIndex is the position of the quota before , after the index is the next position after the value + //! splitDumped(aString) gives theSplitValue = "abc", theTailValue = "defg", theKey = "key" + Standard_EXPORT static Standard_Boolean splitKeyToValue (const TCollection_AsciiString& theStreamStr, + Standard_Integer theStartIndex, + Standard_Integer& theNextIndex, + NCollection_IndexedDataMap& theValues); + + + //! Returns key of json in the index position. Incement the index position to the next symbol in the row + Standard_EXPORT static Standard_Boolean jsonKey (const TCollection_AsciiString& theStreamStr, + Standard_Integer theStartIndex, + Standard_Integer& theNextIndex, + Standard_JsonKey& theKey); + + //! Find position in the source string of the symbol close after the start position. + //! Ignore combination ... between the close symbol. + //! Example, for case ... { ... { ... } ...} ... } it returns the position of the forth brace + Standard_EXPORT static Standard_Integer nextClosePosition (const TCollection_AsciiString& theSourceValue, + const Standard_Integer theStartPosition, + const Standard_JsonKey theCloseKey, + const Standard_JsonKey theOpenKey); + }; #endif // _Standard_Dump_HeaderFile diff --git a/src/StdSelect/StdSelect_BRepOwner.cxx b/src/StdSelect/StdSelect_BRepOwner.cxx index d601d2080c..f86641e8ef 100644 --- a/src/StdSelect/StdSelect_BRepOwner.cxx +++ b/src/StdSelect/StdSelect_BRepOwner.cxx @@ -182,3 +182,17 @@ void StdSelect_BRepOwner::UpdateHighlightTrsf (const Handle(V3d_Viewer)& theView theManager->UpdateHighlightTrsf (theViewer, Selectable(), theDispMode, myPrsSh); } + +// ======================================================================= +// function : DumpJson +// purpose : +// ======================================================================= +void StdSelect_BRepOwner::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myShape) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPrsSh.get()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurMode) +} diff --git a/src/StdSelect/StdSelect_BRepOwner.hxx b/src/StdSelect/StdSelect_BRepOwner.hxx index 3e52352418..3df108af0d 100644 --- a/src/StdSelect/StdSelect_BRepOwner.hxx +++ b/src/StdSelect/StdSelect_BRepOwner.hxx @@ -117,6 +117,9 @@ public: const Handle(PrsMgr_PresentationManager3d)& theManager, const Standard_Integer theDispMode) Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + protected: TopoDS_Shape myShape; diff --git a/src/StdSelect/StdSelect_Shape.cxx b/src/StdSelect/StdSelect_Shape.cxx index 5293d3706a..aa20ba5f06 100644 --- a/src/StdSelect/StdSelect_Shape.cxx +++ b/src/StdSelect/StdSelect_Shape.cxx @@ -71,3 +71,12 @@ void StdSelect_Shape::Compute(const Handle(Prs3d_Projector)& aProjector, { PrsMgr_PresentableObject::Compute(aProjector,aPresentation); } + +void StdSelect_Shape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, PrsMgr_PresentableObject) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &mysh) +} diff --git a/src/StdSelect/StdSelect_Shape.hxx b/src/StdSelect/StdSelect_Shape.hxx index f6ebdd44c4..d3bb771ee7 100644 --- a/src/StdSelect/StdSelect_Shape.hxx +++ b/src/StdSelect/StdSelect_Shape.hxx @@ -46,6 +46,9 @@ public: void Shape (const TopoDS_Shape& theShape) { mysh = theShape; } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.cxx b/src/StdSelect/StdSelect_ViewerSelector3d.cxx index e6bebe89a1..4140942b5d 100644 --- a/src/StdSelect/StdSelect_ViewerSelector3d.cxx +++ b/src/StdSelect/StdSelect_ViewerSelector3d.cxx @@ -1086,3 +1086,19 @@ Standard_Boolean StdSelect_ViewerSelector3d::ToPixMap (Image_PixMap& aFiller->Flush(); return Standard_True; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void StdSelect_ViewerSelector3d::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myStructs.Length()) + for (Graphic3d_SequenceOfStructure::Iterator aStructsIt (myStructs); aStructsIt.More(); aStructsIt.Next()) + { + const Handle(Graphic3d_Structure)& aStructure = aStructsIt.Value(); + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, aStructure) + } +} diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.hxx b/src/StdSelect/StdSelect_ViewerSelector3d.hxx index 6004c9aa70..9496cb5866 100644 --- a/src/StdSelect/StdSelect_ViewerSelector3d.hxx +++ b/src/StdSelect/StdSelect_ViewerSelector3d.hxx @@ -93,6 +93,9 @@ public: const Handle(V3d_View)& theView, const Standard_Boolean theToClearOthers = Standard_True); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(StdSelect_ViewerSelector3d,SelectMgr_ViewerSelector) protected: diff --git a/src/TDF/TDF_Attribute.cxx b/src/TDF/TDF_Attribute.cxx index 524f6f3d2f..c0eaf85b76 100644 --- a/src/TDF/TDF_Attribute.cxx +++ b/src/TDF/TDF_Attribute.cxx @@ -19,6 +19,7 @@ // 0.0 Feb 7 1997 Creation #include +#include #include #include #include @@ -405,3 +406,22 @@ void TDF_Attribute::ExtendedDump TDF_AttributeIndexedMap& /*aMap*/) const { Dump(anOS); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDF_Attribute::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + TCollection_AsciiString aLabel; + TDF_Tool::Entry (Label(), aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTransaction) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySavedTransaction) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFlags) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myNext.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myBackup.get()) +} diff --git a/src/TDF/TDF_Attribute.hxx b/src/TDF/TDF_Attribute.hxx index 69289dc980..7c85746424 100644 --- a/src/TDF/TDF_Attribute.hxx +++ b/src/TDF/TDF_Attribute.hxx @@ -372,6 +372,9 @@ Standard_OStream& operator<< (Standard_OStream& anOS) const //! Should be private. Standard_EXPORT void Forget (const Standard_Integer aTransaction); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + friend class TDF_Data; friend class TDF_Label; diff --git a/src/TDF/TDF_AttributeDelta.cxx b/src/TDF/TDF_AttributeDelta.cxx index 65e556990a..8c8bc929d3 100644 --- a/src/TDF/TDF_AttributeDelta.cxx +++ b/src/TDF/TDF_AttributeDelta.cxx @@ -18,11 +18,13 @@ //Version Date Purpose // 0.0 Sep 8 1997 Creation +#include + +#include #include #include #include #include -#include #include #include @@ -79,3 +81,18 @@ Standard_OStream& TDF_AttributeDelta::Dump(Standard_OStream& OS) const OS<<" on "<DynamicType()->Name(); return OS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDF_AttributeDelta::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAttribute.get()) + + TCollection_AsciiString aStrForTDF_Label; + TDF_Tool::Entry (myLabel, aStrForTDF_Label); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aStrForTDF_Label) +} diff --git a/src/TDF/TDF_AttributeDelta.hxx b/src/TDF/TDF_AttributeDelta.hxx index ced0612a22..f07f1fd3f3 100644 --- a/src/TDF/TDF_AttributeDelta.hxx +++ b/src/TDF/TDF_AttributeDelta.hxx @@ -67,6 +67,9 @@ Standard_OStream& operator<< (Standard_OStream& OS) const return Dump(OS); } + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/TDF/TDF_Data.cxx b/src/TDF/TDF_Data.cxx index a5407cb53d..44ba6da880 100644 --- a/src/TDF/TDF_Data.cxx +++ b/src/TDF/TDF_Data.cxx @@ -15,6 +15,7 @@ #include +#include #include #include #include @@ -444,3 +445,27 @@ Standard_OStream& TDF_Data::Dump(Standard_OStream& anOS) const anOS<<"; Current tick: "< +#include #include #include #include @@ -222,3 +223,23 @@ void TDF_Delta::Dump(Standard_OStream& OS) const OS<<"| "; attDelta->Dump(OS); OS< + +#include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(TDF_DeltaOnResume,TDF_AttributeDelta) @@ -48,3 +50,14 @@ void TDF_DeltaOnResume::Apply() std::cout<<"Forget attribute"< +#include #include #include #include #include #include -#include #include +#include IMPLEMENT_STANDARD_RTTIEXT(TDF_Reference,TDF_Attribute) @@ -147,4 +149,17 @@ Standard_OStream& TDF_Reference::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDF_Reference::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + TCollection_AsciiString aLabel; + TDF_Tool::Entry (myOrigin, aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) +} diff --git a/src/TDF/TDF_Reference.hxx b/src/TDF/TDF_Reference.hxx index 6d9028b181..4cd2b13b88 100644 --- a/src/TDF/TDF_Reference.hxx +++ b/src/TDF/TDF_Reference.hxx @@ -62,6 +62,9 @@ public: Standard_EXPORT TDF_Reference(); + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDF/TDF_TagSource.cxx b/src/TDF/TDF_TagSource.cxx index b4561f574a..0460b03b33 100644 --- a/src/TDF/TDF_TagSource.cxx +++ b/src/TDF/TDF_TagSource.cxx @@ -14,13 +14,14 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDF_TagSource,TDF_Attribute) @@ -166,3 +167,16 @@ void TDF_TagSource::Paste (const Handle(TDF_Attribute)& Into, { Handle(TDF_TagSource)::DownCast(Into)->Set (myTag); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDF_TagSource::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTag) +} diff --git a/src/TDF/TDF_TagSource.hxx b/src/TDF/TDF_TagSource.hxx index 54bbe10996..8959d6df7d 100644 --- a/src/TDF/TDF_TagSource.hxx +++ b/src/TDF/TDF_TagSource.hxx @@ -73,6 +73,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDF/TDF_Transaction.cxx b/src/TDF/TDF_Transaction.cxx index a74121fb2a..b3eab9e128 100644 --- a/src/TDF/TDF_Transaction.cxx +++ b/src/TDF/TDF_Transaction.cxx @@ -19,6 +19,7 @@ // 0.0 Oct 1 1997 Creation #include +#include #include #include #include @@ -159,3 +160,15 @@ void TDF_Transaction::Abort() } } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDF_Transaction::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, TDF_Transaction) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDF.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUntilTransaction) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myName) +} diff --git a/src/TDF/TDF_Transaction.hxx b/src/TDF/TDF_Transaction.hxx index f5f2a59372..e9c370814e 100644 --- a/src/TDF/TDF_Transaction.hxx +++ b/src/TDF/TDF_Transaction.hxx @@ -93,6 +93,9 @@ public: //! Returns true if the transaction is open. Standard_Boolean IsOpen() const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/TDataStd/TDataStd.cxx b/src/TDataStd/TDataStd.cxx index b9f833d29d..0348e6b031 100644 --- a/src/TDataStd/TDataStd.cxx +++ b/src/TDataStd/TDataStd.cxx @@ -14,9 +14,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include #include #include #include diff --git a/src/TDataStd/TDataStd_AsciiString.cxx b/src/TDataStd/TDataStd_AsciiString.cxx index 101417d21c..a5db33bd17 100644 --- a/src/TDataStd/TDataStd_AsciiString.cxx +++ b/src/TDataStd/TDataStd_AsciiString.cxx @@ -13,11 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -199,3 +200,17 @@ Standard_OStream& TDataStd_AsciiString::Dump(Standard_OStream& theOS) const anOS << sguid << "|" < +#include #include #include -#include #include #include #include @@ -320,3 +321,23 @@ Standard_OStream& TDataStd_BooleanArray::Dump (Standard_OStream& anOS) const anOS <Array1()); aValueIt.More(); aValueIt.Next()) + { + const Standard_Byte& aValue = aValueIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLower) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUpper) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_BooleanArray.hxx b/src/TDataStd/TDataStd_BooleanArray.hxx index 9a48804f55..2bd1eee205 100644 --- a/src/TDataStd/TDataStd_BooleanArray.hxx +++ b/src/TDataStd/TDataStd_BooleanArray.hxx @@ -99,6 +99,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& OS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_BooleanList.cxx b/src/TDataStd/TDataStd_BooleanList.cxx index 8593a65ac1..f398ce55b3 100644 --- a/src/TDataStd/TDataStd_BooleanList.cxx +++ b/src/TDataStd/TDataStd_BooleanList.cxx @@ -13,10 +13,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include -#include #include #include #include @@ -306,3 +307,21 @@ Standard_OStream& TDataStd_BooleanList::Dump (Standard_OStream& anOS) const anOS << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_BooleanList::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TDataStd_ListOfByte::Iterator aListIt (myList); aListIt.More(); aListIt.Next()) + { + const Standard_Byte& aValue = aListIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_BooleanList.hxx b/src/TDataStd/TDataStd_BooleanList.hxx index 3879cfda41..4aa9f699bd 100644 --- a/src/TDataStd/TDataStd_BooleanList.hxx +++ b/src/TDataStd/TDataStd_BooleanList.hxx @@ -100,6 +100,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_ByteArray.cxx b/src/TDataStd/TDataStd_ByteArray.cxx index 49ca2e1533..c0277717bd 100644 --- a/src/TDataStd/TDataStd_ByteArray.cxx +++ b/src/TDataStd/TDataStd_ByteArray.cxx @@ -13,10 +13,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include -#include #include #include #include @@ -309,3 +310,21 @@ Handle(TDF_DeltaOnModification) TDataStd_ByteArray::DeltaOnModification else return new TDF_DefaultDeltaOnModification(OldAttribute); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_ByteArray::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TColStd_Array1OfByte::Iterator aValueIt (myValue->Array1()); aValueIt.More(); aValueIt.Next()) + { + const Standard_Byte& aValue = aValueIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDelta) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_ByteArray.hxx b/src/TDataStd/TDataStd_ByteArray.hxx index 16cf2ed43e..ec74d4a419 100644 --- a/src/TDataStd/TDataStd_ByteArray.hxx +++ b/src/TDataStd/TDataStd_ByteArray.hxx @@ -123,6 +123,9 @@ public: //! Makes a DeltaOnModification between and //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: diff --git a/src/TDataStd/TDataStd_ChildNodeIterator.cxx b/src/TDataStd/TDataStd_ChildNodeIterator.cxx index bdd98eeeda..7f5e4aa32b 100644 --- a/src/TDataStd/TDataStd_ChildNodeIterator.cxx +++ b/src/TDataStd/TDataStd_ChildNodeIterator.cxx @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. - #include + #include #define ChildNodeIterator_UpToBrother \ diff --git a/src/TDataStd/TDataStd_Comment.cxx b/src/TDataStd/TDataStd_Comment.cxx index a827f0d9be..cc2d0f72c8 100644 --- a/src/TDataStd/TDataStd_Comment.cxx +++ b/src/TDataStd/TDataStd_Comment.cxx @@ -14,12 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include -#include #include #include #include @@ -170,3 +171,16 @@ AfterRetrieval(const Standard_Boolean) { return Standard_True; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Comment::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myString) +} diff --git a/src/TDataStd/TDataStd_Comment.hxx b/src/TDataStd/TDataStd_Comment.hxx index 9bb96df0ec..a26056ed01 100644 --- a/src/TDataStd/TDataStd_Comment.hxx +++ b/src/TDataStd/TDataStd_Comment.hxx @@ -76,6 +76,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; Standard_EXPORT Standard_Boolean AfterRetrieval (const Standard_Boolean forceIt = Standard_False) Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Current.cxx b/src/TDataStd/TDataStd_Current.cxx index 1f991c1bcc..6c12c3c0fa 100644 --- a/src/TDataStd/TDataStd_Current.cxx +++ b/src/TDataStd/TDataStd_Current.cxx @@ -14,15 +14,17 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include +#include #include #include -#include #include #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Current,TDF_Attribute) @@ -165,4 +167,18 @@ Standard_OStream& TDataStd_Current::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Current::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + TCollection_AsciiString aLabel; + TDF_Tool::Entry (myLabel, aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) +} diff --git a/src/TDataStd/TDataStd_Current.hxx b/src/TDataStd/TDataStd_Current.hxx index 06a032c533..ebad9ea0ba 100644 --- a/src/TDataStd/TDataStd_Current.hxx +++ b/src/TDataStd/TDataStd_Current.hxx @@ -72,6 +72,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx index c04ee56e2c..048a07e6ac 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx @@ -13,6 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx index 064dd080b0..dfb247e99c 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include #include -#include #include #include #include diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx index 5ba9f9c2c2..6280934c5e 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include #include -#include #include #include #include diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx index 6c0d12e37c..05947ca823 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include #include -#include #include #include #include diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx index 41b65a5321..a04f38af44 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include #include -#include #include #include #include diff --git a/src/TDataStd/TDataStd_Directory.cxx b/src/TDataStd/TDataStd_Directory.cxx index 1acc960adc..b592f252d8 100644 --- a/src/TDataStd/TDataStd_Directory.cxx +++ b/src/TDataStd/TDataStd_Directory.cxx @@ -14,12 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include +#include #include #include #include -#include #include #include #include @@ -173,4 +174,13 @@ Standard_OStream& TDataStd_Directory::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Directory::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} diff --git a/src/TDataStd/TDataStd_Directory.hxx b/src/TDataStd/TDataStd_Directory.hxx index a459f35b35..726f974afa 100644 --- a/src/TDataStd/TDataStd_Directory.hxx +++ b/src/TDataStd/TDataStd_Directory.hxx @@ -80,6 +80,9 @@ public: Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Expression.cxx b/src/TDataStd/TDataStd_Expression.cxx index b200ad4ca1..04a358a999 100644 --- a/src/TDataStd/TDataStd_Expression.cxx +++ b/src/TDataStd/TDataStd_Expression.cxx @@ -14,12 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include -#include #include #include #include @@ -173,3 +174,21 @@ Standard_OStream& TDataStd_Expression::Dump(Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Expression::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myExpression) + + for (TDF_AttributeList::Iterator aVariableIt (myVariables); aVariableIt.More(); aVariableIt.Next()) + { + const Handle(TDF_Attribute)& anAttribute = aVariableIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anAttribute.get()) + } +} diff --git a/src/TDataStd/TDataStd_Expression.hxx b/src/TDataStd/TDataStd_Expression.hxx index 38a6fa152a..f10533091d 100644 --- a/src/TDataStd/TDataStd_Expression.hxx +++ b/src/TDataStd/TDataStd_Expression.hxx @@ -77,6 +77,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ExtStringArray.cxx b/src/TDataStd/TDataStd_ExtStringArray.cxx index c7cab25daa..cbeb85c5bc 100644 --- a/src/TDataStd/TDataStd_ExtStringArray.cxx +++ b/src/TDataStd/TDataStd_ExtStringArray.cxx @@ -13,12 +13,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include -#include #include #include #include @@ -335,3 +336,20 @@ Handle(TDF_DeltaOnModification) TDataStd_ExtStringArray::DeltaOnModification else return new TDF_DefaultDeltaOnModification(OldAttribute); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_ExtStringArray::DumpJson (Standard_OStream& theOStream, Standard_Integer /*theDepth*/) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + for (TColStd_Array1OfExtendedString::Iterator aValueIt (myValue->Array1()); aValueIt.More(); aValueIt.Next()) + { + const TCollection_ExtendedString& aValue = aValueIt.Value(); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aValue) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDelta) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_ExtStringArray.hxx b/src/TDataStd/TDataStd_ExtStringArray.hxx index a7383512a7..0b4e5f9c21 100644 --- a/src/TDataStd/TDataStd_ExtStringArray.hxx +++ b/src/TDataStd/TDataStd_ExtStringArray.hxx @@ -125,6 +125,9 @@ public: //! Makes a DeltaOnModification between and //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: diff --git a/src/TDataStd/TDataStd_ExtStringList.cxx b/src/TDataStd/TDataStd_ExtStringList.cxx index 75806696be..97faa89b4b 100644 --- a/src/TDataStd/TDataStd_ExtStringList.cxx +++ b/src/TDataStd/TDataStd_ExtStringList.cxx @@ -13,11 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -366,3 +367,20 @@ Standard_OStream& TDataStd_ExtStringList::Dump (Standard_OStream& anOS) const anOS << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_ExtStringList::DumpJson (Standard_OStream& theOStream, Standard_Integer /*theDepth*/) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + for (TDataStd_ListOfExtendedString::Iterator aListIt (myList); aListIt.More(); aListIt.Next()) + { + const TCollection_ExtendedString& aValue = aListIt.Value(); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aValue); + } + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_ExtStringList.hxx b/src/TDataStd/TDataStd_ExtStringList.hxx index e90ce3abce..d5c0c7f49d 100644 --- a/src/TDataStd/TDataStd_ExtStringList.hxx +++ b/src/TDataStd/TDataStd_ExtStringList.hxx @@ -107,6 +107,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx b/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx index 007f455121..d652995796 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringByte,Standard_Transient) diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx index f2e820fc07..9d0b6c96f2 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfInteger,Standard_Transient) diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx index 4604bd7b6d..71a776cfed 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfReal,Standard_Transient) diff --git a/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx b/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx index 4a5d627b0e..bacefddb50 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringInteger,Standard_Transient) diff --git a/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx b/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx index 0978f53cfa..def8718435 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringReal,Standard_Transient) diff --git a/src/TDataStd/TDataStd_HDataMapOfStringString.cxx b/src/TDataStd/TDataStd_HDataMapOfStringString.cxx index 63ba1e8981..b9dc1849c8 100644 --- a/src/TDataStd/TDataStd_HDataMapOfStringString.cxx +++ b/src/TDataStd/TDataStd_HDataMapOfStringString.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringString,Standard_Transient) diff --git a/src/TDataStd/TDataStd_IntPackedMap.cxx b/src/TDataStd/TDataStd_IntPackedMap.cxx index e5162681ee..ef1f71bd50 100644 --- a/src/TDataStd/TDataStd_IntPackedMap.cxx +++ b/src/TDataStd/TDataStd_IntPackedMap.cxx @@ -13,13 +13,14 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include -#include #include #include #include @@ -234,4 +235,21 @@ Handle(TDF_DeltaOnModification) TDataStd_IntPackedMap::DeltaOnModification else return new TDF_DefaultDeltaOnModification(OldAttribute); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_IntPackedMap::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TColStd_PackedMapOfInteger::Iterator aMapIt (myMap->Map()); aMapIt.More(); aMapIt.Next()) + { + Standard_Integer aKey = aMapIt.Key(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aKey) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDelta) +} diff --git a/src/TDataStd/TDataStd_IntPackedMap.hxx b/src/TDataStd/TDataStd_IntPackedMap.hxx index 2aab1adb68..c6967625ea 100644 --- a/src/TDataStd/TDataStd_IntPackedMap.hxx +++ b/src/TDataStd/TDataStd_IntPackedMap.hxx @@ -96,6 +96,9 @@ public: //! Makes a DeltaOnModification between and //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: diff --git a/src/TDataStd/TDataStd_Integer.cxx b/src/TDataStd/TDataStd_Integer.cxx index 36d42a1baf..5aefc683cb 100644 --- a/src/TDataStd/TDataStd_Integer.cxx +++ b/src/TDataStd/TDataStd_Integer.cxx @@ -14,10 +14,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include -#include #include #include #include @@ -203,3 +204,16 @@ Standard_OStream& TDataStd_Integer::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Integer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValue) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_Integer.hxx b/src/TDataStd/TDataStd_Integer.hxx index 6096d5758c..453b701b25 100644 --- a/src/TDataStd/TDataStd_Integer.hxx +++ b/src/TDataStd/TDataStd_Integer.hxx @@ -83,6 +83,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; Standard_EXPORT TDataStd_Integer(); + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_IntegerArray.cxx b/src/TDataStd/TDataStd_IntegerArray.cxx index 2fc1c38e3f..1bbf603417 100644 --- a/src/TDataStd/TDataStd_IntegerArray.cxx +++ b/src/TDataStd/TDataStd_IntegerArray.cxx @@ -14,11 +14,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -336,3 +337,23 @@ Handle(TDF_DeltaOnModification) TDataStd_IntegerArray::DeltaOnModification return new TDataStd_DeltaOnModificationOfIntArray(Handle(TDataStd_IntegerArray)::DownCast (OldAttribute)); else return new TDF_DefaultDeltaOnModification(OldAttribute); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_IntegerArray::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TColStd_Array1OfInteger::Iterator aValueIt (myValue->Array1()); aValueIt.More(); aValueIt.Next()) + { + const Standard_Integer& aValue = aValueIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDelta) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_IntegerArray.hxx b/src/TDataStd/TDataStd_IntegerArray.hxx index 07323226d8..346d6c1c5f 100644 --- a/src/TDataStd/TDataStd_IntegerArray.hxx +++ b/src/TDataStd/TDataStd_IntegerArray.hxx @@ -129,6 +129,9 @@ public: //! Makes a DeltaOnModification between and //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: diff --git a/src/TDataStd/TDataStd_IntegerList.cxx b/src/TDataStd/TDataStd_IntegerList.cxx index 94a9973701..5c462dd03e 100644 --- a/src/TDataStd/TDataStd_IntegerList.cxx +++ b/src/TDataStd/TDataStd_IntegerList.cxx @@ -13,11 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -362,3 +363,21 @@ Standard_OStream& TDataStd_IntegerList::Dump (Standard_OStream& anOS) const anOS << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_IntegerList::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TColStd_ListOfInteger::Iterator aListIt (myList); aListIt.More(); aListIt.Next()) + { + const Standard_Integer& aValue = aListIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_IntegerList.hxx b/src/TDataStd/TDataStd_IntegerList.hxx index 67ff0f4a72..beb7404302 100644 --- a/src/TDataStd/TDataStd_IntegerList.hxx +++ b/src/TDataStd/TDataStd_IntegerList.hxx @@ -106,6 +106,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Name.cxx b/src/TDataStd/TDataStd_Name.cxx index 19a4c78bb1..279c14db1c 100644 --- a/src/TDataStd/TDataStd_Name.cxx +++ b/src/TDataStd/TDataStd_Name.cxx @@ -14,13 +14,14 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include +#include #include #include #include #include -#include #include #include #include @@ -192,3 +193,17 @@ Standard_OStream& TDataStd_Name::Dump (Standard_OStream& anOS) const anOS << sguid << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Name::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myString) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_Name.hxx b/src/TDataStd/TDataStd_Name.hxx index 9e568278d3..1ccfdba10d 100644 --- a/src/TDataStd/TDataStd_Name.hxx +++ b/src/TDataStd/TDataStd_Name.hxx @@ -98,6 +98,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_NamedData.cxx b/src/TDataStd/TDataStd_NamedData.cxx index 6a1de76055..92340a44ad 100644 --- a/src/TDataStd/TDataStd_NamedData.cxx +++ b/src/TDataStd/TDataStd_NamedData.cxx @@ -15,6 +15,7 @@ #include +#include #include #include #include @@ -893,3 +894,27 @@ Standard_OStream& TDataStd_NamedData::Dump (Standard_OStream& anOS) const anOS << "\tArraysOfReals = " << (HasArraysOfReals() ? myArraysOfReals->Map().Extent() : 0); return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_NamedData::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + if (!myIntegers.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIntegers->Map().Size()) + if (!myReals.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myReals->Map().Size()) + if (!myStrings.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myStrings->Map().Size()) + if (!myBytes.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBytes->Map().Size()) + if (!myArraysOfIntegers.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArraysOfIntegers->Map().Size()) + if (!myArraysOfReals.IsNull()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myArraysOfReals->Map().Size()) +} diff --git a/src/TDataStd/TDataStd_NamedData.hxx b/src/TDataStd/TDataStd_NamedData.hxx index eb677c0144..5b28f62698 100644 --- a/src/TDataStd/TDataStd_NamedData.hxx +++ b/src/TDataStd/TDataStd_NamedData.hxx @@ -283,6 +283,9 @@ public: //! @name TDF_Attribute interface Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; DEFINE_STANDARD_RTTIEXT(TDataStd_NamedData,TDF_Attribute) diff --git a/src/TDataStd/TDataStd_NoteBook.cxx b/src/TDataStd/TDataStd_NoteBook.cxx index 005e0232b8..a385f35d09 100644 --- a/src/TDataStd/TDataStd_NoteBook.cxx +++ b/src/TDataStd/TDataStd_NoteBook.cxx @@ -14,12 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include +#include #include #include #include -#include #include #include #include @@ -166,4 +167,13 @@ Standard_OStream& TDataStd_NoteBook::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_NoteBook::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} diff --git a/src/TDataStd/TDataStd_NoteBook.hxx b/src/TDataStd/TDataStd_NoteBook.hxx index 38d6af6559..12d6a137a3 100644 --- a/src/TDataStd/TDataStd_NoteBook.hxx +++ b/src/TDataStd/TDataStd_NoteBook.hxx @@ -79,6 +79,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Real.cxx b/src/TDataStd/TDataStd_Real.cxx index c4e9449cc4..e27807161f 100644 --- a/src/TDataStd/TDataStd_Real.cxx +++ b/src/TDataStd/TDataStd_Real.cxx @@ -14,11 +14,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -246,4 +247,18 @@ Standard_OStream& TDataStd_Real::Dump (Standard_OStream& anOS) const anOS << sguid; return anOS; } - + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Real::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValue) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDimension) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_Real.hxx b/src/TDataStd/TDataStd_Real.hxx index d20e0588c7..48bb135936 100644 --- a/src/TDataStd/TDataStd_Real.hxx +++ b/src/TDataStd/TDataStd_Real.hxx @@ -99,6 +99,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_RealArray.cxx b/src/TDataStd/TDataStd_RealArray.cxx index 82ce2827ce..7079fddcd9 100644 --- a/src/TDataStd/TDataStd_RealArray.cxx +++ b/src/TDataStd/TDataStd_RealArray.cxx @@ -14,11 +14,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -332,3 +333,23 @@ Handle(TDF_DeltaOnModification) TDataStd_RealArray::DeltaOnModification return new TDataStd_DeltaOnModificationOfRealArray(Handle(TDataStd_RealArray)::DownCast (OldAtt)); else return new TDF_DefaultDeltaOnModification(OldAtt); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_RealArray::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TColStd_Array1OfReal::Iterator aValueIt (myValue->Array1()); aValueIt.More(); aValueIt.Next()) + { + const Standard_Real& aValue = aValueIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDelta) + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_RealArray.hxx b/src/TDataStd/TDataStd_RealArray.hxx index 86f2364911..38a7ab7d1f 100644 --- a/src/TDataStd/TDataStd_RealArray.hxx +++ b/src/TDataStd/TDataStd_RealArray.hxx @@ -128,6 +128,9 @@ public: //! Makes a DeltaOnModification between and //! . Standard_EXPORT virtual Handle(TDF_DeltaOnModification) DeltaOnModification (const Handle(TDF_Attribute)& anOldAttribute) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: diff --git a/src/TDataStd/TDataStd_RealList.cxx b/src/TDataStd/TDataStd_RealList.cxx index 15042aefbb..ba792e222e 100644 --- a/src/TDataStd/TDataStd_RealList.cxx +++ b/src/TDataStd/TDataStd_RealList.cxx @@ -13,11 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -360,3 +361,22 @@ Standard_OStream& TDataStd_RealList::Dump (Standard_OStream& anOS) const anOS << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_RealList::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TColStd_ListOfReal::Iterator aListIt (myList); aListIt.More(); aListIt.Next()) + { + const Standard_Real& aValue = aListIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_RealList.hxx b/src/TDataStd/TDataStd_RealList.hxx index 06c9276e6b..3da451d089 100644 --- a/src/TDataStd/TDataStd_RealList.hxx +++ b/src/TDataStd/TDataStd_RealList.hxx @@ -107,6 +107,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ReferenceArray.cxx b/src/TDataStd/TDataStd_ReferenceArray.cxx index 707e66e56c..6f66c1efa9 100644 --- a/src/TDataStd/TDataStd_ReferenceArray.cxx +++ b/src/TDataStd/TDataStd_ReferenceArray.cxx @@ -13,14 +13,16 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include -#include #include #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ReferenceArray,TDF_Attribute) @@ -330,3 +332,24 @@ Standard_OStream& TDataStd_ReferenceArray::Dump (Standard_OStream& anOS) const anOS << sguid << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_ReferenceArray::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + TCollection_AsciiString aLabel; + for (TDataStd_LabelArray1::Iterator anArrayIt (myArray->Array1()); anArrayIt.More(); anArrayIt.Next()) + { + aLabel.Clear(); + TDF_Tool::Entry (anArrayIt.Value(), aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) + } + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_ReferenceArray.hxx b/src/TDataStd/TDataStd_ReferenceArray.hxx index 8d356200a7..36333eb35d 100644 --- a/src/TDataStd/TDataStd_ReferenceArray.hxx +++ b/src/TDataStd/TDataStd_ReferenceArray.hxx @@ -103,6 +103,9 @@ public: Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ReferenceList.cxx b/src/TDataStd/TDataStd_ReferenceList.cxx index ef19775a4d..c341779d5f 100644 --- a/src/TDataStd/TDataStd_ReferenceList.cxx +++ b/src/TDataStd/TDataStd_ReferenceList.cxx @@ -13,15 +13,17 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include -#include #include #include #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ReferenceList,TDF_Attribute) @@ -383,3 +385,24 @@ Standard_OStream& TDataStd_ReferenceList::Dump (Standard_OStream& anOS) const anOS << std::endl; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_ReferenceList::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + TCollection_AsciiString aLabel; + for (TDF_LabelList::Iterator aListIt (myList); aListIt.More(); aListIt.Next()) + { + aLabel.Clear(); + TDF_Tool::Entry (aListIt.Value(), aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) + } + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_ReferenceList.hxx b/src/TDataStd/TDataStd_ReferenceList.hxx index 5de5ddb493..54beb0b335 100644 --- a/src/TDataStd/TDataStd_ReferenceList.hxx +++ b/src/TDataStd/TDataStd_ReferenceList.hxx @@ -110,6 +110,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_Relation.cxx b/src/TDataStd/TDataStd_Relation.cxx index 68aeb672c0..d4de4a9956 100644 --- a/src/TDataStd/TDataStd_Relation.cxx +++ b/src/TDataStd/TDataStd_Relation.cxx @@ -14,12 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include -#include #include #include #include @@ -173,3 +174,21 @@ Standard_OStream& TDataStd_Relation::Dump(Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Relation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myRelation) + + for (TDF_AttributeList::Iterator aVariableIt (myVariables); aVariableIt.More(); aVariableIt.Next()) + { + const Handle(TDF_Attribute)& aVariable = aVariableIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aVariable.get()) + } +} diff --git a/src/TDataStd/TDataStd_Relation.hxx b/src/TDataStd/TDataStd_Relation.hxx index b96be1d8dc..25387a2661 100644 --- a/src/TDataStd/TDataStd_Relation.hxx +++ b/src/TDataStd/TDataStd_Relation.hxx @@ -78,6 +78,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_Tick.cxx b/src/TDataStd/TDataStd_Tick.cxx index 8c1150141a..6b25ec3124 100644 --- a/src/TDataStd/TDataStd_Tick.cxx +++ b/src/TDataStd/TDataStd_Tick.cxx @@ -13,10 +13,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include -#include #include #include #include @@ -102,3 +103,14 @@ Standard_OStream& TDataStd_Tick::Dump (Standard_OStream& anOS) const anOS << "Tick"; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Tick::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} diff --git a/src/TDataStd/TDataStd_Tick.hxx b/src/TDataStd/TDataStd_Tick.hxx index 44a346d3d7..8427f8f006 100644 --- a/src/TDataStd/TDataStd_Tick.hxx +++ b/src/TDataStd/TDataStd_Tick.hxx @@ -60,6 +60,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_TreeNode.cxx b/src/TDataStd/TDataStd_TreeNode.cxx index e4bcb98d10..1e76f1f013 100644 --- a/src/TDataStd/TDataStd_TreeNode.cxx +++ b/src/TDataStd/TDataStd_TreeNode.cxx @@ -15,12 +15,15 @@ // commercial license or contractual agreement. #include + #include #include #include #include #include +#include #include +#include IMPLEMENT_STANDARD_RTTIEXT(TDataStd_TreeNode,TDF_Attribute) @@ -687,3 +690,46 @@ Standard_OStream& TDataStd_TreeNode::Dump (Standard_OStream& anOS) const anOS<Label(), aFather); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aFather) + } + if (myPrevious) + { + TCollection_AsciiString aPrevious; + TDF_Tool::Entry (myPrevious->Label(), aPrevious); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aPrevious) + } + if (myNext) + { + TCollection_AsciiString aNext; + TDF_Tool::Entry (myNext->Label(), aNext); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aNext) + } + if (myFirst) + { + TCollection_AsciiString aFirst; + TDF_Tool::Entry (myFirst->Label(), aFirst); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aFirst) + } + if (myLast) + { + TCollection_AsciiString aLast; + TDF_Tool::Entry (myLast->Label(), aLast); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLast) + } + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myTreeID) +} diff --git a/src/TDataStd/TDataStd_TreeNode.hxx b/src/TDataStd/TDataStd_TreeNode.hxx index a8c90b7789..a020b72dcc 100644 --- a/src/TDataStd/TDataStd_TreeNode.hxx +++ b/src/TDataStd/TDataStd_TreeNode.hxx @@ -214,6 +214,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + friend class TDataStd_ChildNodeIterator; diff --git a/src/TDataStd/TDataStd_UAttribute.cxx b/src/TDataStd/TDataStd_UAttribute.cxx index 530f2d7484..5ce60a1af4 100644 --- a/src/TDataStd/TDataStd_UAttribute.cxx +++ b/src/TDataStd/TDataStd_UAttribute.cxx @@ -14,11 +14,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include -#include #include #include #include @@ -131,4 +132,15 @@ Standard_OStream& TDataStd_UAttribute::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_UAttribute::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myID) +} diff --git a/src/TDataStd/TDataStd_UAttribute.hxx b/src/TDataStd/TDataStd_UAttribute.hxx index f9253ed699..17e9891f42 100644 --- a/src/TDataStd/TDataStd_UAttribute.hxx +++ b/src/TDataStd/TDataStd_UAttribute.hxx @@ -64,6 +64,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDataStd/TDataStd_Variable.cxx b/src/TDataStd/TDataStd_Variable.cxx index 59f5818ce1..9a37fcae93 100644 --- a/src/TDataStd/TDataStd_Variable.cxx +++ b/src/TDataStd/TDataStd_Variable.cxx @@ -14,8 +14,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include +#include #include #include #include @@ -23,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -336,3 +337,16 @@ Standard_OStream& TDataStd_Variable::Dump(Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDataStd_Variable::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, isConstant) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myUnit) +} diff --git a/src/TDataStd/TDataStd_Variable.hxx b/src/TDataStd/TDataStd_Variable.hxx index 0a437f709c..4b782a4bb0 100644 --- a/src/TDataStd/TDataStd_Variable.hxx +++ b/src/TDataStd/TDataStd_Variable.hxx @@ -140,6 +140,9 @@ public: Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/TDocStd/TDocStd.cxx b/src/TDocStd/TDocStd.cxx index 2869388d94..8905864862 100644 --- a/src/TDocStd/TDocStd.cxx +++ b/src/TDocStd/TDocStd.cxx @@ -20,9 +20,10 @@ //======================================================================= // Declarations: +#include + #include #include -#include #include //#include diff --git a/src/TDocStd/TDocStd_Application.cxx b/src/TDocStd/TDocStd_Application.cxx index 1b7433bb8f..ee2f1ff36c 100644 --- a/src/TDocStd/TDocStd_Application.cxx +++ b/src/TDocStd/TDocStd_Application.cxx @@ -14,6 +14,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -25,11 +26,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -597,3 +598,14 @@ void TDocStd_Application::OnCommitTransaction (const Handle(TDocStd_Document)&) { // nothing to do on this level } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDocStd_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDriverLoaded) +} diff --git a/src/TDocStd/TDocStd_Application.hxx b/src/TDocStd/TDocStd_Application.hxx index 498fac803c..11ce9e535c 100644 --- a/src/TDocStd/TDocStd_Application.hxx +++ b/src/TDocStd/TDocStd_Application.hxx @@ -267,6 +267,9 @@ public: //! Notification that is fired at each AbortTransaction event. Standard_EXPORT virtual void OnAbortTransaction (const Handle(TDocStd_Document)& theDoc); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(TDocStd_Application,CDF_Application) protected: diff --git a/src/TDocStd/TDocStd_ApplicationDelta.cxx b/src/TDocStd/TDocStd_ApplicationDelta.cxx index cd4b0a688f..6c64a88506 100644 --- a/src/TDocStd/TDocStd_ApplicationDelta.cxx +++ b/src/TDocStd/TDocStd_ApplicationDelta.cxx @@ -13,11 +13,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(TDocStd_ApplicationDelta,Standard_Transient) diff --git a/src/TDocStd/TDocStd_CompoundDelta.cxx b/src/TDocStd/TDocStd_CompoundDelta.cxx index 073b09d176..5503a2331b 100644 --- a/src/TDocStd/TDocStd_CompoundDelta.cxx +++ b/src/TDocStd/TDocStd_CompoundDelta.cxx @@ -14,8 +14,9 @@ // ------------- -#include #include + +#include #include IMPLEMENT_STANDARD_RTTIEXT(TDocStd_CompoundDelta,TDF_Delta) diff --git a/src/TDocStd/TDocStd_Document.cxx b/src/TDocStd/TDocStd_Document.cxx index 99f3a293f2..1319abbd0f 100644 --- a/src/TDocStd/TDocStd_Document.cxx +++ b/src/TDocStd/TDocStd_Document.cxx @@ -11,9 +11,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include +#include #include #include #include @@ -33,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -898,3 +899,45 @@ void TDocStd_Document::BeforeClose() myUndoFILO.Clear(); ClearUndos(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDocStd_Document::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, CDM_Document) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myStorageFormat) + + for (TDF_DeltaList::Iterator anUndoIt (myUndos); anUndoIt.More(); anUndoIt.Next()) + { + const Handle(TDF_Delta)& anUndo = anUndoIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anUndo.get()) + } + + for (TDF_DeltaList::Iterator aRedoIt (myRedos); aRedoIt.More(); aRedoIt.Next()) + { + const Handle(TDF_Delta)& aRedo = aRedoIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aRedo.get()) + } + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myData.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUndoLimit) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUndoTransaction) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myFromUndo.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myFromRedo.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySaveTime) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsNestedTransactionMode) + + for (TDF_DeltaList::Iterator anUndoFILOIt (myUndoFILO); anUndoFILOIt.More(); anUndoFILOIt.Next()) + { + const Handle(TDF_Delta)& anUndoFILO = anUndoFILOIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anUndoFILO.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOnlyTransactionModification) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySaveEmptyLabels) +} diff --git a/src/TDocStd/TDocStd_Document.hxx b/src/TDocStd/TDocStd_Document.hxx index b5ac62368f..0d07b103d1 100644 --- a/src/TDocStd/TDocStd_Document.hxx +++ b/src/TDocStd/TDocStd_Document.hxx @@ -245,6 +245,9 @@ public: //! Prepares document for closing Standard_EXPORT virtual void BeforeClose(); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/TDocStd/TDocStd_Modified.cxx b/src/TDocStd/TDocStd_Modified.cxx index b8e1daa8fc..df67833818 100644 --- a/src/TDocStd/TDocStd_Modified.cxx +++ b/src/TDocStd/TDocStd_Modified.cxx @@ -14,6 +14,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDocStd_Modified,TDF_Attribute) diff --git a/src/TDocStd/TDocStd_MultiTransactionManager.cxx b/src/TDocStd/TDocStd_MultiTransactionManager.cxx index 8780603af6..37d78f5303 100644 --- a/src/TDocStd/TDocStd_MultiTransactionManager.cxx +++ b/src/TDocStd/TDocStd_MultiTransactionManager.cxx @@ -13,12 +13,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDocStd_MultiTransactionManager,Standard_Transient) diff --git a/src/TDocStd/TDocStd_Owner.cxx b/src/TDocStd/TDocStd_Owner.cxx index bfa14f07c9..aeba4b2b18 100644 --- a/src/TDocStd/TDocStd_Owner.cxx +++ b/src/TDocStd/TDocStd_Owner.cxx @@ -14,14 +14,15 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDocStd_Owner,TDF_Attribute) @@ -147,3 +148,14 @@ Standard_OStream& TDocStd_Owner::Dump (Standard_OStream& anOS) const return anOS; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TDocStd_Owner::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDocument.get()) +} + diff --git a/src/TDocStd/TDocStd_Owner.hxx b/src/TDocStd/TDocStd_Owner.hxx index 01768c0db7..69e5b0534f 100644 --- a/src/TDocStd/TDocStd_Owner.hxx +++ b/src/TDocStd/TDocStd_Owner.hxx @@ -68,6 +68,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/TDocStd/TDocStd_PathParser.cxx b/src/TDocStd/TDocStd_PathParser.cxx index eba6f7203e..5f9fd775c2 100644 --- a/src/TDocStd/TDocStd_PathParser.cxx +++ b/src/TDocStd/TDocStd_PathParser.cxx @@ -14,9 +14,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include TDocStd_PathParser::TDocStd_PathParser(const TCollection_ExtendedString& path) { diff --git a/src/TDocStd/TDocStd_XLink.cxx b/src/TDocStd/TDocStd_XLink.cxx index 180bf68f58..be54a25ccb 100644 --- a/src/TDocStd/TDocStd_XLink.cxx +++ b/src/TDocStd/TDocStd_XLink.cxx @@ -18,6 +18,8 @@ //Version Date Purpose // 0.0 Sep 15 1997 Creation +#include + #include #include #include @@ -32,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/src/TDocStd/TDocStd_XLinkIterator.cxx b/src/TDocStd/TDocStd_XLinkIterator.cxx index d5666e9e90..84809a9fc9 100644 --- a/src/TDocStd/TDocStd_XLinkIterator.cxx +++ b/src/TDocStd/TDocStd_XLinkIterator.cxx @@ -18,11 +18,12 @@ //Version Date Purpose // 0.0 Sep 15 1997 Creation +#include + #include #include #include #include -#include #include //======================================================================= diff --git a/src/TDocStd/TDocStd_XLinkRoot.cxx b/src/TDocStd/TDocStd_XLinkRoot.cxx index d1c0207beb..d0fd4462a3 100644 --- a/src/TDocStd/TDocStd_XLinkRoot.cxx +++ b/src/TDocStd/TDocStd_XLinkRoot.cxx @@ -18,6 +18,8 @@ //Version Date Purpose // 0.0 Sep 15 1997 Creation +#include + #include #include #include @@ -25,7 +27,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(TDocStd_XLinkRoot,TDF_Attribute) diff --git a/src/TDocStd/TDocStd_XLinkTool.cxx b/src/TDocStd/TDocStd_XLinkTool.cxx index da951e4f32..ca333c0a84 100644 --- a/src/TDocStd/TDocStd_XLinkTool.cxx +++ b/src/TDocStd/TDocStd_XLinkTool.cxx @@ -14,6 +14,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include // standard copy //======================================================================= diff --git a/src/TNaming/TNaming_Name.cxx b/src/TNaming/TNaming_Name.cxx index 9d7ec9d3d0..34ee0bdb9e 100644 --- a/src/TNaming/TNaming_Name.cxx +++ b/src/TNaming/TNaming_Name.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2144,3 +2145,28 @@ void TNaming_Name::Orientation(const TopAbs_Orientation theOrientation) myOrientation = theOrientation; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TNaming_Name::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, TNaming_Name) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myType) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myShapeType) + + for (TNaming_ListOfNamedShape::Iterator anArgsIt (myArgs); anArgsIt.More(); anArgsIt.Next()) + { + const Handle(TNaming_NamedShape)& anArg = anArgsIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anArg.get()) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIndex) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myShape) + + TCollection_AsciiString aLabel; + TDF_Tool::Entry (myContextLabel, aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myOrientation) +} diff --git a/src/TNaming/TNaming_Name.hxx b/src/TNaming/TNaming_Name.hxx index 6c51bd9ebc..6b8fe206ae 100644 --- a/src/TNaming/TNaming_Name.hxx +++ b/src/TNaming/TNaming_Name.hxx @@ -84,6 +84,9 @@ public: Standard_EXPORT Standard_Boolean Solve (const TDF_Label& aLab, const TDF_LabelMap& Valid) const; Standard_EXPORT void Paste (TNaming_Name& into, const Handle(TDF_RelocationTable)& RT) const; + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; private: TNaming_NameType myType; diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx index 860cdcd8fb..e67e4be77c 100644 --- a/src/TNaming/TNaming_NamedShape.cxx +++ b/src/TNaming/TNaming_NamedShape.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -89,6 +90,9 @@ public: // et Trans n est pas posterieure a son BackUp Standard_Boolean IsValidInTrans(Standard_Integer Trans); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + // Memory management DEFINE_STANDARD_ALLOC @@ -135,6 +139,23 @@ Standard_Boolean TNaming_Node::IsValidInTrans(Standard_Integer Trans) return 0; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TNaming_Node::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, TNaming_Node) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myOld) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myNew) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAtt) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, nextSameAttribute) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, nextSameOld) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, nextSameNew) +} + //********************************************************************** // Methods of TNaming_NamedShape //********************************************************************** @@ -1472,6 +1493,17 @@ Handle(TNaming_NamedShape) TNaming_RefShape::NamedShape() const return myFirstUse->myAtt; } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TNaming_RefShape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, TNaming_NamedShape); + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myShape); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myFirstUse); +} //********************************************************************** //Methods of the TNaming_Tool class @@ -1626,3 +1658,20 @@ Standard_Integer TNaming_Tool::ValidUntil (const TopoDS_Shape& S, } return Until; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TNaming_NamedShape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + TCollection_AsciiString aLabel; + TDF_Tool::Entry (myNode->Label(), aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myEvolution) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVersion) +} diff --git a/src/TNaming/TNaming_NamedShape.hxx b/src/TNaming/TNaming_NamedShape.hxx index 4e72e3ab3c..1533423443 100644 --- a/src/TNaming/TNaming_NamedShape.hxx +++ b/src/TNaming/TNaming_NamedShape.hxx @@ -135,6 +135,9 @@ public: //! Dumps the attribute on . Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; friend class TNaming_Builder; friend class TNaming_Iterator; diff --git a/src/TNaming/TNaming_Naming.cxx b/src/TNaming/TNaming_Naming.cxx index 989ab7d003..c2d2b5785c 100644 --- a/src/TNaming/TNaming_Naming.cxx +++ b/src/TNaming/TNaming_Naming.cxx @@ -1998,3 +1998,15 @@ void TNaming_Naming::ExtendedDump(Standard_OStream& anOS, //anOS<<"myContext: #" < #include #include +#include #include #include #include @@ -185,3 +186,28 @@ Standard_OStream& TNaming_UsedShapes::Dump(Standard_OStream& anOS) const void TNaming_UsedShapes::References(const Handle(TDF_DataSet)& ) const { } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TNaming_UsedShapes::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TNaming_DataMapOfShapePtrRefShape::Iterator aMapIt (myMap); aMapIt.More(); aMapIt.Next()) + { + const TopoDS_Shape& aShape = aMapIt.Key(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aShape) + + TCollection_AsciiString aLabel; + TDF_Tool::Entry (aMapIt.Value()->Label(), aLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aLabel) + + const TopoDS_Shape& aRefShape = aMapIt.Value()->Shape(); + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aRefShape) + } +} diff --git a/src/TNaming/TNaming_UsedShapes.hxx b/src/TNaming/TNaming_UsedShapes.hxx index 8e3bd3df7f..935828874e 100644 --- a/src/TNaming/TNaming_UsedShapes.hxx +++ b/src/TNaming/TNaming_UsedShapes.hxx @@ -106,6 +106,9 @@ public: //! Dumps the attribute on . Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; friend class TNaming_Builder; diff --git a/src/TObj/TObj_Application.cxx b/src/TObj/TObj_Application.cxx index 07e92ab329..35588bbe21 100644 --- a/src/TObj/TObj_Application.cxx +++ b/src/TObj/TObj_Application.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -234,3 +235,13 @@ void TObj_Application::ErrorMessage (const TCollection_ExtendedString &theMsg, myMessenger->Send ( theMsg, theLevel ); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void TObj_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application) +} diff --git a/src/TObj/TObj_Application.hxx b/src/TObj/TObj_Application.hxx index d393269ebd..8c44bf001a 100644 --- a/src/TObj/TObj_Application.hxx +++ b/src/TObj/TObj_Application.hxx @@ -79,6 +79,9 @@ public: Standard_Boolean IsVerbose () const { return myIsVerbose; } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + public: /** * Redefined OCAF methods diff --git a/src/TopLoc/TopLoc_Datum3D.cxx b/src/TopLoc/TopLoc_Datum3D.cxx index eff550adca..7837327cf9 100644 --- a/src/TopLoc/TopLoc_Datum3D.cxx +++ b/src/TopLoc/TopLoc_Datum3D.cxx @@ -46,10 +46,10 @@ TopLoc_Datum3D::TopLoc_Datum3D (const gp_Trsf& T) : //function : DumpJson //purpose : //======================================================================= -void TopLoc_Datum3D::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void TopLoc_Datum3D::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, TopLoc_Datum3D); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myTrsf); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myTrsf) } //======================================================================= diff --git a/src/TopLoc/TopLoc_Datum3D.hxx b/src/TopLoc/TopLoc_Datum3D.hxx index 8c145a7752..0997bca4b8 100644 --- a/src/TopLoc/TopLoc_Datum3D.hxx +++ b/src/TopLoc/TopLoc_Datum3D.hxx @@ -54,7 +54,7 @@ public: //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; //! Writes the contents of this Datum3D to the stream S. Standard_EXPORT void ShallowDump (Standard_OStream& S) const; diff --git a/src/TopLoc/TopLoc_ItemLocation.cxx b/src/TopLoc/TopLoc_ItemLocation.cxx index a3530ddc58..a8355e411c 100644 --- a/src/TopLoc/TopLoc_ItemLocation.cxx +++ b/src/TopLoc/TopLoc_ItemLocation.cxx @@ -38,12 +38,12 @@ TopLoc_ItemLocation::TopLoc_ItemLocation //function : DumpJson //purpose : //======================================================================= -void TopLoc_ItemLocation::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void TopLoc_ItemLocation::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, TopLoc_ItemLocation); + OCCT_DUMP_CLASS_BEGIN (theOStream, TopLoc_ItemLocation) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myTrsf); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDatum.get()); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myTrsf) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myDatum.get()) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPower); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPower) } diff --git a/src/TopLoc/TopLoc_ItemLocation.hxx b/src/TopLoc/TopLoc_ItemLocation.hxx index 90cc4103fc..c70f34319e 100644 --- a/src/TopLoc/TopLoc_ItemLocation.hxx +++ b/src/TopLoc/TopLoc_ItemLocation.hxx @@ -51,7 +51,7 @@ public: Standard_EXPORT TopLoc_ItemLocation(const Handle(TopLoc_Datum3D)& D, const Standard_Integer P); //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class TopLoc_Location; diff --git a/src/TopLoc/TopLoc_Location.cxx b/src/TopLoc/TopLoc_Location.cxx index 337077bfd9..f96af9d2e5 100644 --- a/src/TopLoc/TopLoc_Location.cxx +++ b/src/TopLoc/TopLoc_Location.cxx @@ -236,12 +236,12 @@ Standard_Boolean TopLoc_Location::IsDifferent //function : DumpJson //purpose : //======================================================================= -void TopLoc_Location::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void TopLoc_Location::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, TopLoc_Location); + OCCT_DUMP_CLASS_BEGIN (theOStream, TopLoc_Location) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Transformation()); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsIdentity()); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &Transformation()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsIdentity()) } //======================================================================= diff --git a/src/TopLoc/TopLoc_Location.hxx b/src/TopLoc/TopLoc_Location.hxx index fa11d8253d..f3d30815bb 100644 --- a/src/TopLoc/TopLoc_Location.hxx +++ b/src/TopLoc/TopLoc_Location.hxx @@ -143,7 +143,7 @@ Standard_Boolean operator != (const TopLoc_Location& Other) const } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; //! Prints the contents of on the stream . Standard_EXPORT void ShallowDump (Standard_OStream& S) const; diff --git a/src/TopoDS/TopoDS_Shape.cxx b/src/TopoDS/TopoDS_Shape.cxx index aa5067202f..8550758618 100644 --- a/src/TopoDS/TopoDS_Shape.cxx +++ b/src/TopoDS/TopoDS_Shape.cxx @@ -39,12 +39,12 @@ Standard_Integer TopoDS_Shape::HashCode (const Standard_Integer theUpperBound) c //function : DumpJson //purpose : //======================================================================= -void TopoDS_Shape::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void TopoDS_Shape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, TopoDS_Shape); + OCCT_DUMP_CLASS_BEGIN (theOStream, TopoDS_Shape) - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTShape.get()); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myTShape.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOrient); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOrient) } diff --git a/src/TopoDS/TopoDS_Shape.hxx b/src/TopoDS/TopoDS_Shape.hxx index f9f8a30132..52e401287a 100644 --- a/src/TopoDS/TopoDS_Shape.hxx +++ b/src/TopoDS/TopoDS_Shape.hxx @@ -281,7 +281,7 @@ public: void TShape (const Handle(TopoDS_TShape)& theTShape) { myTShape = theTShape; } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; private: diff --git a/src/TopoDS/TopoDS_TShape.cxx b/src/TopoDS/TopoDS_TShape.cxx index 3ae9e1f6b2..82489573d7 100644 --- a/src/TopoDS/TopoDS_TShape.cxx +++ b/src/TopoDS/TopoDS_TShape.cxx @@ -25,8 +25,26 @@ IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TShape,Standard_Transient) //function : DumpJson //purpose : //======================================================================= -void TopoDS_TShape::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void TopoDS_TShape::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, TopoDS_TShape); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFlags); + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, this) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, ShapeType()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, NbChildren()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myFlags) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Free()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Free()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Locked()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Modified()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Checked()) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Orientable()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Closed()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Infinite()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Convex()) } diff --git a/src/TopoDS/TopoDS_TShape.hxx b/src/TopoDS/TopoDS_TShape.hxx index 342436d358..1efe412fab 100644 --- a/src/TopoDS/TopoDS_TShape.hxx +++ b/src/TopoDS/TopoDS_TShape.hxx @@ -127,7 +127,7 @@ public: Standard_Integer NbChildren() const { return myShapes.Size(); } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class TopoDS_Iterator; friend class TopoDS_Builder; diff --git a/src/V3d/V3d_Viewer.cxx b/src/V3d/V3d_Viewer.cxx index 951df3752d..a21cef0143 100644 --- a/src/V3d/V3d_Viewer.cxx +++ b/src/V3d/V3d_Viewer.cxx @@ -573,3 +573,14 @@ void V3d_Viewer::DisplayPrivilegedPlane (const Standard_Boolean theOnOff, const myPlaneStructure->Display(); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void V3d_Viewer::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPrivilegedPlane) +} diff --git a/src/V3d/V3d_Viewer.hxx b/src/V3d/V3d_Viewer.hxx index 306c74c98b..2d3895225e 100644 --- a/src/V3d/V3d_Viewer.hxx +++ b/src/V3d/V3d_Viewer.hxx @@ -508,6 +508,9 @@ public: //! @name deprecated methods Standard_DEPRECATED ("Deprecated method - DefinedLights() should be used instead") const Handle(V3d_Light)& DefinedLight() const { return myDefinedLightsIterator.Value(); } + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + private: //! Returns the default background colour. diff --git a/src/XCAFApp/XCAFApp_Application.cxx b/src/XCAFApp/XCAFApp_Application.cxx index a02d48aa11..6e5e32a069 100644 --- a/src/XCAFApp/XCAFApp_Application.cxx +++ b/src/XCAFApp/XCAFApp_Application.cxx @@ -15,6 +15,7 @@ #include +#include #include #include #include @@ -67,3 +68,14 @@ void XCAFApp_Application::InitDocument(const Handle(TDocStd_Document)& aDoc) con { XCAFDoc_DocumentTool::Set(aDoc->Main()); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFApp_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application) +} diff --git a/src/XCAFApp/XCAFApp_Application.hxx b/src/XCAFApp/XCAFApp_Application.hxx index ea9b93e5ba..05067f69c5 100644 --- a/src/XCAFApp/XCAFApp_Application.hxx +++ b/src/XCAFApp/XCAFApp_Application.hxx @@ -48,6 +48,9 @@ public: //! any actions with documents in order to init application Standard_EXPORT static Handle(XCAFApp_Application) GetApplication(); + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + DEFINE_STANDARD_RTTIEXT(XCAFApp_Application,TDocStd_Application) protected: diff --git a/src/XCAFDoc/XCAFDoc_Area.cxx b/src/XCAFDoc/XCAFDoc_Area.cxx index 3f87af66ef..fa9d84e3e9 100644 --- a/src/XCAFDoc/XCAFDoc_Area.cxx +++ b/src/XCAFDoc/XCAFDoc_Area.cxx @@ -13,13 +13,14 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Area,TDF_Attribute) @@ -146,3 +147,16 @@ Standard_OStream& XCAFDoc_Area::Dump (Standard_OStream& anOS) const anOS << Get(); return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Area::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValue) +} diff --git a/src/XCAFDoc/XCAFDoc_Area.hxx b/src/XCAFDoc/XCAFDoc_Area.hxx index f1fcf4269f..76de1b81a4 100644 --- a/src/XCAFDoc/XCAFDoc_Area.hxx +++ b/src/XCAFDoc/XCAFDoc_Area.hxx @@ -66,6 +66,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_AssemblyItemId.cxx b/src/XCAFDoc/XCAFDoc_AssemblyItemId.cxx index 032ce30e82..2a727a1615 100644 --- a/src/XCAFDoc/XCAFDoc_AssemblyItemId.cxx +++ b/src/XCAFDoc/XCAFDoc_AssemblyItemId.cxx @@ -15,6 +15,8 @@ #include +#include + XCAFDoc_AssemblyItemId::XCAFDoc_AssemblyItemId() { @@ -122,3 +124,18 @@ XCAFDoc_AssemblyItemId::ToString() const aStr.Remove(1, 1); return aStr; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_AssemblyItemId::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, XCAFDoc_AssemblyItemId) + + for (TColStd_ListOfAsciiString::Iterator aPathIt (myPath); aPathIt.More(); aPathIt.Next()) + { + TCollection_AsciiString aPath = aPathIt.Value(); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aPath) + } +} diff --git a/src/XCAFDoc/XCAFDoc_AssemblyItemId.hxx b/src/XCAFDoc/XCAFDoc_AssemblyItemId.hxx index 67a4024830..2d30806f02 100644 --- a/src/XCAFDoc/XCAFDoc_AssemblyItemId.hxx +++ b/src/XCAFDoc/XCAFDoc_AssemblyItemId.hxx @@ -76,6 +76,9 @@ public: //! Returns the full pass as a formatted string. Standard_EXPORT TCollection_AsciiString ToString() const; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; struct Hasher { diff --git a/src/XCAFDoc/XCAFDoc_AssemblyItemRef.cxx b/src/XCAFDoc/XCAFDoc_AssemblyItemRef.cxx index 9059998e78..73fb97f360 100644 --- a/src/XCAFDoc/XCAFDoc_AssemblyItemRef.cxx +++ b/src/XCAFDoc/XCAFDoc_AssemblyItemRef.cxx @@ -13,6 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + +#include #include #include #include @@ -24,7 +27,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_AssemblyItemRef, TDF_Attribute) @@ -293,3 +295,18 @@ XCAFDoc_AssemblyItemRef::Dump(Standard_OStream& theOS) const theOS << "/Subshape: " << myExtraId; return theOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_AssemblyItemRef::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myItemId) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myExtraRef) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myExtraId) +} diff --git a/src/XCAFDoc/XCAFDoc_AssemblyItemRef.hxx b/src/XCAFDoc/XCAFDoc_AssemblyItemRef.hxx index 510b5516a0..62586bf0b9 100644 --- a/src/XCAFDoc/XCAFDoc_AssemblyItemRef.hxx +++ b/src/XCAFDoc/XCAFDoc_AssemblyItemRef.hxx @@ -132,6 +132,9 @@ public: //! Reverts the reference to empty state. Standard_EXPORT void ClearExtraRef(); + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; public: diff --git a/src/XCAFDoc/XCAFDoc_Centroid.cxx b/src/XCAFDoc/XCAFDoc_Centroid.cxx index f1920406ed..dc2e5b4a4a 100644 --- a/src/XCAFDoc/XCAFDoc_Centroid.cxx +++ b/src/XCAFDoc/XCAFDoc_Centroid.cxx @@ -13,6 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Centroid,TDF_Attribute) @@ -149,3 +149,16 @@ Standard_OStream& XCAFDoc_Centroid::Dump (Standard_OStream& anOS) const anOS << myCentroid.Z() << ")"; return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Centroid::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCentroid) +} diff --git a/src/XCAFDoc/XCAFDoc_Centroid.hxx b/src/XCAFDoc/XCAFDoc_Centroid.hxx index bad28e8e81..90ac9a58e1 100644 --- a/src/XCAFDoc/XCAFDoc_Centroid.hxx +++ b/src/XCAFDoc/XCAFDoc_Centroid.hxx @@ -69,6 +69,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.cxx b/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.cxx index da90dfd2d9..366f26c607 100644 --- a/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.cxx @@ -13,6 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ClippingPlaneTool, TDF_Attribute) @@ -345,3 +345,14 @@ XCAFDoc_ClippingPlaneTool::XCAFDoc_ClippingPlaneTool() { } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_ClippingPlaneTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} + diff --git a/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.hxx b/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.hxx index 3dd3d5c34e..d0cb8a5a39 100644 --- a/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ClippingPlaneTool.hxx @@ -105,6 +105,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_Color.cxx b/src/XCAFDoc/XCAFDoc_Color.cxx index e1f1ad91e2..05fd3c0ce3 100644 --- a/src/XCAFDoc/XCAFDoc_Color.cxx +++ b/src/XCAFDoc/XCAFDoc_Color.cxx @@ -13,15 +13,16 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include +#include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Color,TDF_Attribute) @@ -257,3 +258,15 @@ const Standard_GUID& XCAFDoc_Color::ID() const Handle(XCAFDoc_Color)::DownCast(Into)->Set(myColor); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Color::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColor) +} diff --git a/src/XCAFDoc/XCAFDoc_Color.hxx b/src/XCAFDoc/XCAFDoc_Color.hxx index db94e724f6..63af4b7bef 100644 --- a/src/XCAFDoc/XCAFDoc_Color.hxx +++ b/src/XCAFDoc/XCAFDoc_Color.hxx @@ -81,6 +81,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cxx b/src/XCAFDoc/XCAFDoc_ColorTool.cxx index 815dc0e083..7a9e5779a3 100644 --- a/src/XCAFDoc/XCAFDoc_ColorTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ColorTool.cxx @@ -11,8 +11,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include +#include #include #include #include @@ -26,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -798,3 +799,16 @@ Standard_Boolean XCAFDoc_ColorTool::ReverseChainsOfTreeNodes() } return Standard_True; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_ColorTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myShapeTool.get()) +} diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.hxx b/src/XCAFDoc/XCAFDoc_ColorTool.hxx index 8b40145b19..0169e8a17a 100644 --- a/src/XCAFDoc/XCAFDoc_ColorTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ColorTool.hxx @@ -247,6 +247,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_Datum.cxx b/src/XCAFDoc/XCAFDoc_Datum.cxx index bafc41bd6e..ce0e31e0a2 100644 --- a/src/XCAFDoc/XCAFDoc_Datum.cxx +++ b/src/XCAFDoc/XCAFDoc_Datum.cxx @@ -11,6 +11,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -547,3 +547,17 @@ void XCAFDoc_Datum::Paste(const Handle(TDF_Attribute)& theInto, Handle(XCAFDoc_Datum)::DownCast(theInto)->Set(myName,myDescription,myIdentification); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Datum::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myName.get()) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myDescription.get()) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myIdentification.get()) +} diff --git a/src/XCAFDoc/XCAFDoc_Datum.hxx b/src/XCAFDoc/XCAFDoc_Datum.hxx index 2ec529efa7..1afe973824 100644 --- a/src/XCAFDoc/XCAFDoc_Datum.hxx +++ b/src/XCAFDoc/XCAFDoc_Datum.hxx @@ -72,6 +72,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; DEFINE_STANDARD_RTTIEXT(XCAFDoc_Datum,TDF_Attribute) diff --git a/src/XCAFDoc/XCAFDoc_DimTol.cxx b/src/XCAFDoc/XCAFDoc_DimTol.cxx index 4fb3b21da1..01b5118871 100644 --- a/src/XCAFDoc/XCAFDoc_DimTol.cxx +++ b/src/XCAFDoc/XCAFDoc_DimTol.cxx @@ -11,14 +11,15 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_DimTol,TDF_Attribute) @@ -175,3 +176,24 @@ void XCAFDoc_DimTol::Paste(const Handle(TDF_Attribute)& Into, Handle(XCAFDoc_DimTol)::DownCast(Into)->Set(myKind,myVal,myName,myDescription); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_DimTol::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myKind) + + for (TColStd_Array1OfReal::Iterator aValIt (myVal->Array1()); aValIt.More(); aValIt.Next()) + { + const Standard_Real& aValue = aValIt.Value(); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, aValue) + } + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myName.get()) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myDescription.get()) +} diff --git a/src/XCAFDoc/XCAFDoc_DimTol.hxx b/src/XCAFDoc/XCAFDoc_DimTol.hxx index b218a1e80b..52833582e6 100644 --- a/src/XCAFDoc/XCAFDoc_DimTol.hxx +++ b/src/XCAFDoc/XCAFDoc_DimTol.hxx @@ -62,6 +62,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_DimTolTool.cxx b/src/XCAFDoc/XCAFDoc_DimTolTool.cxx index 931a6a2e45..f2f9045802 100644 --- a/src/XCAFDoc/XCAFDoc_DimTolTool.cxx +++ b/src/XCAFDoc/XCAFDoc_DimTolTool.cxx @@ -12,6 +12,7 @@ // commercial license or contractual agreement. #include + #include #include #include @@ -1089,4 +1090,17 @@ void XCAFDoc_DimTolTool::SetGDTPresentations(NCollection_IndexedDataMap +#include #include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_GraphNode,TDF_Attribute) @@ -480,3 +481,28 @@ void XCAFDoc_GraphNode::BeforeForget() UnSetChild (1); } } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_GraphNode::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (XCAFDoc_GraphNodeSequence::Iterator anIteratorFather (myFathers); anIteratorFather.More(); anIteratorFather.Next()) + { + const Handle(XCAFDoc_GraphNode)& aFather = anIteratorFather.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aFather.get()) + } + + for (XCAFDoc_GraphNodeSequence::Iterator anIteratorChild (myChildren); anIteratorChild.More(); anIteratorChild.Next()) + { + const Handle(XCAFDoc_GraphNode)& aChild = anIteratorChild.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aChild.get()) + } + + OCCT_DUMP_FIELD_VALUE_GUID (theOStream, myGraphID) +} diff --git a/src/XCAFDoc/XCAFDoc_GraphNode.hxx b/src/XCAFDoc/XCAFDoc_GraphNode.hxx index 96380774b9..cf54212b7a 100644 --- a/src/XCAFDoc/XCAFDoc_GraphNode.hxx +++ b/src/XCAFDoc/XCAFDoc_GraphNode.hxx @@ -141,6 +141,9 @@ public: Standard_EXPORT virtual void BeforeForget() Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.cxx b/src/XCAFDoc/XCAFDoc_LayerTool.cxx index db5d16d417..95bf9f55bf 100644 --- a/src/XCAFDoc/XCAFDoc_LayerTool.cxx +++ b/src/XCAFDoc/XCAFDoc_LayerTool.cxx @@ -13,6 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_LayerTool,TDF_Attribute) @@ -622,3 +622,15 @@ void XCAFDoc_LayerTool::Paste(const Handle(TDF_Attribute)& /* into */, { } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_LayerTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myShapeTool.get()) +} diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.hxx b/src/XCAFDoc/XCAFDoc_LayerTool.hxx index 59cd30a604..b3428d3e6f 100644 --- a/src/XCAFDoc/XCAFDoc_LayerTool.hxx +++ b/src/XCAFDoc/XCAFDoc_LayerTool.hxx @@ -190,6 +190,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_Location.cxx b/src/XCAFDoc/XCAFDoc_Location.cxx index 61021e118a..58dca9c77f 100644 --- a/src/XCAFDoc/XCAFDoc_Location.cxx +++ b/src/XCAFDoc/XCAFDoc_Location.cxx @@ -13,6 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Location,TDF_Attribute) @@ -121,3 +121,15 @@ const Standard_GUID& XCAFDoc_Location::ID() const } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Location::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myLocation) +} diff --git a/src/XCAFDoc/XCAFDoc_Location.hxx b/src/XCAFDoc/XCAFDoc_Location.hxx index a2dfc61a04..60497f1d56 100644 --- a/src/XCAFDoc/XCAFDoc_Location.hxx +++ b/src/XCAFDoc/XCAFDoc_Location.hxx @@ -62,6 +62,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_Material.cxx b/src/XCAFDoc/XCAFDoc_Material.cxx index 7b6090a8b9..3b8c887a87 100644 --- a/src/XCAFDoc/XCAFDoc_Material.cxx +++ b/src/XCAFDoc/XCAFDoc_Material.cxx @@ -11,14 +11,15 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Material,TDF_Attribute) @@ -188,3 +189,19 @@ void XCAFDoc_Material::Paste(const Handle(TDF_Attribute)& Into, myDensName,myDensValType); } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Material::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myName.get()) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myDescription.get()) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDensity) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myDensName.get()) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myDensValType.get()) +} diff --git a/src/XCAFDoc/XCAFDoc_Material.hxx b/src/XCAFDoc/XCAFDoc_Material.hxx index 9a07f705c9..936f38600a 100644 --- a/src/XCAFDoc/XCAFDoc_Material.hxx +++ b/src/XCAFDoc/XCAFDoc_Material.hxx @@ -63,6 +63,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_MaterialTool.cxx b/src/XCAFDoc/XCAFDoc_MaterialTool.cxx index a62e8a12bf..f50676b6ac 100644 --- a/src/XCAFDoc/XCAFDoc_MaterialTool.cxx +++ b/src/XCAFDoc/XCAFDoc_MaterialTool.cxx @@ -11,6 +11,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -24,7 +25,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_MaterialTool,TDF_Attribute) @@ -266,3 +266,15 @@ void XCAFDoc_MaterialTool::Paste(const Handle(TDF_Attribute)& /*into*/, { } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_MaterialTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myShapeTool.get()) +} diff --git a/src/XCAFDoc/XCAFDoc_MaterialTool.hxx b/src/XCAFDoc/XCAFDoc_MaterialTool.hxx index 4826d8195f..07751866ab 100644 --- a/src/XCAFDoc/XCAFDoc_MaterialTool.hxx +++ b/src/XCAFDoc/XCAFDoc_MaterialTool.hxx @@ -91,6 +91,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_Note.cxx b/src/XCAFDoc/XCAFDoc_Note.cxx index f4ab611c87..0a474df07e 100644 --- a/src/XCAFDoc/XCAFDoc_Note.cxx +++ b/src/XCAFDoc/XCAFDoc_Note.cxx @@ -229,3 +229,17 @@ XCAFDoc_Note::Dump(Standard_OStream& theOS) const ; return theOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Note::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myUserName) + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myTimeStamp) +} diff --git a/src/XCAFDoc/XCAFDoc_Note.hxx b/src/XCAFDoc/XCAFDoc_Note.hxx index 16a77fa929..d96341d52c 100644 --- a/src/XCAFDoc/XCAFDoc_Note.hxx +++ b/src/XCAFDoc/XCAFDoc_Note.hxx @@ -69,6 +69,9 @@ public: Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theAttrInto, const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; Standard_EXPORT Standard_OStream& Dump(Standard_OStream& theOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; protected: diff --git a/src/XCAFDoc/XCAFDoc_NoteBalloon.cxx b/src/XCAFDoc/XCAFDoc_NoteBalloon.cxx index 559d4eaffc..495d74f3cb 100644 --- a/src/XCAFDoc/XCAFDoc_NoteBalloon.cxx +++ b/src/XCAFDoc/XCAFDoc_NoteBalloon.cxx @@ -11,9 +11,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_NoteBalloon, XCAFDoc_NoteComment) diff --git a/src/XCAFDoc/XCAFDoc_NoteBinData.cxx b/src/XCAFDoc/XCAFDoc_NoteBinData.cxx index c8bb3e3f98..bbb92e3e81 100644 --- a/src/XCAFDoc/XCAFDoc_NoteBinData.cxx +++ b/src/XCAFDoc/XCAFDoc_NoteBinData.cxx @@ -11,10 +11,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_NoteBinData, XCAFDoc_Note) diff --git a/src/XCAFDoc/XCAFDoc_NoteComment.cxx b/src/XCAFDoc/XCAFDoc_NoteComment.cxx index 1d1cb99e42..7d93f70d83 100644 --- a/src/XCAFDoc/XCAFDoc_NoteComment.cxx +++ b/src/XCAFDoc/XCAFDoc_NoteComment.cxx @@ -11,9 +11,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_NoteComment, XCAFDoc_Note) diff --git a/src/XCAFDoc/XCAFDoc_NotesTool.cxx b/src/XCAFDoc/XCAFDoc_NotesTool.cxx index fe971ac8eb..bdbecfd674 100644 --- a/src/XCAFDoc/XCAFDoc_NotesTool.cxx +++ b/src/XCAFDoc/XCAFDoc_NotesTool.cxx @@ -11,6 +11,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + #include #include #include @@ -21,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -1060,3 +1061,14 @@ XCAFDoc_NotesTool::Dump(Standard_OStream& theOS) const ; return theOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_NotesTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} diff --git a/src/XCAFDoc/XCAFDoc_NotesTool.hxx b/src/XCAFDoc/XCAFDoc_NotesTool.hxx index 7480d134fd..1163ce8959 100644 --- a/src/XCAFDoc/XCAFDoc_NotesTool.hxx +++ b/src/XCAFDoc/XCAFDoc_NotesTool.hxx @@ -509,6 +509,9 @@ public: Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theAttrInto, const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; Standard_EXPORT Standard_OStream& Dump(Standard_OStream& theOS) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; }; diff --git a/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx index 938a66f94e..552732b84b 100644 --- a/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx @@ -11,6 +11,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ShapeMapTool,TDF_Attribute) @@ -149,3 +149,20 @@ const TopTools_IndexedMapOfShape& XCAFDoc_ShapeMapTool::GetMap() const { return myMap; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_ShapeMapTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (TopTools_IndexedMapOfShape::Iterator aMapIt (myMap); aMapIt.More(); aMapIt.Next()) + { + const TopoDS_Shape& aShape = aMapIt.Value(); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aShape) + } +} diff --git a/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx b/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx index 93cdcb3237..72fdee8057 100644 --- a/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx @@ -63,6 +63,9 @@ public: Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT const TopTools_IndexedMapOfShape& GetMap() const; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx index 6142603e3a..767175f27f 100644 --- a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx @@ -13,6 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ShapeTool,TDF_Attribute) @@ -2143,3 +2143,43 @@ Handle(TDataStd_NamedData) XCAFDoc_ShapeTool::GetNamedProperties (const TopoDS_S return aNamedProperty; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_ShapeTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + for (XCAFDoc_DataMapOfShapeLabel::Iterator aShapeLabelIt (myShapeLabels); aShapeLabelIt.More(); aShapeLabelIt.Next()) + { + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aShapeLabelIt.Key()) + + TCollection_AsciiString aShapeLabel; + TDF_Tool::Entry (aShapeLabelIt.Value(), aShapeLabel); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aShapeLabel) + } + + for (XCAFDoc_DataMapOfShapeLabel::Iterator aSubShapeIt (mySubShapes); aSubShapeIt.More(); aSubShapeIt.Next()) + { + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aSubShapeIt.Key()) + + TCollection_AsciiString aSubShape; + TDF_Tool::Entry (aSubShapeIt.Value(), aSubShape); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aSubShape) + } + + for (XCAFDoc_DataMapOfShapeLabel::Iterator aSimpleShapeIt (mySimpleShapes); aSimpleShapeIt.More(); aSimpleShapeIt.Next()) + { + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &aSimpleShapeIt.Key()) + + TCollection_AsciiString aSimpleShape; + TDF_Tool::Entry (aSimpleShapeIt.Value(), aSimpleShape); + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, aSimpleShape) + } + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, hasSimpleShapes) +} diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.hxx b/src/XCAFDoc/XCAFDoc_ShapeTool.hxx index 2cc83e0b6d..7f66a4b1ba 100644 --- a/src/XCAFDoc/XCAFDoc_ShapeTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ShapeTool.hxx @@ -424,6 +424,9 @@ public: //! @param theToCreate [in] create and assign attribute if it doesn't exist //! @return Handle to the NamedData attribute or Null if there is none Standard_EXPORT Handle(TDataStd_NamedData) GetNamedProperties(const TopoDS_Shape& theShape, const Standard_Boolean theToCreate = Standard_False) const; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; DEFINE_STANDARD_RTTIEXT(XCAFDoc_ShapeTool,TDF_Attribute) diff --git a/src/XCAFDoc/XCAFDoc_View.cxx b/src/XCAFDoc/XCAFDoc_View.cxx index 080467401c..9e96db27a6 100644 --- a/src/XCAFDoc/XCAFDoc_View.cxx +++ b/src/XCAFDoc/XCAFDoc_View.cxx @@ -313,3 +313,14 @@ void XCAFDoc_View::Paste(const Handle(TDF_Attribute)& /*Into*/, const Handle(TDF_RelocationTable)& /*RT*/) const { } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_View::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} diff --git a/src/XCAFDoc/XCAFDoc_View.hxx b/src/XCAFDoc/XCAFDoc_View.hxx index b88bfb7b9d..a3a12b3701 100644 --- a/src/XCAFDoc/XCAFDoc_View.hxx +++ b/src/XCAFDoc/XCAFDoc_View.hxx @@ -60,6 +60,9 @@ public: //! Returns view object data taken from the paren's label and its sub-labels. Standard_EXPORT Handle(XCAFView_Object) GetObject() const; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; DEFINE_STANDARD_RTTIEXT(XCAFDoc_View, TDF_Attribute) diff --git a/src/XCAFDoc/XCAFDoc_ViewTool.cxx b/src/XCAFDoc/XCAFDoc_ViewTool.cxx index d3ee01db12..8a6269a6f2 100644 --- a/src/XCAFDoc/XCAFDoc_ViewTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ViewTool.cxx @@ -13,6 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + #include #include #include @@ -26,8 +28,6 @@ #include #include #include -#include - IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ViewTool, TDF_Attribute) @@ -791,3 +791,13 @@ void XCAFDoc_ViewTool::Paste(const Handle(TDF_Attribute)& /*into*/, { } +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_ViewTool::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) +} diff --git a/src/XCAFDoc/XCAFDoc_ViewTool.hxx b/src/XCAFDoc/XCAFDoc_ViewTool.hxx index 7fcd681007..ea1a3b0468 100644 --- a/src/XCAFDoc/XCAFDoc_ViewTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ViewTool.hxx @@ -144,6 +144,9 @@ public: Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; DEFINE_STANDARD_RTTIEXT(XCAFDoc_ViewTool, TDF_Attribute) diff --git a/src/XCAFDoc/XCAFDoc_VisMaterial.cxx b/src/XCAFDoc/XCAFDoc_VisMaterial.cxx index 3872c5875d..d31890a6df 100644 --- a/src/XCAFDoc/XCAFDoc_VisMaterial.cxx +++ b/src/XCAFDoc/XCAFDoc_VisMaterial.cxx @@ -299,3 +299,23 @@ void XCAFDoc_VisMaterial::FillAspect (const Handle(Graphic3d_Aspects)& theAspect theAspect->SetTextureSet (aTextureSet); theAspect->SetTextureMapOn (true); } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_VisMaterial::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_STRING (theOStream, myRawName.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPbrMat) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCommonMat) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlphaMode) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAlphaCutOff) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsDoubleSided) +} diff --git a/src/XCAFDoc/XCAFDoc_VisMaterial.hxx b/src/XCAFDoc/XCAFDoc_VisMaterial.hxx index 41ec4afebb..54e53ad637 100644 --- a/src/XCAFDoc/XCAFDoc_VisMaterial.hxx +++ b/src/XCAFDoc/XCAFDoc_VisMaterial.hxx @@ -154,6 +154,9 @@ public: //! @name interface implementation //! @param theRelTable [in] relocation table Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& theInto, const Handle(TDF_RelocationTable)& theRelTable) const Standard_OVERRIDE; + + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; private: diff --git a/src/XCAFDoc/XCAFDoc_VisMaterialCommon.hxx b/src/XCAFDoc/XCAFDoc_VisMaterialCommon.hxx index dfb01d6e2e..22cb88a336 100644 --- a/src/XCAFDoc/XCAFDoc_VisMaterialCommon.hxx +++ b/src/XCAFDoc/XCAFDoc_VisMaterialCommon.hxx @@ -18,6 +18,7 @@ #include #include #include +#include class Graphic3d_Aspects; class Graphic3d_MaterialAspect; @@ -68,6 +69,23 @@ struct XCAFDoc_VisMaterialCommon && theOther.Shininess == Shininess && theOther.Transparency == Transparency; } -}; + + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + OCCT_DUMP_CLASS_BEGIN (theOStream, XCAFDoc_VisMaterialCommon) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, DiffuseTexture.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &AmbientColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &DiffuseColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &SpecularColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &EmissiveColor) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Shininess) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Transparency) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsDefined) + } +}; #endif // _XCAFDoc_VisMaterialCommon_HeaderFile diff --git a/src/XCAFDoc/XCAFDoc_VisMaterialPBR.hxx b/src/XCAFDoc/XCAFDoc_VisMaterialPBR.hxx index 802768c2b9..39bd90abfb 100644 --- a/src/XCAFDoc/XCAFDoc_VisMaterialPBR.hxx +++ b/src/XCAFDoc/XCAFDoc_VisMaterialPBR.hxx @@ -18,6 +18,7 @@ #include #include #include +#include //! Metallic-roughness PBR material definition. struct XCAFDoc_VisMaterialPBR @@ -70,6 +71,26 @@ struct XCAFDoc_VisMaterialPBR && theOther.Roughness == Roughness && theOther.RefractionIndex == RefractionIndex; } + + //! Dumps the content of me into the stream + void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const + { + OCCT_DUMP_CLASS_BEGIN (theOStream, XCAFDoc_VisMaterialPBR) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, BaseColorTexture.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, MetallicRoughnessTexture.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, EmissiveTexture.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, OcclusionTexture.get()) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, NormalTexture.get()) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &BaseColor) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &EmissiveFactor) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Metallic) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Roughness) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, RefractionIndex) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsDefined) + } }; #endif // _XCAFDoc_VisMaterialPBR_HeaderFile diff --git a/src/XCAFDoc/XCAFDoc_Volume.cxx b/src/XCAFDoc/XCAFDoc_Volume.cxx index c53f8cb5a1..93252c2747 100644 --- a/src/XCAFDoc/XCAFDoc_Volume.cxx +++ b/src/XCAFDoc/XCAFDoc_Volume.cxx @@ -13,13 +13,14 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include +#include #include #include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Volume,TDF_Attribute) @@ -146,3 +147,16 @@ Standard_OStream& XCAFDoc_Volume::Dump (Standard_OStream& anOS) const anOS << Get(); return anOS; } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void XCAFDoc_Volume::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream) + + OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDF_Attribute) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myValue) +} diff --git a/src/XCAFDoc/XCAFDoc_Volume.hxx b/src/XCAFDoc/XCAFDoc_Volume.hxx index 751fed588e..8e6644ec31 100644 --- a/src/XCAFDoc/XCAFDoc_Volume.hxx +++ b/src/XCAFDoc/XCAFDoc_Volume.hxx @@ -67,6 +67,9 @@ public: Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; + //! Dumps the content of me into the stream + Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; + diff --git a/src/XCAFPrs/XCAFPrs_Style.cxx b/src/XCAFPrs/XCAFPrs_Style.cxx index 434cccf709..b4970370c8 100644 --- a/src/XCAFPrs/XCAFPrs_Style.cxx +++ b/src/XCAFPrs/XCAFPrs_Style.cxx @@ -74,14 +74,14 @@ void XCAFPrs_Style::UnSetColorCurv() //function : DumpJson //purpose : //======================================================================= -void XCAFPrs_Style::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void XCAFPrs_Style::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const { OCCT_DUMP_CLASS_BEGIN (theOStream, XCAFPrs_Style); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColorSurf); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColorCurv); + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColorSurf) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myColorCurv) - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasColorSurf); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasColorCurv); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsVisible); + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasColorSurf) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasColorCurv) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsVisible) } diff --git a/src/XCAFPrs/XCAFPrs_Style.hxx b/src/XCAFPrs/XCAFPrs_Style.hxx index fedc277a22..cef8024b70 100644 --- a/src/XCAFPrs/XCAFPrs_Style.hxx +++ b/src/XCAFPrs/XCAFPrs_Style.hxx @@ -143,7 +143,7 @@ public: } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; protected: diff --git a/src/gp/gp_Ax1.cxx b/src/gp/gp_Ax1.cxx index 65290c0d21..3ee0231b34 100644 --- a/src/gp/gp_Ax1.cxx +++ b/src/gp/gp_Ax1.cxx @@ -27,6 +27,7 @@ #include #include #include +#include Standard_Boolean gp_Ax1::IsCoaxial (const gp_Ax1& Other, @@ -84,3 +85,8 @@ gp_Ax1 gp_Ax1::Mirrored (const gp_Ax2& A2) const return A1; } +void gp_Ax1::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "Location", 3, loc.X(), loc.Y(), loc.Z()) + OCCT_DUMP_VECTOR_CLASS (theOStream, "Direction", 3, vdir.X(), vdir.Y(), vdir.Z()) +} diff --git a/src/gp/gp_Ax1.hxx b/src/gp/gp_Ax1.hxx index 75575dbcb9..f71a0829fe 100644 --- a/src/gp/gp_Ax1.hxx +++ b/src/gp/gp_Ax1.hxx @@ -205,6 +205,9 @@ public: Standard_NODISCARD gp_Ax1 Translated (const gp_Pnt& P1, const gp_Pnt& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Ax2.cxx b/src/gp/gp_Ax2.cxx index bcecdca6fd..ba8e7b155d 100644 --- a/src/gp/gp_Ax2.cxx +++ b/src/gp/gp_Ax2.cxx @@ -28,6 +28,7 @@ #include #include #include +#include gp_Ax2::gp_Ax2 (const gp_Pnt& P, const gp_Dir& V) : axis(P,V) @@ -113,3 +114,11 @@ gp_Ax2 gp_Ax2::Mirrored(const gp_Ax2& A2) const return Temp; } +void gp_Ax2::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "Location", 3, axis.Location().X(), axis.Location().Y(), axis.Location().Z()) + OCCT_DUMP_VECTOR_CLASS (theOStream, "Direction", 3, axis.Direction().X(), axis.Direction().Y(), axis.Direction().Z()) + + OCCT_DUMP_VECTOR_CLASS (theOStream, "XDirection", 3, vxdir.X(), vxdir.Y(), vxdir.Z()) + OCCT_DUMP_VECTOR_CLASS (theOStream, "YDirection", 3, vydir.X(), vydir.Y(), vydir.Z()) +} diff --git a/src/gp/gp_Ax2.hxx b/src/gp/gp_Ax2.hxx index 1577b6d9a6..1586dfed73 100644 --- a/src/gp/gp_Ax2.hxx +++ b/src/gp/gp_Ax2.hxx @@ -323,6 +323,9 @@ public: Standard_NODISCARD gp_Ax2 Translated (const gp_Pnt& P1, const gp_Pnt& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Ax22d.cxx b/src/gp/gp_Ax22d.cxx index 40ea9ac5cb..fc8b27f480 100644 --- a/src/gp/gp_Ax22d.cxx +++ b/src/gp/gp_Ax22d.cxx @@ -24,6 +24,7 @@ #include #include #include +#include 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, 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 057d624878..a249c162d6 100644 --- a/src/gp/gp_Ax22d.hxx +++ b/src/gp/gp_Ax22d.hxx @@ -210,6 +210,9 @@ public: //! point . Standard_NODISCARD gp_Ax22d Translated (const gp_Pnt2d& P1, const gp_Pnt2d& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/gp/gp_Ax2d.cxx b/src/gp/gp_Ax2d.cxx index ab24a561a9..6fb6bdfc7d 100644 --- a/src/gp/gp_Ax2d.cxx +++ b/src/gp/gp_Ax2d.cxx @@ -25,6 +25,7 @@ #include #include #include +#include Standard_Boolean gp_Ax2d::IsCoaxial (const gp_Ax2d& Other, const Standard_Real AngularTolerance, @@ -75,3 +76,10 @@ gp_Ax2d gp_Ax2d::Mirrored (const gp_Ax2d& A) const return AA; } +void gp_Ax2d::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, gp_Ax2d) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &loc) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &vdir) +} diff --git a/src/gp/gp_Ax2d.hxx b/src/gp/gp_Ax2d.hxx index 0d66cdb951..03b9ff26d7 100644 --- a/src/gp/gp_Ax2d.hxx +++ b/src/gp/gp_Ax2d.hxx @@ -168,6 +168,9 @@ public: //! point . Standard_NODISCARD gp_Ax2d Translated (const gp_Pnt2d& P1, const gp_Pnt2d& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/gp/gp_Ax3.cxx b/src/gp/gp_Ax3.cxx index 2a9a065c24..ec5e8b7c4d 100644 --- a/src/gp/gp_Ax3.cxx +++ b/src/gp/gp_Ax3.cxx @@ -23,6 +23,7 @@ #include #include #include +#include //======================================================================= //function : gp_Ax3 @@ -105,3 +106,12 @@ gp_Ax3 gp_Ax3::Mirrored(const gp_Ax2& A2)const return Temp; } + +void gp_Ax3::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "Location", 3, Location().X(), Location().Y(), Location().Z()) + OCCT_DUMP_VECTOR_CLASS (theOStream, "Direction", 3, Direction().X(), Direction().Y(), Direction().Z()) + + OCCT_DUMP_VECTOR_CLASS (theOStream, "XDirection", 3, XDirection().X(), XDirection().Y(), XDirection().Z()) + OCCT_DUMP_VECTOR_CLASS (theOStream, "YDirection", 3, YDirection().X(), YDirection().Y(), YDirection().Z()) +} diff --git a/src/gp/gp_Ax3.hxx b/src/gp/gp_Ax3.hxx index 5a53cfdcd8..50068bea7b 100644 --- a/src/gp/gp_Ax3.hxx +++ b/src/gp/gp_Ax3.hxx @@ -290,6 +290,9 @@ public: Standard_NODISCARD gp_Ax3 Translated (const gp_Pnt& P1, const gp_Pnt& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Dir.cxx b/src/gp/gp_Dir.cxx index 228e23db09..0714a34e6b 100644 --- a/src/gp/gp_Dir.cxx +++ b/src/gp/gp_Dir.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include Standard_Real gp_Dir::Angle (const gp_Dir& Other) const @@ -139,3 +140,7 @@ gp_Dir gp_Dir::Mirrored (const gp_Ax2& A2) const return V; } +void gp_Dir::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_Dir", 3, coord.X(), coord.Y(), coord.Z()) +} diff --git a/src/gp/gp_Dir.hxx b/src/gp/gp_Dir.hxx index e290b787d2..0892155c00 100644 --- a/src/gp/gp_Dir.hxx +++ b/src/gp/gp_Dir.hxx @@ -263,6 +263,9 @@ public: Standard_NODISCARD gp_Dir Transformed (const gp_Trsf& T) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Dir2d.cxx b/src/gp/gp_Dir2d.cxx index 90d06bc78e..57e7b4664c 100644 --- a/src/gp/gp_Dir2d.cxx +++ b/src/gp/gp_Dir2d.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include Standard_Real gp_Dir2d::Angle (const gp_Dir2d& Other) const @@ -101,3 +102,7 @@ gp_Dir2d gp_Dir2d::Mirrored (const gp_Ax2d& A) const return V; } +void gp_Dir2d::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_Dir2d", 2, coord.X(), coord.Y()) +} diff --git a/src/gp/gp_Dir2d.hxx b/src/gp/gp_Dir2d.hxx index 091b27dc7c..d775029c24 100644 --- a/src/gp/gp_Dir2d.hxx +++ b/src/gp/gp_Dir2d.hxx @@ -249,6 +249,9 @@ public: //! direction is reversed. Standard_NODISCARD gp_Dir2d Transformed (const gp_Trsf2d& T) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/gp/gp_GTrsf.cxx b/src/gp/gp_GTrsf.cxx index 0196ec7fe9..76b97fd488 100644 --- a/src/gp/gp_GTrsf.cxx +++ b/src/gp/gp_GTrsf.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include void gp_GTrsf::SetTranslationPart (const gp_XYZ& Coord) @@ -157,3 +158,18 @@ void gp_GTrsf::SetForm() return; } } + +//======================================================================= +//function : DumpJson +//purpose : +//======================================================================= +void gp_GTrsf::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_CLASS_BEGIN (theOStream, gp_GTrsf) + + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &matrix) + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &loc) + + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, shape) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, scale) +} diff --git a/src/gp/gp_GTrsf.hxx b/src/gp/gp_GTrsf.hxx index 068aa81826..0d2414cae6 100644 --- a/src/gp/gp_GTrsf.hxx +++ b/src/gp/gp_GTrsf.hxx @@ -244,6 +244,9 @@ public: gp_Trsf Trsf() const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + diff --git a/src/gp/gp_Mat.cxx b/src/gp/gp_Mat.cxx index 014797b851..dcf8fe37e8 100644 --- a/src/gp/gp_Mat.cxx +++ b/src/gp/gp_Mat.cxx @@ -273,7 +273,7 @@ void gp_Mat::Power (const Standard_Integer N) //function : DumpJson //purpose : //======================================================================= -void gp_Mat::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void gp_Mat::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_VECTOR_CLASS (theOStream, gp_Mat, 9, Mat00, Mat01, Mat02, Mat10, Mat11, Mat12, Mat20, Mat21, Mat22); + OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_Mat", 9, Mat00, Mat01, Mat02, Mat10, Mat11, Mat12, Mat20, Mat21, Mat22) } diff --git a/src/gp/gp_Mat.hxx b/src/gp/gp_Mat.hxx index d327280a65..8eb57bc987 100644 --- a/src/gp/gp_Mat.hxx +++ b/src/gp/gp_Mat.hxx @@ -256,7 +256,7 @@ public: Standard_NODISCARD gp_Mat Transposed() const; //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class gp_XYZ; diff --git a/src/gp/gp_Pln.cxx b/src/gp/gp_Pln.cxx index 27a9a35717..4d14751d50 100644 --- a/src/gp/gp_Pln.cxx +++ b/src/gp/gp_Pln.cxx @@ -30,6 +30,7 @@ #include #include #include +#include gp_Pln::gp_Pln (const gp_Pnt& P, const gp_Dir& V) @@ -130,3 +131,7 @@ gp_Pln gp_Pln::Mirrored (const gp_Ax2& A2) const return Pl; } +void gp_Pln::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const +{ + OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos) +} diff --git a/src/gp/gp_Pln.hxx b/src/gp/gp_Pln.hxx index 2432fef27f..5ac20a3f8c 100644 --- a/src/gp/gp_Pln.hxx +++ b/src/gp/gp_Pln.hxx @@ -241,6 +241,9 @@ public: Standard_NODISCARD gp_Pln Translated (const gp_Pnt& P1, const gp_Pnt& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Pnt.cxx b/src/gp/gp_Pnt.cxx index ac82fb208a..10a9b5d434 100644 --- a/src/gp/gp_Pnt.cxx +++ b/src/gp/gp_Pnt.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include void gp_Pnt::Transform (const gp_Trsf& T) @@ -85,3 +86,7 @@ gp_Pnt gp_Pnt::Mirrored (const gp_Ax2& A2) const return P; } +void gp_Pnt::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_Pnt", 3, coord.X(), coord.Y(), coord.Z()) +} diff --git a/src/gp/gp_Pnt.hxx b/src/gp/gp_Pnt.hxx index 39d7d2efcf..b9c4b5c087 100644 --- a/src/gp/gp_Pnt.hxx +++ b/src/gp/gp_Pnt.hxx @@ -174,6 +174,9 @@ public: Standard_NODISCARD gp_Pnt Translated (const gp_Pnt& P1, const gp_Pnt& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Pnt2d.cxx b/src/gp/gp_Pnt2d.cxx index f51542f05c..51119eb850 100644 --- a/src/gp/gp_Pnt2d.cxx +++ b/src/gp/gp_Pnt2d.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include void gp_Pnt2d::Transform (const gp_Trsf2d& T) @@ -69,3 +70,7 @@ gp_Pnt2d gp_Pnt2d::Mirrored (const gp_Ax2d& A) const return P; } +void gp_Pnt2d::DumpJson (Standard_OStream& theOStream, Standard_Integer) const +{ + OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_Pnt2d", 2, coord.X(), coord.Y()) +} diff --git a/src/gp/gp_Pnt2d.hxx b/src/gp/gp_Pnt2d.hxx index a4c2a25129..badbfa9137 100644 --- a/src/gp/gp_Pnt2d.hxx +++ b/src/gp/gp_Pnt2d.hxx @@ -151,6 +151,9 @@ public: Standard_NODISCARD gp_Pnt2d Translated (const gp_Pnt2d& P1, const gp_Pnt2d& P2) const; + //! Dumps the content of me into the stream + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; + protected: diff --git a/src/gp/gp_Trsf.cxx b/src/gp/gp_Trsf.cxx index 7c4a4c9cd9..9a4e299de5 100644 --- a/src/gp/gp_Trsf.cxx +++ b/src/gp/gp_Trsf.cxx @@ -855,13 +855,12 @@ void gp_Trsf::Orthogonalize() //function : DumpJson //purpose : //======================================================================= -void gp_Trsf::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const +void gp_Trsf::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_CLASS_BEGIN (theOStream, gp_Trsf); - - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &loc); - OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &matrix); - - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, shape); - OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, scale); + OCCT_DUMP_VECTOR_CLASS (theOStream, "Location", 3, loc.X(), loc.Y(), loc.Z()) + OCCT_DUMP_VECTOR_CLASS (theOStream, "Matrix", 9, matrix.Value(1, 1), matrix.Value(1, 2), matrix.Value(1, 3), + matrix.Value(2, 1), matrix.Value(2, 2), matrix.Value(2, 3), + matrix.Value(3, 1), matrix.Value(3, 2), matrix.Value(3, 3)) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, shape) + OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, scale) } diff --git a/src/gp/gp_Trsf.hxx b/src/gp/gp_Trsf.hxx index 85e258c67f..82c15e91c1 100644 --- a/src/gp/gp_Trsf.hxx +++ b/src/gp/gp_Trsf.hxx @@ -351,7 +351,7 @@ void operator *= (const gp_Trsf& T) } //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; friend class gp_GTrsf; diff --git a/src/gp/gp_XYZ.cxx b/src/gp/gp_XYZ.cxx index a02fbed913..0599ad950e 100644 --- a/src/gp/gp_XYZ.cxx +++ b/src/gp/gp_XYZ.cxx @@ -38,7 +38,7 @@ Standard_Boolean gp_XYZ::IsEqual (const gp_XYZ& Other, //function : DumpJson //purpose : //======================================================================= -void gp_XYZ::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const +void gp_XYZ::DumpJson (Standard_OStream& theOStream, Standard_Integer) const { - OCCT_DUMP_VECTOR_CLASS (theOStream, gp_XYZ, 3, x, y, z) + OCCT_DUMP_VECTOR_CLASS (theOStream, "gp_XYZ", 3, x, y, z) } diff --git a/src/gp/gp_XYZ.hxx b/src/gp/gp_XYZ.hxx index bc2ebdb135..e3b49d82ec 100644 --- a/src/gp/gp_XYZ.hxx +++ b/src/gp/gp_XYZ.hxx @@ -328,8 +328,7 @@ public: //! Dumps the content of me into the stream - Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; - + Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const; protected: diff --git a/tests/bugs/vis/bug30949 b/tests/bugs/vis/bug30949 index 6fcfdef00e..c7506fe447 100644 --- a/tests/bugs/vis/bug30949 +++ b/tests/bugs/vis/bug30949 @@ -11,7 +11,7 @@ set pblue 0.00209 set dump_aligned_off [vaspects -defaults -dumpJson -dumpCompact on] -if {![regexp {"RGB": \[+([-0-9.+eE]+)\, +([-0-9.+eE]+)\, +([-0-9.+eE]+)\]} $dump_aligned_off full cred cgreen cblue]} { +if {![regexp {"RGBA": \[+([-0-9.+eE]+)\, +([-0-9.+eE]+)\, +([-0-9.+eE]+)\, +([-0-9.+eE]+)\]} $dump_aligned_off full cred cgreen cblue]} { puts "Error in Dump. Wrong format of output." } @@ -22,7 +22,7 @@ checkreal "Cblue" $cblue $pblue 1.0e-7 0.0 set dump_aligned_off_deep [vaspects -defaults -dumpJson -dumpCompact on -dumpDepth 2] -if {[regexp {\[+([-0-9.+eE]+)\, +([-0-9.+eE]+)\, +([-0-9.+eE]+)\]} dump_aligned_off_deep full cred cgreen cblue]} { +if {[regexp {\[+([-0-9.+eE]+)\, +([-0-9.+eE]+)\, +([-0-9.+eE]+)\, +([-0-9.+eE]+)\]} dump_aligned_off_deep full cred cgreen cblue]} { puts "Error in Dump. Wrong deep of output" }