OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

Revert "0030268: Inspectors - improvements in VInspector plugin"

Browse Source 
This reverts commit 22f35b2166.

# Conflicts:
#	src/Graphic3d/Graphic3d_ClipPlane.cxx
This commit is contained in:
nds
2019-10-15 11:06:54 +03:00
parent 47329f0adf
commit 62e59942c9
269 changed files with 884 additions and 16173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/AIS/AIS_Shape.cxx
View File

@@ -987,23 +987,3 @@ Standard_Boolean AIS_Shape::OwnHLRDeviationAngle ( Standard_Real & anAngle,
aPreviousAngle = myDrawer->PreviousHLRDeviationAngle ();
return myDrawer->HasOwnHLRDeviationAngle();
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void AIS_Shape::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, AIS_Shape);
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_VALUES_DUMPED (theOStream, theDepth, &myUVOrigin);
//OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUVRepeat);
//OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myUVScale);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myInitAng);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCompBB);
}

3
src/AIS/AIS_Shape.hxx
View File

@@ -325,9 +325,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
TopoDS_Shape myshape; //!< shape to display

30
src/AIS/AIS_Trihedron.cxx
View File

@@ -995,33 +995,3 @@ Handle(Prs3d_PointAspect) AIS_Trihedron::getHighlightPointAspect()
return myHighlightPointAspect;
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void AIS_Trihedron::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, AIS_Trihedron);
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);
//Handle(Geom_Axis2Placement) myComponent;
//NCollection_DataMap<Prs3d_DatumParts, Standard_Integer> mySelectionPriority;
//NCollection_DataMap<Prs3d_DatumParts, TCollection_ExtendedString> myLabel;
//NCollection_DataMap<Prs3d_DatumParts, Handle(Graphic3d_Group)> myPartToGroup;
//NCollection_List<Prs3d_DatumParts> mySelectedParts;
OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myHighlightAspect.get());
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myHighlightLineAspect.get());
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myHighlightPointAspect.get());
//NCollection_DataMap<Prs3d_DatumParts, Handle(Graphic3d_ArrayOfPrimitives)> myPrimitives;
}

3
src/AIS/AIS_Trihedron.hxx
View File

@@ -222,9 +222,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
//! Creates a sensitive entity for the datum part that will be used in selection owner creation.

19
src/BVH/BVH_Box.hxx
View File

@@ -114,24 +114,7 @@ public:
{
(void)theDepth;
OCCT_DUMP_CLASS_BEGIN (theOStream, BVH_Box);
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]);
}
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, IsValid());
}
public:

7
src/Geom/Geom_Transformation.cxx
View File

@@ -16,8 +16,6 @@
#include <Geom_Transformation.hxx>
#include <Standard_Dump.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Geom_Transformation, Standard_Transient)
Geom_Transformation::Geom_Transformation () { }
@@ -58,8 +56,3 @@ void Geom_Transformation::PreMultiply (const Handle(Geom_Transformation)& Other)
gpTrsf.PreMultiply (Other->Trsf());
}
void Geom_Transformation::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &gpTrsf);
}

3
src/Geom/Geom_Transformation.hxx
View File

@@ -192,9 +192,6 @@ 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, const Standard_Integer theDepth = -1) const;
private:
gp_Trsf gpTrsf;

26
src/Graphic3d/Graphic3d_CStructure.cxx
View File

@@ -18,7 +18,6 @@
#include <Graphic3d_StructureManager.hxx>
#include <Graphic3d_TransModeFlags.hxx>
#include <Graphic3d_GraphicDriver.hxx>
#include <Standard_Dump.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CStructure,Standard_Transient)
@@ -45,28 +44,3 @@ Graphic3d_CStructure::Graphic3d_CStructure (const Handle(Graphic3d_StructureMana
{
Id = myGraphicDriver->NewIdentification();
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Graphic3d_CStructure::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_CStructure);
for (Graphic3d_SequenceOfGroup::Iterator anIterator (myGroups); anIterator.More(); anIterator.Next())
{
Handle(Graphic3d_Group) aGroup = anIterator.Value();
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aGroup.get());
}
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);
}

3
src/Graphic3d/Graphic3d_CStructure.hxx
View File

@@ -194,9 +194,6 @@ public:
//! Update render transformation matrix.
virtual void updateLayerTransformation() {}
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
public:
int Id;

23
src/Graphic3d/Graphic3d_ClipPlane.cxx
View File

@@ -274,26 +274,3 @@ void Graphic3d_ClipPlane::SetChainNextPlane (const Handle(Graphic3d_ClipPlane)&
}
updateChainLen();
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Graphic3d_ClipPlane::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySectionStyle.get());
//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);
}

3
src/Graphic3d/Graphic3d_ClipPlane.hxx
View File

@@ -319,9 +319,6 @@ public:
return !IsPointOutHalfspace (aMinPnt);
}
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
public: // @name modification counters
//! @return modification counter for equation.

17
src/Graphic3d/Graphic3d_PresentationAttributes.cxx
View File

@@ -15,21 +15,4 @@
#include <Graphic3d_PresentationAttributes.hxx>
#include <Standard_Dump.hxx>
IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_PresentationAttributes, Standard_Transient)
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Graphic3d_PresentationAttributes::DumpJson (Standard_OStream& theOStream, const 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);
}

3
src/Graphic3d/Graphic3d_PresentationAttributes.hxx
View File

@@ -90,9 +90,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
Handle(Graphic3d_AspectFillArea3d) myBasicFillAreaAspect; //!< presentation fill area aspect

15
src/Graphic3d/Graphic3d_SequenceOfHClipPlane.cxx
View File

@@ -58,18 +58,3 @@ bool Graphic3d_SequenceOfHClipPlane::Remove (const Handle(Graphic3d_ClipPlane)&
}
return false;
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Graphic3d_SequenceOfHClipPlane::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToOverrideGlobal);
for (NCollection_Sequence<Handle(Graphic3d_ClipPlane)>::Iterator anIterator (myItems); anIterator.More(); anIterator.Next())
{
Handle(Graphic3d_ClipPlane) aClipPlane = anIterator.Value();
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aClipPlane.get());
}
}

3
src/Graphic3d/Graphic3d_SequenceOfHClipPlane.hxx
View File

@@ -94,9 +94,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
NCollection_Sequence<Handle(Graphic3d_ClipPlane)> myItems;

21
src/Graphic3d/Graphic3d_Structure.cxx
View File

@@ -30,8 +30,6 @@
#include "Graphic3d_Structure.pxx"
#include <Standard_Dump.hxx>
#include <stdio.h>
IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Structure,Standard_Transient)
@@ -1029,22 +1027,3 @@ 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, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Graphic3d_Structure);
//Graphic3d_StructureManager* myStructureManager;
//NCollection_IndexedMap<Graphic3d_Structure*> myAncestors;
//NCollection_IndexedMap<Graphic3d_Structure*> myDescendants;
//Standard_Address myOwner;
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myCStructure.get());
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myVisual);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myComputeVisual);
}

3
src/Graphic3d/Graphic3d_Structure.hxx
View File

@@ -432,9 +432,6 @@ public:
//! Returns the low-level structure
const Handle(Graphic3d_CStructure)& CStructure() const { return myCStructure; }
//! Dumps the content of me into the stream
Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:
//! Transforms boundaries with <theTrsf> transformation.

12
src/Graphic3d/Graphic3d_TransformPers.cxx
View File

@@ -51,15 +51,3 @@ Handle(Graphic3d_TransformPers) Graphic3d_TransformPers::FromDeprecatedParams (G
}
return aTrsfPers;
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Graphic3d_TransformPers::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const
{
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMode)
OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "Params3d", 3, myParams.Params3d.PntX, myParams.Params3d.PntY, myParams.Params3d.PntZ)
OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "Params2d", 3, myParams.Params2d.OffsetX, myParams.Params2d.OffsetY, myParams.Params2d.Corner)
}

3
src/Graphic3d/Graphic3d_TransformPers.hxx
View File

@@ -283,9 +283,6 @@ 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, const Standard_Integer theDepth = -1) const;
private:
//! 3D anchor point for zoom/rotate transformation persistence.

1
src/OpenGl/OpenGl_Aspects.cxx
View File

@@ -118,7 +118,6 @@ void OpenGl_Aspects::Release (OpenGl_Context* theContext)
void OpenGl_Aspects::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
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);

2
src/OpenGl/OpenGl_Aspects.hxx
View File

@@ -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_OVERRIDE;
Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

4
src/OpenGl/OpenGl_Element.hxx
View File

@@ -63,10 +63,6 @@ public:
//! Update parameters of the drawable elements.
virtual void SynchronizeAspects() {}
//! Dumps the content of me into the stream
virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const
{ (void)theOStream; (void)theDepth; }
protected:
Standard_EXPORT virtual ~OpenGl_Element();

19
src/OpenGl/OpenGl_Flipper.cxx
View File

@@ -135,22 +135,3 @@ 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, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Flipper);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element);
//OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get());
//OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel);
//OpenGl_Vec4 myReferenceOrigin;
//OpenGl_Vec4 myReferenceX;
//OpenGl_Vec4 myReferenceY;
//OpenGl_Vec4 myReferenceZ;
//Standard_Boolean myIsEnabled;
}

4
src/OpenGl/OpenGl_Flipper.hxx
View File

@@ -42,9 +42,6 @@ public:
Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const;
Standard_EXPORT virtual void Release (OpenGl_Context* theCtx);
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
public:
DEFINE_STANDARD_ALLOC
@@ -57,7 +54,6 @@ protected:
OpenGl_Vec4 myReferenceZ;
Standard_Boolean myIsEnabled;
};
#endif // OpenGl_Flipper_Header

24
src/OpenGl/OpenGl_FrameStatsPrs.cxx
View File

@@ -454,27 +454,3 @@ 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, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_FrameStatsPrs);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element);
//OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get());
//OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel);
//Handle(OpenGl_FrameStats) myStatsPrev; //!< currently displayed stats
//Handle(Graphic3d_TransformPers) myCountersTrsfPers; //!< transformation persistence for counters presentation
//OpenGl_Text myCountersText; //!< counters presentation
//OpenGl_Aspects myTextAspect; //!< text aspect
//Handle(Graphic3d_TransformPers) myChartTrsfPers; //!< transformation persistence for chart presentation
//Handle(Graphic3d_ArrayOfTriangles) myChartArray; //!< array of chart triangles
//Handle(OpenGl_VertexBuffer) myChartVertices; //!< VBO with chart triangles
//Handle(OpenGl_IndexBuffer) myChartIndices; //!< VBO with chart triangle indexes
//Handle(OpenGl_VertexBuffer) myChartLines; //!< array of chart lines
//OpenGl_Text myChartLabels[3]; //!< chart labels
}

3
src/OpenGl/OpenGl_FrameStatsPrs.hxx
View File

@@ -45,9 +45,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
//! Update chart presentation.

23
src/OpenGl/OpenGl_GraduatedTrihedron.cxx
View File

@@ -838,26 +838,3 @@ void OpenGl_GraduatedTrihedron::Axis::Release (OpenGl_Context* theCtx)
Line .Release (theCtx);
Arrow .Release (theCtx);
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void OpenGl_GraduatedTrihedron::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_GraduatedTrihedron);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element);
//OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get());
//OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel);
//OpenGl_Vec3 myMin;
//OpenGl_Vec3 myMax;
//mutable Axis myAxes[3]; //!< Axes for trihedron
//mutable Graphic3d_GraduatedTrihedron myData;
//mutable OpenGl_Aspects myGridLineAspect; //!< Color grid properties
//mutable OpenGl_Text myLabelValues;
//mutable OpenGl_Aspects myAspectLabels;
//mutable OpenGl_Aspects myAspectValues;
//mutable Standard_Boolean myIsInitialized;
}

3
src/OpenGl/OpenGl_GraduatedTrihedron.hxx
View File

@@ -61,9 +61,6 @@ public:
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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
private:
//! Axis of trihedron. It incapsulates geometry and style.

5
src/OpenGl/OpenGl_Group.cxx
View File

@@ -365,9 +365,4 @@ void OpenGl_Group::DumpJson (Standard_OStream& theOStream, const Standard_Intege
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Group);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspects);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsRaytracable);
for (OpenGl_ElementNode* aNodeIter = myFirst; aNodeIter != NULL; aNodeIter = aNodeIter->next)
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aNodeIter->elem);
}
}

9
src/OpenGl/OpenGl_LayerList.cxx
View File

@@ -159,6 +159,15 @@ OpenGl_LayerList::OpenGl_LayerList (const Standard_Integer theNbPriorities)
//
}
//=======================================================================
//function : ~OpenGl_LayerList
//purpose : Destructor
//=======================================================================
OpenGl_LayerList::~OpenGl_LayerList()
{
}
//=======================================================================
//function : SetFrustumCullingBVHBuilder
//purpose :

5
src/OpenGl/OpenGl_LayerList.hxx
View File

@@ -25,7 +25,6 @@
#include <NCollection_Sequence.hxx>
#include <NCollection_DataMap.hxx>
class OpenGl_FrameBuffer;
class OpenGl_Structure;
class OpenGl_Workspace;
struct OpenGl_GlobalLayerSettings;
@@ -36,10 +35,10 @@ class OpenGl_LayerList
public:
//! Constructor
Standard_EXPORT OpenGl_LayerList (const Standard_Integer theNbPriorities);
OpenGl_LayerList (const Standard_Integer theNbPriorities);
//! Destructor
virtual ~OpenGl_LayerList() {};
virtual ~OpenGl_LayerList();
//! Method returns the number of available priorities
Standard_Integer NbPriorities() const { return myNbPriorities; }

23
src/OpenGl/OpenGl_PrimitiveArray.cxx
View File

@@ -1115,26 +1115,3 @@ void OpenGl_PrimitiveArray::InitBuffers (const Handle(OpenGl_Context)& th
setDrawMode (theType);
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void OpenGl_PrimitiveArray::DumpJson (Standard_OStream& theOStream, const 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, myAspect.get());
//OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel);
//mutable Handle(OpenGl_VertexBuffer) myVboIndices;
//mutable Handle(OpenGl_VertexBuffer) myVboAttribs;
//mutable Handle(Graphic3d_IndexBuffer) myIndices;
//mutable Handle(Graphic3d_Buffer) myAttribs;
//mutable Handle(Graphic3d_BoundBuffer) myBounds;
//GLshort myDrawMode;
//mutable Standard_Boolean myIsFillType;
//mutable Standard_Boolean myIsVboInit;
//Standard_Size myUID; //!< Unique ID of primitive array.
}

3
src/OpenGl/OpenGl_PrimitiveArray.hxx
View File

@@ -99,9 +99,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
//! VBO initialization procedures

13
src/OpenGl/OpenGl_StencilTest.cxx
View File

@@ -15,7 +15,6 @@
#include <OpenGl_GlCore11.hxx>
#include <OpenGl_StencilTest.hxx>
#include <Standard_Dump.hxx>
OpenGl_StencilTest::OpenGl_StencilTest()
{
@@ -65,15 +64,3 @@ OpenGl_StencilTest::~OpenGl_StencilTest()
{
//
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void OpenGl_StencilTest::DumpJson (Standard_OStream& theOStream, const 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);
}

3
src/OpenGl/OpenGl_StencilTest.hxx
View File

@@ -32,9 +32,6 @@ public:
void SetOptions (const Standard_Boolean theIsEnabled);
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
//! Destructor

18
src/OpenGl/OpenGl_Structure.cxx
View File

@@ -639,21 +639,3 @@ 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, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Structure);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_CStructure);
OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myInstancedStructure);
//Graphic3d_Mat4 myRenderTrsf; //!< transformation, actually used for rendering (includes Local Origin shift)
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsRaytracable);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myModificationState);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsMirrored);
}

3
src/OpenGl/OpenGl_Structure.hxx
View File

@@ -128,9 +128,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
Standard_EXPORT virtual ~OpenGl_Structure();

27
src/OpenGl/OpenGl_Text.cxx
View File

@@ -843,30 +843,3 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
theCtx->WorldViewState.Pop();
theCtx->ApplyModelViewMatrix();
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void OpenGl_Text::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, OpenGl_Text);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, OpenGl_Element);
//OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myAspect.get());
//OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myShadingModel);
//Handle(Graphic3d_Text) myText; //!< text parameters
//mutable Handle(OpenGl_Font) myFont;
//mutable NCollection_Vector<GLuint> myTextures; //!< textures' IDs
//mutable NCollection_Vector<Handle(OpenGl_VertexBuffer)> myVertsVbo; //!< VBOs of vertices
//mutable NCollection_Vector<Handle(OpenGl_VertexBuffer)> myTCrdsVbo; //!< VBOs of texture coordinates
//mutable Handle(OpenGl_VertexBuffer) myBndVertsVbo;//!< VBOs of vertices for bounding box
//mutable Font_Rect myBndBox;
//mutable OpenGl_Mat4d myProjMatrix;
//mutable OpenGl_Mat4d myModelMatrix;
//mutable OpenGl_Mat4d myOrientationMatrix;
//mutable OpenGl_Vec3d myWinXYZ;
//mutable GLdouble myScaleHeight;
//Standard_Boolean myIs2d;
}

3
src/OpenGl/OpenGl_Text.hxx
View File

@@ -100,9 +100,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
//! @name obsolete methods
public:

17
src/Poly/Poly_Triangulation.cxx
View File

@@ -19,7 +19,6 @@
#include <gp_Pnt.hxx>
#include <Poly_Triangle.hxx>
#include <Standard_DomainError.hxx>
#include <Standard_Dump.hxx>
#include <Standard_NullObject.hxx>
#include <Standard_Type.hxx>
@@ -310,19 +309,3 @@ gp_Dir Poly_Triangulation::Normal (const Standard_Integer theIndex) const
return N;
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Poly_Triangulation::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Poly_Triangulation);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDeflection);
//TColgp_Array1OfPnt myNodes;
//Handle(TColgp_HArray1OfPnt2d) myUVNodes;
//Poly_Array1OfTriangle myTriangles;
//Handle(TShort_HArray1OfShortReal) myNormals;
}

3
src/Poly/Poly_Triangulation.hxx
View File

@@ -196,9 +196,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
Standard_Real myDeflection;

33
src/PrsMgr/PrsMgr_PresentableObject.cxx
View File

@@ -842,41 +842,12 @@ void PrsMgr_PresentableObject::PolygonOffsets (Standard_Integer& theMode,
// function : DumpJson
// purpose :
// =======================================================================
void PrsMgr_PresentableObject::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
void PrsMgr_PresentableObject::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, PrsMgr_PresentableObject);
OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myParent);
for (PrsMgr_Presentations::Iterator anIterator (myPresentations); anIterator.More(); anIterator.Next())
{
Handle(PrsMgr_Presentation) aPresentation = anIterator.Value();
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, aPresentation.get());
}
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())
{
Handle(PrsMgr_PresentableObject) aPresentableObject = anIterator.Value();
OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, aPresentableObject.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);
@@ -884,6 +855,4 @@ void PrsMgr_PresentableObject::DumpJson (Standard_OStream& theOStream, const Sta
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);
}

19
src/PrsMgr/PrsMgr_Presentation.cxx
View File

@@ -263,22 +263,3 @@ PrsMgr_Presentation::~PrsMgr_Presentation()
{
Erase();
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void PrsMgr_Presentation::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, PrsMgr_Presentation);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Graphic3d_Structure);
//Handle(PrsMgr_PresentationManager) myPresentationManager;
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);
}

3
src/PrsMgr/PrsMgr_Presentation.hxx
View File

@@ -80,9 +80,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
//! Main constructor.

16
src/Select3D/Select3D_InteriorSensitivePointSet.cxx
View File

@@ -323,19 +323,3 @@ Standard_Integer Select3D_InteriorSensitivePointSet::NbSubElements()
{
return myPlanarPolygons.Length();
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Select3D_InteriorSensitivePointSet::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_InteriorSensitivePointSet);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet);
//Select3D_VectorOfHPoly myPlanarPolygons; //!< Vector of planar polygons
//Handle(TColStd_HArray1OfInteger) myPolygonsIdxs; //!< Indexes array for BVH calculation
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCOG);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox);
}

3
src/Select3D/Select3D_InteriorSensitivePointSet.hxx
View File

@@ -70,9 +70,6 @@ public:
//! Returns the amount of points in set
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
DEFINE_STANDARD_RTTIEXT(Select3D_InteriorSensitivePointSet,Select3D_SensitiveSet)
protected:

12
src/Select3D/Select3D_SensitiveBox.cxx
View File

@@ -120,15 +120,3 @@ Select3D_BndBox3d Select3D_SensitiveBox::BoundingBox()
{
return myBox;
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Select3D_SensitiveBox::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveBox);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBox);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCenter3d);
}

3
src/Select3D/Select3D_SensitiveBox.hxx
View File

@@ -70,9 +70,6 @@ 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, const Standard_Integer theDepth = -1) const;
private:
Select3D_BndBox3d myBox; //!< 3d coordinates of box corners

12
src/Select3D/Select3D_SensitiveEntity.cxx
View File

@@ -30,15 +30,3 @@ Select3D_SensitiveEntity::Select3D_SensitiveEntity (const Handle(SelectMgr_Entit
{
//
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Select3D_SensitiveEntity::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveEntity);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myOwnerId.get());
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySFactor);
}

3
src/Select3D/Select3D_SensitiveEntity.hxx
View File

@@ -91,9 +91,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
Standard_EXPORT Select3D_SensitiveEntity (const Handle(SelectMgr_EntityOwner)& theOwnerId);

12
src/Select3D/Select3D_SensitiveFace.cxx
View File

@@ -143,15 +143,3 @@ Standard_Integer Select3D_SensitiveFace::NbSubElements()
{
return myFacePoints->NbSubElements();
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Select3D_SensitiveFace::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveFace);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensType);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myFacePoints.get());
}

3
src/Select3D/Select3D_SensitiveFace.hxx
View File

@@ -73,9 +73,6 @@ public:
//! Returns the amount of sub-entities (points or planar convex polygons)
Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
private:
Select3D_TypeOfSensitivity mySensType; //!< Type of sensitivity: interior or boundary

24
src/Select3D/Select3D_SensitiveGroup.cxx
View File

@@ -361,27 +361,3 @@ Standard_Real Select3D_SensitiveGroup::distanceToCOG (SelectBasics_SelectingVolu
{
return theMgr.DistToGeometryCenter (CenterOfGeometry());
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Select3D_SensitiveGroup::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveGroup);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet);
for (Select3D_IndexedMapOfEntity::Iterator anIterator (myEntities); anIterator.More(); anIterator.Next())
{
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, &myCenter);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox);
//NCollection_Vector<Standard_Integer> myBVHPrimIndexes; //!< Vector of sub-entities indexes for BVH tree build
}

3
src/Select3D/Select3D_SensitiveGroup.hxx
View File

@@ -143,9 +143,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
//! Checks whether the entity with index theIdx overlaps the current selecting volume

11
src/Select3D/Select3D_SensitivePoint.cxx
View File

@@ -85,14 +85,3 @@ Standard_Integer Select3D_SensitivePoint::NbSubElements()
{
return 1;
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Select3D_SensitivePoint::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitivePoint);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myPoint);
}

3
src/Select3D/Select3D_SensitivePoint.hxx
View File

@@ -50,9 +50,6 @@ 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, const Standard_Integer theDepth = -1) const;
private:
gp_Pnt myPoint; //!< 3d coordinates of the point

17
src/Select3D/Select3D_SensitivePoly.cxx
View File

@@ -310,20 +310,3 @@ gp_Pnt Select3D_SensitivePoly::CenterOfGeometry() const
return myCOG;
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Select3D_SensitivePoly::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitivePoly);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet);
//Select3D_PointData myPolyg; //!< Points of the poly
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCOG);
//Handle(TColStd_HArray1OfInteger) mySegmentIndexes; //!< Segment indexes for BVH tree build
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsComputed);
}

3
src/Select3D/Select3D_SensitivePoly.hxx
View File

@@ -92,9 +92,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
//! Checks whether the segment with index theIdx overlaps the current selecting volume

41
src/Select3D/Select3D_SensitivePrimitiveArray.cxx
View File

@@ -1218,44 +1218,3 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::elementIsInside (SelectBasics
}
}
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Select3D_SensitivePrimitiveArray::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitivePrimitiveArray);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet);
//Handle(Select3D_PrimArraySubGroupArray) myGroups; //!< sub-groups of sensitive entities
//Handle(Graphic3d_Buffer) myVerts; //!< source data - nodes position
//Handle(Graphic3d_IndexBuffer) myIndices; //!< source data - primitive indexes
//const Standard_Byte* myPosData; //!< position vertex attribute data
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, &myCDG3D);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox);
//Handle(TColStd_HPackedMapOfInteger) myDetectedElemMap; //!< index map of last detected elements
//Handle(TColStd_HPackedMapOfInteger) myDetectedNodeMap; //!< index map of last detected nodes
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);
}

3
src/Select3D/Select3D_SensitivePrimitiveArray.hxx
View File

@@ -197,9 +197,6 @@ 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, const Standard_Integer theDepth = -1) const;
public:
//! Checks whether the sensitive entity is overlapped by current selecting volume.

12
src/Select3D/Select3D_SensitiveSegment.cxx
View File

@@ -102,15 +102,3 @@ Standard_Integer Select3D_SensitiveSegment::NbSubElements()
{
return 2;
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Select3D_SensitiveSegment::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveSegment);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myStart);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myEnd);
}

3
src/Select3D/Select3D_SensitiveSegment.hxx
View File

@@ -70,9 +70,6 @@ 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, const Standard_Integer theDepth = -1) const;
private:
gp_Pnt myStart; //!< Start point

11
src/Select3D/Select3D_SensitiveSet.cxx
View File

@@ -232,14 +232,3 @@ void Select3D_SensitiveSet::Clear()
{
//
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void Select3D_SensitiveSet::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveSet);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedIdx);
}

3
src/Select3D/Select3D_SensitiveSet.hxx
View File

@@ -96,9 +96,6 @@ 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, const Standard_Integer theDepth = -1) const;
protected:
//! Checks whether one or more entities of the set overlap current selecting volume.

16
src/Select3D/Select3D_SensitiveTriangle.cxx
View File

@@ -93,19 +93,3 @@ 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, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveTriangle);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensType);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCentroid);
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]);
}

5
src/Select3D/Select3D_SensitiveTriangle.hxx
View File

@@ -67,11 +67,6 @@ 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, const Standard_Integer theDepth = -1) const;
public:
DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveTriangle,Select3D_SensitiveEntity)
private:

21
src/Select3D/Select3D_SensitiveTriangulation.cxx
View File

@@ -443,24 +443,3 @@ gp_GTrsf Select3D_SensitiveTriangulation::InvInitLocation() const
{
return myInvInitLocation;
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Select3D_SensitiveTriangulation::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveTriangulation);
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_VALUES_DUMPED (theOStream, theDepth, &myCDG3D);
//Handle(TColStd_HArray1OfInteger) myFreeEdges;
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensType);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPrimitivesNb);
//Handle(TColStd_HArray1OfInteger) myBVHPrimIndexes; //!< Indexes of edges or triangles for BVH build
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox);
//gp_GTrsf myInvInitLocation;
}

3
src/Select3D/Select3D_SensitiveTriangulation.hxx
View File

@@ -93,9 +93,6 @@ public:
const TopLoc_Location& GetInitLocation() const { return myInitLocation; }
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:
//! Inner function for transformation application to bounding

19
src/Select3D/Select3D_SensitiveWire.cxx
View File

@@ -226,22 +226,3 @@ gp_Pnt Select3D_SensitiveWire::CenterOfGeometry() const
{
return myCenter;
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void Select3D_SensitiveWire::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, Select3D_SensitiveWire);
OCCT_DUMP_BASE_CLASS (theOStream, theDepth, Select3D_SensitiveSet);
for (NCollection_Vector<Handle(Select3D_SensitiveEntity)>::Iterator anIterator (myEntities); anIterator.More(); anIterator.Next())
{
Handle(Select3D_SensitiveEntity) anEntity = anIterator.Value();
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anEntity.get());
}
//NCollection_Vector<Standard_Integer> myEntityIndexes; //!< Indexes of entities for BVH build
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myCenter);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBndBox);
}

3
src/Select3D/Select3D_SensitiveWire.hxx
View File

@@ -68,9 +68,6 @@ 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, const Standard_Integer theDepth = -1) const;
DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveWire,Select3D_SensitiveSet)
protected:

11
src/SelectMgr/SelectMgr_SelectableObject.cxx
View File

@@ -558,17 +558,6 @@ void SelectMgr_SelectableObject::DumpJson (Standard_OStream& theOStream, const S
OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_SelectableObject);
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())
{
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, mycurrent);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAutoHilight);
}

23
src/SelectMgr/SelectMgr_Selection.cxx
View File

@@ -116,26 +116,3 @@ void SelectMgr_Selection::SetSensitivity (const Standard_Integer theNewSens)
anEntity->BaseSensitive()->SetSensitivityFactor (theNewSens);
}
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void SelectMgr_Selection::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_Selection);
for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator anIterator (myEntities); anIterator.More(); anIterator.Next())
{
Handle(SelectMgr_SensitiveEntity) anEntity = anIterator.Value();
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, anEntity.get());
}
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myEntityIter);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myMode);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myUpdateStatus);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySelectionState);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myBVHUpdateStatus);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, mySensFactor);
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsCustomSens);
}

3
src/SelectMgr/SelectMgr_Selection.hxx
View File

@@ -139,9 +139,6 @@ 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, const Standard_Integer theDepth = -1) const;
private:
NCollection_Vector<Handle(SelectMgr_SensitiveEntity)> myEntities;

12
src/SelectMgr/SelectMgr_SensitiveEntity.cxx
View File

@@ -39,15 +39,3 @@ void SelectMgr_SensitiveEntity::Clear()
mySensitive->Clear();
mySensitive.Nullify();
}
// =======================================================================
// function : DumpJson
// purpose :
// =======================================================================
void SelectMgr_SensitiveEntity::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, SelectMgr_SensitiveEntity);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, mySensitive.get());
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsActiveForSelection);
}

3
src/SelectMgr/SelectMgr_SensitiveEntity.hxx
View File

@@ -47,9 +47,6 @@ 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, const Standard_Integer theDepth = -1) const;
DEFINE_STANDARD_RTTIEXT(SelectMgr_SensitiveEntity,Standard_Transient) // Type definition
private:

6
src/SelectMgr/SelectMgr_ViewerSelector.hxx
View File

@@ -201,12 +201,6 @@ public:
//! Returns instance of selecting volume manager of the viewer selector
SelectMgr_SelectingVolumeManager& GetManager() { return mySelectingVolumeMgr; }
//! Returns container of sensitives
const SelectMgr_MapOfObjectSensitives& GetObjectSensitives() const { return myMapOfObjectSensitives; }
//! Returns container of selectable objects
const SelectMgr_SelectableObjectSet& GetSelectableObjects() const { return mySelectableObjects; }
//! Marks all added sensitive entities of all objects as non-selectable
Standard_EXPORT void ResetSelectionActivationStatus();

367
src/Standard/Standard_Dump.cxx
View File

@@ -93,66 +93,6 @@ void Standard_Dump::DumpRealValues (Standard_OStream& theOStream, int theCount,
va_end(vl);
}
//=======================================================================
//function : ProcessStreamName
//purpose :
//=======================================================================
Standard_Boolean Standard_Dump::ProcessStreamName (const Standard_SStream& theStream,
const TCollection_AsciiString& theName,
Standard_Integer& theStreamPos)
{
TCollection_AsciiString aText = Text (theStream);
if (aText.IsEmpty())
return Standard_False;
TCollection_AsciiString aSubText = aText.SubString (theStreamPos, aText.Length());
TCollection_AsciiString aKeyName = theName + JsonKeyToString (Standard_JsonKey_SeparatorKeyToValue);
Standard_Boolean aResult = aSubText.StartsWith (aKeyName);
if (aResult)
theStreamPos += aKeyName.Length();
return aResult;
}
//=======================================================================
//function : InitRealValues
//purpose :
//=======================================================================
Standard_Boolean Standard_Dump::InitRealValues (const Standard_SStream& theStream,
Standard_Integer& theStreamPos,
int theCount, ...)
{
Standard_Integer aStreamPos = theStreamPos + JsonKeyLength (Standard_JsonKey_OpenContainer) + 1;
TCollection_AsciiString aText = Text (theStream);
TCollection_AsciiString aSubText = aText.SubString (aStreamPos, aText.Length());
Standard_Integer aClosePos = aSubText.Location (JsonKeyToString (Standard_JsonKey_CloseContainer), aStreamPos, aSubText.Length());
va_list vl;
va_start(vl, theCount);
for(int i = 0; i < theCount; ++i)
{
//if (i < theCount -1)
// theOStream << ", ";
Standard_Integer aNextPos = (i < theCount-1) ? aSubText.Location (JsonKeyToString (Standard_JsonKey_SeparatorValueToValue), aStreamPos, aSubText.Length())
: aClosePos;
TCollection_AsciiString aValueText = aSubText.SubString (aStreamPos, aNextPos - 1);
if (!aValueText.IsRealValue())
return Standard_False;
va_arg(vl, Standard_Real) = aValueText.RealValue();
aStreamPos = aNextPos + 1;
//theOStream << va_arg(vl, Standard_Real);
}
va_end(vl);
return Standard_True;
}
// =======================================================================
// function : GetPointerInfo
// purpose :
@@ -172,9 +112,6 @@ 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)
@@ -285,307 +222,3 @@ TCollection_AsciiString Standard_Dump::FormatJson (const Standard_SStream& theSt
}
return aText;
}
// ----------------------------------------------------------------------------
// SplitJson
// ----------------------------------------------------------------------------
Standard_Boolean Standard_Dump::SplitJson (const TCollection_AsciiString& theStreamStr,
NCollection_IndexedDataMap<TCollection_AsciiString, TCollection_AsciiString>& theValues)
{
Standard_Integer /*anIndex = 1, */aNextIndex = 1;
while (aNextIndex < theStreamStr.Length())
{
Standard_JsonKey aKey;
//Standard_Integer aNextIndex = 0;
if (!jsonKey (theStreamStr, aNextIndex/*anIndex*/, aNextIndex, aKey))
return Standard_False;
Standard_Boolean aProcessed = Standard_False;
switch (aKey)
{
case Standard_JsonKey_Quote:
{
aProcessed = splitKeyToValue (theStreamStr, aNextIndex/*anIndex*/, aNextIndex, theValues);
//anIndex = aNextIndex;
}
break;
case Standard_JsonKey_OpenChild:
{
Standard_Integer aStartIndex = aNextIndex;
//Standard_Integer aNextIndex = anIndex;
Standard_Integer aClosePos = nextClosePosition (theStreamStr, aStartIndex, Standard_JsonKey_OpenChild, Standard_JsonKey_CloseChild);
if (!aClosePos)
return Standard_False;
TCollection_AsciiString aSubStreamStr = theStreamStr.SubString (aStartIndex + JsonKeyLength (aKey), aNextIndex - 2);
if (!SplitJson (aSubStreamStr, theValues))
return Standard_False;
aNextIndex/*anIndex*/ = aClosePos + Standard_Integer (JsonKeyLength (Standard_JsonKey_CloseChild));
}
break;
case Standard_JsonKey_SeparatorValueToValue:
{
//anIndex = aNextIndex;
continue;
}
default:
break;
}
if (!aProcessed)
return Standard_False;
}
return Standard_True;
}
// ----------------------------------------------------------------------------
// JoinJson
// ----------------------------------------------------------------------------
void Standard_Dump::JoinJson (Standard_OStream& theOStream,
const NCollection_IndexedDataMap<TCollection_AsciiString, TCollection_AsciiString>& theValues)
{
}
// ----------------------------------------------------------------------------
// HierarchicalValueIndices
// ----------------------------------------------------------------------------
NCollection_List<Standard_Integer> Standard_Dump::HierarchicalValueIndices (
const NCollection_IndexedDataMap<TCollection_AsciiString, TCollection_AsciiString>& theValues)
{
NCollection_List<Standard_Integer> 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<TCollection_AsciiString, TCollection_AsciiString>& theValues)
{
// find key value: "key"
Standard_Integer aStartIndex = theStartIndex;
Standard_Integer aCloseIndex = nextClosePosition (theStreamStr, aStartIndex + 1, Standard_JsonKey_None, Standard_JsonKey_Quote);
if (!aCloseIndex)
return Standard_False;
TCollection_AsciiString aSplitKey = theStreamStr.SubString (aStartIndex/* + 1*/, aCloseIndex - 1);
// key to value
aStartIndex = aCloseIndex + 1;
Standard_JsonKey aKey;
if (!jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey))
return Standard_False;
// find value
aStartIndex = aCloseIndex;// + 1;
/*Standard_JsonKey */aKey = Standard_JsonKey_None;
if (jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey))
{
//if (aKey == Standard_JsonKey_Quote && aCloseIndex - aStartIndex == 1)
{
//aKey = Standard_JsonKey_None;
//aStartIndex = aCloseIndex + 1;
}
//else
// aStartIndex = aCloseIndex;// + 1;
//Standard_JsonKey aKey;
//if (!jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey))
// return Standard_False;
//aStartIndex = aCloseIndex;
//aStartIndex = aCloseIndex + JsonKeyLength (Standard_JsonKey_Quote);
}
else
{
//aStartIndex = aCloseIndex;
}
//Standard_JsonKey aKey;
//if (!jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey))
// return Standard_False;
//Standard_Integer aValueLength = (aCloseIndex - 1) - aStartIndex;
aStartIndex = aCloseIndex;
//if (!jsonKey (theStreamStr, aStartIndex, aCloseIndex, aKey))
// return Standard_False;
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;
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:
{
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 = theStreamStr.SubString (aStartIndex, aCloseIndex);
theNextIndex = aCloseIndex + 1;
}
break;
default:
return Standard_False;
}
//TCollection_AsciiString aSplitValue = theStreamStr.SubString (aStartIndex, aCloseIndex - 1);
//theNextIndex = aCloseIndex + 1;
TCollection_AsciiString 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, aSplitValue);
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;
const 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
// ----------------------------------------------------------------------------
const 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 ", ";
default: break;
}
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)
{
const Standard_CString anOpenKey = JsonKeyToString (theOpenKey);
const 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)
break;
if (anOpenKeyPos && anOpenKeyPos <= aCloseKeyPos)
{
aDepthKey++;
aStartPos = anOpenKeyPos + 1;
}
else
{
if (!aDepthKey)
return aCloseKeyPos;
else
{
aDepthKey--;
aStartPos = aCloseKeyPos + 1;
}
}
}
return theSourceValue.Length();
}

110
src/Standard/Standard_Dump.hxx
View File

@@ -14,8 +14,6 @@
#ifndef _Standard_Dump_HeaderFile
#define _Standard_Dump_HeaderFile
#include <NCollection_IndexedDataMap.hxx>
#include <NCollection_List.hxx>
#include <Standard_SStream.hxx>
#include <TCollection_AsciiString.hxx>
@@ -132,8 +130,10 @@ class Standard_DumpSentry;
{ \
if (theDepth != 0) \
{ \
Standard_Dump::AddValuesSeparator (theOStream); \
theField::DumpJson (theOStream, theDepth - 1); \
Standard_SStream aFieldStream; \
theField::DumpJson (aFieldStream, theDepth - 1); \
const char* aName = Standard_Dump::DumpFieldToName (#theField); \
Standard_Dump::DumpKeyToClass (theOStream, aName, Standard_Dump::Text (aFieldStream)); \
} \
}
@@ -148,18 +148,6 @@ class Standard_DumpSentry;
theOStream << "]"; \
}
//! @def OCCT_DUMP_VECTOR_CLASS
//! Append vector values into output value: "Name": [value_1, value_2, ...]
//! This macro is intended to have only one row for dumped object in Json.
//! 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_INIT_VECTOR_CLASS(theOStream, theName, theStreamPos, theCount, ...) \
{ \
if (!Standard_Dump::ProcessStreamName (theOStream, OCCT_CLASS_NAME(theName), theStreamPos)) \
return Standard_False; \
if (!Standard_Dump::InitRealValues (theOStream, theStreamPos, theCount, __VA_ARGS__)) \
return Standard_False; \
}
//! @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" { ... }
@@ -177,19 +165,6 @@ private:
Standard_OStream* myOStream; //!< modified stream
};
//! Kind of key in Json string
enum Standard_JsonKey
{
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 //!< ", "
};
//! This interface has some tool methods for stream (in JSON format) processing.
class Standard_Dump
{
@@ -208,38 +183,7 @@ public:
//! @return text presentation
Standard_EXPORT static TCollection_AsciiString FormatJson (const Standard_SStream& theStream, const Standard_Integer theIndent = 3);
//! Converts stream into map of values. Values are not empty if the stream contains at least two values.
//!
//! The one level stream example: <class_name>key_1\value_1\key_2\value_2</class_name>
//! In output: theStreamKey equals class_name, theValues contains key_1, value_1, key_2, and value_2.
//!
//! Two level stream example: <class_name>key_1\value_1\key_2\value_2\key_3<subclass_name>subclass_key_1\subclass_value1</subclass_name></class_name>
//! In output: theStreamKey equals class_name, theValues contains key_1, value_1, key_2, and value_2, key_3 and
//! <subclass_name>subclass_key_1\subclass_value1</subclass_name>.
//! The last value might be processed later using the same method.
//!
//! \param theStream stream value
//! \param theValues [out] container of split values
Standard_EXPORT static Standard_Boolean SplitJson (const TCollection_AsciiString& theStreamStr,
NCollection_IndexedDataMap<TCollection_AsciiString, TCollection_AsciiString>& theValues);
//! Unites container of values into Json output in form: key_1 : value_1, key_2: value_2, ... key_n: value_n
Standard_EXPORT static void JoinJson (Standard_OStream& theOStream,
const NCollection_IndexedDataMap<TCollection_AsciiString, TCollection_AsciiString>& theValues);
//! Returns container of indices in values, that has hierarchical value
Standard_EXPORT static NCollection_List<Standard_Integer> HierarchicalValueIndices (
const NCollection_IndexedDataMap<TCollection_AsciiString, TCollection_AsciiString>& 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 const Standard_CString JsonKeyToString (const Standard_JsonKey theKey);
//! Returns length value for enum type
Standard_EXPORT static Standard_Integer JsonKeyLength (const Standard_JsonKey theKey);
//! Add Json values separator if the stream last symbol is not an open brace.
//! @param theStream source value
static Standard_EXPORT void AddValuesSeparator (Standard_OStream& theOStream);
@@ -278,55 +222,11 @@ public:
//! @param theCount numer of values
Standard_EXPORT static void DumpRealValues (Standard_OStream& theOStream, int theCount, ...);
//! Check whether the parameter name is equal to the name in the stream at position
//! @param theSStream stream with values
//! @param theName stream key value
//! @param theStreamPos current position in the stream
Standard_EXPORT static Standard_Boolean ProcessStreamName (const Standard_SStream& theStream,
const TCollection_AsciiString& theName,
Standard_Integer& theStreamPos);
//! Unite values in one value using template: value_1, value_2, ..., value_n
//! @param theSStream stream with values
//! @param theStreamPos current position in the stream
//! @param theCount numer of values
Standard_EXPORT static Standard_Boolean InitRealValues (const Standard_SStream& theStream,
Standard_Integer& theStreamPos,
int theCount, ...);
//! Convert field name into dump text value, removes "&" and "my" prefixes
//! 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);
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": <value>...
//! a pair key, value will be added into theValues
//! at beginning theIndex is the position of the quota before <key>, 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<TCollection_AsciiString, TCollection_AsciiString>& 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 <symbol open> ... <symbol close> 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

14
src/StdSelect/StdSelect_BRepOwner.cxx
View File

@@ -182,17 +182,3 @@ 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, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, StdSelect_BRepOwner);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myShape);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, myPrsSh.get());
OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurMode);
}

3
src/StdSelect/StdSelect_BRepOwner.hxx
View File

@@ -117,9 +117,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected:
TopoDS_Shape myShape;

7
src/StdSelect/StdSelect_Shape.cxx
View File

@@ -71,10 +71,3 @@ void StdSelect_Shape::Compute(const Handle(Prs3d_Projector)& aProjector,
{
PrsMgr_PresentableObject::Compute(aProjector,aPresentation);
}
void StdSelect_Shape::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, StdSelect_Shape);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &mysh);
}

3
src/StdSelect/StdSelect_Shape.hxx
View File

@@ -46,9 +46,6 @@ 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, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
private:
Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;

16
src/TCollection/TCollection_AsciiString.cxx
View File

@@ -1192,22 +1192,6 @@ void TCollection_AsciiString::Split(const Standard_Integer where,
return ;
}
// ----------------------------------------------------------------------------
// Split
// ----------------------------------------------------------------------------
void TCollection_AsciiString::Split (const TCollection_AsciiString& theSeparator,
NCollection_IndexedMap<TCollection_AsciiString>& theValues)
{
Standard_Integer aStartPosition = 1, aSeparatorPosition = -1;
aSeparatorPosition = Location (theSeparator, aStartPosition, Length());
while (aSeparatorPosition)
{
theValues.Add (SubString (aStartPosition, aSeparatorPosition - 1));
aStartPosition = aSeparatorPosition + theSeparator.Length();
}
}
// ----------------------------------------------------------------------------
// Split
// ----------------------------------------------------------------------------

8
src/TCollection/TCollection_AsciiString.hxx
View File

@@ -21,8 +21,6 @@
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <NCollection_IndexedMap.hxx>
#include <Standard_PCharacter.hxx>
#include <Standard_Integer.hxx>
#include <Standard_CString.hxx>
@@ -627,12 +625,6 @@ friend Standard_EXPORT Standard_IStream& operator >> (Standard_IStream& astream,
//! aString.Split(3) gives <me> = "abc" and returns "defg"
Standard_EXPORT TCollection_AsciiString Split (const Standard_Integer where);
//! Splits a AsciiString into list of sub-strings.
//! Example:
//! aString contains "value_1, value_2, ..., value_n"
//! aString.Split(", ") gives container of strings: "value_1", "value_2"
Standard_EXPORT void Split (const TCollection_AsciiString& theSeparator, NCollection_IndexedMap<TCollection_AsciiString>& theValues);
//! Creation of a sub-string of the string <me>.
//! The sub-string starts to the index Fromindex and ends
//! to the index ToIndex.

7
src/gp/gp_Ax1.cxx
View File

@@ -28,8 +28,6 @@
#include <gp_Trsf.hxx>
#include <gp_Vec.hxx>
#include <Standard_Dump.hxx>
Standard_Boolean gp_Ax1::IsCoaxial
(const gp_Ax1& Other,
const Standard_Real AngularTolerance,
@@ -86,8 +84,3 @@ gp_Ax1 gp_Ax1::Mirrored (const gp_Ax2& A2) const
return A1;
}
void gp_Ax1::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &loc);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &vdir);
}

2
src/gp/gp_Ax1.hxx
View File

@@ -205,8 +205,6 @@ 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 virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

9
src/gp/gp_Ax2.cxx
View File

@@ -28,7 +28,6 @@
#include <gp_Trsf.hxx>
#include <gp_Vec.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_Dump.hxx>
gp_Ax2::gp_Ax2 (const gp_Pnt& P, const gp_Dir& V) :
axis(P,V)
@@ -114,11 +113,3 @@ gp_Ax2 gp_Ax2::Mirrored(const gp_Ax2& A2) const
return Temp;
}
void gp_Ax2::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_CLASS_BEGIN (theOStream, gp_Ax2);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &axis);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &vydir);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &vxdir);
}

3
src/gp/gp_Ax2.hxx
View File

@@ -323,9 +323,6 @@ 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 virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

9
src/gp/gp_Ax2d.cxx
View File

@@ -26,8 +26,6 @@
#include <gp_Vec2d.hxx>
#include <gp_XY.hxx>
#include <Standard_Dump.hxx>
Standard_Boolean gp_Ax2d::IsCoaxial (const gp_Ax2d& Other,
const Standard_Real AngularTolerance,
const Standard_Real LinearTolerance) const
@@ -77,10 +75,3 @@ gp_Ax2d gp_Ax2d::Mirrored (const gp_Ax2d& A) const
return AA;
}
void gp_Ax2d::DumpJson (Standard_OStream& theOStream, const 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);
}

3
src/gp/gp_Ax2d.hxx
View File

@@ -168,8 +168,7 @@ public:
//! point <P2>.
Standard_NODISCARD gp_Ax2d Translated (const gp_Pnt2d& P1, const gp_Pnt2d& P2) const;
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

8
src/gp/gp_Ax3.cxx
View File

@@ -23,7 +23,6 @@
#include <gp_Trsf.hxx>
#include <gp_Vec.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_Dump.hxx>
//=======================================================================
//function : gp_Ax3
@@ -106,10 +105,3 @@ gp_Ax3 gp_Ax3::Mirrored(const gp_Ax2& A2)const
return Temp;
}
void gp_Ax3::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &axis);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &vydir);
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &vxdir);
}

2
src/gp/gp_Ax3.hxx
View File

@@ -290,8 +290,6 @@ 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 virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

5
src/gp/gp_Dir.cxx
View File

@@ -22,7 +22,6 @@
#include <gp_XYZ.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_DomainError.hxx>
#include <Standard_Dump.hxx>
#include <Standard_OutOfRange.hxx>
Standard_Real gp_Dir::Angle (const gp_Dir& Other) const
@@ -140,7 +139,3 @@ gp_Dir gp_Dir::Mirrored (const gp_Ax2& A2) const
return V;
}
void gp_Dir::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &coord);
}

2
src/gp/gp_Dir.hxx
View File

@@ -263,8 +263,6 @@ public:
Standard_NODISCARD gp_Dir Transformed (const gp_Trsf& T) const;
//! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

16
src/gp/gp_GTrsf.cxx
View File

@@ -22,7 +22,6 @@
#include <gp_Trsf.hxx>
#include <gp_XYZ.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_Dump.hxx>
#include <Standard_OutOfRange.hxx>
void gp_GTrsf::SetTranslationPart (const gp_XYZ& Coord)
@@ -158,18 +157,3 @@ void gp_GTrsf::SetForm()
return;
}
}
//=======================================================================
//function : DumpJson
//purpose :
//=======================================================================
void gp_GTrsf::DumpJson (Standard_OStream& theOStream, const 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);
}

2
src/gp/gp_GTrsf.hxx
View File

@@ -244,8 +244,6 @@ public:
gp_Trsf Trsf() const;
//! Dumps the content of me into the stream
Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;

5
src/gp/gp_Pln.cxx
View File

@@ -30,7 +30,6 @@
#include <gp_Trsf.hxx>
#include <gp_Vec.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_Dump.hxx>
gp_Pln::gp_Pln (const gp_Pnt& P,
const gp_Dir& V)
@@ -131,7 +130,3 @@ gp_Pln gp_Pln::Mirrored (const gp_Ax2& A2) const
return Pl;
}
void gp_Pln::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &pos);
}

3
src/gp/gp_Pln.hxx
View File

@@ -241,9 +241,6 @@ 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 virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

5
src/gp/gp_Pnt.cxx
View File

@@ -25,7 +25,6 @@
#include <gp_Trsf.hxx>
#include <gp_Vec.hxx>
#include <gp_XYZ.hxx>
#include <Standard_Dump.hxx>
#include <Standard_OutOfRange.hxx>
void gp_Pnt::Transform (const gp_Trsf& T)
@@ -86,7 +85,3 @@ gp_Pnt gp_Pnt::Mirrored (const gp_Ax2& A2) const
return P;
}
void gp_Pnt::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
{
OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &coord);
}

2
src/gp/gp_Pnt.hxx
View File

@@ -174,8 +174,6 @@ 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 virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const;
protected:

Some files were not shown because too many files have changed in this diff Show More