0026072: Visualization - more realistic display of face edges

Code tweaks.

dox/user_guides/step/step.md

@@ -475,7 +475,7 @@ Modify this parameter with:
 if(!Interface_Static::SetIVal("read.step.tessellated",1))  
 .. error .. 
 ~~~~
-Default value is 1 (On). 
+Default value is 0 (On). 
 
 @subsubsection occt_step_2_3_4 Performing the STEP file translation
 
@@ -1653,6 +1653,13 @@ For each Saved View OCCT STEP Reader will retrieve the following attributes:
 - clipping planes (single plane of combination of planes);
 - front and back plane clipping.
 
+### User defined attributes
+Attributes are implemented in accordance with <a href="https://www.mbx-if.org/documents/rec_prac_user_def_attributes_v18.pdf">Recommended practices for User Defined Attributes</a> section 4, 5, 6.1-6.3 and 7.
+Attributes can be read for shapes at levels:
+- Part/Product Level;
+- Component Instances in an Assembly;
+- Geometry Level.
+
 @subsection occt_step_7_3 Writing to STEP
 
 The translation from XDE to STEP can be initialized as follows: 
@@ -1730,5 +1737,8 @@ Interface_Static::SetIVal("write.step.schema", 5));
 ### Saved views
 Saved Views are not exported by OCCT.
 
+### User defined attributes
+Attributes can be imported from STEP.
+
 
 

src/AIS/AIS_ColoredShape.cxx

@@ -636,12 +636,22 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
         {
           if (Handle(Graphic3d_ArrayOfSegments) aBndSegments = StdPrs_ShadedShape::FillFaceBoundaries (aShapeDraw, aDrawer->FaceBoundaryUpperContinuity()))
           {
-            if (anEdgesGroup.IsNull())
+            Handle(Graphic3d_AspectLine3d) aLineAspect = Handle(Graphic3d_AspectLine3d)(aDrawer->FaceBoundaryAspect()->Aspect());
+            if (aDrawer->FaceBoundaryShadingOverride())
+            {
+              Quantity_Color aColor = aDrawer->Color();
+              if (aDrawer->HasOwnShadingAspect())
+              {
+                aColor = aDrawer->ShadingAspect()->Color();
+              }
+              aLineAspect->SetColor (aColor);
+              anEdgesGroup = thePrs->NewGroup();
+            }
+            else if (anEdgesGroup.IsNull())
             {
               anEdgesGroup = thePrs->NewGroup();
             }
-
-            anEdgesGroup->SetPrimitivesAspect (aDrawer->FaceBoundaryAspect()->Aspect());
+            anEdgesGroup->SetGroupPrimitivesAspect (aLineAspect);
             anEdgesGroup->AddPrimitiveArray (aBndSegments);
           }
         }

src/Approx/Approx_BSplComputeLine.gxx

@@ -808,11 +808,8 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
   const Standard_Integer aNbp = lastP - firstP + 1;
 
 
-  // The first parameter should always be zero according to all the logic below,
-  // so division by any value will give zero anyway, so it should never be scaled
-  // to avoid case when there is only one parameter in the array thus division by zero happens.
-  TheParameters(firstP) = 0.0;
   if (aNbp == 2) {
+    TheParameters(firstP) = 0.0;
     TheParameters(lastP) = 1.0;
   }
   else if (Par == Approx_ChordLength || Par == Approx_Centripetal)
@@ -823,6 +820,7 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
     if (nbP3d == 0) mynbP3d = 1;
     if (nbP2d == 0) mynbP2d = 1;
 
+    TheParameters(firstP) = 0.0;
     dist = 0.0;
     TColgp_Array1OfPnt tabP(1, mynbP3d);
     TColgp_Array1OfPnt tabPP(1, mynbP3d);
@@ -863,10 +861,10 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
         TheParameters(i) = TheParameters(i - 1) + Sqrt(dist);
       }
     }
-    for (i = firstP + 1; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
+    for (i = firstP; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
   }
   else {
-    for (i = firstP + 1; i <= lastP; i++) {
+    for (i = firstP; i <= lastP; i++) {
       TheParameters(i) = (Standard_Real(i) - firstP) /
         (Standard_Real(lastP - Standard_Real(firstP)));
     }

src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx

@@ -103,7 +103,7 @@ static Standard_Boolean  ChangePCurve (TopoDS_Edge&          E,
 //purpose  : 
 //=======================================================================
 
-static bool ProjCurve3d (TopoDS_Edge&          E,
+static void ProjCurve3d (TopoDS_Edge&          E,
                          const Handle(Geom_Surface)& S,
                          TopLoc_Location&      L)
 {
@@ -111,10 +111,6 @@ static bool ProjCurve3d (TopoDS_Edge&          E,
   TopLoc_Location           LE;
   Standard_Real             f,l;
   Handle(Geom_Curve)        C  = BRep_Tool::Curve(E,LE,f,l);
-  if (C.IsNull())
-  {
-    return false;
-  }
   Handle(Geom_TrimmedCurve) CT = new Geom_TrimmedCurve(C,f,l);
   
   TopLoc_Location LL = L.Inverted().Multiplied(LE);
@@ -122,7 +118,6 @@ static bool ProjCurve3d (TopoDS_Edge&          E,
   
   Handle(Geom2d_Curve) C2 = GeomProjLib::Curve2d (CT,S);
   BB.UpdateEdge(E,C2,S,L,Precision::Confusion());
-  return true;
 }
 
 //=======================================================================
@@ -170,19 +165,13 @@ void BRepAlgo_FaceRestrictor::Perform()
         // no pcurve on the reference surface.
         if (modeProj) {
           // Projection of the 3D curve on surface.
-          if (!ProjCurve3d(E, S, L))
-          {
-            return;
-          }
+          ProjCurve3d ( E, S, L);
         }
         else {
           // return the first pcurve glued on <S>
           Standard_Boolean YaPCurve = ChangePCurve (E, S, L);
           if (!YaPCurve) {
-            if (!ProjCurve3d(E, S, L))
-            {
-              return;
-            }
+            ProjCurve3d (E, S, L);
           }
         }
       }

src/BRepAlgo/BRepAlgo_NormalProjection.cxx

@@ -333,7 +333,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
 	    Only2d = Standard_True;
 	  
 	  if(Only2d && Only3d) {
-	    BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(*hcur),
+	    BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(hcur->Curve()), 
 				  Udeb, Ufin);
 	    prj = MKed.Edge();
 	    BB.UpdateEdge(TopoDS::Edge(prj), 
@@ -369,7 +369,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
 	    
 	    if(!Only3d) PCur2d = appr.Curve2d();
 	    if(Only2d) {
-	      BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(*hcur),
+	      BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(hcur->Curve()), 
 				    Udeb, Ufin);
 	      prj = MKed.Edge();
 	    }

src/BRepOffset/BRepOffset_Inter3d.cxx

@@ -1292,10 +1292,11 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
             for ( ;exp2.More(); exp2.Next()) {
               LOE.Append(exp2.Current());
             }
+            BRepOffset_Tool::TryProject(CF,OF1,LOE,LInt1,LInt2,mySide,myTol);
             //-------------------------------------------------------
             // If no trace try intersection.
             //-------------------------------------------------------
-            if (!BRepOffset_Tool::TryProject(CF, OF1, LOE, LInt1, LInt2, mySide, myTol) || LInt1.IsEmpty()) {
+            if (LInt1.IsEmpty()) {
               BRepOffset_Tool::Inter3D (CF,OF1,LInt1,LInt2,mySide,NullEdge,NullFace,NullFace);
             }
             Store (CF,OF1,LInt1,LInt2);

src/BRepOffset/BRepOffset_MakeOffset.cxx

@@ -1175,16 +1175,12 @@ void BRepOffset_MakeOffset::MakeThickSolid(const Message_ProgressRange& theRange
     {
       NbOF++;
     }
-    if (NbOF < NbF)
+    if (NbOF <= NbF)
     {
       myDone = Standard_False;
       myError = BRepOffset_UnknownError;
       return;
     }
-    if (NbOF == NbF)
-    {
-      myOffset = 0;
-    }
   }
 
   if (myOffset > 0 ) myOffsetShape.Reverse();

src/BRepOffset/BRepOffset_Tool.cxx

@@ -1881,10 +1881,6 @@ Standard_Boolean BRepOffset_Tool::TryProject
     if (C.IsNull()) {
       BRepLib::BuildCurve3d(CurE,BRep_Tool::Tolerance(CurE));
       C  = BRep_Tool::Curve(CurE,L,f,l);
-      if (C.IsNull())
-      {
-        return Standard_False;
-      }
     }
     C = new Geom_TrimmedCurve(C,f,l);
     if ( !L.IsIdentity()) C->Transform(L);
@@ -3523,8 +3519,9 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face&            F,
       if (ToBuild.IsBound(E)) {
 	TopTools_ListOfShape LOE;
 	LOE.Append(E);
-	if (BRepOffset_Tool::TryProject(TopoDS::Face(ToBuild(E)), EF, LOE, LInt2, LInt1, Side, TolConf)
-        && !LInt1.IsEmpty())
+	BRepOffset_Tool::TryProject (TopoDS::Face(ToBuild(E)),
+				     EF,LOE,LInt2,LInt1,Side,TolConf);
+	if (!LInt1.IsEmpty()) 
 	  ToBuild.UnBind(E);
       }
     }

src/BSplCLib/BSplCLib_2.cxx

@@ -515,13 +515,8 @@ BSplCLib::EvalBsplineBasis
       //
       // this should be always invertible if ii is correctly computed 
       //
-      const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
-      if (Abs (aScale) < gp::Resolution())
-      {
-        return 2;
-      }
-
-      Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) / aScale;
+      Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) 
+	/ (FlatKnots(ii + pp)   - FlatKnots(ii - qq + pp + 1)) ; 
       Saved = Factor *    BsplineBasis(1,pp) ;
       BsplineBasis(1,pp) *= (1.0e0 - Factor) ;
       BsplineBasis(1,pp) += BsplineBasis(1,qq) ;
@@ -541,13 +536,7 @@ BSplCLib::EvalBsplineBasis
     }
 
     for (pp = 1 ; pp <= qq - 1 ; pp++) {
-      const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
-      if (Abs (aScale) < gp::Resolution())
-      {
-        return 2;
-      }
-
-      Inverse = 1.0e0 / aScale;
+      Inverse = 1.0e0 / (FlatKnots(ii + pp)  - FlatKnots(ii - qq + pp + 1)) ;
       Factor  =  (Parameter - FlatKnots(ii - qq + pp + 1)) * Inverse ;
       Saved = Factor *                 BsplineBasis(1,pp) ;
       BsplineBasis(1,pp) *= (1.0e0 - Factor) ;

src/GeomToStep/GeomToStep_MakeAxis1Placement.hxx

@@ -20,10 +20,10 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
+#include <StepData_Factors.hxx>
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_Axis1Placement;
 class gp_Ax1;
 class gp_Ax2d;
@@ -43,16 +43,16 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax1& A,
-                                                const StepData_Factors& theLocalFactors);
+                                                const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax2d& A,
-                                                const StepData_Factors& theLocalFactors);
+                                                const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom_Axis1Placement)& A,
-                                                const StepData_Factors& theLocalFactors);
+                                                const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom2d_AxisPlacement)& A,
-                                                const StepData_Factors& theLocalFactors);
+                                                const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Axis1Placement)& Value() const;
 

src/GeomToStep/GeomToStep_MakeAxis2Placement2d.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_Axis2Placement2d;
 class gp_Ax2;
 class gp_Ax22d;
@@ -41,10 +40,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement2d(const gp_Ax2& A,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement2d(const gp_Ax22d& A,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Axis2Placement2d)& Value() const;
 

src/GeomToStep/GeomToStep_MakeAxis2Placement3d.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 #include <StepData_StepModel.hxx>
-class StepData_Factors;
 class StepGeom_Axis2Placement3d;
 class gp_Ax2;
 class gp_Ax3;
@@ -42,19 +41,19 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const StepData_Factors& theLocalFactors);
+  Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Ax2& A,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Ax3& A,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Trsf& T,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const Handle(Geom_Axis2Placement)& A,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Axis2Placement3d)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.hxx

@@ -24,7 +24,6 @@
 #include <GeomToStep_Root.hxx>
 class Geom_BSplineCurve;
 class Geom2d_BSplineCurve;
-class StepData_Factors;
 class StepGeom_BSplineCurveWithKnots;
 
 
@@ -41,10 +40,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnots(const Handle(Geom_BSplineCurve)& Bsplin,
-                                                       const StepData_Factors& theLocalFactors);
+                                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnots(const Handle(Geom2d_BSplineCurve)& Bsplin,
-                                                       const StepData_Factors& theLocalFactors);
+                                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_BSplineCurveWithKnots)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve;
 class Geom_BSplineCurve;
 class Geom2d_BSplineCurve;
@@ -42,10 +41,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve(const Handle(Geom_BSplineCurve)& Bsplin,
-                                                                              const StepData_Factors& theLocalFactors);
+                                                                              const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve(const Handle(Geom2d_BSplineCurve)& Bsplin,
-                                                                              const StepData_Factors& theLocalFactors);
+                                                                              const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineSurfaceWithKnots.hxx

@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
-class StepData_Factors;
 class StepGeom_BSplineSurfaceWithKnots;
 class Geom_BSplineSurface;
 
@@ -40,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineSurfaceWithKnots(const Handle(Geom_BSplineSurface)& Bsplin,
-                                                         const StepData_Factors& theLocalFactors);
+                                                         const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_BSplineSurfaceWithKnots)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface;
 class Geom_BSplineSurface;
 
@@ -41,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineSurfaceWithKnotsAndRationalBSplineSurface(const Handle(Geom_BSplineSurface)& Bsplin,
-                                                                                  const StepData_Factors& theLocalFactors);
+                                                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBoundedCurve.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_BoundedCurve;
 class Geom_BoundedCurve;
 class Geom2d_BoundedCurve;
@@ -42,10 +41,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBoundedCurve(const Handle(Geom_BoundedCurve)& C,
-                                              const StepData_Factors& theLocalFactors);
+                                              const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeBoundedCurve(const Handle(Geom2d_BoundedCurve)& C,
-                                              const StepData_Factors& theLocalFactors);
+                                              const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_BoundedCurve)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBoundedSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_BoundedSurface;
 class Geom_BoundedSurface;
 
@@ -41,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBoundedSurface(const Handle(Geom_BoundedSurface)& C,
-                                                const StepData_Factors& theLocalFactors);
+                                                const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_BoundedSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeCircle.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_Circle;
 class gp_Circ;
 class Geom_Circle;
@@ -42,13 +41,13 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeCircle(const gp_Circ& C,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeCircle(const Handle(Geom_Circle)& C,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeCircle(const Handle(Geom2d_Circle)& C,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Circle)& Value() const;
 

src/GeomToStep/GeomToStep_MakeConic.hxx

@@ -25,7 +25,6 @@
 class StepGeom_Conic;
 class Geom_Conic;
 class Geom2d_Conic;
-class StepData_Factors;
 
 
 //! This class implements the mapping between classes
@@ -40,10 +39,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeConic(const Handle(Geom_Conic)& C,
-                                       const StepData_Factors& theLocalFactors);
+                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeConic(const Handle(Geom2d_Conic)& C,
-                                       const StepData_Factors& theLocalFactors);
+                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Conic)& Value() const;
 

src/GeomToStep/GeomToStep_MakeConicalSurface.hxx

@@ -24,7 +24,6 @@
 #include <GeomToStep_Root.hxx>
 class StepGeom_ConicalSurface;
 class Geom_ConicalSurface;
-class StepData_Factors;
 
 
 //! This class implements the mapping between class
@@ -39,7 +38,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeConicalSurface(const Handle(Geom_ConicalSurface)& CSurf,
-                                                const StepData_Factors& theLocalFactors);
+                                                const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_ConicalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeCurve.hxx

@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
-class StepData_Factors;
 class StepGeom_Curve;
 class Geom_Curve;
 class Geom2d_Curve;
@@ -40,10 +39,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeCurve(const Handle(Geom_Curve)& C,
-                                       const StepData_Factors& theLocalFactors);
+                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeCurve(const Handle(Geom2d_Curve)& C,
-                                       const StepData_Factors& theLocalFactors);
+                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Curve)& Value() const;
 

src/GeomToStep/GeomToStep_MakeCylindricalSurface.hxx

@@ -24,7 +24,6 @@
 #include <GeomToStep_Root.hxx>
 class StepGeom_CylindricalSurface;
 class Geom_CylindricalSurface;
-class StepData_Factors;
 
 
 //! This class implements the mapping between class
@@ -39,7 +38,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeCylindricalSurface(const Handle(Geom_CylindricalSurface)& CSurf,
-                                                    const StepData_Factors& theLocalFactors);
+                                                    const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_CylindricalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeElementarySurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_ElementarySurface;
 class Geom_ElementarySurface;
 
@@ -41,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeElementarySurface(const Handle(Geom_ElementarySurface)& S,
-                                                   const StepData_Factors& theLocalFactors);
+                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_ElementarySurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeEllipse.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_Ellipse;
 class gp_Elips;
 class Geom_Ellipse;
@@ -42,13 +41,13 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeEllipse(const gp_Elips& C,
-                                         const StepData_Factors& theLocalFactors);
+                                         const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeEllipse(const Handle(Geom_Ellipse)& C,
-                                         const StepData_Factors& theLocalFactors);
+                                         const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeEllipse(const Handle(Geom2d_Ellipse)& C,
-                                         const StepData_Factors& theLocalFactors);
+                                         const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Ellipse)& Value() const;
 

src/GeomToStep/GeomToStep_MakeHyperbola.hxx

@@ -38,10 +38,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeHyperbola(const Handle(Geom2d_Hyperbola)& C,
-                                           const StepData_Factors& theLocalFactors);
+                                           const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeHyperbola(const Handle(Geom_Hyperbola)& C,
-                                           const StepData_Factors& theLocalFactors);
+                                           const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Hyperbola)& Value() const;
 

src/GeomToStep/GeomToStep_MakeLine.hxx

@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
-class StepData_Factors;
 class StepGeom_Line;
 class gp_Lin;
 class gp_Lin2d;
@@ -42,16 +41,16 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeLine(const gp_Lin& L,
-                                      const StepData_Factors& theLocalFactors);
+                                      const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeLine(const gp_Lin2d& L,
-                                      const StepData_Factors& theLocalFactors);
+                                      const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeLine(const Handle(Geom_Line)& C,
-                                      const StepData_Factors& theLocalFactors);
+                                      const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeLine(const Handle(Geom2d_Line)& C,
-                                      const StepData_Factors& theLocalFactors);
+                                      const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Line)& Value() const;
 

src/GeomToStep/GeomToStep_MakeParabola.hxx

@@ -25,7 +25,6 @@
 class StepGeom_Parabola;
 class Geom2d_Parabola;
 class Geom_Parabola;
-class StepData_Factors;
 
 
 //! This class implements the mapping between the class
@@ -39,10 +38,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeParabola(const Handle(Geom2d_Parabola)& C,
-                                          const StepData_Factors& theLocalFactors);
+                                          const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeParabola(const Handle(Geom_Parabola)& C,
-                                          const StepData_Factors& theLocalFactors);
+                                          const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Parabola)& Value() const;
 

src/GeomToStep/GeomToStep_MakePlane.hxx

@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
-class StepData_Factors;
 class StepGeom_Plane;
 class gp_Pln;
 class Geom_Plane;
@@ -40,10 +39,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakePlane(const gp_Pln& P,
-                                       const StepData_Factors& theLocalFactors);
+                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakePlane(const Handle(Geom_Plane)& P,
-                                       const StepData_Factors& theLocalFactors);
+                                       const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Plane)& Value() const;
 

src/GeomToStep/GeomToStep_MakePolyline.hxx

@@ -25,7 +25,6 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 
-class StepData_Factors;
 class StepGeom_Polyline;
 
 
@@ -39,10 +38,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakePolyline(const TColgp_Array1OfPnt& P,
-                                          const StepData_Factors& theLocalFactors);
+                                          const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakePolyline(const TColgp_Array1OfPnt2d& P,
-                                          const StepData_Factors& theLocalFactors);
+                                          const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Polyline)& Value() const;
 

src/GeomToStep/GeomToStep_MakeRectangularTrimmedSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_RectangularTrimmedSurface;
 class Geom_RectangularTrimmedSurface;
 
@@ -41,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeRectangularTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)& RTSurf,
-                                                           const StepData_Factors& theLocalFactors);
+                                                           const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_RectangularTrimmedSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSphericalSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_SphericalSurface;
 class Geom_SphericalSurface;
 
@@ -40,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSphericalSurface(const Handle(Geom_SphericalSurface)& CSurf,
-                                                  const StepData_Factors& theLocalFactors);
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_SphericalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_Surface;
 class Geom_Surface;
 
@@ -40,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSurface(const Handle(Geom_Surface)& C,
-                                         const StepData_Factors& theLocalFactors);
+                                         const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Surface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSurfaceOfLinearExtrusion.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_SurfaceOfLinearExtrusion;
 class Geom_SurfaceOfLinearExtrusion;
 
@@ -40,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSurfaceOfLinearExtrusion(const Handle(Geom_SurfaceOfLinearExtrusion)& CSurf,
-                                                          const StepData_Factors& theLocalFactors);
+                                                          const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_SurfaceOfLinearExtrusion)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSurfaceOfRevolution.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_SurfaceOfRevolution;
 class Geom_SurfaceOfRevolution;
 
@@ -40,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSurfaceOfRevolution(const Handle(Geom_SurfaceOfRevolution)& RevSurf,
-                                                     const StepData_Factors& theLocalFactors);
+                                                     const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_SurfaceOfRevolution)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSweptSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_SweptSurface;
 class Geom_SweptSurface;
 
@@ -41,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSweptSurface(const Handle(Geom_SweptSurface)& S,
-                                              const StepData_Factors& theLocalFactors);
+                                              const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_SweptSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeToroidalSurface.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_ToroidalSurface;
 class Geom_ToroidalSurface;
 
@@ -40,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeToroidalSurface(const Handle(Geom_ToroidalSurface)& TorSurf,
-                                                 const StepData_Factors& theLocalFactors);
+                                                 const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_ToroidalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeVector.hxx

@@ -23,7 +23,6 @@
 
 #include <GeomToStep_Root.hxx>
 
-class StepData_Factors;
 class StepGeom_Vector;
 class gp_Vec;
 class gp_Vec2d;
@@ -43,16 +42,16 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeVector(const gp_Vec& V,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeVector(const gp_Vec2d& V,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeVector(const Handle(Geom_Vector)& V,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT GeomToStep_MakeVector(const Handle(Geom2d_Vector)& V,
-                                        const StepData_Factors& theLocalFactors);
+                                        const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT const Handle(StepGeom_Vector)& Value() const;
 

src/GeomToStep/GeomToStep_Root.hxx

@@ -20,6 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
+#include <StepData_Factors.hxx>
 
 #include <Standard_Boolean.hxx>
 

src/Graphic3d/Graphic3d_ArrayOfSegments.hxx

@@ -54,11 +54,16 @@ public:
   //! @param theMaxVertexs defines the maximum allowed vertex number in the array
   //! @param theMaxEdges   defines the maximum allowed edge   number in the array
   //! @param theHasVColors when TRUE, AddVertex(Point,Color) should be used for specifying vertex color
+  //! @param theHasVNormals when TRUE,  AddVertex(Point,Normal) or AddVertex(Point,Normal,Color) should be used to specify vertex normal;
+  //!                       vertex normals should be specified coherent to the edge's neighbour triangle face's orientation
+  //!                       (defined by order of vertexes within triangle) for proper rendering
   Graphic3d_ArrayOfSegments (Standard_Integer theMaxVertexs,
-                             Standard_Integer theMaxEdges   = 0,
-                             Standard_Boolean theHasVColors = Standard_False)
-  : Graphic3d_ArrayOfPrimitives (Graphic3d_TOPA_SEGMENTS, theMaxVertexs, 0, theMaxEdges, theHasVColors ? Graphic3d_ArrayFlags_VertexColor : Graphic3d_ArrayFlags_None) {}
-
+                             Standard_Integer theMaxEdges = 0,
+                             Standard_Boolean theHasVColors = Standard_False,
+                             Standard_Boolean theHasVNormals = Standard_False)
+  : Graphic3d_ArrayOfPrimitives (Graphic3d_TOPA_SEGMENTS, theMaxVertexs, 0, theMaxEdges,
+                                 (theHasVNormals ? Graphic3d_ArrayFlags_VertexNormal : Graphic3d_ArrayFlags_None)
+                               | (theHasVColors  ? Graphic3d_ArrayFlags_VertexColor  : Graphic3d_ArrayFlags_None)) {}
 
 };
 

src/Graphic3d/Graphic3d_TransModeFlags.hxx

@@ -25,8 +25,15 @@ enum Graphic3d_TransModeFlags
   Graphic3d_TMF_TriedronPers   = 0x0020,                  //!< object behaves like trihedron - it is fixed at the corner of view and does not resizing (but rotating)
   Graphic3d_TMF_2d             = 0x0040,                  //!< object is defined in 2D screen coordinates (pixels) and does not resize, pan and rotate
   Graphic3d_TMF_CameraPers     = 0x0080,                  //!< object is in front of the camera
+  Graphic3d_TMF_OrthoPers      = 0x0100,                  //!< object is forced to be rendered with orthographic projection.
   Graphic3d_TMF_ZoomRotatePers = Graphic3d_TMF_ZoomPers
                                | Graphic3d_TMF_RotatePers //!< object doesn't resize and rotate
 };
 
+//! Bitwise OR operator for transform persistence mode flags. Be aware that some flags combinations are not valid.
+inline Graphic3d_TransModeFlags operator| (Graphic3d_TransModeFlags a, Graphic3d_TransModeFlags b)
+{
+  return static_cast<Graphic3d_TransModeFlags> (static_cast<uint32_t> (a) | static_cast<uint32_t> (b));
+}
+
 #endif

src/Graphic3d/Graphic3d_TransformPers.hxx

@@ -58,6 +58,12 @@ public:
     return (theMode & (Graphic3d_TMF_TriedronPers | Graphic3d_TMF_2d)) != 0;
   }
 
+  //! Return true if specified mode is orthographic projection transformation persistence.
+  static Standard_Boolean IsOrthoPers (Graphic3d_TransModeFlags theMode)
+  {
+    return (theMode & Graphic3d_TMF_OrthoPers) != 0;
+  }
+
 public:
 
   //! Set transformation persistence.
@@ -110,6 +116,9 @@ public:
   //! Return true for Graphic3d_TMF_TriedronPers and Graphic3d_TMF_2d modes.
   Standard_Boolean IsTrihedronOr2d() const { return IsTrihedronOr2d (myMode); }
 
+  //! Return true for Graphic3d_TMF_OrthoPers mode.
+  Standard_Boolean IsOrthoPers () const { return IsOrthoPers (myMode); }
+
   //! Transformation persistence mode flags.
   Graphic3d_TransModeFlags Mode() const { return myMode; }
 
@@ -297,28 +306,32 @@ public:
   //! @param theWorldView [in] the world view transformation matrix.
   //! @param theViewportWidth [in] the width of viewport (for 2d persistence).
   //! @param theViewportHeight [in] the height of viewport (for 2d persistence).
+  //! @param theToApplyProjPers [in] if should apply projection persistence to matrix (for orthographic persistence).
   //! @return transformation matrix to be applied to model world transformation of an object.
   template<class T>
   NCollection_Mat4<T> Compute (const Handle(Graphic3d_Camera)& theCamera,
                                const NCollection_Mat4<T>& theProjection,
                                const NCollection_Mat4<T>& theWorldView,
                                const Standard_Integer theViewportWidth,
-                               const Standard_Integer theViewportHeight) const;
+                               const Standard_Integer theViewportHeight,
+                               const Standard_Boolean theToApplyProjPers = false) const;
 
   //! Apply transformation persistence on specified matrices.
-  //! @param theCamera camera definition
-  //! @param theProjection projection matrix to modify
-  //! @param theWorldView  world-view matrix to modify
-  //! @param theViewportWidth  viewport width
-  //! @param theViewportHeight viewport height
-  //! @param theAnchor if not NULL, overrides anchor point
+  //! @param theCamera [in] camera definition
+  //! @param theProjection [in] projection matrix to modify
+  //! @param theWorldView [in/out]  world-view matrix to modify
+  //! @param theViewportWidth [in]  viewport width
+  //! @param theViewportHeight [in] viewport height
+  //! @param theAnchor [in] if not NULL, overrides anchor point
+  //! @param theToApplyProjPers [in] if should apply projection persistence to matrix (for orthographic persistence).
   template<class T>
   void Apply (const Handle(Graphic3d_Camera)& theCamera,
               const NCollection_Mat4<T>& theProjection,
               NCollection_Mat4<T>& theWorldView,
               const Standard_Integer theViewportWidth,
               const Standard_Integer theViewportHeight,
-              const gp_Pnt* theAnchor = NULL) const;
+              const gp_Pnt* theAnchor = NULL,
+              const Standard_Boolean theToApplyProjPers = true) const;
 
   //! Dumps the content of me into the stream
   Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
@@ -368,41 +381,50 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
                                      NCollection_Mat4<T>& theWorldView,
                                      const Standard_Integer theViewportWidth,
                                      const Standard_Integer theViewportHeight,
-                                     const gp_Pnt* theAnchor) const
+                                     const gp_Pnt* theAnchor,
+                                     const Standard_Boolean theToApplyProjPers) const
 {
   (void )theViewportWidth;
-  (void )theProjection;
   if (myMode == Graphic3d_TMF_None
    || theViewportHeight == 0)
   {
     return;
   }
 
+  Handle(Graphic3d_Camera) aCamera = theCamera;
+  if (IsOrthoPers() && !aCamera->IsOrthographic())
+  {
+    aCamera = new Graphic3d_Camera(*theCamera); // If OrthoPers, copy camera and set to orthographic projection
+    aCamera->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
+  }
+
+  NCollection_Mat4<Standard_Real> aWorldView = aCamera->OrientationMatrix();
+
   // use total size when tiling is active
-  const Standard_Integer aVPSizeY = theCamera->Tile().IsValid() ? theCamera->Tile().TotalSize.y() : theViewportHeight;
+  const Standard_Integer aVPSizeY = aCamera->Tile().IsValid() ? aCamera->Tile().TotalSize.y() : theViewportHeight;
 
   // a small enough jitter compensation offset
   // to avoid image dragging within single pixel in corner cases
   const Standard_Real aJitterComp = 0.001;
-  if (myMode == Graphic3d_TMF_TriedronPers)
+  if ((myMode & Graphic3d_TMF_TriedronPers) != 0)
   {
     // reset Z focus for trihedron persistence
-    const Standard_Real aFocus = theCamera->IsOrthographic()
-                               ? theCamera->Distance()
-                               : (theCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
-                                ? Standard_Real(theCamera->ZFocus() * theCamera->Distance())
-                                : Standard_Real(theCamera->ZFocus()));
+    const Standard_Real aFocus = aCamera->IsOrthographic()
+                               ? aCamera->Distance()
+                               : (aCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
+                                ? Standard_Real(aCamera->ZFocus() * aCamera->Distance())
+                                : Standard_Real(aCamera->ZFocus()));
 
     // scale factor to pixels
-    const gp_XYZ aViewDim = theCamera->ViewDimensions (aFocus);
+    const gp_XYZ aViewDim = aCamera->ViewDimensions (aFocus);
     const Standard_Real aScale = Abs(aViewDim.Y()) / Standard_Real(aVPSizeY);
-    const gp_Dir aForward = theCamera->Direction();
-    gp_XYZ aCenter = theCamera->Center().XYZ() + aForward.XYZ() * (aFocus - theCamera->Distance());
+    const gp_Dir aForward = aCamera->Direction();
+    gp_XYZ aCenter = aCamera->Center().XYZ() + aForward.XYZ() * (aFocus - aCamera->Distance());
     if ((myParams.Params2d.Corner & (Aspect_TOTP_LEFT | Aspect_TOTP_RIGHT)) != 0)
     {
       const Standard_Real anOffsetX = (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale;
-      const gp_Dir aSide   = aForward.Crossed (theCamera->Up());
-      const gp_XYZ aDeltaX = aSide.XYZ() * (Abs(aViewDim.X()) * theCamera->NDC2dOffsetX() - anOffsetX);
+      const gp_Dir aSide   = aForward.Crossed (aCamera->Up());
+      const gp_XYZ aDeltaX = aSide.XYZ() * (Abs(aViewDim.X()) * aCamera->NDC2dOffsetX() - anOffsetX);
       if ((myParams.Params2d.Corner & Aspect_TOTP_RIGHT) != 0)
       {
         aCenter += aDeltaX;
@@ -415,7 +437,7 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     if ((myParams.Params2d.Corner & (Aspect_TOTP_TOP | Aspect_TOTP_BOTTOM)) != 0)
     {
       const Standard_Real anOffsetY = (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale;
-      const gp_XYZ aDeltaY = theCamera->Up().XYZ() * (Abs(aViewDim.Y()) * theCamera->NDC2dOffsetY() - anOffsetY);
+      const gp_XYZ aDeltaY = aCamera->Up().XYZ() * (Abs(aViewDim.Y()) * aCamera->NDC2dOffsetY() - anOffsetY);
       if ((myParams.Params2d.Corner & Aspect_TOTP_TOP) != 0)
       {
         aCenter += aDeltaY;
@@ -426,27 +448,24 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
       }
     }
 
-    NCollection_Mat4<Standard_Real> aWorldView = theCamera->OrientationMatrix();
     Graphic3d_TransformUtils::Translate (aWorldView, aCenter.X(), aCenter.Y(), aCenter.Z());
     Graphic3d_TransformUtils::Scale     (aWorldView, aScale,      aScale,      aScale);
-    theWorldView.ConvertFrom (aWorldView);
-    return;
   }
-  else if (myMode == Graphic3d_TMF_2d)
+  else if ((myMode & Graphic3d_TMF_2d) != 0)
   {
-    const Standard_Real aFocus = theCamera->IsOrthographic()
-                               ? theCamera->Distance()
-                               : (theCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
-                                ? Standard_Real(theCamera->ZFocus() * theCamera->Distance())
-                                : Standard_Real(theCamera->ZFocus()));
+    const Standard_Real aFocus = aCamera->IsOrthographic()
+                               ? aCamera->Distance()
+                               : (aCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
+                                ? Standard_Real(aCamera->ZFocus() * aCamera->Distance())
+                                : Standard_Real(aCamera->ZFocus()));
 
     // scale factor to pixels
-    const gp_XYZ        aViewDim = theCamera->ViewDimensions (aFocus);
+    const gp_XYZ        aViewDim = aCamera->ViewDimensions (aFocus);
     const Standard_Real aScale   = Abs(aViewDim.Y()) / Standard_Real(aVPSizeY);
     gp_XYZ aCenter (0.0, 0.0, -aFocus);
     if ((myParams.Params2d.Corner & (Aspect_TOTP_LEFT | Aspect_TOTP_RIGHT)) != 0)
     {
-      aCenter.SetX (-aViewDim.X() * theCamera->NDC2dOffsetX() + (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale);
+      aCenter.SetX (-aViewDim.X() * aCamera->NDC2dOffsetX() + (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale);
       if ((myParams.Params2d.Corner & Aspect_TOTP_RIGHT) != 0)
       {
         aCenter.SetX (-aCenter.X());
@@ -454,26 +473,24 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     }
     if ((myParams.Params2d.Corner & (Aspect_TOTP_TOP | Aspect_TOTP_BOTTOM)) != 0)
     {
-      aCenter.SetY (-aViewDim.Y() * theCamera->NDC2dOffsetY() + (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale);
+      aCenter.SetY (-aViewDim.Y() * aCamera->NDC2dOffsetY() + (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale);
       if ((myParams.Params2d.Corner & Aspect_TOTP_TOP) != 0)
       {
         aCenter.SetY (-aCenter.Y());
       }
     }
 
-    theWorldView.InitIdentity();
-    Graphic3d_TransformUtils::Translate (theWorldView, T(aCenter.X()), T(aCenter.Y()), T(aCenter.Z()));
-    Graphic3d_TransformUtils::Scale     (theWorldView, T(aScale),      T(aScale),      T(aScale));
-    return;
+    aWorldView.InitIdentity();
+    Graphic3d_TransformUtils::Translate (aWorldView, aCenter.X(), aCenter.Y(), aCenter.Z());
+    Graphic3d_TransformUtils::Scale     (aWorldView, aScale,      aScale,      aScale);
   }
   else if ((myMode & Graphic3d_TMF_CameraPers) != 0)
   {
-    theWorldView.InitIdentity();
+    aWorldView.InitIdentity();
   }
   else
   {
     // Compute reference point for transformation in untransformed projection space.
-    NCollection_Mat4<Standard_Real> aWorldView = theCamera->OrientationMatrix();
     if (theAnchor != NULL)
     {
       Graphic3d_TransformUtils::Translate (aWorldView, theAnchor->X(), theAnchor->Y(), theAnchor->Z());
@@ -503,12 +520,19 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     if ((myMode & Graphic3d_TMF_ZoomPers) != 0)
     {
       // lock zooming
-      Standard_Real aScale = persistentScale (theCamera, theViewportWidth, theViewportHeight);
+      Standard_Real aScale = persistentScale (aCamera, theViewportWidth, theViewportHeight);
       Graphic3d_TransformUtils::Scale (aWorldView, aScale, aScale, aScale);
     }
-    theWorldView.ConvertFrom (aWorldView);
-    return;
   }
+
+  if (!theCamera->IsOrthographic() && IsOrthoPers() && theToApplyProjPers)
+  {
+    Graphic3d_Mat4d aProjInv;
+    aProjInv.ConvertFrom (theProjection.Inverted());
+    aWorldView = (aProjInv * aCamera->ProjectionMatrix()) * aWorldView;
+  }
+
+  theWorldView.ConvertFrom (aWorldView);
 }
 
 // =======================================================================
@@ -555,7 +579,7 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
                                      const Standard_Integer theViewportHeight,
                                      BVH_Box<T, 3>& theBoundingBox) const
 {
-  NCollection_Mat4<T> aTPers = Compute (theCamera, theProjection, theWorldView, theViewportWidth, theViewportHeight);
+  NCollection_Mat4<T> aTPers = Compute (theCamera, theProjection, theWorldView, theViewportWidth, theViewportHeight, false);
   if (aTPers.IsIdentity()
   || !theBoundingBox.IsValid())
   {
@@ -594,7 +618,8 @@ NCollection_Mat4<T> Graphic3d_TransformPers::Compute (const Handle(Graphic3d_Cam
                                                       const NCollection_Mat4<T>& theProjection,
                                                       const NCollection_Mat4<T>& theWorldView,
                                                       const Standard_Integer theViewportWidth,
-                                                      const Standard_Integer theViewportHeight) const
+                                                      const Standard_Integer theViewportHeight,
+                                                      const Standard_Boolean theToApplyProjPers) const
 {
   if (myMode == Graphic3d_TMF_None)
   {
@@ -610,7 +635,7 @@ NCollection_Mat4<T> Graphic3d_TransformPers::Compute (const Handle(Graphic3d_Cam
 
   // compute only world-view matrix difference to avoid floating point instability
   // caused by projection matrix modifications outside of this algorithm (e.g. by Z-fit)
-  Apply (theCamera, theProjection, aWorldView, theViewportWidth, theViewportHeight);
+  Apply (theCamera, theProjection, aWorldView, theViewportWidth, theViewportHeight, NULL, theToApplyProjPers);
   return anUnviewMat * aWorldView;
 }
 

src/Prs3d/Prs3d_Drawer.hxx

@@ -772,6 +772,17 @@ public:
     myFaceBoundaryDraw = false;
   }
 
+  //! Return flag value for boundary shading edge color override
+  Standard_Boolean FaceBoundaryShadingOverride() const
+  {
+    return myHasOwnFaceBoundaryDraw || myLink.IsNull()
+      ? myFaceBoundaryShadingOverride
+      : myLink->FaceBoundaryShadingOverride();
+  }
+  
+  //! Return flag value for boundary shading edge color override
+  void SetFaceBoundaryShadingOverride (Standard_Boolean theFlag) { myFaceBoundaryShadingOverride = theFlag; }
+
   //! Returns true if the drawer has its own attribute for face boundaries upper edge continuity class that overrides the one in the link.
   Standard_Boolean HasOwnFaceBoundaryUpperContinuity() const { return myFaceBoundaryUpperContinuity != -1; }
 
@@ -1008,6 +1019,7 @@ protected:
   Standard_Integer              myFaceBoundaryUpperContinuity; //!< the most edge continuity class (GeomAbs_Shape) to be included to face boundaries presentation, or -1 if undefined
   Standard_Boolean              myFaceBoundaryDraw;
   Standard_Boolean              myHasOwnFaceBoundaryDraw;
+  Standard_Boolean              myFaceBoundaryShadingOverride;
 
   Handle(Prs3d_DimensionAspect) myDimensionAspect;
   Prs3d_DimensionUnits          myDimensionModelUnits;

src/RWStepAP214/RWStepAP214_GeneralModule.cxx

@@ -98,6 +98,8 @@
 #include <RWStepBasic_RWExternalIdentificationAssignment.hxx>
 #include <RWStepBasic_RWExternallyDefinedItem.hxx>
 #include <RWStepBasic_RWGeneralProperty.hxx>
+#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
+#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
 #include <RWStepBasic_RWGroupRelationship.hxx>
 #include <RWStepBasic_RWIdentificationAssignment.hxx>
 #include <RWStepBasic_RWIdentificationRole.hxx>
@@ -570,6 +572,8 @@
 #include <StepBasic_ExternalIdentificationAssignment.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_GeneralProperty.hxx>
+#include <StepBasic_GeneralPropertyAssociation.hxx>
+#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepBasic_IdentificationAssignment.hxx>
@@ -1188,7 +1192,9 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
+#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
+#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -5876,6 +5882,20 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN,
     aTool.Share(anEnt, iter);
   }
   break;
+  case 820:
+  {
+    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
+    RWStepBasic_RWGeneralPropertyAssociation aTool;
+    aTool.Share(anEnt, iter);
+  }
+  break;
+  case 821:
+  {
+    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
+    RWStepBasic_RWGeneralPropertyRelationship aTool;
+    aTool.Share(anEnt, iter);
+  }
+  break;
   default : break;
   }
 }
@@ -8185,6 +8205,18 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid
    case 819:
      ent = new StepVisual_TriangulatedSurfaceSet;
      break;
+   case 820:
+     ent = new StepBasic_GeneralPropertyAssociation;
+     break;
+   case 821:
+     ent = new StepBasic_GeneralPropertyRelationship;
+     break;
+   case 822:
+     ent = new StepRepr_BooleanRepresentationItem;
+     break;
+   case 823:
+     ent = new StepRepr_RealRepresentationItem;
+     break;
 
   default: 
     return Standard_False;

src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx

@@ -188,6 +188,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
+#include <StepBasic_GeneralPropertyAssociation.hxx>
+#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
@@ -622,6 +624,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx>
 #include <RWStepRepr_RWGlobalUnitAssignedContext.hxx>
+#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
+#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
 #include <RWStepBasic_RWGroup.hxx>
 #include <RWStepBasic_RWGroupRelationship.hxx>
 #include <RWStepShape_RWHalfSpaceSolid.hxx>
@@ -1355,7 +1359,9 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx>
+#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
 #include <RWStepRepr_RWIntegerRepresentationItem.hxx>
+#include <RWStepRepr_RWRealRepresentationItem.hxx>
 #include <RWStepRepr_RWValueRepresentationItem.hxx>
 #include <RWStepRepr_RWValueRepresentationItem.hxx>
 #include <RWStepAP242_RWDraughtingModelItemAssociation.hxx>
@@ -1406,7 +1412,9 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
+#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
+#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -2352,6 +2360,10 @@ static TCollection_AsciiString Reco_ComplexTriangulatedSurfaceSet("COMPLEX_TRIAN
 static TCollection_AsciiString Reco_CubicBezierTessellatedEdge("CUBIC_BEZIER_TESSELLATED_EDGE");
 static TCollection_AsciiString Reco_CubicBezierTriangulatedFace("CUBIC_BEZIER_TRIANGULATED_FACE");
 static TCollection_AsciiString Reco_TriangulatedSurfaceSet("TRIANGULATED_SURFACE_SET");
+static TCollection_AsciiString Reco_GeneralPropertyAssociation("GENERAL_PROPERTY_ASSOCIATION");
+static TCollection_AsciiString Reco_GeneralPropertyRelationship("GENERAL_PROPERTY_RELATIONSHIP");
+static TCollection_AsciiString Reco_BooleanRepresentationItem("BOOLEAN_REPRESENTATION_ITEM");
+static TCollection_AsciiString Reco_RealRepresentationItem("REAL_REPRESENTATION_ITEM");
 
 // -- Definition of the libraries --
 
@@ -3109,6 +3121,10 @@ RWStepAP214_ReadWriteModule::RWStepAP214_ReadWriteModule ()
   typenums.Bind(Reco_CubicBezierTessellatedEdge, 817);
   typenums.Bind(Reco_CubicBezierTriangulatedFace, 818);
   typenums.Bind(Reco_TriangulatedSurfaceSet, 819);
+  typenums.Bind(Reco_GeneralPropertyAssociation, 820);
+  typenums.Bind(Reco_GeneralPropertyRelationship, 821);
+  typenums.Bind(Reco_BooleanRepresentationItem, 822);
+  typenums.Bind(Reco_RealRepresentationItem, 823);
 
   
 //    SHORT NAMES
@@ -5097,6 +5113,10 @@ const TCollection_AsciiString& RWStepAP214_ReadWriteModule::StepType
   case 817: return Reco_CubicBezierTessellatedEdge;
   case 818: return Reco_CubicBezierTriangulatedFace;
   case 819: return Reco_TriangulatedSurfaceSet;
+  case 820: return Reco_GeneralPropertyAssociation;
+  case 821: return Reco_GeneralPropertyRelationship;
+  case 822: return Reco_BooleanRepresentationItem;
+  case 823: return Reco_RealRepresentationItem;
   default : return PasReco;
   }
 }
@@ -10706,6 +10726,34 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN,
     aTool.ReadStep(data, num, ach, anEnt);
   }
   break;
+  case 820:
+  {
+    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
+    RWStepBasic_RWGeneralPropertyAssociation aTool;
+    aTool.ReadStep(data, num, ach, anEnt);
+  }
+  break;
+  case 821:
+  {
+    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
+    RWStepBasic_RWGeneralPropertyRelationship aTool;
+    aTool.ReadStep(data, num, ach, anEnt);
+  }
+  break;
+  case 822:
+  {
+    DeclareAndCast(StepRepr_BooleanRepresentationItem, anent, ent);
+    RWStepRepr_RWBooleanRepresentationItem aTool;
+    aTool.ReadStep(data, num, ach, anent);
+  }
+  break;
+  case 823:
+  {
+    DeclareAndCast(StepRepr_RealRepresentationItem, anent, ent);
+    RWStepRepr_RWRealRepresentationItem aTool;
+    aTool.ReadStep(data, num, ach, anent);
+  }
+  break;
   default: 
     ach->AddFail("Type Mismatch when reading - Entity");
   }
@@ -16257,6 +16305,34 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN,
     aTool.WriteStep(SW, anEnt);
   }
   break;
+  case 820:
+  {
+    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
+    RWStepBasic_RWGeneralPropertyAssociation aTool;
+    aTool.WriteStep(SW, anEnt);
+  }
+  break;
+  case 821:
+  {
+    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
+    RWStepBasic_RWGeneralPropertyRelationship aTool;
+    aTool.WriteStep(SW, anEnt);
+  }
+  break;
+  case 822:
+  {
+    DeclareAndCast(StepRepr_BooleanRepresentationItem, anent, ent);
+    RWStepRepr_RWBooleanRepresentationItem aTool;
+    aTool.WriteStep(SW, anent);
+  }
+  break;
+  case 823:
+  {
+    DeclareAndCast(StepRepr_RealRepresentationItem, anent, ent);
+    RWStepRepr_RWRealRepresentationItem aTool;
+    aTool.WriteStep(SW, anent);
+  }
+  break;
   default:
     return;
   }

src/RWStepBasic/FILES

@@ -108,6 +108,10 @@ RWStepBasic_RWExternalSource.cxx
 RWStepBasic_RWExternalSource.hxx
 RWStepBasic_RWGeneralProperty.cxx
 RWStepBasic_RWGeneralProperty.hxx
+RWStepBasic_RWGeneralPropertyAssociation.cxx
+RWStepBasic_RWGeneralPropertyAssociation.hxx
+RWStepBasic_RWGeneralPropertyRelationship.cxx
+RWStepBasic_RWGeneralPropertyRelationship.hxx
 RWStepBasic_RWGroup.cxx
 RWStepBasic_RWGroup.hxx
 RWStepBasic_RWGroupAssignment.cxx

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx

@@ -0,0 +1,87 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#include <Interface_EntityIterator.hxx>
+#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
+#include <StepBasic_GeneralProperty.hxx>
+#include <StepBasic_GeneralPropertyAssociation.hxx>
+#include <StepData_StepReaderData.hxx>
+#include <StepData_StepWriter.hxx>
+#include <StepRepr_PropertyDefinition.hxx>
+
+//=======================================================================
+//function : RWStepBasic_RWGeneralPropertyAssociation
+//purpose  : 
+//=======================================================================
+RWStepBasic_RWGeneralPropertyAssociation::RWStepBasic_RWGeneralPropertyAssociation()
+{
+}
+
+//=======================================================================
+//function : ReadStep
+//purpose  : 
+//=======================================================================
+void RWStepBasic_RWGeneralPropertyAssociation::ReadStep(const Handle(StepData_StepReaderData)& theData,
+                                                        const Standard_Integer theNum,
+                                                        Handle(Interface_Check)& theAch,
+                                                        const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const
+{
+  // Check number of parameters
+  if (!theData->CheckNbParams(theNum, 4, theAch, "general_property_association")) return;
+
+  Handle(TCollection_HAsciiString) aName;
+  theData->ReadString(theNum, 1, "name", theAch, aName);
+
+  Handle(TCollection_HAsciiString) aDescription;
+  theData->ReadString(theNum, 2, "description", theAch, aDescription);
+
+  Handle(StepBasic_GeneralProperty) aGeneralProperty;
+  theData->ReadEntity(theNum, 3, "base_definition", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aGeneralProperty);
+
+  Handle(StepRepr_PropertyDefinition) aPropertyDefinition;
+  theData->ReadEntity(theNum, 4, "derived_definition", theAch, STANDARD_TYPE(StepRepr_PropertyDefinition), aPropertyDefinition);
+
+  // Initialize entity
+  theEnt->Init(aName,
+               aDescription,
+               aGeneralProperty,
+               aPropertyDefinition);
+}
+
+//=======================================================================
+//function : WriteStep
+//purpose  : 
+//=======================================================================
+void RWStepBasic_RWGeneralPropertyAssociation::WriteStep (StepData_StepWriter& theSW,
+                                                          const Handle(StepBasic_GeneralPropertyAssociation) &theEnt) const
+{
+  theSW.Send(theEnt->Name());
+
+  theSW.Send(theEnt->Description());
+
+  theSW.Send(theEnt->GeneralProperty());
+
+  theSW.Send(theEnt->PropertyDefinition());
+}
+
+//=======================================================================
+//function : Share
+//purpose  : 
+//=======================================================================
+void RWStepBasic_RWGeneralPropertyAssociation::Share(const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
+                                                     Interface_EntityIterator& theIter) const
+{
+  theIter.AddItem(theEnt->GeneralProperty());
+
+  theIter.AddItem(theEnt->PropertyDefinition());
+}

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.hxx

@@ -0,0 +1,60 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
+#define _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_Integer.hxx>
+class StepData_StepReaderData;
+class Interface_Check;
+class StepBasic_GeneralProperty;
+class StepData_StepWriter;
+class Interface_EntityIterator;
+
+class StepBasic_GeneralPropertyAssociation;
+
+//! Read & Write tool for GeneralPropertyAssociation
+class RWStepBasic_RWGeneralPropertyAssociation
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+
+  //! Empty constructor
+  Standard_EXPORT RWStepBasic_RWGeneralPropertyAssociation();
+  
+  //! Reads GeneralPropertyAssociation
+  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+                                 const Standard_Integer theNum,
+                                 Handle(Interface_Check)& theAch,
+                                 const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
+  
+  //! Writes GeneralPropertyAssociation
+  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+                                  const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
+  
+  //! Fills data for graph (shared items)
+  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
+                              Interface_EntityIterator& theIter) const;
+
+protected:
+
+private:
+
+};
+
+#endif // _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile

src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx

@@ -0,0 +1,103 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#include <Interface_EntityIterator.hxx>
+#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
+#include <StepBasic_GeneralProperty.hxx>
+#include <StepBasic_GeneralPropertyRelationship.hxx>
+#include <StepData_StepReaderData.hxx>
+#include <StepData_StepWriter.hxx>
+#include <StepRepr_PropertyDefinition.hxx>
+
+//=======================================================================
+//function : RWStepBasic_RWGeneralPropertyRelationship
+//purpose  : 
+//=======================================================================
+RWStepBasic_RWGeneralPropertyRelationship::RWStepBasic_RWGeneralPropertyRelationship()
+{
+}
+
+//=======================================================================
+//function : ReadStep
+//purpose  : 
+//=======================================================================
+void RWStepBasic_RWGeneralPropertyRelationship::ReadStep(const Handle(StepData_StepReaderData)& theData,
+                                                         const Standard_Integer theNum,
+                                                         Handle(Interface_Check)& theAch,
+                                                         const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const
+{
+  // Check number of parameters
+  if (!theData->CheckNbParams(theNum, 4, theAch, "general_property_association")) return;
+
+  Handle(TCollection_HAsciiString) aName;
+  theData->ReadString(theNum, 1, "name", theAch, aName);
+
+  Handle(TCollection_HAsciiString) aDescription;
+  Standard_Boolean hasDescription = Standard_True;
+  if (theData->IsParamDefined(theNum, 2))
+  {
+    theData->ReadString(theNum, 2, "description", theAch, aDescription);
+  }
+  else
+  {
+    hasDescription = Standard_False;
+  }
+
+  Handle(StepBasic_GeneralProperty) aRelatingGeneralProperty;
+  theData->ReadEntity(theNum, 3, "relating_property", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aRelatingGeneralProperty);
+
+  Handle(StepBasic_GeneralProperty) aRelatedGeneralProperty;
+  theData->ReadEntity(theNum, 4, "related_property", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aRelatedGeneralProperty);
+
+  // Initialize entity
+  theEnt->Init(aName,
+               hasDescription,
+               aDescription,
+               aRelatingGeneralProperty,
+               aRelatedGeneralProperty);
+}
+
+//=======================================================================
+//function : WriteStep
+//purpose  : 
+//=======================================================================
+void RWStepBasic_RWGeneralPropertyRelationship::WriteStep(StepData_StepWriter& theSW,
+                                                          const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const
+{
+  theSW.Send(theEnt->Name());
+
+  if (theEnt->HasDescription())
+  {
+    theSW.Send(theEnt->Description());
+  }
+  else
+  {
+    theSW.SendUndef();
+  }
+
+  theSW.Send(theEnt->RelatingGeneralProperty());
+
+  theSW.Send(theEnt->RelatedGeneralProperty());
+}
+
+//=======================================================================
+//function : Share
+//purpose  : 
+//=======================================================================
+void RWStepBasic_RWGeneralPropertyRelationship::Share(const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
+                                                      Interface_EntityIterator& theIter) const
+{
+  theIter.AddItem(theEnt->RelatingGeneralProperty());
+
+  theIter.AddItem(theEnt->RelatedGeneralProperty());
+}

src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.hxx

@@ -0,0 +1,60 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _RWStepBasic_RWGeneralPropertyRelationship_HeaderFile
+#define _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_Integer.hxx>
+class StepData_StepReaderData;
+class Interface_Check;
+class StepBasic_GeneralProperty;
+class StepData_StepWriter;
+class Interface_EntityIterator;
+
+class StepBasic_GeneralPropertyRelationship;
+
+//! Read & Write tool for GeneralPropertyRelationship
+class RWStepBasic_RWGeneralPropertyRelationship
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+
+  //! Empty constructor
+  Standard_EXPORT RWStepBasic_RWGeneralPropertyRelationship();
+
+  //! Reads GeneralPropertyAssociation
+  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+                                 const Standard_Integer theNum,
+                                 Handle(Interface_Check)& theAch,
+                                 const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
+
+  //! Writes GeneralPropertyAssociation
+  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+                                  const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
+
+  //! Fills data for graph (shared items)
+  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
+                              Interface_EntityIterator& theIter) const;
+
+protected:
+
+private:
+
+};
+
+#endif // _RWStepBasic_RWGeneralPropertyRelationship_HeaderFile

src/RWStepRepr/FILES

@@ -8,6 +8,8 @@ RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
 RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx
 RWStepRepr_RWBetweenShapeAspect.cxx
 RWStepRepr_RWBetweenShapeAspect.hxx
+RWStepRepr_RWBooleanRepresentationItem.cxx
+RWStepRepr_RWBooleanRepresentationItem.hxx
 RWStepRepr_RWCentreOfSymmetry.cxx
 RWStepRepr_RWCentreOfSymmetry.hxx
 RWStepRepr_RWCharacterizedRepresentation.cxx
@@ -88,6 +90,8 @@ RWStepRepr_RWPropertyDefinitionRepresentation.cxx
 RWStepRepr_RWPropertyDefinitionRepresentation.hxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx
+RWStepRepr_RWRealRepresentationItem.cxx
+RWStepRepr_RWRealRepresentationItem.hxx
 RWStepRepr_RWRepresentation.cxx
 RWStepRepr_RWRepresentation.hxx
 RWStepRepr_RWRepresentationContext.cxx

src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx

@@ -0,0 +1,50 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+
+#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
+#include <StepData_StepReaderData.hxx>
+#include <StepData_StepWriter.hxx>
+#include <StepRepr_BooleanRepresentationItem.hxx>
+#include <TCollection_HAsciiString.hxx>
+
+RWStepRepr_RWBooleanRepresentationItem::RWStepRepr_RWBooleanRepresentationItem()
+{
+}
+
+void RWStepRepr_RWBooleanRepresentationItem::ReadStep(const Handle(StepData_StepReaderData)& theData,
+                                                      const Standard_Integer theNum,
+                                                      Handle(Interface_Check)& theAch,
+                                                      const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const
+{
+  // Check number of parameters
+  if (!theData->CheckNbParams(theNum, 2, theAch, "boolean_representation_item") ) return;
+
+  // --- inherited field : name ---
+  Handle(TCollection_HAsciiString) aName;
+  theData->ReadString (theNum, 1, "name", theAch, aName);
+
+  // --- own field : value ---
+  Standard_Boolean aValue;
+  theData->ReadBoolean (theNum, 2, "value", theAch, aValue);
+
+  //--- Initialisation of the read entity ---
+  theEnt->Init(aName, aValue);
+}
+
+void RWStepRepr_RWBooleanRepresentationItem::WriteStep(StepData_StepWriter& theSW,
+                                                       const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const
+{
+  theSW.Send(theEnt->Name());
+  theSW.Send(theEnt->Value());
+}

src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.hxx

@@ -0,0 +1,45 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
+#define _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_Boolean.hxx>
+class StepData_StepReaderData;
+class Interface_Check;
+class StepRepr_BooleanRepresentationItem;
+class StepData_StepWriter;
+
+
+//! Read & Write Module for BooleanRepresentationItem
+class RWStepRepr_RWBooleanRepresentationItem 
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+
+  Standard_EXPORT RWStepRepr_RWBooleanRepresentationItem();
+  
+  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+                                 const Standard_Integer theNum,
+                                 Handle(Interface_Check)& theAch,
+                                 const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
+  
+  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+                                  const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
+};
+#endif // _RWStepRepr_RWBooleanRepresentationItem_HeaderFile

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx

@@ -0,0 +1,50 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+
+#include <RWStepRepr_RWRealRepresentationItem.hxx>
+#include <StepData_StepReaderData.hxx>
+#include <StepData_StepWriter.hxx>
+#include <StepRepr_RealRepresentationItem.hxx>
+#include <TCollection_HAsciiString.hxx>
+
+RWStepRepr_RWRealRepresentationItem::RWStepRepr_RWRealRepresentationItem()
+{
+}
+
+void RWStepRepr_RWRealRepresentationItem::ReadStep(const Handle(StepData_StepReaderData)& theData,
+                                                   const Standard_Integer theNum,
+                                                   Handle(Interface_Check)& theAch,
+                                                   const Handle(StepRepr_RealRepresentationItem)& theEnt) const
+{
+  // Check number of parameters
+  if (!theData->CheckNbParams (theNum, 2, theAch, "real_representation_item")) return;
+
+  // --- inherited field : name ---
+  Handle(TCollection_HAsciiString) aName;
+  theData->ReadString (theNum, 1, "name", theAch, aName);
+
+  // --- own field : value ---
+  Standard_Real aValue;
+  theData->ReadReal (theNum, 2, "value", theAch, aValue);
+
+  //--- Initialisation of the read entity ---
+  theEnt->Init(aName, aValue);
+}
+
+void RWStepRepr_RWRealRepresentationItem::WriteStep(StepData_StepWriter& theSW,
+                                                    const Handle(StepRepr_RealRepresentationItem)& theEnt) const
+{
+  theSW.Send(theEnt->Name());
+  theSW.Send(theEnt->Value());
+}

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.hxx

@@ -0,0 +1,46 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _RWStepRepr_RWRealRepresentationItem_HeaderFile
+#define _RWStepRepr_RWRealRepresentationItem_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_Real.hxx>
+class StepData_StepReaderData;
+class Interface_Check;
+class StepRepr_RealRepresentationItem;
+class StepData_StepWriter;
+
+
+//! Read & Write Module for RealRepresentationItem
+class RWStepRepr_RWRealRepresentationItem 
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+
+  
+  Standard_EXPORT RWStepRepr_RWRealRepresentationItem();
+  
+  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
+                                 const Standard_Integer theNum,
+                                 Handle(Interface_Check)& theAch,
+                                 const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
+  
+  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
+                                  const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
+};
+#endif // _RWStepRepr_RWRealRepresentationItem_HeaderFile

src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx

@@ -116,6 +116,8 @@ bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext
     theResource->BooleanVal("read.layer", InternalParameters.ReadLayer, aScope);
   InternalParameters.ReadProps =
     theResource->BooleanVal("read.props", InternalParameters.ReadProps, aScope);
+  InternalParameters.ReadMetadata =
+    theResource->BooleanVal("read.metadata", InternalParameters.ReadMetadata, aScope);
 
   InternalParameters.WritePrecisionMode = (StepData_ConfParameters::WriteMode_PrecisionMode)
     theResource->IntegerVal("write.precision.mode", InternalParameters.WritePrecisionMode, aScope);
@@ -370,6 +372,12 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
   aResult += aScope + "read.props :\t " + InternalParameters.ReadProps + "\n";
   aResult += "!\n";
 
+  aResult += "!\n";
+  aResult += "!Setting up the read.metadata parameter which is used to indicate read Metadata or not\n";
+  aResult += "!Default value: 0(\"OFF\"). Available values: 0(\"OFF\"), 1(\"ON\")\n";
+  aResult += aScope + "read.metadata :\t " + InternalParameters.ReadMetadata + "\n";
+  aResult += "!\n";
+
   aResult += "!\n";
   aResult += "!Write Parameters:\n";
   aResult += "!\n";

src/STEPCAFControl/STEPCAFControl_Provider.cxx

@@ -73,6 +73,8 @@ bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
   aReader.SetNameMode(aNode->InternalParameters.ReadName);
   aReader.SetLayerMode(aNode->InternalParameters.ReadLayer);
   aReader.SetPropsMode(aNode->InternalParameters.ReadProps);
+  aReader.SetMetaMode(aNode->InternalParameters.ReadMetadata);
+
   IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
   StepData_ConfParameters aParams;
   aReadStat = aReader.ReadFile(thePath.ToCString(), aParams);

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -30,9 +30,12 @@
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
+#include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_DocumentFile.hxx>
+#include <StepBasic_GeneralProperty.hxx>
+#include <StepBasic_GeneralPropertyAssociation.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepBasic_Product.hxx>
@@ -40,6 +43,9 @@
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
+#include <StepBasic_SiUnitAndMassUnit.hxx>
+#include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
+#include <StepBasic_SiUnitAndTimeUnit.hxx>
 #include <STEPCAFControl_Controller.hxx>
 #include <STEPCAFControl_DataMapOfPDExternFile.hxx>
 #include <STEPCAFControl_DataMapOfShapePD.hxx>
@@ -129,6 +135,7 @@
 #include <StepShape_DimensionalLocation.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_EdgeLoop.hxx>
+#include <StepShape_GeometricCurveSet.hxx>
 #include <StepShape_GeometricSet.hxx>
 #include <StepShape_HArray1OfFace.hxx>
 #include <StepShape_HArray1OfFaceBound.hxx>
@@ -214,6 +221,7 @@
 #include <XSControl_WorkSession.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
+#include <StepAP242_IdAttribute.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <STEPCAFControl_GDTProperty.hxx>
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
@@ -225,7 +233,15 @@
 #include <StepVisual_OverRidingStyledItem.hxx>
 #include <StepVisual_ContextDependentOverRidingStyledItem.hxx>
 #include <StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx>
+#include <StepRepr_BooleanRepresentationItem.hxx>
+#include <StepRepr_IntegerRepresentationItem.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
+#include <StepRepr_PropertyDefinitionRelationship.hxx>
+#include <StepRepr_RealRepresentationItem.hxx>
+#include <StepRepr_ValueRepresentationItem.hxx>
+
+#include <StepRepr_ShapeAspectRelationship.hxx>
+
 
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
@@ -275,6 +291,7 @@ STEPCAFControl_Reader::STEPCAFControl_Reader()
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
+  myMetaMode(Standard_False),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -299,6 +316,7 @@ STEPCAFControl_Reader::STEPCAFControl_Reader(const Handle(XSControl_WorkSession)
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
+  myMetaMode(Standard_False),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -770,6 +788,10 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader,
   if (GetViewMode())
     ReadViews(reader.WS(), doc, aLocalFactors);
 
+  // read metadata
+  if (GetMetaMode())
+    ReadMetadata(reader.WS(), doc, aLocalFactors);
+
   // Expand resulting CAF structure for sub-shapes (optionally with their
   // names) if requested
   ExpandSubShapes(STool, ShapePDMap);
@@ -1957,7 +1979,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs(const Handle(XSControl_WorkSes
 //function : GetMassConversionFactor
 //purpose  : 
 //=======================================================================
-static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& NU,
+static Standard_Boolean GetMassConversionFactor(const Handle(StepBasic_NamedUnit)& NU,
   Standard_Real& afact)
 {
   afact = 1.;
@@ -1996,7 +2018,7 @@ Handle(Poly_Triangulation) createMesh(const Handle(StepVisual_ComplexTriangulate
   const Standard_Integer aNbNormals = theTriangulatedSufaceSet->NbNormals();
   // Number of pairs (Point, Normal). It is possible for one point to have multiple normals. This is
   // useful when the underlying surface is not C1 continuous.
-  const Standard_Integer aNbPairs = aNbNormals > 1 ? theTriangulatedSufaceSet->Pnmax() : aNodes->Length();
+  const Standard_Integer aNbPairs = aNbNormals > 1 ? theTriangulatedSufaceSet->NbPnindex() : aNodes->Length();
   const Standard_Boolean aHasNormals = aNbNormals > 0;
 
   // Counting number of triangles in the triangle strips list.
@@ -2021,7 +2043,7 @@ Handle(Poly_Triangulation) createMesh(const Handle(StepVisual_ComplexTriangulate
 
   for (Standard_Integer j = 1; j <= aNbPairs; ++j)
   {
-    const gp_XYZ& aPoint = aNodes->Value((aNbNormals > 1 && theTriangulatedSufaceSet->NbPnindex() > 0) ? theTriangulatedSufaceSet->PnindexValue(j) : j);
+    const gp_XYZ& aPoint = aNodes->Value(aNbNormals > 1 ? theTriangulatedSufaceSet->PnindexValue(j) : j);
     aMesh->SetNode(j, theFact * aPoint);
   }
 
@@ -5243,6 +5265,26 @@ Standard_Boolean STEPCAFControl_Reader::GetPropsMode() const
   return myPropsMode;
 }
 
+//=======================================================================
+//function : SetMetaMode
+//purpose  : 
+//=======================================================================
+
+void STEPCAFControl_Reader::SetMetaMode(const Standard_Boolean theMetaMode)
+{
+  myMetaMode = theMetaMode;
+}
+
+//=======================================================================
+//function : GetMetaMode
+//purpose  : 
+//=======================================================================
+
+Standard_Boolean STEPCAFControl_Reader::GetMetaMode() const
+{
+  return myMetaMode;
+}
+
 //=======================================================================
 //function : SetSHUOMode
 //purpose  : 
@@ -5323,3 +5365,427 @@ Standard_Boolean STEPCAFControl_Reader::GetViewMode() const
 {
   return myViewMode;
 }
+
+//=======================================================================
+//function : ReadMetadata
+//purpose  : 
+//=======================================================================
+Standard_Boolean STEPCAFControl_Reader::ReadMetadata(const Handle(XSControl_WorkSession)& theWS,
+                                                     const Handle(TDocStd_Document)& theDoc,
+                                                     const StepData_Factors& theLocalFactors) const
+{
+  const Handle(Interface_InterfaceModel)& aModel = theWS->Model();
+  const Handle(XSControl_TransferReader)& aTR = theWS->TransferReader();
+  const Handle(Transfer_TransientProcess)& aTP = aTR->TransientProcess();
+  Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool(theDoc->Main());
+  if (aSTool.IsNull())
+  {
+    return Standard_False;
+  }
+
+  Standard_Integer aNb = aModel->NbEntities();
+  STEPConstruct_Tool aTool(theWS);
+
+  for (Standard_Integer anEntityInd = 1; anEntityInd <= aNb; ++anEntityInd)
+  {
+    Handle(Standard_Transient) anEntity = aModel->Value(anEntityInd);
+    Handle(StepBasic_GeneralProperty) aGeneralProp = Handle(StepBasic_GeneralProperty)::DownCast(anEntity);
+    if (aGeneralProp.IsNull())
+      continue;
+
+    Handle(StepBasic_GeneralPropertyAssociation) aPropAssociation;
+    NCollection_List< Handle(StepRepr_PropertyDefinition)> aPropDefinitionList;
+    Interface_EntityIterator aSharingListOfGP = theWS->Graph().Sharings(aGeneralProp);
+    for (aSharingListOfGP.Start(); aSharingListOfGP.More(); aSharingListOfGP.Next())
+    {
+      aPropAssociation = Handle(StepBasic_GeneralPropertyAssociation)::DownCast(aSharingListOfGP.Value());
+      if (aPropAssociation.IsNull())
+        continue;
+
+      aPropDefinitionList.Append(aPropAssociation->PropertyDefinition());
+    }
+
+    if (aPropDefinitionList.IsEmpty())
+      continue;
+
+    NCollection_List< Handle(StepRepr_PropertyDefinition)>::Iterator aPropDefIter(aPropDefinitionList);
+    for ( ; aPropDefIter.More(); aPropDefIter.Next())
+    {
+      Handle(StepRepr_PropertyDefinition) aPropDefinition = aPropDefIter.Value();
+
+      // check group of PropertyDefinition
+      NCollection_List<Handle(StepRepr_PropertyDefinition)> aGroupedProperties;
+      Interface_EntityIterator aSharingsListOfPD = theWS->Graph().Sharings(aPropDefinition);
+      for (aSharingsListOfPD.Start(); aSharingsListOfPD.More(); aSharingsListOfPD.Next())
+      {
+        Handle(StepRepr_PropertyDefinitionRelationship) aRel =
+          Handle(StepRepr_PropertyDefinitionRelationship)::DownCast(aSharingsListOfPD.Value());
+        if (aRel.IsNull())
+        {
+          continue;
+        }
+
+        Handle(StepRepr_PropertyDefinition) aGroupedProp = aRel->RelatedPropertyDefinition();
+        if (!aGroupedProp.IsNull())
+        {
+          aGroupedProperties.Append(aGroupedProp);
+        }
+      }
+
+      NCollection_List<Handle(Transfer_Binder)> aBinders;
+      Interface_EntityIterator aSharedListOfPD = theWS->Graph().Shareds(aPropDefinition);
+      for (aSharedListOfPD.Start(); aSharedListOfPD.More(); aSharedListOfPD.Next())
+      {
+        Handle(Transfer_Binder) aBinder;
+        Handle(StepBasic_ProductDefinition) aProductDefinition =
+          Handle(StepBasic_ProductDefinition)::DownCast(aSharedListOfPD.Value());
+        if (!aProductDefinition.IsNull())
+        {
+          aBinder = aTP->Find(aProductDefinition);
+          if (!aBinder.IsNull())
+          {
+            aBinders.Append(aBinder);
+          }
+          continue;
+        }
+
+        Handle(StepRepr_ProductDefinitionShape) aProductDefinitionShape =
+          Handle(StepRepr_ProductDefinitionShape)::DownCast(aSharedListOfPD.Value());
+        if (!aProductDefinitionShape.IsNull())
+        {
+          Handle(StepBasic_ProductDefinition) aProductDef =
+            aProductDefinitionShape->Definition().ProductDefinition();
+          aBinder = aTP->Find(aProductDef);
+          if (!aBinder.IsNull())
+          {
+            aBinders.Append(aBinder);
+          }
+          continue;
+        }
+
+        Handle(StepRepr_NextAssemblyUsageOccurrence) aNextAssembUsOcc =
+          Handle(StepRepr_NextAssemblyUsageOccurrence)::DownCast(aSharedListOfPD.Value());
+        if (!aNextAssembUsOcc.IsNull())
+        {
+          aBinder = aTP->Find(aNextAssembUsOcc);
+          if (!aBinder.IsNull())
+          {
+            aBinders.Append(aBinder);
+          }
+          continue;
+        }
+
+        Handle(StepRepr_ShapeAspect) aShapeAspect =
+          Handle(StepRepr_ShapeAspect)::DownCast(aSharedListOfPD.Value());
+        if (!aShapeAspect.IsNull())
+        {
+          TDF_Label aLabel;
+          if (!aBinder.IsNull())
+          {
+            TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBinder);
+            if (aShape.IsNull())
+              continue;
+
+            if (myMap.IsBound(aShape))
+            {
+              aLabel = myMap.Find(aShape);
+            }
+          }
+          Interface_EntityIterator aSharedListOfSA = theWS->Graph().Sharings(aShapeAspect);
+          for (aSharedListOfSA.Start(); aSharedListOfSA.More(); aSharedListOfSA.Next())
+          {
+            Handle(StepAP242_DraughtingModelItemAssociation) aDMIA =
+              Handle(StepAP242_DraughtingModelItemAssociation)::DownCast(aSharedListOfSA.Value());
+            if (!aDMIA.IsNull())
+              break;
+
+            Handle(StepAP242_ItemIdentifiedRepresentationUsage) anItemIdentUsage =
+              Handle(StepAP242_ItemIdentifiedRepresentationUsage)::DownCast(aSharedListOfSA.Value());
+            if (!anItemIdentUsage.IsNull())
+            {
+              for (Standard_Integer anIndex = 1; anIndex <= anItemIdentUsage->NbIdentifiedItem(); ++anIndex)
+              {
+                Handle(StepRepr_RepresentationItem) aReprItem = anItemIdentUsage->IdentifiedItemValue(anIndex);
+                if (aReprItem.IsNull())
+                  continue;
+                aBinder = aTP->Find(aReprItem);
+                if (!aBinder.IsNull())
+                {
+                  aBinders.Append(aBinder);
+                }
+              }
+              continue;
+            }
+
+            Handle(StepRepr_PropertyDefinition) aPropDef =
+              Handle(StepRepr_PropertyDefinition)::DownCast(aSharedListOfSA.Value());
+            if (!aPropDef.IsNull() && aPropDef != aPropDefinition)
+            {
+              Interface_EntityIterator aSharingListOfPD = theWS->Graph().Sharings(aPropDef);
+              for (aSharingListOfPD.Start(); aSharingListOfPD.More(); aSharingListOfPD.Next())
+              {
+                Handle(StepShape_ShapeDefinitionRepresentation) aShDef =
+                  Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(aSharingListOfPD.Value());
+                if (aShDef.IsNull())
+                  continue;
+
+                findReprItems(theWS, aShDef, aBinders);
+              }
+              continue;
+            }
+
+            Handle(StepShape_ShapeDefinitionRepresentation) aShapeDefRepr =
+              Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(aSharedListOfSA.Value());
+            if (!aShapeDefRepr.IsNull())
+            {
+              findReprItems(theWS, aShapeDefRepr, aBinders);
+            }
+          }
+        }
+      }
+
+      if (aBinders.IsEmpty())
+        continue;
+
+      TDF_LabelSequence aLabelSeq;
+      NCollection_List<Handle(Transfer_Binder)>::Iterator aBindIt(aBinders);
+      for (; aBindIt.More(); aBindIt.Next())
+      {
+        TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBindIt.Value());
+        if (aShape.IsNull())
+          continue;
+
+        TDF_Label aShapeLabel;
+        if (myMap.IsBound(aShape))
+        {
+          aShapeLabel = myMap.Find(aShape);
+        }
+        if (!aShapeLabel.IsNull())
+        {
+          aLabelSeq.Append(aShapeLabel);
+        }
+      }
+
+      //create metadata
+      for (TDF_LabelSequence::Iterator aLabelIt(aLabelSeq); aLabelIt.More(); aLabelIt.Next())
+      {
+        TDF_Label aLabel = aLabelIt.Value();
+        Handle(TDataStd_NamedData) anAttr;
+        if (!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAttr))
+        {
+          anAttr = new TDataStd_NamedData;
+          aLabel.AddAttribute(anAttr);
+        }
+
+        fillAttributes(theWS, aPropDefinition, theLocalFactors, anAttr);
+        if (!aGroupedProperties.IsEmpty())
+        {
+          NCollection_List<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(aGroupedProperties);
+          for ( ; aPropIt.More(); aPropIt.Next())
+          {
+            fillAttributes(theWS, aPropIt.Value(), theLocalFactors, anAttr);
+          }
+        }
+      }
+    }
+  }
+
+  return Standard_True;
+}
+
+//=======================================================================
+//function : findReprItems
+//purpose  : 
+//=======================================================================
+Standard_Boolean STEPCAFControl_Reader::findReprItems(const Handle(XSControl_WorkSession)& theWS,
+                                                      const Handle(StepShape_ShapeDefinitionRepresentation)& theShDefRepr,
+                                                      NCollection_List<Handle(Transfer_Binder)>& theBinders) const
+{
+  Handle(StepRepr_Representation) aRepr = theShDefRepr->UsedRepresentation();
+  if (aRepr.IsNull())
+  {
+    return Standard_False;
+  }
+
+  Handle(Transfer_Binder) aBinder;
+  const Handle(Transfer_TransientProcess)& aTP = theWS->TransferReader()->TransientProcess();
+  Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = aRepr->Items();
+  if (!aReprItems->IsEmpty())
+  {
+    for (Standard_Integer anInd = aReprItems->Lower(); anInd <= aReprItems->Upper(); anInd++)
+    {
+      Handle(StepRepr_RepresentationItem) aReprItem = aReprItems->Value(anInd);
+      aBinder = aTP->Find(aReprItem);
+      if (!aBinder.IsNull())
+      {
+        theBinders.Append(aBinder);
+      }
+    }
+  }
+
+  return Standard_True;
+}
+
+//=======================================================================
+//function : fillAttributes
+//purpose  : 
+//=======================================================================
+Standard_Boolean STEPCAFControl_Reader::fillAttributes(const Handle(XSControl_WorkSession)& theWS,
+                                                       const Handle(StepRepr_PropertyDefinition)& thePropDef,
+                                                       const StepData_Factors& theLocalFactors,
+                                                       Handle(TDataStd_NamedData)& theAttr) const
+{
+  // skip if key is null
+  if (thePropDef->Name().IsNull())
+  {
+    return Standard_False;
+  }
+
+  Handle(StepRepr_PropertyDefinitionRepresentation) aPropDefRepr;
+  Interface_EntityIterator aSharingListOfPD = theWS->Graph().Sharings(thePropDef);
+  for (aSharingListOfPD.Start(); aSharingListOfPD.More(); aSharingListOfPD.Next())
+  {
+    aPropDefRepr = Handle(StepRepr_PropertyDefinitionRepresentation)::DownCast(aSharingListOfPD.Value());
+    if (aPropDefRepr.IsNull())
+      continue;
+
+    Handle(StepRepr_Representation) aUsedRepr = aPropDefRepr->UsedRepresentation();
+    if (aUsedRepr.IsNull())
+      continue;
+
+    Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = aUsedRepr->Items();
+    if (!aReprItems.IsNull())
+    {
+      for (Standard_Integer anIndex = aReprItems->Lower(); anIndex <= aReprItems->Upper(); anIndex++)
+      {
+        Handle(StepRepr_RepresentationItem) anItem = aReprItems->Value(anIndex);
+        if (anItem.IsNull())
+          continue;
+
+        if (anItem->IsKind(STANDARD_TYPE(StepRepr_DescriptiveRepresentationItem)))
+        {
+          Handle(StepRepr_DescriptiveRepresentationItem) aDescrItem = Handle(StepRepr_DescriptiveRepresentationItem)::DownCast(anItem);
+          Handle(TCollection_HAsciiString) aDescription = aDescrItem->Description();
+          theAttr->SetString(thePropDef->Name()->ToCString(), aDescription->ToCString());
+        }
+        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_MeasureRepresentationItem)))
+        {
+          Handle(StepRepr_MeasureRepresentationItem) aMeasureItem = Handle(StepRepr_MeasureRepresentationItem)::DownCast(anItem);
+          Standard_Real aValue = aMeasureItem->Measure()->ValueComponent();
+          TCollection_AsciiString aValType = aMeasureItem->Measure()->ValueComponentMember()->Name();
+          StepBasic_Unit anUnit = aMeasureItem->Measure()->UnitComponent();
+          if (!anUnit.IsNull())
+          {
+            Standard_Real aParam = 1.;
+            if (anUnit.Type() == STANDARD_TYPE(StepBasic_DerivedUnit))
+            {
+              Handle(StepBasic_DerivedUnit) aDUnit = anUnit.DerivedUnit();
+              for (Standard_Integer anInd = 1; anInd <= aDUnit->NbElements(); ++anInd)
+              {
+                Handle(StepBasic_DerivedUnitElement) aDUElem = aDUnit->ElementsValue(anInd);
+                Standard_Real anExp = aDUElem->Exponent();
+                Handle(StepBasic_NamedUnit) aNUnit = aDUElem->Unit();
+                if (!aNUnit.IsNull())
+                {
+                  if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit)) ||
+                    aNUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit)))
+                  {
+                    STEPConstruct_UnitContext anUnitCtx;
+                    anUnitCtx.ComputeFactors(aNUnit, theLocalFactors);
+                    if (aValType == "VOLUME_MEASURE")
+                    {
+                      aParam = pow(theLocalFactors.LengthFactor(), anExp);
+                    }
+                    else
+                    {
+                      aParam = aParam / pow(theLocalFactors.LengthFactor(), anExp);
+                    }
+                  }
+                  else if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit))) {
+                    Standard_Real aFact = 1.;
+                    if (GetMassConversionFactor(aNUnit, aFact))
+                    {
+                      aParam = aParam * aFact;
+                    }
+                  }
+                  else
+                  {
+                    STEPConstruct_UnitContext anUnitCtx;
+                    anUnitCtx.ComputeFactors(aNUnit, theLocalFactors);
+                    if (anUnitCtx.AreaDone())
+                      aParam = anUnitCtx.AreaFactor();
+                    if (anUnitCtx.LengthDone())
+                    {
+                      Standard_Real aLengthFactor = anUnitCtx.LengthFactor();
+                      aParam *= pow(aLengthFactor, anExp);
+                    }
+                  }
+                }
+              }
+              aValue = aValue * aParam;
+            }
+            else
+            {
+              Handle(StepBasic_NamedUnit) aNUnit = anUnit.NamedUnit();
+              if (!aNUnit.IsNull())
+              {
+                if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit)))
+                {
+                  Standard_Real aFact = 1.;
+                  if (GetMassConversionFactor(aNUnit, aFact))
+                  {
+                    aValue *= aFact;
+                  }
+                }
+                else
+                {
+                  STEPConstruct_UnitContext anUnitCtx;
+                  anUnitCtx.ComputeFactors(aNUnit, theLocalFactors);
+                  if (anUnitCtx.AreaDone())
+                    aParam = anUnitCtx.AreaFactor();
+                  if (anUnitCtx.VolumeDone())
+                    aParam = anUnitCtx.VolumeFactor();
+                  if (anUnitCtx.LengthDone())
+                    aParam = anUnitCtx.LengthFactor();
+
+                  aValue *= aParam;
+                }
+              }
+            }
+          }
+          theAttr->SetReal(thePropDef->Name()->ToCString(), aValue);
+        }
+        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_ValueRepresentationItem)))
+        {
+          Handle(StepRepr_ValueRepresentationItem) aValueItem = Handle(StepRepr_ValueRepresentationItem)::DownCast(anItem);
+          Handle(StepBasic_MeasureValueMember) aMeasureValueMem = aValueItem->ValueComponentMember();
+          Interface_ParamType aParamType = aMeasureValueMem->ParamType();
+          if (aParamType == Interface_ParamInteger)
+          {
+            theAttr->SetInteger(thePropDef->Name()->ToCString(), aMeasureValueMem->Integer());
+          }
+          else if (aParamType == Interface_ParamReal)
+          {
+            theAttr->SetReal(thePropDef->Name()->ToCString(), aMeasureValueMem->Real());
+          }
+        }
+        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_IntegerRepresentationItem)))
+        {
+          Handle(StepRepr_IntegerRepresentationItem) anIntegerItem = Handle(StepRepr_IntegerRepresentationItem)::DownCast(anItem);
+          theAttr->SetInteger(thePropDef->Name()->ToCString(), anIntegerItem->Value());
+        }
+        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_RealRepresentationItem)))
+        {
+          Handle(StepRepr_RealRepresentationItem) aRealItem = Handle(StepRepr_RealRepresentationItem)::DownCast(anItem);
+          theAttr->SetReal(thePropDef->Name()->ToCString(), aRealItem->Value());
+        }
+        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_BooleanRepresentationItem)))
+        {
+          Handle(StepRepr_BooleanRepresentationItem) aBoolItem = Handle(StepRepr_BooleanRepresentationItem)::DownCast(anItem);
+          theAttr->SetInteger(thePropDef->Name()->ToCString(), aBoolItem->Value());
+        }
+      }
+    }
+  }
+  return Standard_True;
+}

src/STEPCAFControl/STEPCAFControl_Reader.hxx

@@ -17,6 +17,7 @@
 #define _STEPCAFControl_Reader_HeaderFile
 
 #include <STEPControl_Reader.hxx>
+#include <StepData_Factors.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <TDF_LabelSequence.hxx>
 #include <TopTools_MapOfShape.hxx>
@@ -28,18 +29,21 @@
 #include <XCAFDimTolObjects_DatumModifWithValue.hxx>
 
 class XSControl_WorkSession;
+class TDataStd_NamedData;
 class TDocStd_Document;
 class STEPCAFControl_ExternFile;
 class TopoDS_Shape;
 class XCAFDoc_ShapeTool;
 class StepRepr_RepresentationItem;
 class Transfer_TransientProcess;
+class StepBasic_NamedUnit;
 class StepShape_ConnectedFaceSet;
+class StepShape_ShapeDefinitionRepresentation;
 class StepRepr_NextAssemblyUsageOccurrence;
+class StepRepr_PropertyDefinition;
 class STEPConstruct_Tool;
 class StepDimTol_Datum;
-class StepData_Factors;
-
+class Transfer_Binder;
 
 //! Provides a tool to read STEP file and put it into
 //! DECAF document. Besides transfer of shapes (including
@@ -176,6 +180,11 @@ public:
   Standard_EXPORT void SetPropsMode (const Standard_Boolean propsmode);
   
   Standard_EXPORT Standard_Boolean GetPropsMode() const;
+
+  //! MetaMode for indicate read Metadata or not.
+  Standard_EXPORT void SetMetaMode(const Standard_Boolean theMetaMode);
+
+  Standard_EXPORT Standard_Boolean GetMetaMode() const;
   
   //! Set SHUO mode for indicate write SHUO or not.
   Standard_EXPORT void SetSHUOMode (const Standard_Boolean shuomode);
@@ -234,7 +243,7 @@ protected:
   Standard_EXPORT Standard_Boolean ReadColors
                 (const Handle(XSControl_WorkSession)& WS,
                  const Handle(TDocStd_Document)& doc,
-                 const StepData_Factors& theLocalFactors) const;
+                 const StepData_Factors& theLocalFactors = StepData_Factors()) const;
   
   //! Reads names of parts defined in the STEP model and
   //! assigns them to corresponding labels in the DECAF document
@@ -246,7 +255,13 @@ protected:
   Standard_EXPORT Standard_Boolean ReadValProps (const Handle(XSControl_WorkSession)& WS,
                                                  const Handle(TDocStd_Document)& doc,
                                                  const STEPCAFControl_DataMapOfPDExternFile& PDFileMap,
-                                                 const StepData_Factors& theLocalFactors) const;
+                                                 const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+
+  //! Reads metadata assigned to shapes in the STEP model and
+  //! assigns them to corresponding labels in the DECAF document
+  Standard_EXPORT Standard_Boolean ReadMetadata(const Handle(XSControl_WorkSession)& theWS,
+                                                const Handle(TDocStd_Document)& theDoc,
+                                                const StepData_Factors& theLocalFactors = StepData_Factors()) const;
   
   //! Reads layers of parts defined in the STEP model and
   //! set reference between shape and layers in the DECAF document
@@ -260,19 +275,19 @@ protected:
   //! set reference between shape instances from different assemblyes
   Standard_EXPORT Standard_Boolean ReadGDTs (const Handle(XSControl_WorkSession)& WS,
                                              const Handle(TDocStd_Document)& doc,
-                                             const StepData_Factors& theLocalFactors);
+                                             const StepData_Factors& theLocalFactors = StepData_Factors());
   
   //! Reads materials for instances defined in the STEP model and
   //! set reference between shape instances from different assemblyes
   Standard_EXPORT Standard_Boolean ReadMaterials (const Handle(XSControl_WorkSession)& WS,
                                                   const Handle(TDocStd_Document)& doc,
                                                   const Handle(TColStd_HSequenceOfTransient)& SeqPDS,
-                                                  const StepData_Factors& theLocalFactors) const;
+                                                  const StepData_Factors& theLocalFactors = StepData_Factors()) const;
   
   //! Reads Views for instances defined in the STEP model
   Standard_EXPORT Standard_Boolean ReadViews(const Handle(XSControl_WorkSession)& theWS,
                                              const Handle(TDocStd_Document)& theDoc,
-                                             const StepData_Factors& theLocalFactors) const;
+                                             const StepData_Factors& theLocalFactors = StepData_Factors()) const;
 
   //! Populates the sub-Label of the passed TDF Label with shape
   //! data associated with the given STEP Representation Item,
@@ -314,26 +329,37 @@ private:
     const Standard_Real theModifValue,
     const Handle(TDocStd_Document)& theDoc,
     const Handle(XSControl_WorkSession)& theWS,
-    const StepData_Factors& theLocalFactors);
+    const StepData_Factors& theLocalFactors = StepData_Factors());
   
   //! Internal method. Read Datums, connected to GeomTolerance theGDTL.
   Standard_Boolean readDatumsAP242(const Handle(Standard_Transient)& theEnt,
     const TDF_Label theGDTL,
     const Handle(TDocStd_Document)& theDoc,
     const Handle(XSControl_WorkSession)& theWS,
-    const StepData_Factors& theLocalFactors);
+    const StepData_Factors& theLocalFactors = StepData_Factors());
 
   //! Internal method. Read Dimension or GeomTolerance.
   TDF_Label createGDTObjectInXCAF(const Handle(Standard_Transient)& theEnt,
     const Handle(TDocStd_Document)& theDoc,
     const Handle(XSControl_WorkSession)& theWS,
-    const StepData_Factors& theLocalFactors);
+    const StepData_Factors& theLocalFactors = StepData_Factors());
 
   //! Prepares units for transfer
   void prepareUnits(const Handle(StepData_StepModel)& theModel,
                     const Handle(TDocStd_Document)& theDoc,
                     StepData_Factors& theLocalFactors) const;
 
+  //! Find RepresentationItems
+  Standard_Boolean findReprItems(const Handle(XSControl_WorkSession) & theWS,
+                                 const Handle(StepShape_ShapeDefinitionRepresentation) & theShDefRepr,
+                                 NCollection_List<Handle(Transfer_Binder)>& theBinders) const;
+
+  //! Fill metadata
+  Standard_Boolean fillAttributes(const Handle(XSControl_WorkSession)& theWS,
+                                  const Handle(StepRepr_PropertyDefinition)& thePropDef,
+                                  const StepData_Factors& theLocalFactors,
+                                  Handle(TDataStd_NamedData)& theAttr) const;
+
 private:
 
   STEPControl_Reader myReader;
@@ -343,6 +369,7 @@ private:
   Standard_Boolean myNameMode;
   Standard_Boolean myLayerMode;
   Standard_Boolean myPropsMode;
+  Standard_Boolean myMetaMode;
   Standard_Boolean mySHUOMode;
   Standard_Boolean myGDTMode;
   Standard_Boolean myMatMode;

src/STEPCAFControl/STEPCAFControl_Writer.cxx

@@ -983,7 +983,7 @@ static Standard_Integer FindEntities(const Handle(Transfer_FinderProcess)& theFP
     //Handle(Transfer_TransientListBinder)::DownCast( bnd->Next(Standard_True) );
     Handle(Transfer_TransientListBinder)::DownCast(aBinder);
   Standard_Integer aResCount = 0;
-  if (aTransientListBinder.IsNull())
+  if (aTransientListBinder.IsNull() && theShape.ShapeType() == TopAbs_COMPOUND)
   {
     for (TopoDS_Iterator anIter(theShape); anIter.More(); anIter.Next())
     {

src/STEPCAFControl/STEPCAFControl_Writer.hxx

@@ -25,6 +25,7 @@
 #include <STEPControl_Writer.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 #include <StepData_ConfParameters.hxx>
+#include <StepData_Factors.hxx>
 #include <StepDimTol_Datum.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
@@ -39,7 +40,6 @@ class XSControl_WorkSession;
 class TDocStd_Document;
 class STEPCAFControl_ExternFile;
 class TopoDS_Shape;
-class StepData_Factors;
 
 //! Provides a tool to write DECAF document to the
 //! STEP file. Besides transfer of shapes (including
@@ -233,7 +233,7 @@ protected:
   TopoDS_Shape transferExternFiles(const TDF_Label& theLabel,
                                    const STEPControl_StepModelType theMode,
                                    TDF_LabelSequence& theLabelSeq,
-                                   const StepData_Factors& theLocalFactors,
+                                   const StepData_Factors& theLocalFactors = StepData_Factors(),
                                    const Standard_CString thePrefix = "",
                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
 
@@ -256,7 +256,7 @@ protected:
   //! Write D&GTs assigned to specified labels, to STEP model, according AP242
   Standard_Boolean writeDGTsAP242(const Handle(XSControl_WorkSession)& theWS,
                                   const TDF_LabelSequence& theLabels,
-                                  const StepData_Factors& theLocalFactors);
+                                  const StepData_Factors& theLocalFactors = StepData_Factors());
 
   //! Write materials assigned to specified labels, to STEP model
   Standard_Boolean writeMaterials(const Handle(XSControl_WorkSession)& theWS,
@@ -297,14 +297,14 @@ protected:
                          const gp_Ax2& theAnnotationPlane,
                          const gp_Pnt& theTextPosition,
                          const Handle(Standard_Transient)& theDimension,
-                         const StepData_Factors& theLocalFactors);
+                         const StepData_Factors& theLocalFactors = StepData_Factors());
 
   Handle(StepDimTol_Datum) writeDatumAP242(const Handle(XSControl_WorkSession)& theWS,
                                            const TDF_LabelSequence& theShapeL,
                                            const TDF_Label& theDatumL,
                                            const Standard_Boolean isFirstDTarget,
                                            const Handle(StepDimTol_Datum)& theWrittenDatum,
-                                           const StepData_Factors& theLocalFactors);
+                                           const StepData_Factors& theLocalFactors = StepData_Factors());
 
   void writeToleranceZone(const Handle(XSControl_WorkSession)& theWS,
                           const Handle(XCAFDimTolObjects_GeomToleranceObject)& theObject,
@@ -316,7 +316,7 @@ protected:
                           const TDF_Label& theGeomTolL,
                           const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem,
                           const Handle(StepRepr_RepresentationContext)& theRC,
-                          const StepData_Factors& theLocalFactors);
+                          const StepData_Factors& theLocalFactors = StepData_Factors());
 
 private:
 

src/STEPConstruct/STEPConstruct_UnitContext.hxx

@@ -23,8 +23,8 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_CString.hxx>
+#include <StepData_Factors.hxx>
 #include <StepBasic_SiPrefix.hxx>
-class StepData_Factors;
 class StepData_StepModel;
 class StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx;
 class StepRepr_GlobalUnitAssignedContext;
@@ -49,7 +49,7 @@ public:
   //! uncertainty equal to Tol3d)
   Standard_EXPORT void Init (const Standard_Real Tol3d,
                              const Handle(StepData_StepModel)& theModel,
-                             const StepData_Factors& theLocalFactors);
+                             const StepData_Factors& theLocalFactors = StepData_Factors());
   
   //! Returns True if Init was called successfully
   Standard_EXPORT Standard_Boolean IsDone() const;
@@ -60,10 +60,10 @@ public:
   //! Computes the length, plane angle and solid angle conversion
   //! factor  .  Returns a status, 0 if OK
   Standard_EXPORT Standard_Integer ComputeFactors (const Handle(StepRepr_GlobalUnitAssignedContext)& aContext,
-                                                   const StepData_Factors& theLocalFactors);
+                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
   
   Standard_EXPORT Standard_Integer ComputeFactors (const Handle(StepBasic_NamedUnit)& aUnit,
-                                                   const StepData_Factors& theLocalFactors);
+                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
   
   //! Computes the uncertainty value (for length)
   Standard_EXPORT Standard_Integer ComputeTolerance (const Handle(StepRepr_GlobalUncertaintyAssignedContext)& aContext);

src/STEPConstruct/STEPConstruct_ValidationProps.hxx

@@ -26,7 +26,6 @@
 #include <Standard_CString.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
 class StepBasic_ProductDefinition;
-class StepData_Factors;
 class XSControl_WorkSession;
 class TopoDS_Shape;
 class StepRepr_RepresentationItem;
@@ -115,13 +114,13 @@ public:
   Standard_EXPORT Standard_Boolean GetPropReal (const Handle(StepRepr_RepresentationItem)& item,
                                                 Standard_Real& Val,
                                                 Standard_Boolean& isArea,
-                                                const StepData_Factors& theLocalFactors) const;
+                                                const StepData_Factors& theLocalFactors = StepData_Factors()) const;
   
   //! Returns value of Centriod property (or False if it is not)
   Standard_EXPORT Standard_Boolean GetPropPnt (const Handle(StepRepr_RepresentationItem)& item,
                                                const Handle(StepRepr_RepresentationContext)& Context,
                                                gp_Pnt& Pnt,
-                                               const StepData_Factors& theLocalFactors) const;
+                                               const StepData_Factors& theLocalFactors = StepData_Factors()) const;
   
   //! Sets current assembly shape SDR (for FindCDSR calls)
   Standard_EXPORT void SetAssemblyShape (const TopoDS_Shape& shape);

src/STEPControl/STEPControl_ActorRead.cxx

@@ -1469,7 +1469,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
     }
     else if (start->IsKind(STANDARD_TYPE(StepVisual_TessellatedSurfaceSet)))
     {
-      myShapeBuilder.Init(GetCasted(StepVisual_TessellatedSurfaceSet, start), TP, aLocalFactors, aHasGeom);
+      myShapeBuilder.Init(GetCasted(StepVisual_TessellatedSurfaceSet, start), TP, aHasGeom, aLocalFactors);
       found = Standard_True;
     }
   }

src/STEPControl/STEPControl_ActorRead.hxx

@@ -20,6 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
+#include <StepData_Factors.hxx>
 #include <StepToTopoDS_NMTool.hxx>
 #include <Transfer_ActorOfTransientProcess.hxx>
 #include <Standard_Integer.hxx>
@@ -47,7 +48,6 @@ class StepShape_FaceSurface;
 class TopoDS_Shell;
 class TopoDS_Compound;
 class StepRepr_ConstructiveGeometryRepresentationRelationship;
-class StepData_Factors;
 class StepData_StepModel;
 
 
@@ -77,7 +77,7 @@ public:
   Standard_EXPORT Handle(Transfer_Binder) TransferShape (
       const Handle(Standard_Transient)& start,
       const Handle(Transfer_TransientProcess)& TP,
-      const StepData_Factors& theLocalFactors,
+      const StepData_Factors& theLocalFactors = StepData_Factors(),
       const Standard_Boolean isManifold = Standard_True,
       const Standard_Boolean theUseTrsf = Standard_False,
       const Message_ProgressRange& theProgress = Message_ProgressRange());
@@ -105,14 +105,14 @@ public:
                                                           const Handle(StepRepr_Representation)& TargContext,
                                                           const Handle(Transfer_TransientProcess)& TP,
                                                           gp_Trsf& Trsf,
-                                                          const StepData_Factors& theLocalFactors);
+                                                          const StepData_Factors& theLocalFactors = StepData_Factors());
 
   //! Computes transformation defined by given
   //! REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION
   Standard_EXPORT Standard_Boolean ComputeSRRWT (const Handle(StepRepr_RepresentationRelationship)& SRR,
                                                  const Handle(Transfer_TransientProcess)& TP,
                                                  gp_Trsf& Trsf,
-                                                 const StepData_Factors& theLocalFactors);
+                                                 const StepData_Factors& theLocalFactors = StepData_Factors());
 
 
 
@@ -127,7 +127,7 @@ protected:
     Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (
       const Handle(StepBasic_ProductDefinition)& PD,
       const Handle(Transfer_TransientProcess)& TP,
-      const StepData_Factors& theLocalFactors,
+      const StepData_Factors& theLocalFactors = StepData_Factors(),
       const Standard_Boolean theUseTrsf = Standard_False,
       const Message_ProgressRange& theProgress = Message_ProgressRange());
 
@@ -135,7 +135,7 @@ protected:
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity
                    (const Handle(StepRepr_NextAssemblyUsageOccurrence)& NAUO,
                     const Handle(Transfer_TransientProcess)& TP,
-                    const StepData_Factors& theLocalFactors,
+                    const StepData_Factors& theLocalFactors = StepData_Factors(),
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Transfers shape representation entity
@@ -152,7 +152,7 @@ protected:
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity
                    (const Handle(StepShape_ContextDependentShapeRepresentation)& CDSR,
                     const Handle(Transfer_TransientProcess)& TP,
-                    const StepData_Factors& theLocalFactors,
+                    const StepData_Factors& theLocalFactors = StepData_Factors(),
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Transfers  shape representation relationship entity
@@ -189,7 +189,7 @@ protected:
 
   Handle(TransferBRep_ShapeBinder) TransferEntity( const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& theCGRR,
                                                    const Handle(Transfer_TransientProcess)& theTP,
-                                                   const StepData_Factors& theLocalFactors);
+                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
 
   //! Translates file by old way when CDSR are roots . Acts only if "read.step.product_mode" is equal Off.
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) OldWay

src/STEPControl/STEPControl_ActorWrite.hxx

@@ -28,7 +28,6 @@
 class Transfer_Finder;
 class Transfer_Binder;
 class Transfer_FinderProcess;
-class StepData_Factors;
 class StepShape_ShapeDefinitionRepresentation;
 class StepGeom_Axis2Placement3d;
 class TopoDS_Shape;
@@ -60,7 +59,7 @@ public:
                     const Handle(StepShape_ShapeDefinitionRepresentation)& SDR,
                     Handle(StepGeom_Axis2Placement3d)& AX1, 
                     const Handle(Transfer_FinderProcess)& FP,
-                    const StepData_Factors& theLocalFactors,
+                    const StepData_Factors& theLocalFactors = StepData_Factors(),
                     const Handle(TopTools_HSequenceOfShape)& shapeGroup = NULL, 
                     const Standard_Boolean isManifold = Standard_True,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
@@ -69,7 +68,7 @@ public:
                    (const Handle(Transfer_Finder)& start,
                     const Handle(StepShape_ShapeDefinitionRepresentation)& SDR,
                     const Handle(Transfer_FinderProcess)& FP,
-                    const StepData_Factors& theLocalFactors,
+                    const StepData_Factors& theLocalFactors = StepData_Factors(),
                     const Handle(TopTools_HSequenceOfShape)& shapeGroup = NULL,
                     const Standard_Boolean isManifold = Standard_True,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
@@ -78,7 +77,7 @@ public:
                    (const Handle(Transfer_Finder)& start,
                     const Handle(StepShape_ShapeDefinitionRepresentation)& SDR,
                     const Handle(Transfer_FinderProcess)& FP,
-                    const StepData_Factors& theLocalFactors,
+                    const StepData_Factors& theLocalFactors = StepData_Factors(),
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
   
   Standard_EXPORT void SetMode (const STEPControl_StepModelType M);

src/SelectMgr/SelectMgr_AxisIntersector.cxx

@@ -93,6 +93,24 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_AxisIntersector::ScaleAndTransform (
   return aRes;
 }
 
+//=======================================================================
+// function : CopyWithBuilder
+// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
+//            Returned frustum should be re-constructed before being used.
+//=======================================================================
+Handle(SelectMgr_BaseIntersector) SelectMgr_AxisIntersector::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
+{
+  (void )theBuilder;
+  Standard_ASSERT_RAISE(mySelectionType == SelectMgr_SelectionType_Point,
+    "Error! SelectMgr_AxisIntersector::CopyWithBuilder() should be called after selection axis initialization");
+
+  Handle(SelectMgr_AxisIntersector) aRes = new SelectMgr_AxisIntersector();
+  aRes->myAxis = myAxis;
+  aRes->mySelectionType = mySelectionType;
+
+  return aRes;
+}
+
 // =======================================================================
 // function : hasIntersection
 // purpose  :

src/SelectMgr/SelectMgr_AxisIntersector.hxx

@@ -52,6 +52,11 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
+  //! Returns a copy of the intersector transformed using the builder configuration given.
+  //! Builder is an argument that represents corresponding settings for re-constructing transformed frustum from scratch.
+  //! In this class, builder is not used and theBuilder parameter is ignored.
+  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
+
 public:
 
   //! Intersection test between defined axis and given axis-aligned box

src/SelectMgr/SelectMgr_BaseIntersector.hxx

@@ -71,6 +71,11 @@ public:
                                                                const gp_GTrsf& theTrsf,
                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const = 0;
 
+  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
+  //!                        should NOT be NULL.
+  //! @return a copy of the frustum with the input builder assigned
+  virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const = 0;
+
 public:
 
   //! Return camera definition.

src/SelectMgr/SelectMgr_RectangularFrustum.cxx

@@ -449,6 +449,28 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_RectangularFrustum::ScaleAndTransfor
   return aRes;
 }
 
+// =======================================================================
+// function : CopyWithBuilder
+// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
+//            Returned frustum should be re-constructed before being used.
+// =======================================================================
+Handle(SelectMgr_BaseIntersector) SelectMgr_RectangularFrustum::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
+{
+  Standard_ASSERT_RAISE (mySelectionType == SelectMgr_SelectionType_Point || mySelectionType == SelectMgr_SelectionType_Box,
+    "Error! SelectMgr_RectangularFrustum::CopyWithBuilder() should be called after selection frustum initialization");
+
+  Standard_ASSERT_RAISE (!theBuilder.IsNull(), 
+    "Error! SelectMgr_RectangularFrustum::CopyWithBuilder() should be called with valid builder");
+
+  Handle(SelectMgr_RectangularFrustum) aRes = new SelectMgr_RectangularFrustum();
+  aRes->mySelectionType = mySelectionType;
+  aRes->mySelRectangle = mySelRectangle;
+  aRes->myPixelTolerance = myPixelTolerance;
+  aRes->SetBuilder (theBuilder);
+
+  return aRes;
+}
+
 // =======================================================================
 // function : IsScalable
 // purpose  :

src/SelectMgr/SelectMgr_RectangularFrustum.hxx

@@ -99,6 +99,13 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
+  //! Returns a copy of the frustum using the given frustum builder configuration.
+  //! Returned frustum should be re-constructed before being used.
+  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
+  //!                        should NOT be NULL.
+  //! @return a copy of the frustum with the input builder assigned
+  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
+
   // SAT Tests for different objects
 
   //! SAT intersection test between defined volume and given axis-aligned box

src/SelectMgr/SelectMgr_SelectableObjectSet.cxx

@@ -241,17 +241,23 @@ namespace
 //=============================================================================
 SelectMgr_SelectableObjectSet::SelectMgr_SelectableObjectSet()
 {
-  myBVH[BVHSubset_2dPersistent] = new BVH_Tree<Standard_Real, 3>();
-  myBVH[BVHSubset_3dPersistent] = new BVH_Tree<Standard_Real, 3>();
-  myBVH[BVHSubset_3d]           = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_ortho2dPersistent] = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_ortho3dPersistent] = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_2dPersistent]      = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_3dPersistent]      = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_3d]                = new BVH_Tree<Standard_Real, 3>();
 
-  myBuilder[BVHSubset_2dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
-  myBuilder[BVHSubset_3dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
-  myBuilder[BVHSubset_3d]           = new BVH_BinnedBuilder<Standard_Real, 3, 4> (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth, Standard_True);
+  myBuilder[BVHSubset_ortho2dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
+  myBuilder[BVHSubset_ortho3dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
+  myBuilder[BVHSubset_2dPersistent]      = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
+  myBuilder[BVHSubset_3dPersistent]      = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
+  myBuilder[BVHSubset_3d]                = new BVH_BinnedBuilder<Standard_Real, 3, 4> (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth, Standard_True);
 
-  myIsDirty[BVHSubset_2dPersistent] = Standard_False;
-  myIsDirty[BVHSubset_3dPersistent] = Standard_False;
-  myIsDirty[BVHSubset_3d]           = Standard_False;
+  myIsDirty[BVHSubset_ortho2dPersistent] = Standard_False;
+  myIsDirty[BVHSubset_ortho3dPersistent] = Standard_False;
+  myIsDirty[BVHSubset_2dPersistent]      = Standard_False;
+  myIsDirty[BVHSubset_3dPersistent]      = Standard_False;
+  myIsDirty[BVHSubset_3d]                = Standard_False;
 }
 
 //=============================================================================
@@ -262,10 +268,9 @@ Standard_Boolean SelectMgr_SelectableObjectSet::Append (const Handle(SelectMgr_S
 {
   // get an appropriate BVH subset to insert the object into it
   const Standard_Integer aSubsetIdx = appropriateSubset (theObject);
-
+  
   // check that the object is excluded from other subsets
-  if (myObjects[(aSubsetIdx + 1) % BVHSubsetNb].Contains (theObject)
-   || myObjects[(aSubsetIdx + 2) % BVHSubsetNb].Contains (theObject))
+  if (currentSubset (theObject) != -1)
   {
     return Standard_False;
   }
@@ -401,9 +406,51 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t
       myBuilder[BVHSubset_2dPersistent]->Build (&anAdaptor, myBVH[BVHSubset_2dPersistent].get(), anAdaptor.Box());
     }
 
+    // -------------------------------------------------------------------
+    // check and update 3D orthographic persistence BVH tree if necessary
+    // -------------------------------------------------------------------
+    if (!IsEmpty (BVHSubset_ortho3dPersistent)
+      && (myIsDirty[BVHSubset_ortho3dPersistent]
+       || myLastViewState.IsChanged (aViewState)
+       || isWinSizeChanged))
+    {
+      Handle(Graphic3d_Camera) aNewOrthoCam = new Graphic3d_Camera (*theCam); // If OrthoPers, copy camera and set to orthographic projection
+      aNewOrthoCam->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
+
+      // construct adaptor over private fields to provide direct access for the BVH builder
+      BVHBuilderAdaptorPersistent anAdaptor (myObjects[BVHSubset_ortho3dPersistent],
+                                             aNewOrthoCam, aNewOrthoCam->ProjectionMatrix(), 
+                                             aNewOrthoCam->OrientationMatrix(), theWinSize);
+
+      // update corresponding BVH tree data structure
+      myBuilder[BVHSubset_ortho3dPersistent]->Build (&anAdaptor, myBVH[BVHSubset_ortho3dPersistent].get(), anAdaptor.Box());
+    }
+
+    // -------------------------------------------------------------------
+    // check and update 2D orthographic persistence BVH tree if necessary
+    // -------------------------------------------------------------------
+    if (!IsEmpty (BVHSubset_ortho2dPersistent)
+      && (myIsDirty[BVHSubset_ortho2dPersistent]
+       || myLastViewState.IsProjectionChanged (aViewState)
+       || isWinSizeChanged))
+    {
+      Handle(Graphic3d_Camera) aNewOrthoCam = new Graphic3d_Camera (*theCam); // If OrthoPers, copy camera and set to orthographic projection
+      aNewOrthoCam->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
+
+      // construct adaptor over private fields to provide direct access for the BVH builder
+      BVHBuilderAdaptorPersistent anAdaptor (myObjects[BVHSubset_ortho2dPersistent],
+                                             aNewOrthoCam, aNewOrthoCam->ProjectionMatrix(), 
+                                             SelectMgr_SelectableObjectSet_THE_IDENTITY_MAT, theWinSize);
+
+      // update corresponding BVH tree data structure
+      myBuilder[BVHSubset_ortho2dPersistent]->Build (&anAdaptor, myBVH[BVHSubset_ortho2dPersistent].get(), anAdaptor.Box());
+    }
+
     // release dirty state for every subset
-    myIsDirty[BVHSubset_3dPersistent] = Standard_False;
-    myIsDirty[BVHSubset_2dPersistent] = Standard_False;
+    myIsDirty[BVHSubset_3dPersistent]      = Standard_False;
+    myIsDirty[BVHSubset_2dPersistent]      = Standard_False;
+    myIsDirty[BVHSubset_ortho3dPersistent] = Standard_False;
+    myIsDirty[BVHSubset_ortho2dPersistent] = Standard_False;
 
     // keep last view state
     myLastViewState = aViewState;
@@ -419,9 +466,11 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t
 //=============================================================================
 void SelectMgr_SelectableObjectSet::MarkDirty()
 {
-  myIsDirty[BVHSubset_3d]           = Standard_True;
-  myIsDirty[BVHSubset_3dPersistent] = Standard_True;
-  myIsDirty[BVHSubset_2dPersistent] = Standard_True;
+  myIsDirty[BVHSubset_3d]                = Standard_True;
+  myIsDirty[BVHSubset_3dPersistent]      = Standard_True;
+  myIsDirty[BVHSubset_2dPersistent]      = Standard_True;
+  myIsDirty[BVHSubset_ortho3dPersistent] = Standard_True;
+  myIsDirty[BVHSubset_ortho2dPersistent] = Standard_True;
 }
 //=======================================================================
 //function : DumpJson

src/SelectMgr/SelectMgr_SelectableObjectSet.hxx

@@ -42,11 +42,22 @@ public:
   //! needs to be updated only when camera's projection changes. Bounding volumes for this object subclass
   //! is represented directly in eye space coordinates.
   //! This subset uses linear BVH builder with 32 levels of depth and 1 element per leaf.
+  //! - BVHSubset_ortho3dPersistent refers to the subset of 3D persistent selectable objects (rotate, pan, zoom persistence)
+  //! that contains `Graphic3d_TMF_OrthoPers` persistence mode.
+  //! Associated BVH tree needs to be updated when either the camera's projection and position change.
+  //! This subset uses linear BVH builder with 32 levels of depth and 1 element per leaf.
+  //! - BVHSubset_ortho2dPersistent refers to the subset of 2D persistent selectable objects
+  //! that contains `Graphic3d_TMF_OrthoPers` persistence mode. Associated BVH tree
+  //! needs to be updated only when camera's projection changes. Bounding volumes for this object subclass
+  //! is represented directly in eye space coordinates.
+  //! This subset uses linear BVH builder with 32 levels of depth and 1 element per leaf.
   enum BVHSubset
   {
     BVHSubset_3d,
     BVHSubset_3dPersistent,
     BVHSubset_2dPersistent,
+    BVHSubset_ortho3dPersistent,
+    BVHSubset_ortho2dPersistent,
     BVHSubsetNb
   };
 
@@ -140,7 +151,9 @@ public:
   {
     return myObjects[BVHSubset_3d].Contains (theObject)
         || myObjects[BVHSubset_3dPersistent].Contains (theObject)
-        || myObjects[BVHSubset_2dPersistent].Contains (theObject);
+        || myObjects[BVHSubset_2dPersistent].Contains (theObject)
+        || myObjects[BVHSubset_ortho3dPersistent].Contains (theObject)
+        || myObjects[BVHSubset_ortho2dPersistent].Contains (theObject);
   }
 
   //! Returns true if the object set does not contain any selectable objects.
@@ -148,7 +161,9 @@ public:
   {
     return myObjects[BVHSubset_3d].IsEmpty()
         && myObjects[BVHSubset_3dPersistent].IsEmpty()
-        && myObjects[BVHSubset_2dPersistent].IsEmpty();
+        && myObjects[BVHSubset_2dPersistent].IsEmpty()
+        && myObjects[BVHSubset_ortho3dPersistent].IsEmpty()
+        && myObjects[BVHSubset_ortho2dPersistent].IsEmpty();
   }
 
   //! Returns true if the specified object subset is empty.
@@ -192,10 +207,18 @@ private:
       }
       return SelectMgr_SelectableObjectSet::BVHSubset_3d;
     }
-    else if (theObject->TransformPersistence()->Mode() == Graphic3d_TMF_2d)
+    else if ((theObject->TransformPersistence()->Mode() & Graphic3d_TMF_2d) != 0)
     {
+      if (theObject->TransformPersistence()->IsOrthoPers())
+      {
+        return SelectMgr_SelectableObjectSet::BVHSubset_ortho2dPersistent;
+      }
       return SelectMgr_SelectableObjectSet::BVHSubset_2dPersistent;
     }
+    else if (theObject->TransformPersistence()->IsOrthoPers())
+    {
+      return SelectMgr_SelectableObjectSet::BVHSubset_ortho3dPersistent;
+    }
     else
     {
       return SelectMgr_SelectableObjectSet::BVHSubset_3dPersistent;

src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx

@@ -67,6 +67,28 @@ SelectMgr_SelectingVolumeManager SelectMgr_SelectingVolumeManager::ScaleAndTrans
   return aMgr;
 }
 
+//=======================================================================
+// function : CopyWithBuilder
+// purpose  : Returns a copy of the selecting volume manager and its active frustum re-constructed using the passed builder.
+//            Builder is an argument that represents corresponding settings for re-constructing transformed
+//            frustum from scratch.
+//=======================================================================
+SelectMgr_SelectingVolumeManager SelectMgr_SelectingVolumeManager::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
+{
+  SelectMgr_SelectingVolumeManager aMgr;
+  aMgr.myToAllowOverlap = myToAllowOverlap;
+  aMgr.myViewClipPlanes = myViewClipPlanes;
+  aMgr.myObjectClipPlanes = myObjectClipPlanes;
+  aMgr.myViewClipRange = myViewClipRange;
+  if (!myActiveSelectingVolume.IsNull())
+  {
+    aMgr.myActiveSelectingVolume = myActiveSelectingVolume->CopyWithBuilder (theBuilder);
+    aMgr.BuildSelectingVolume();
+  }
+
+  return aMgr;
+}
+
 //=======================================================================
 // function : GetActiveSelectionType
 // purpose  :

src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx

@@ -81,6 +81,11 @@ public:
                                                                               const gp_GTrsf& theTrsf,
                                                                               const Handle(SelectMgr_FrustumBuilder)& theBuilder) const;
 
+  //! Returns a copy of the selecting volume manager and its active frustum re-constructed using the passed builder.
+  //! Builder is an argument that represents corresponding settings for re-constructing transformed
+  //! frustum from scratch.
+  Standard_EXPORT virtual SelectMgr_SelectingVolumeManager CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const;
+
 public:
 
   //! Returns current camera definition.

src/SelectMgr/SelectMgr_SensitiveEntitySet.cxx

@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SensitiveEntitySet, BVH_PrimitiveSet3d)
 SelectMgr_SensitiveEntitySet::SelectMgr_SensitiveEntitySet (const Handle(Select3D_BVHBuilder3d)& theBuilder)
 : BVH_PrimitiveSet3d (theBuilder)
 {
-  //
+  myNbEntityWithPersistence = 0;
 }
 
 //=======================================================================
@@ -42,7 +42,6 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_SensitiveEntit
     theEntity->ResetSelectionActiveStatus();
     return;
   }
-
   const Standard_Integer anExtent = mySensitives.Extent();
   if (mySensitives.Add (theEntity) > anExtent)
   {
@@ -50,7 +49,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_SensitiveEntit
   }
   if (!theEntity->BaseSensitive()->TransformPersistence().IsNull())
   {
-    myHasEntityWithPersistence = Standard_True;
+    ++myNbEntityWithPersistence;
   }
   MarkDirty();
 }
@@ -78,7 +77,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_Selection)& th
     }
     if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull())
     {
-      myHasEntityWithPersistence = Standard_True;
+      ++myNbEntityWithPersistence;
     }
   }
   MarkDirty();
@@ -93,7 +92,8 @@ void SelectMgr_SensitiveEntitySet::Remove (const Handle(SelectMgr_Selection)& th
 {
   for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (theSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next())
   {
-    const Standard_Integer anEntIdx = mySensitives.FindIndex (aSelEntIter.Value());
+    const Handle(SelectMgr_SensitiveEntity)& aSensEnt = aSelEntIter.Value();
+    const Standard_Integer anEntIdx = mySensitives.FindIndex (aSensEnt);
     if (anEntIdx == 0)
     {
       continue;
@@ -103,9 +103,13 @@ void SelectMgr_SensitiveEntitySet::Remove (const Handle(SelectMgr_Selection)& th
     {
       Swap (anEntIdx - 1, mySensitives.Size() - 1);
     }
+    if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull())
+    {
+      --myNbEntityWithPersistence;
+    }
 
     mySensitives.RemoveLast();
-    removeOwner (aSelEntIter.Value()->BaseSensitive()->OwnerId());
+    removeOwner (aSensEnt->BaseSensitive()->OwnerId());
   }
 
   MarkDirty();

src/SelectMgr/SelectMgr_SensitiveEntitySet.hxx

@@ -77,7 +77,7 @@ public:
   const SelectMgr_MapOfOwners& Owners() const { return myOwnersMap; }
 
   //! Returns map of entities.
-  Standard_Boolean HasEntityWithPersistence() const { return myHasEntityWithPersistence; }
+  Standard_Boolean HasEntityWithPersistence() const { return myNbEntityWithPersistence > 0; }
 
 protected:
 
@@ -89,9 +89,9 @@ protected:
 
 private:
 
-  SelectMgr_IndexedMapOfHSensitive mySensitives; //!< Map of entities and its corresponding index in BVH
-  SelectMgr_MapOfOwners            myOwnersMap;  //!< Map of entity owners and its corresponding number of sensitives
-  Standard_Boolean  myHasEntityWithPersistence;  //!< flag if some of sensitive entity has own transform persistence
+  SelectMgr_IndexedMapOfHSensitive mySensitives;              //!< Map of entities and its corresponding index in BVH
+  SelectMgr_MapOfOwners            myOwnersMap;               //!< Map of entity owners and its corresponding number of sensitives
+  Standard_Integer                 myNbEntityWithPersistence; //!< number of sensitive entities that have own transform persistence
 };
 
 #endif // _SelectMgr_SensitiveEntitySet_HeaderFile

src/SelectMgr/SelectMgr_TriangularFrustum.cxx

@@ -189,6 +189,20 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustum::ScaleAndTransform
   return aRes;
 }
 
+//=======================================================================
+// function : CopyWithBuilder
+// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
+//            Returned frustum should be re-constructed before being used.
+//=======================================================================
+Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustum::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
+{
+  Handle(SelectMgr_TriangularFrustum) aRes = new SelectMgr_TriangularFrustum();
+  aRes->mySelTriangle = mySelTriangle;
+  aRes->SetBuilder (theBuilder);
+
+  return aRes;
+}
+
 //=======================================================================
 // function : OverlapsBox
 // purpose  : SAT intersection test between defined volume and

src/SelectMgr/SelectMgr_TriangularFrustum.hxx

@@ -55,6 +55,13 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
+  //! Returns a copy of the frustum using the given frustum builder configuration.
+  //! Returned frustum should be re-constructed before being used.
+  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
+  //!                        should NOT be NULL.
+  //! @return a copy of the frustum with the input builder assigned
+  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
+
 public: //! @name SAT Tests for different objects
 
   //! SAT intersection test between defined volume and given axis-aligned box

src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx

@@ -186,6 +186,32 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustumSet::ScaleAndTransf
   return aRes;
 }
 
+//=======================================================================
+// function : CopyWithBuilder
+// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
+//            Returned frustum should be re-constructed before being used.
+//=======================================================================
+Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustumSet::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
+{
+  Standard_ASSERT_RAISE (mySelectionType == SelectMgr_SelectionType_Polyline,
+    "Error! SelectMgr_TriangularFrustumSet::CopyWithBuilder() should be called after selection frustum initialization");
+
+  Standard_ASSERT_RAISE (!theBuilder.IsNull(), 
+    "Error! SelectMgr_TriangularFrustumSet::CopyWithBuilder() should be called with valid builder");
+
+  Handle(SelectMgr_TriangularFrustumSet) aRes = new SelectMgr_TriangularFrustumSet();
+  aRes->SetCamera (myCamera);
+  for (SelectMgr_TriangFrustums::Iterator anIter (myFrustums); anIter.More(); anIter.Next())
+  {
+    aRes->myFrustums.Append (Handle(SelectMgr_TriangularFrustum)::DownCast (anIter.Value()->CopyWithBuilder (theBuilder)));
+  }
+  aRes->mySelectionType = mySelectionType;
+  aRes->mySelPolyline = mySelPolyline;
+  aRes->myToAllowOverlap = myToAllowOverlap;
+  aRes->SetBuilder (theBuilder);
+  return aRes;
+}
+
 // =======================================================================
 // function : OverlapsBox
 // purpose  :

src/SelectMgr/SelectMgr_TriangularFrustumSet.hxx

@@ -62,6 +62,13 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
+  //! Returns a copy of the frustum using the given frustum builder configuration.
+  //! Returned frustum should be re-constructed before being used.
+  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
+  //!                        should NOT be NULL.
+  //! @return a copy of the frustum with the input builder assigned
+  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
+
 public:
 
   Standard_EXPORT virtual Standard_Boolean OverlapsBox (const SelectMgr_Vec3& theMinPnt,

src/SelectMgr/SelectMgr_ViewerSelector.cxx

@@ -138,12 +138,12 @@ void SelectMgr_ViewerSelector::updatePoint3d (SelectMgr_SortCriterion& theCriter
     case SelectMgr_TypeOfDepthTolerance_UniformPixels:
     case SelectMgr_TypeOfDepthTolerance_SensitivityFactor:
     {
-      if (mySelectingVolumeMgr.Camera().IsNull())
+      if (theMgr.Camera().IsNull())
       {
         // fallback for an arbitrary projection matrix
         theCriterion.Tolerance = aSensFactor / 33.0;
       }
-      else if (mySelectingVolumeMgr.Camera()->IsOrthographic())
+      else if (theMgr.Camera()->IsOrthographic())
       {
         theCriterion.Tolerance = myCameraScale * aSensFactor;
       }
@@ -634,6 +634,9 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
 
   Graphic3d_Vec2i aWinSize;
   mySelectingVolumeMgr.WindowSize (aWinSize.x(), aWinSize.y());
+  const double aPixelSize = aWinSize.x() > 0 && aWinSize.y() > 0
+                          ? Max (1.0 / aWinSize.x(), 1.0 / aWinSize.y())
+                          : 1.0;
 
   const Handle(Graphic3d_Camera)& aCamera = mySelectingVolumeMgr.Camera();
   Graphic3d_Mat4d aProjectionMat, aWorldViewMat;
@@ -646,11 +649,6 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
 
     myCameraEye = aCamera->Eye().XYZ();
     myCameraDir = aCamera->Direction().XYZ();
-    myCameraScale = aCamera->IsOrthographic()
-                  ? aCamera->Scale()
-                  : 2.0 * Tan (aCamera->FOVy() * M_PI / 360.0);
-    const double aPixelSize = Max (1.0 / aWinSize.x(), 1.0 / aWinSize.y());
-    myCameraScale *= aPixelSize;
   }
   mySelectableObjects.UpdateBVH (aCamera, aWinSize);
 
@@ -672,7 +670,8 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
     // for 2D space selection transform selecting volumes to perform overlap testing
     // directly in camera's eye space omitting the camera position, which is not
     // needed there at all
-    if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_2dPersistent)
+    if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_2dPersistent 
+     || aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_ortho2dPersistent)
     {
       gp_GTrsf aTFrustum;
       aTFrustum.SetValue (1, 1, aWorldViewMat.GetValue (0, 0));
@@ -688,22 +687,46 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
                                             aWorldViewMat.GetValue (1, 3),
                                             aWorldViewMat.GetValue (2, 3)));
 
-      // define corresponding frustum builder parameters
+      // define corresponding frustum builder parameters for 2d persistence.
       Handle(SelectMgr_FrustumBuilder) aBuilder = new SelectMgr_FrustumBuilder();
       Handle(Graphic3d_Camera) aNewCamera = new Graphic3d_Camera();
       aNewCamera->CopyMappingData (aCamera);
       aNewCamera->SetIdentityOrientation();
+      if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_ortho2dPersistent)
+      {
+        aNewCamera->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
+      }
       aWorldViewMat = aNewCamera->OrientationMatrix(); // should be identity matrix
       aProjectionMat = aNewCamera->ProjectionMatrix(); // should be the same to aProjectionMat
       aBuilder->SetCamera (aNewCamera);
       aBuilder->SetWindowSize (aWinSize.x(), aWinSize.y());
       aMgr = mySelectingVolumeMgr.ScaleAndTransform (1, aTFrustum, aBuilder);
     }
+    else if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_ortho3dPersistent)
+    {
+      // define corresponding frustum builder parameters for 3d orthographic persistence.
+      Handle(SelectMgr_FrustumBuilder) aBuilder = new SelectMgr_FrustumBuilder();
+      Handle(Graphic3d_Camera) aNewCamera = new Graphic3d_Camera (*aCamera);
+      aNewCamera->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
+      aWorldViewMat = aNewCamera->OrientationMatrix(); // should be the same to aWorldViewMat
+      aProjectionMat = aNewCamera->ProjectionMatrix(); // should be orthographic projection
+      aBuilder->SetCamera (aNewCamera);
+      aBuilder->SetWindowSize (aWinSize.x(), aWinSize.y());
+      aMgr = mySelectingVolumeMgr.CopyWithBuilder (aBuilder);
+    }
     else
     {
       aMgr = mySelectingVolumeMgr;
     }
 
+    if (!aMgr.Camera().IsNull())
+    {
+      myCameraScale = aMgr.Camera()->IsOrthographic()
+                   ? aMgr.Camera()->Scale()
+                   : 2.0 * Tan (aMgr.Camera()->FOVy() * M_PI / 360.0);
+      myCameraScale *= aPixelSize;
+    }
+
     const opencascade::handle<BVH_Tree<Standard_Real, 3> >& aBVHTree = mySelectableObjects.BVH (aBVHSubset);
 
     Standard_Integer aNode = 0;

src/SelectMgr/SelectMgr_ViewerSelector.hxx

@@ -328,7 +328,7 @@ protected:
   //! @param theObject [in] the selectable object for traversal.
   //! @param theMgr [in] the (un)transformed copy of the selecting volume manager representing active selection frustum.
   //! @param theCamera, theProjectionMat, theWorldViewMat [in] the source camera and matrices for theMgr given.
-  //! @param theViewportWidth, theViewportHeight [in] viewport (window) dimensions for evaluating 
+  //! @param theWinSize [in] viewport (window) dimensions for evaluating 
   //!        object's transformation persistence.
   Standard_EXPORT void traverseObject (const Handle(SelectMgr_SelectableObject)& theObject,
                                        const SelectMgr_SelectingVolumeManager& theMgr,

src/Standard/Standard_Type.cxx

@@ -14,10 +14,8 @@
 
 
 #include <Standard_Type.hxx>
-
-#include <Standard_Assert.hxx>
-#include <Standard_CStringHasher.hxx>
 #include <Standard_Mutex.hxx>
+#include <Standard_Assert.hxx>
 
 #include <unordered_map>
 
@@ -25,23 +23,12 @@ IMPLEMENT_STANDARD_RTTIEXT(Standard_Type,Standard_Transient)
 
 //============================================================================
 
-namespace
-{
-  static Standard_CString copy_string (const char* theString)
-  {
-    size_t aLength = strlen (theString);
-    char* aResult = static_cast<char*> (Standard::Allocate (aLength + 1));
-    strncpy (aResult, theString, aLength + 1); //including null-character
-    return aResult;
-  }
-}
-
 Standard_Type::Standard_Type (const std::type_info& theInfo,
                               const char* theName,
                               Standard_Size theSize,
                               const Handle(Standard_Type)& theParent) :
   myInfo(theInfo),
-  myName(copy_string (theName)),
+  myName(theName),
   mySize(theSize), 
   myParent(theParent)
 {
@@ -75,7 +62,7 @@ void Standard_Type::Print (Standard_OStream& AStream) const
 
 namespace {
   // Map of string to type
-  typedef std::unordered_map<Standard_CString, Standard_Type*, Standard_CStringHasher, Standard_CStringHasher> registry_type;
+  typedef std::unordered_map<std::type_index, Standard_Type*> registry_type;
 
   // Registry is made static in the function to ensure that it gets
   // initialized by the time of first access
@@ -100,7 +87,7 @@ Standard_Type* Standard_Type::Register (const std::type_info& theInfo, const cha
   // return existing descriptor if already in the registry
   registry_type& aRegistry = GetRegistry();
   Standard_Type* aType = 0;
-  auto anIter = aRegistry.find(theName);
+  auto anIter = aRegistry.find(theInfo);
   if (anIter != aRegistry.end())
     return anIter->second;
 
@@ -108,7 +95,7 @@ Standard_Type* Standard_Type::Register (const std::type_info& theInfo, const cha
   aType = new Standard_Type (theInfo, theName, theSize, theParent);
 
   // then add it to registry and return (the reference to the handle stored in the registry)
-  aRegistry.emplace(theName, aType);
+  aRegistry.emplace(theInfo, aType);
   return aType;
 }
 
@@ -116,6 +103,5 @@ Standard_Type::~Standard_Type ()
 {
   // remove descriptor from the registry
   registry_type& aRegistry = GetRegistry();
-  Standard_ASSERT(aRegistry.erase(myName) > 0, "Standard_Type::~Standard_Type() cannot find itself in registry",);
-  Standard::Free (myName);
+  Standard_ASSERT(aRegistry.erase(myInfo) > 0, "Standard_Type::~Standard_Type() cannot find itself in registry",);
 }

src/Standard/Standard_Version.hxx

@@ -42,7 +42,7 @@
 //! - "dev" for development version between releases
 //! - "beta..." or "rc..." for beta releases or release candidates
 //! - "project..." for version containing project-specific fixes
-//#define OCC_VERSION_DEVELOPMENT   "dev"
+#define OCC_VERSION_DEVELOPMENT   "dev"
 
 // Derived (manually): version as real and string (major.minor)
 #define OCC_VERSION               7.8

src/StdPrs/StdPrs_ShadedShape.cxx

@@ -299,9 +299,7 @@ namespace
     // for computing boundaries presentation
     Standard_Integer aNodeNumber = 0;
     Standard_Integer aNbPolylines = 0;
-
-    TopLoc_Location aTrsf;
-
+    TopLoc_Location aLoc;
     Handle(NCollection_Shared<TColgp_SequenceOfPnt>) aSeqPntsExtra;
     for (TopExp_Explorer aFaceIter (theShape, TopAbs_FACE); aFaceIter.More(); aFaceIter.Next())
     {
@@ -331,7 +329,7 @@ namespace
 
       // take one of the shared edges and get edge triangulation
       const TopoDS_Face& aFace = TopoDS::Face (anEdgeIter.Value().First());
-      Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aFace, aTrsf);
+      Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aFace, aLoc);
       if (aTriangulation.IsNull())
       {
         continue;
@@ -345,7 +343,7 @@ namespace
         continue;
       }
 
-      Handle(Poly_PolygonOnTriangulation) anEdgePoly = BRep_Tool::PolygonOnTriangulation (anEdge, aTriangulation, aTrsf);
+      Handle(Poly_PolygonOnTriangulation) anEdgePoly = BRep_Tool::PolygonOnTriangulation (anEdge, aTriangulation, aLoc);
       if (!anEdgePoly.IsNull()
         && anEdgePoly->Nodes().Length() >= 2)
       {
@@ -371,7 +369,8 @@ namespace
 
     // create indexed segments array to pack polylines from different edges into single array
     const Standard_Integer aSegmentEdgeNb = (aNodeNumber - aNbPolylines) * 2;
-    Handle(Graphic3d_ArrayOfSegments) aSegments = new Graphic3d_ArrayOfSegments (aNodeNumber + aNbExtra, aSegmentEdgeNb + aNbExtra);
+    Handle(Graphic3d_ArrayOfSegments) aSegments = new Graphic3d_ArrayOfSegments (aNodeNumber + aNbExtra, aSegmentEdgeNb + aNbExtra,
+                                                                                 Standard_False, Standard_True);
     for (TopTools_IndexedDataMapOfShapeListOfShape::Iterator anEdgeIter (anEdgesMap); anEdgeIter.More(); anEdgeIter.Next())
     {
       if (anEdgeIter.Value().Extent() == 0)
@@ -379,50 +378,77 @@ namespace
         continue;
       }
 
-      const TopoDS_Face& aFace = TopoDS::Face (anEdgeIter.Value().First());
-      Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aFace, aTrsf);
-      if (aTriangulation.IsNull())
-      {
-        continue;
-      }
-
       const TopoDS_Edge& anEdge = TopoDS::Edge (anEdgeIter.Key());
       if (theUpperContinuity < GeomAbs_CN
-       && anEdgeIter.Value().Extent() >= 2
-       && BRep_Tool::MaxContinuity (anEdge) > theUpperContinuity)
+        && anEdgeIter.Value().Extent() >= 2
+        && BRep_Tool::MaxContinuity (anEdge) > theUpperContinuity)
       {
         continue;
       }
 
-      Handle(Poly_PolygonOnTriangulation) anEdgePoly = BRep_Tool::PolygonOnTriangulation (anEdge, aTriangulation, aTrsf);
-      if (anEdgePoly.IsNull()
-       || anEdgePoly->Nodes().Length () < 2)
+      Standard_Integer aFaceIndex = 0;
+      const Standard_Integer aFirstNodeInFace = aSegments->VertexNumber() + 1;
+      for (TopTools_ListOfShape::Iterator aFaceIter (anEdgeIter.Value()); aFaceIter.More(); aFaceIter.Next())
       {
-        continue;
-      }
-
-      // get edge nodes indexes from face triangulation
-      const TColStd_Array1OfInteger& anEdgeNodes = anEdgePoly->Nodes();
-
-      // collect the edge nodes
-      Standard_Integer aSegmentEdge = aSegments->VertexNumber() + 1;
-      for (Standard_Integer aNodeIdx = anEdgeNodes.Lower(); aNodeIdx <= anEdgeNodes.Upper(); ++aNodeIdx)
-      {
-        // node index in face triangulation
-        // get node and apply location transformation to the node
-        const Standard_Integer aTriIndex = anEdgeNodes.Value (aNodeIdx);
-        gp_Pnt aTriNode = aTriangulation->Node (aTriIndex);
-        if (!aTrsf.IsIdentity())
+        const TopoDS_Face& aFace = TopoDS::Face (aFaceIter.Value());
+        Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aFace, aLoc);
+        if (aTriangulation.IsNull())
         {
-          aTriNode.Transform (aTrsf);
+          continue;
         }
 
-        aSegments->AddVertex (aTriNode);
-        if (aNodeIdx != anEdgeNodes.Lower())
+        Standard_Boolean aHasNormals = aTriangulation->HasNormals();
+        Handle(Poly_PolygonOnTriangulation) anEdgePoly = BRep_Tool::PolygonOnTriangulation (anEdge, aTriangulation, aLoc);
+        if (anEdgePoly.IsNull()
+          || anEdgePoly->Nodes().Length () < 2)
         {
-          aSegments->AddEdge (  aSegmentEdge);
-          aSegments->AddEdge (++aSegmentEdge);
+          continue;
         }
+
+        // get edge nodes indexes from face triangulation
+        const TColStd_Array1OfInteger& anEdgeNodes = anEdgePoly->Nodes();
+        const gp_Trsf& aTrsf = aLoc.Transformation();
+
+        // collect the edge nodes
+        Standard_Integer aSegmentEdge = aFirstNodeInFace;
+        for (Standard_Integer aNodeIdx = anEdgeNodes.Lower(); aNodeIdx <= anEdgeNodes.Upper(); ++aNodeIdx)
+        {
+          // node index in face triangulation
+          // get node and apply location transformation to the node
+          const Standard_Integer aTriIndex = anEdgeNodes.Value (aNodeIdx);
+          
+          gp_Pnt aTriNode = aTriangulation->Node (aTriIndex);
+          gp_Dir aNorm = aHasNormals ? aTriangulation->Normal (aTriIndex) : gp_Dir();
+          if (aFace.Orientation() == TopAbs_REVERSED)
+          {
+            aNorm.Reverse();
+          }
+          if (!aLoc.IsIdentity())
+          {
+            aTriNode.Transform (aTrsf);
+            aNorm.Transform (aTrsf);
+          }
+          
+          if (aFaceIndex == 0)
+          {
+            aSegments->AddVertex (aTriNode, aNorm);
+            if (aNodeIdx != anEdgeNodes.Lower())
+            {
+              aSegments->AddEdge (aSegmentEdge);
+              aSegments->AddEdge (++aSegmentEdge);
+            }
+          }
+          else
+          {
+            gp_XYZ aNormSum;
+            aSegments->VertexNormal (aSegmentEdge, aNormSum.ChangeCoord (1), aNormSum.ChangeCoord (2), aNormSum.ChangeCoord (3));
+            aNormSum += aNorm.XYZ();
+            aNormSum.Normalize();
+            aSegments->SetVertexNormal (aSegmentEdge, aNormSum.ChangeCoord (1), aNormSum.ChangeCoord (2), aNormSum.ChangeCoord (3));
+            ++aSegmentEdge;
+          }
+        }
+        ++aFaceIndex;
       }
     }
 
@@ -588,7 +614,13 @@ void StdPrs_ShadedShape::Add (const Handle (Prs3d_Presentation)& thePrs,
     if (Handle(Graphic3d_ArrayOfSegments) aBndSegments = fillFaceBoundaries (theShape, theDrawer->FaceBoundaryUpperContinuity()))
     {
       Handle(Graphic3d_Group) aPrsGrp = !theGroup.IsNull() ? theGroup : thePrs->NewGroup();
-      aPrsGrp->SetGroupPrimitivesAspect (theDrawer->FaceBoundaryAspect()->Aspect());
+      Handle(Graphic3d_AspectLine3d) aLineAspect = Handle(Graphic3d_AspectLine3d)(theDrawer->FaceBoundaryAspect()->Aspect());
+      if (theDrawer->FaceBoundaryShadingOverride())
+      {
+        Quantity_Color aColor = theDrawer->ShadingAspect()->Color();
+        aLineAspect->SetColor (aColor);
+      }
+      aPrsGrp->SetGroupPrimitivesAspect (aLineAspect);
       aPrsGrp->AddPrimitiveArray (aBndSegments);
     }
   }

src/StepAP214/StepAP214_Protocol.cxx

@@ -158,6 +158,8 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
+#include <StepBasic_GeneralPropertyAssociation.hxx>
+#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
 #include <StepGeom_Hyperbola.hxx>
@@ -639,7 +641,9 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
+#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
+#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -1560,6 +1564,10 @@ StepAP214_Protocol::StepAP214_Protocol ()
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTessellatedEdge), 817);
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTriangulatedFace), 818);
   types.Bind(STANDARD_TYPE(StepVisual_TriangulatedSurfaceSet), 819);
+  types.Bind(STANDARD_TYPE(StepBasic_GeneralPropertyAssociation), 820);
+  types.Bind(STANDARD_TYPE(StepBasic_GeneralPropertyRelationship), 821);
+  types.Bind(STANDARD_TYPE(StepRepr_BooleanRepresentationItem), 822);
+  types.Bind(STANDARD_TYPE(StepRepr_RealRepresentationItem), 823);
 }
 
 

src/StepBasic/FILES

@@ -135,6 +135,10 @@ StepBasic_ExternalSource.cxx
 StepBasic_ExternalSource.hxx
 StepBasic_GeneralProperty.cxx
 StepBasic_GeneralProperty.hxx
+StepBasic_GeneralPropertyAssociation.cxx
+StepBasic_GeneralPropertyAssociation.hxx
+StepBasic_GeneralPropertyRelationship.cxx
+StepBasic_GeneralPropertyRelationship.hxx
 StepBasic_Group.cxx
 StepBasic_Group.hxx
 StepBasic_GroupAssignment.cxx

src/StepBasic/StepBasic_GeneralPropertyAssociation.cxx

@@ -0,0 +1,117 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+
+#include <StepBasic_GeneralPropertyAssociation.hxx>
+#include <TCollection_HAsciiString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GeneralPropertyAssociation, Standard_Transient)
+
+//=======================================================================
+//function : StepBasic_GeneralPropertyAssociation
+//purpose  : 
+//=======================================================================
+StepBasic_GeneralPropertyAssociation::StepBasic_GeneralPropertyAssociation ()
+{
+}
+
+//=======================================================================
+//function : Init
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyAssociation::Init (const Handle(TCollection_HAsciiString)& aName,
+                                                 const Handle(TCollection_HAsciiString)& aDescription,
+                                                 const Handle(StepBasic_GeneralProperty)& aGeneralProperty,
+                                                 const Handle(StepRepr_PropertyDefinition)& aPropertyDefinition)
+{
+  theName = aName;
+
+  theDescription = aDescription;
+
+  theGeneralProperty = aGeneralProperty;
+
+  thePropertyDefinition = aPropertyDefinition;
+}
+
+//=======================================================================
+//function : Name
+//purpose  : 
+//=======================================================================
+Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyAssociation::Name() const
+{
+  return theName;
+}
+
+//=======================================================================
+//function : SetName
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyAssociation::SetName(const Handle(TCollection_HAsciiString)& aName)
+{
+  theName = aName;
+}
+
+//=======================================================================
+//function : Description
+//purpose  : 
+//=======================================================================
+Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyAssociation::Description() const
+{
+  return theDescription;
+}
+
+//=======================================================================
+//function : SetDescription
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyAssociation::SetDescription (const Handle(TCollection_HAsciiString)& aDescription)
+{
+  theDescription = aDescription;
+}
+
+//=======================================================================
+//function : GeneralProperty
+//purpose  : 
+//=======================================================================
+Handle(StepBasic_GeneralProperty) StepBasic_GeneralPropertyAssociation::GeneralProperty() const
+{
+  return theGeneralProperty;
+}
+
+//=======================================================================
+//function : SetGeneralProperty
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyAssociation::SetGeneralProperty(const Handle(StepBasic_GeneralProperty)& aGeneralProperty)
+{
+  theGeneralProperty = aGeneralProperty;
+}
+
+//=======================================================================
+//function : PropertyDefinition
+//purpose  : 
+//=======================================================================
+
+Handle(StepRepr_PropertyDefinition) StepBasic_GeneralPropertyAssociation::PropertyDefinition() const
+{
+  return thePropertyDefinition;
+}
+
+//=======================================================================
+//function : SetPropertyDefinition
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyAssociation::SetPropertyDefinition(const Handle(StepRepr_PropertyDefinition)& aPropertyDefinition)
+{
+  thePropertyDefinition = aPropertyDefinition;
+}

src/StepBasic/StepBasic_GeneralPropertyAssociation.hxx

@@ -0,0 +1,84 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _StepBasic_GeneralPropertyAssociation_HeaderFile
+#define _StepBasic_GeneralPropertyAssociation_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Transient.hxx>
+
+class TCollection_HAsciiString;
+class StepBasic_GeneralProperty;
+class StepRepr_PropertyDefinition;
+
+DEFINE_STANDARD_HANDLE(StepBasic_GeneralPropertyAssociation, Standard_Transient)
+
+//! Representation of STEP entity GeneralPropertyAssociation
+class StepBasic_GeneralPropertyAssociation : public Standard_Transient
+{
+
+public:
+
+  
+  //! Empty constructor
+  Standard_EXPORT StepBasic_GeneralPropertyAssociation();
+  
+  //! Initialize all fields (own and inherited)
+  Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& aName,
+                            const Handle(TCollection_HAsciiString)& aDescription,
+                            const Handle(StepBasic_GeneralProperty)& aGeneralProperty,
+                            const Handle(StepRepr_PropertyDefinition)& aPropertyDefinition);
+
+  //! Returns field Name
+  Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
+
+  //! Set field Name
+  Standard_EXPORT void SetName(const Handle(TCollection_HAsciiString)& Name);
+
+  //! Returns field Description
+  Standard_EXPORT Handle(TCollection_HAsciiString) Description() const;
+
+  //! Set field Description
+  Standard_EXPORT void SetDescription(const Handle(TCollection_HAsciiString)& Description);
+
+  //! Returns field GeneralProperty
+  Standard_EXPORT Handle(StepBasic_GeneralProperty) GeneralProperty() const;
+
+  //! Set field GeneralProperty
+  Standard_EXPORT void SetGeneralProperty(const Handle(StepBasic_GeneralProperty)& GeneralProperty);
+
+  //! Returns field PropertyDefinition
+  Standard_EXPORT Handle(StepRepr_PropertyDefinition) PropertyDefinition() const;
+
+  //! Set field PropertyDefinition
+  Standard_EXPORT void SetPropertyDefinition(const Handle(StepRepr_PropertyDefinition)& PropertyDefinition);
+
+  DEFINE_STANDARD_RTTIEXT(StepBasic_GeneralPropertyAssociation, Standard_Transient)
+
+protected:
+
+
+
+
+private:
+
+  Handle(TCollection_HAsciiString) theName;
+  Handle(TCollection_HAsciiString) theDescription;
+  Handle(StepBasic_GeneralProperty) theGeneralProperty;
+  Handle(StepRepr_PropertyDefinition) thePropertyDefinition;
+
+};
+
+#endif // _StepBasic_GeneralPropertyAssociation_HeaderFile

src/StepBasic/StepBasic_GeneralPropertyRelationship.cxx

@@ -0,0 +1,137 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+
+#include <StepBasic_GeneralProperty.hxx>
+#include <StepBasic_GeneralPropertyRelationship.hxx>
+#include <TCollection_HAsciiString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GeneralPropertyRelationship, Standard_Transient)
+
+//=======================================================================
+//function : StepBasic_GeneralPropertyRelationship
+//purpose  : 
+//=======================================================================
+StepBasic_GeneralPropertyRelationship::StepBasic_GeneralPropertyRelationship ()
+{
+}
+
+//=======================================================================
+//function : Init
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyRelationship::Init(const Handle(TCollection_HAsciiString)& aName,
+                                                 const Standard_Boolean hasDescription,
+                                                 const Handle(TCollection_HAsciiString)& aDescription,
+                                                 const Handle(StepBasic_GeneralProperty)& aRelatingGeneralProperty,
+                                                 const Handle(StepBasic_GeneralProperty)& aRelatedGeneralProperty)
+{
+  theName = aName;
+
+  defDescription = hasDescription;
+  if (defDescription) {
+    theDescription = aDescription;
+  }
+  else theDescription.Nullify();
+
+  theRelatingGeneralProperty = aRelatingGeneralProperty;
+
+  theRelatedGeneralProperty = aRelatedGeneralProperty;
+}
+
+//=======================================================================
+//function : Name
+//purpose  : 
+//=======================================================================
+Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyRelationship::Name() const
+{
+  return theName;
+}
+
+//=======================================================================
+//function : SetName
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyRelationship::SetName(const Handle(TCollection_HAsciiString)& aName)
+{
+  theName = aName;
+}
+
+//=======================================================================
+//function : HasDescription
+//purpose  : 
+//=======================================================================
+Standard_Boolean StepBasic_GeneralPropertyRelationship::HasDescription() const
+{
+  return defDescription;
+}
+
+//=======================================================================
+//function : Description
+//purpose  : 
+//=======================================================================
+Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyRelationship::Description() const
+{
+  return theDescription;
+}
+
+//=======================================================================
+//function : SetDescription
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyRelationship::SetDescription (const Handle(TCollection_HAsciiString)& aDescription)
+{
+  defDescription = true;
+  if (aDescription.IsNull())
+  {
+    defDescription = false;
+  }
+  theDescription = aDescription;
+}
+
+//=======================================================================
+//function : RelatingGeneralProperty
+//purpose  : 
+//=======================================================================
+Handle(StepBasic_GeneralProperty) StepBasic_GeneralPropertyRelationship::RelatingGeneralProperty() const
+{
+  return theRelatingGeneralProperty;
+}
+
+//=======================================================================
+//function : SetRelatingGeneralProperty
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyRelationship::SetRelatingGeneralProperty(const Handle(StepBasic_GeneralProperty)& aRelatingGeneralProperty)
+{
+  theRelatingGeneralProperty = aRelatingGeneralProperty;
+}
+
+//=======================================================================
+//function : RelatedGeneralProperty
+//purpose  : 
+//=======================================================================
+
+Handle(StepBasic_GeneralProperty) StepBasic_GeneralPropertyRelationship::RelatedGeneralProperty() const
+{
+  return theRelatedGeneralProperty;
+}
+
+//=======================================================================
+//function : SetRelatedGeneralProperty
+//purpose  : 
+//=======================================================================
+void StepBasic_GeneralPropertyRelationship::SetRelatedGeneralProperty(const Handle(StepBasic_GeneralProperty)& aRelatedGeneralProperty)
+{
+  theRelatedGeneralProperty = aRelatedGeneralProperty;
+}

src/StepBasic/StepBasic_GeneralPropertyRelationship.hxx

@@ -0,0 +1,88 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _StepBasic_GeneralPropertyRelationship_HeaderFile
+#define _StepBasic_GeneralPropertyRelationship_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Transient.hxx>
+
+class TCollection_HAsciiString;
+class StepBasic_GeneralProperty;
+
+DEFINE_STANDARD_HANDLE(StepBasic_GeneralPropertyRelationship, Standard_Transient)
+
+//! Representation of STEP entity GeneralPropertyRelationship
+class StepBasic_GeneralPropertyRelationship : public Standard_Transient
+{
+
+public:
+
+  
+  //! Empty constructor
+  Standard_EXPORT StepBasic_GeneralPropertyRelationship();
+  
+  //! Initialize all fields (own and inherited)
+  Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& aName,
+                            const Standard_Boolean hasDescription,
+                            const Handle(TCollection_HAsciiString)& aDescription,
+                            const Handle(StepBasic_GeneralProperty)& aRelatingGeneralProperty,
+                            const Handle(StepBasic_GeneralProperty)& aRelatedGeneralProperty);
+
+  //! Returns field Name
+  Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
+
+  //! Set field Name
+  Standard_EXPORT void SetName(const Handle(TCollection_HAsciiString)& Name);
+
+  //! Returns True if optional field Description is defined
+  Standard_EXPORT Standard_Boolean HasDescription() const;
+
+  //! Returns field Description
+  Standard_EXPORT Handle(TCollection_HAsciiString) Description() const;
+
+  //! Set field Description
+  Standard_EXPORT void SetDescription(const Handle(TCollection_HAsciiString)& Description);
+
+  //! Returns field RelatingGeneralProperty
+  Standard_EXPORT Handle(StepBasic_GeneralProperty) RelatingGeneralProperty() const;
+
+  //! Set field RelatingGeneralProperty
+  Standard_EXPORT void SetRelatingGeneralProperty(const Handle(StepBasic_GeneralProperty)& RelatingGeneralProperty);
+
+  //! Returns field RelatedGeneralProperty
+  Standard_EXPORT Handle(StepBasic_GeneralProperty) RelatedGeneralProperty() const;
+
+  //! Set field RelatedGeneralProperty
+  Standard_EXPORT void SetRelatedGeneralProperty(const Handle(StepBasic_GeneralProperty)& RelatedGeneralProperty);
+
+  DEFINE_STANDARD_RTTIEXT(StepBasic_GeneralPropertyRelationship, Standard_Transient)
+
+protected:
+
+
+
+
+private:
+
+  Standard_Boolean defDescription;
+  Handle(TCollection_HAsciiString) theName;
+  Handle(TCollection_HAsciiString) theDescription;
+  Handle(StepBasic_GeneralProperty) theRelatingGeneralProperty;
+  Handle(StepBasic_GeneralProperty) theRelatedGeneralProperty;
+
+};
+
+#endif // _StepBasic_GeneralPropertyRelationship_HeaderFile

src/StepBasic/StepBasic_MeasureValueMember.cxx

@@ -62,6 +62,7 @@ Standard_CString StepBasic_MeasureValueMember::Name () const
     case 13 : return "MASS_MEASURE"; 
     case 14 : return "THERMODYNAMIC_TEMPERATURE_MEASURE"; 
     case 15 : return "COUNT_MEASURE";
+    case 16 : return "NUMERIC_MEASURE";
     default : break;
   }
   return "";
@@ -92,6 +93,7 @@ Standard_Boolean  StepBasic_MeasureValueMember::SetName (const Standard_CString
   else if (name[0] == 'M' && !strcmp (name,"MASS_MEASURE"))        thecase = 13;
   else if (name[1] == 'H' && !strcmp (name,"THERMODYNAMIC_TEMPERATURE_MEASURE")) thecase = 14;
   else if (name[2] == 'U' && !strcmp (name,"COUNT_MEASURE"))       thecase = 15;
+  else if (name[0] == 'N' && !strcmp (name,"NUMERIC_MEASURE"))     thecase = 16;
   else return Standard_False;
 
   return Standard_True;

src/StepData/StepData_ConfParameters.cxx

@@ -58,6 +58,7 @@ void StepData_ConfParameters::InitFromStatic()
   ReadName = Interface_Static::IVal("read.name") == 1;
   ReadLayer = Interface_Static::IVal("read.layer") == 1;
   ReadProps = Interface_Static::IVal("read.props") == 1;
+  ReadMetadata = Interface_Static::IVal("read.metadata") == 1;
 
   WritePrecisionMode = (StepData_ConfParameters::WriteMode_PrecisionMode)Interface_Static::IVal("write.precision.mode");
   WritePrecisionVal = Interface_Static::RVal("write.precision.val");

src/StepData/StepData_ConfParameters.hxx

@@ -166,6 +166,7 @@ public:
   bool ReadName = true; //<! NameMode is used to indicate read Name or not
   bool ReadLayer = true; //<! LayerMode is used to indicate read Layers or not
   bool ReadProps = true; //<! PropsMode is used to indicate read Validation properties or not
+  bool ReadMetadata = false; //! Parameter for metadata reading
   
   // Write
   WriteMode_PrecisionMode WritePrecisionMode = WriteMode_PrecisionMode_Average; //<! Specifies the mode of writing the resolution value into the STEP file

src/StepData/StepData_StepReaderData.cxx

@@ -299,7 +299,7 @@ void StepData_StepReaderData::cleanText(const Handle(TCollection_HAsciiString)&
         }
       }
     }
-    if (aChar == '\n' || aChar == '\r')
+    if (aChar == '\n')
     {
       aResString.SetValue(aSetCharInd, aResString.ToExtString() + aStringInd);
       aResStringSize--;
@@ -1000,7 +1000,7 @@ Standard_Boolean StepData_StepReaderData::ReadAny(const Standard_Integer num,
   case Interface_ParamInteger: {
     if (!val.IsNull()) {
       DeclareAndCast(StepData_SelectMember, sm, val);
-      sm->SetInteger(atoi(str));
+      sm->SetReal(Interface_FileReaderData::Fastof(str));
       return Standard_True;
     }
     Handle(StepData_SelectInt) sin = new StepData_SelectInt;
@@ -1358,16 +1358,27 @@ Standard_Boolean StepData_StepReaderData::ReadInteger(const Standard_Integer num
   Standard_Integer& val) const
 {
   Handle(String) errmess;  // Null si pas d erreur
+  Standard_Boolean warn = Standard_False;
   if (nump > 0 && nump <= NbParams(num)) {
     const Interface_FileParameter& FP = Param(num, nump);
-    if (FP.ParamType() == Interface_ParamInteger)  val = atoi(FP.CValue());
-    else errmess = new String("Parameter n0.%d (%s) not an Integer");
+    if (FP.ParamType() == Interface_ParamInteger)
+      val = atoi(FP.CValue());
+    else if (FP.ParamType() == Interface_ParamReal)
+    {
+      val = static_cast<Standard_Integer>(std::round(Interface_FileReaderData::Fastof(FP.CValue())));
+      if (acceptvoid) warn = Standard_True;
+      errmess = new String("Parameter n0.%d (%s) was rounded");
+    }
+    if (FP.ParamType() != Interface_ParamInteger &&
+        FP.ParamType() != Interface_ParamReal)
+      errmess = new String("Parameter n0.%d (%s) not an Integer");
   }
   else errmess = new String("Parameter n0.%d (%s) absent");
 
   if (errmess.IsNull()) return Standard_True;
   sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+  if (warn) ach->AddWarning(txtmes, errmess->ToCString());
+  else ach->AddFail(txtmes, errmess->ToCString());
   return Standard_False;
 }
 

src/StepRepr/FILES

@@ -12,6 +12,8 @@ StepRepr_AssemblyComponentUsageSubstitute.cxx
 StepRepr_AssemblyComponentUsageSubstitute.hxx
 StepRepr_BetweenShapeAspect.cxx
 StepRepr_BetweenShapeAspect.hxx
+StepRepr_BooleanRepresentationItem.cxx
+StepRepr_BooleanRepresentationItem.hxx
 StepRepr_CentreOfSymmetry.cxx
 StepRepr_CentreOfSymmetry.hxx
 StepRepr_CharacterizedDefinition.cxx
@@ -110,6 +112,8 @@ StepRepr_PropertyDefinitionRepresentation.cxx
 StepRepr_PropertyDefinitionRepresentation.hxx
 StepRepr_QuantifiedAssemblyComponentUsage.cxx
 StepRepr_QuantifiedAssemblyComponentUsage.hxx
+StepRepr_RealRepresentationItem.cxx
+StepRepr_RealRepresentationItem.hxx
 StepRepr_Representation.cxx
 StepRepr_Representation.hxx
 StepRepr_RepresentationContext.cxx

src/StepRepr/StepRepr_BooleanRepresentationItem.cxx

@@ -0,0 +1,28 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#include <StepRepr_BooleanRepresentationItem.hxx>
+#include <TCollection_HAsciiString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_BooleanRepresentationItem, StepRepr_RepresentationItem)
+
+StepRepr_BooleanRepresentationItem::StepRepr_BooleanRepresentationItem()
+{
+}
+
+void StepRepr_BooleanRepresentationItem::Init(const Handle(TCollection_HAsciiString)& theName,
+                                              const Standard_Boolean theValue)
+{
+  value = theValue;
+  StepRepr_RepresentationItem::Init(theName);
+}

src/StepRepr/StepRepr_BooleanRepresentationItem.hxx

@@ -0,0 +1,52 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _StepRepr_BooleanRepresentationItem_HeaderFile
+#define _StepRepr_BooleanRepresentationItem_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <StepRepr_RepresentationItem.hxx>
+class TCollection_HAsciiString;
+
+class StepRepr_BooleanRepresentationItem;
+DEFINE_STANDARD_HANDLE(StepRepr_BooleanRepresentationItem, StepRepr_RepresentationItem)
+
+class StepRepr_BooleanRepresentationItem : public StepRepr_RepresentationItem
+{
+public:
+
+  //! Returns a BooleanRepresentationItem
+  Standard_EXPORT StepRepr_BooleanRepresentationItem();
+  
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Standard_Boolean theValue);
+  
+  inline void SetValue(const Standard_Boolean theValue)
+  {
+    value = theValue;
+  }
+  
+  inline Standard_Boolean Value() const 
+  {
+    return value;
+  }
+
+  DEFINE_STANDARD_RTTIEXT(StepRepr_BooleanRepresentationItem, StepRepr_RepresentationItem)
+
+private:
+
+  Standard_Boolean value;
+};
+
+#endif // _StepRepr_BooleanRepresentationItem_HeaderFile

src/StepRepr/StepRepr_RealRepresentationItem.cxx

@@ -0,0 +1,28 @@
+// Copyright (c) 2024 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#include <StepRepr_RealRepresentationItem.hxx>
+#include <TCollection_HAsciiString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RealRepresentationItem, StepRepr_RepresentationItem)
+
+StepRepr_RealRepresentationItem::StepRepr_RealRepresentationItem()
+{
+}
+
+void StepRepr_RealRepresentationItem::Init(const Handle(TCollection_HAsciiString)& theName,
+                                              const Standard_Real theValue)
+{
+  value = theValue;
+  StepRepr_RepresentationItem::Init(theName);
+}