0031313: Foundation Classes - Dump improvement for classes

[occt.git] / src / Prs3d / Prs3d.cxx

diff --git a/src/Prs3d/Prs3d.cxx b/src/Prs3d/Prs3d.cxx
index db6b09d..33f33fe 100644 (file)
--- a/src/Prs3d/Prs3d.cxx
+++ b/src/Prs3d/Prs3d.cxx
@@ -14,24 +14,30 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Prs3d.ixx>
+#include <Prs3d.hxx>
+
 #include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
+#include <gp_Pnt.hxx>
+#include <Graphic3d_Group.hxx>
 #include <Prs3d_Drawer.hxx>
+#include <Prs3d_LineAspect.hxx>
+#include <Prs3d_Root.hxx>
 #include <TopoDS_Shape.hxx>
+#include <Graphic3d_ArrayOfSegments.hxx>
 
 //=======================================================================
 //function : MatchSegment
 //purpose  :
 //=======================================================================
 Standard_Boolean Prs3d::MatchSegment 
-                 (const Quantity_Length X,
-                  const Quantity_Length Y,
-                  const Quantity_Length Z,
-                  const Quantity_Length aDistance,
+                 (const Standard_Real X,
+                  const Standard_Real Y,
+                  const Standard_Real Z,
+                  const Standard_Real aDistance,
                   const gp_Pnt& P1,
                   const gp_Pnt& P2,
-                  Quantity_Length& dist)
+                  Standard_Real& dist)
 {
   Standard_Real X1,Y1,Z1,X2,Y2,Z2;
   P1.Coord(X1,Y1,Z1); P2.Coord(X2,Y2,Z2);
@@ -56,20 +62,86 @@ Standard_Boolean Prs3d::MatchSegment
 Standard_Real Prs3d::GetDeflection (const TopoDS_Shape&         theShape,
                                     const Handle(Prs3d_Drawer)& theDrawer)
 {
-#define MAX2(X, Y)    (Abs(X) > Abs(Y) ? Abs(X) : Abs(Y))
-#define MAX3(X, Y, Z) (MAX2 (MAX2 (X, Y), Z))
+  if (theDrawer->TypeOfDeflection() != Aspect_TOD_RELATIVE)
+  {
+    return theDrawer->MaximalChordialDeviation();
+  }
 
-  Standard_Real aDeflection = theDrawer->MaximalChordialDeviation();
-  if (theDrawer->TypeOfDeflection() == Aspect_TOD_RELATIVE)
+  Bnd_Box aBndBox;
+  BRepBndLib::Add (theShape, aBndBox, Standard_False);
+  if (aBndBox.IsVoid())
   {
-    Bnd_Box aBndBox;
-    BRepBndLib::Add (theShape, aBndBox, Standard_False);
-    if (!aBndBox.IsVoid())
+    return theDrawer->MaximalChordialDeviation();
+  }
+  else if (aBndBox.IsOpen())
+  {
+    if (!aBndBox.HasFinitePart())
     {
-      Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;
-      aBndBox.Get (aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
-      aDeflection = MAX3 (aXmax-aXmin, aYmax-aYmin, aZmax-aZmin) * theDrawer->DeviationCoefficient() * 4.0;
+      return theDrawer->MaximalChordialDeviation();
     }
+    aBndBox = aBndBox.FinitePart();
   }
+
+  Graphic3d_Vec3d aVecMin, aVecMax;
+  aBndBox.Get (aVecMin.x(), aVecMin.y(), aVecMin.z(), aVecMax.x(), aVecMax.y(), aVecMax.z());
+  const Graphic3d_Vec3d aDiag = aVecMax - aVecMin;
+  const Standard_Real aDeflection = aDiag.maxComp() * theDrawer->DeviationCoefficient() * 4.0;
+
+  // we store computed relative deflection of shape as absolute deviation coefficient
+  // in case relative type to use it later on for sub-shapes.
+  theDrawer->SetMaximalChordialDeviation (aDeflection);
   return aDeflection;
 }
+
+//==================================================================
+// function: PrimitivesFromPolylines
+// purpose:
+//==================================================================
+Handle(Graphic3d_ArrayOfPrimitives) Prs3d::PrimitivesFromPolylines (const Prs3d_NListOfSequenceOfPnt& thePoints)
+{
+  if (thePoints.IsEmpty())
+  {
+    return Handle(Graphic3d_ArrayOfPrimitives)();
+  }
+
+  Standard_Integer aNbVertices = 0;
+  for (Prs3d_NListOfSequenceOfPnt::Iterator anIt (thePoints); anIt.More(); anIt.Next())
+  {
+    aNbVertices += anIt.Value()->Length();
+  }
+  const Standard_Integer aSegmentEdgeNb = (aNbVertices - thePoints.Size()) * 2;
+  Handle(Graphic3d_ArrayOfSegments) aSegments = new Graphic3d_ArrayOfSegments (aNbVertices, aSegmentEdgeNb);
+  for (Prs3d_NListOfSequenceOfPnt::Iterator anIt (thePoints); anIt.More(); anIt.Next())
+  {
+    const Handle(TColgp_HSequenceOfPnt)& aPoints = anIt.Value();
+
+    Standard_Integer aSegmentEdge = aSegments->VertexNumber() + 1;
+    aSegments->AddVertex (aPoints->First());
+    for (Standard_Integer aPntIter = aPoints->Lower() + 1; aPntIter <= aPoints->Upper(); ++aPntIter)
+    {
+      aSegments->AddVertex (aPoints->Value (aPntIter));
+      aSegments->AddEdge (  aSegmentEdge);
+      aSegments->AddEdge (++aSegmentEdge);
+    }
+  }
+
+  return aSegments;
+}
+
+//==================================================================
+// function: AddPrimitivesGroup
+// purpose:
+//==================================================================
+void Prs3d::AddPrimitivesGroup (const Handle(Prs3d_Presentation)& thePrs,
+                                const Handle(Prs3d_LineAspect)&   theAspect,
+                                Prs3d_NListOfSequenceOfPnt&       thePolylines)
+{
+  Handle(Graphic3d_ArrayOfPrimitives) aPrims = Prs3d::PrimitivesFromPolylines (thePolylines);
+  thePolylines.Clear();
+  if (!aPrims.IsNull())
+  {
+    Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup (thePrs);
+    aGroup->SetPrimitivesAspect (theAspect->Aspect());
+    aGroup->AddPrimitiveArray (aPrims);
+  }
+}