0033731: Visualization - Transparent background for rendered image files

- add flag to 3D view dump for removing background based color keying.
- add color keying function to Image_PixMap

dox/user_guides/step/step.md

@@ -1653,13 +1653,6 @@ 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: 
@@ -1737,8 +1730,5 @@ 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/BRepMesh/BRepMesh_BaseMeshAlgo.cxx

@@ -99,38 +99,44 @@ Standard_Boolean BRepMesh_BaseMeshAlgo::initDataStructure()
 
     for (Standard_Integer aEdgeIt = 0; aEdgeIt < aDWire->EdgesNb(); ++aEdgeIt)
     {
-      const IMeshData::IEdgeHandle    aDEdge = aDWire->GetEdge(aEdgeIt);
+      const IMeshData::IEdgeHandle    aDEdge = aDWire->GetEdge (aEdgeIt);
       const IMeshData::ICurveHandle&  aCurve = aDEdge->GetCurve();
-      const IMeshData::IPCurveHandle& aPCurve = aDEdge->GetPCurve(
-        myDFace.get(), aDWire->GetEdgeOrientation(aEdgeIt));
+      const IMeshData::ListOfInteger& aListOfPCurves = aDEdge->GetPCurves (myDFace.get());
 
-      const TopAbs_Orientation aOri = fixSeamEdgeOrientation(aDEdge, aPCurve);
-
-      Standard_Integer aPrevNodeIndex = -1;
-      const Standard_Integer aLastPoint = aPCurve->ParametersNb() - 1;
-      for (Standard_Integer aPointIt = 0; aPointIt <= aLastPoint; ++aPointIt)
+      for (IMeshData::ListOfInteger::Iterator aPCurveIt(aListOfPCurves); aPCurveIt.More(); aPCurveIt.Next())
       {
-        const Standard_Integer aNodeIndex = registerNode(
-          aCurve ->GetPoint(aPointIt),
-          aPCurve->GetPoint(aPointIt),
-          BRepMesh_Frontier, Standard_False/*aPointIt > 0 && aPointIt < aLastPoint*/);
+        const IMeshData::IPCurveHandle& aPCurve = aDEdge->GetPCurve (aPCurveIt.Value());
 
-        aPCurve->GetIndex(aPointIt) = aNodeIndex;
-        myUsedNodes->Bind(aNodeIndex, aNodeIndex);
+        const TopAbs_Orientation aOri = fixSeamEdgeOrientation(aDEdge, aPCurve);
 
-        if (aPrevNodeIndex != -1 && aPrevNodeIndex != aNodeIndex)
+        Standard_Integer aPrevNodeIndex = -1;
+        const Standard_Integer aLastPoint = aPCurve->ParametersNb() - 1;
+
+        Standard_Integer aPointIt = 0;
+        for (; aPointIt <= aLastPoint; ++aPointIt)
         {
-          const Standard_Integer aLinksNb   = myStructure->NbLinks();
-          const Standard_Integer aLinkIndex = addLinkToMesh(aPrevNodeIndex, aNodeIndex, aOri);
-          if (aWireIt != 0 && aLinkIndex <= aLinksNb)
-          {
-            // Prevent holes around wire of zero area.
-            BRepMesh_Edge& aLink = const_cast<BRepMesh_Edge&>(myStructure->GetLink(aLinkIndex));
-            aLink.SetMovability(BRepMesh_Fixed);
-          }
-        }
+          const Standard_Integer aNodeIndex = registerNode(
+            aCurve->GetPoint(aPointIt),
+            aPCurve->GetPoint(aPointIt),
+            BRepMesh_Frontier, Standard_False/*aPointIt > 0 && aPointIt < aLastPoint*/);
 
-        aPrevNodeIndex = aNodeIndex;
+          aPCurve->GetIndex (aPointIt) = aNodeIndex;
+          myUsedNodes->Bind (aNodeIndex, aNodeIndex);
+
+          if (aPrevNodeIndex != -1 && aPrevNodeIndex != aNodeIndex)
+          {
+            const Standard_Integer aLinksNb = myStructure->NbLinks();
+            const Standard_Integer aLinkIndex = addLinkToMesh(aPrevNodeIndex, aNodeIndex, aOri);
+            if (aWireIt != 0 && aLinkIndex <= aLinksNb)
+            {
+              // Prevent holes around wire of zero area.
+              BRepMesh_Edge& aLink = const_cast<BRepMesh_Edge&>(myStructure->GetLink(aLinkIndex));
+              aLink.SetMovability(BRepMesh_Fixed);
+            }
+          }
+
+          aPrevNodeIndex = aNodeIndex;
+        }
       }
     }
   }

src/BRepMesh/BRepMesh_ConeRangeSplitter.cxx

@@ -36,14 +36,12 @@ std::pair<Standard_Real, Standard_Real> BRepMesh_ConeRangeSplitter::GetSplitStep
                               Abs(aRefR + aRangeV.second * Sin(aSAng)));
 
   Standard_Real Dv, Du = GCPnts_TangentialDeflection::ArcAngularStep(
-    aRadius, GetDFace()->GetDeflection() * 0.5,
+    aRadius, GetDFace()->GetDeflection(),
     theParameters.Angle, theParameters.MinSize);
 
   const Standard_Real aDiffU = aRangeU.second - aRangeU.first;
   const Standard_Real aDiffV = aRangeV.second - aRangeV.first;
-  //compute subdivision factor acounting for the parameters minimum size
-  const Standard_Real aSubDivFactor = Max (theParameters.MinSize, 1.0);
-  const Standard_Real aScale = (Du * aRadius / aSubDivFactor);
+  const Standard_Real aScale = (Du * aRadius);
   const Standard_Real aRatio = Max(1., Log(aDiffV / aScale));
   const Standard_Integer nbU = (Standard_Integer)(aDiffU / Du);
   const Standard_Integer nbV = (Standard_Integer)(aDiffV / aScale / aRatio);

src/BRepMeshData/BRepMeshData_Edge.cxx

@@ -91,6 +91,15 @@ const IMeshData::IPCurveHandle& BRepMeshData_Edge::GetPCurve (
     myPCurves (aListOfPCurves.Last ());
 }
 
+//=======================================================================
+// Function: GetPCurves
+// Purpose : 
+//=======================================================================
+const IMeshData::ListOfInteger& BRepMeshData_Edge::GetPCurves (const IMeshData::IFacePtr& theDFace) const
+{
+  return myPCurvesMap.Find (theDFace);
+}
+
 //=======================================================================
 // Function: GetPCurve
 // Purpose : 

src/BRepMeshData/BRepMeshData_Edge.hxx

@@ -48,6 +48,10 @@ public:
     const IMeshData::IFacePtr& theDFace,
     const TopAbs_Orientation   theOrientation) const Standard_OVERRIDE;
 
+  //! Returns an array of pcurves indices for the specified discrete face.
+  Standard_EXPORT virtual const IMeshData::ListOfInteger& GetPCurves(
+    const IMeshData::IFacePtr& theDFace) const Standard_OVERRIDE;
+
   //! Returns pcurve with the given index.
   Standard_EXPORT virtual const IMeshData::IPCurveHandle& GetPCurve (
     const Standard_Integer theIndex) const Standard_OVERRIDE;

src/BRepOffset/BRepOffset_Tool.cxx

@@ -3183,12 +3183,23 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace
   }
   else
   {
-    Standard_Real FaceDU = UF2 - UF1;
-    Standard_Real FaceDV = VF2 - VF1;
-    UU1 = UF1 - 10*FaceDU;
-    UU2 = UF2 + 10*FaceDU;
-    VV1 = VF1 - 10*FaceDV;
-    VV2 = VF2 + 10*FaceDV;
+    if (theExtensionMode == 2)
+    {
+      Standard_Real FaceDU = UF2 - UF1;
+      Standard_Real FaceDV = VF2 - VF1;
+      UU1 = UF1 - 10*FaceDU;
+      UU2 = UF2 + 10*FaceDU;
+      VV1 = VF1 - 10*FaceDV;
+      VV2 = VF2 + 10*FaceDV;
+    }
+    else
+    {
+      Standard_Real aSize = theLenBeforeUfirst;
+      UU1 = UF1 - aSize;
+      UU2 = UF2 + aSize;
+      VV1 = VF1 - aSize;
+      VV2 = VF2 + aSize;
+    }
     coeff = 1.;
   }
   

src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx

@@ -33,7 +33,6 @@
 #include <Storage_Schema.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
-#include <TDataStd_TreeNode.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
@@ -325,16 +324,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
   // read sub-tree of the root label
   if (!theFilter.IsNull())
     theFilter->StartIteration();
-  const auto aStreamStartPosition = theIStream.tellg();
-  Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, Standard_False, aPS.Next());
-  if (!myUnresolvedLinks.IsEmpty())
-  {
-    // In case we have skipped some linked TreeNodes before getting to
-    // their children.
-    theFilter->StartIteration();
-    theIStream.seekg(aStreamStartPosition, std::ios_base::beg);
-    nbRead += ReadSubTree(theIStream, aData->Root(), theFilter, aQuickPart, Standard_True, aPS.Next());
-  }
+  Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, aPS.Next());
   if (!aPS.More()) 
   {
     myReaderStatus = PCDM_RS_UserBreak;
@@ -383,7 +373,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
   const TDF_Label& theLabel,
   const Handle(PCDM_ReaderFilter)& theFilter,
   const Standard_Boolean& theQuickPart,
-  const Standard_Boolean theReadMissing,
   const Message_ProgressRange& theRange)
 {
   Standard_Integer nbRead = 0;
@@ -404,7 +393,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     aLabelSize = InverseUint64(aLabelSize);
 #endif
     // no one sub-label is needed, so, skip everything
-    if (aSkipAttrs && !theFilter->IsSubPassed() && myUnresolvedLinks.IsEmpty())
+    if (aSkipAttrs && !theFilter->IsSubPassed())
     {
       aLabelSize -= sizeof (uint64_t);
       theIS.seekg (aLabelSize, std::ios_base::cur);
@@ -414,11 +403,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     }
   }
 
-  if (theReadMissing)
-  {
-    aSkipAttrs = Standard_True;
-  }
-  const auto anAttStartPosition = theIS.tellg();
   // Read attributes:
   for (theIS >> myPAtt;
     theIS && myPAtt.TypeId() > 0 &&             // not an end marker ?
@@ -431,12 +415,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
       myReaderStatus = PCDM_RS_UserBreak;
       return -1;
     }
-    if (myUnresolvedLinks.Remove(myPAtt.Id()) && aSkipAttrs)
-    {
-      aSkipAttrs = Standard_False;
-      theIS.seekg(anAttStartPosition, std::ios_base::beg);
-      continue;
-    }
     if (aSkipAttrs)
     {
       if (myPAtt.IsDirect()) // skip direct written stream
@@ -509,17 +487,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
           aDriver->TypeName(), Message_Warning);
       }
       else if (!isBound)
-      {
         myRelocTable.Bind(anID, tAtt);
-        Handle(TDataStd_TreeNode) aNode = Handle(TDataStd_TreeNode)::DownCast(tAtt);
-        if (!theFilter.IsNull() && !aNode.IsNull() && !aNode->Father().IsNull() && aNode->Father()->IsNew())
-        {
-          Standard_Integer anUnresolvedLink;
-          myPAtt.SetPosition(BP_HEADSIZE);
-          myPAtt >> anUnresolvedLink;
-          myUnresolvedLinks.Add(anUnresolvedLink);
-        }
-      }
     }
     else if (!myMapUnsupported.Contains(myPAtt.TypeId()))
       myMsgDriver->Send(aMethStr + "warning: type ID not registered in header: "
@@ -554,7 +522,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     // read sub-tree
     if (!theFilter.IsNull())
       theFilter->Down (aTag);
-    Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, theReadMissing, aPS.Next());
+    Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, aPS.Next());
     // check for error
     if (nbSubRead == -1)
       return -1;

src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx

@@ -80,7 +80,6 @@ protected:
      const TDF_Label& theData, 
      const Handle(PCDM_ReaderFilter)& theFilter,
      const Standard_Boolean& theQuickPart,
-     const Standard_Boolean theReadMissing,
      const Message_ProgressRange& theRanges = Message_ProgressRange());
   
   
@@ -126,7 +125,6 @@ private:
   BinObjMgt_Persistent myPAtt;
   TColStd_MapOfInteger myMapUnsupported;
   BinLDrivers_VectorOfDocumentSection mySections;
-  NCollection_Map<Standard_Integer> myUnresolvedLinks;
 
 
 };

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 = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax2d& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom_Axis1Placement)& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom2d_AxisPlacement)& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Axis1Placement)& Value() const;
 

src/GeomToStep/GeomToStep_MakeAxis2Placement2d.hxx

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

src/GeomToStep/GeomToStep_MakeAxis2Placement3d.hxx

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

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.hxx

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

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.hxx

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

src/GeomToStep/GeomToStep_MakeBSplineSurfaceWithKnots.hxx

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

src/GeomToStep/GeomToStep_MakeBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx

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

src/GeomToStep/GeomToStep_MakeBoundedCurve.hxx

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

src/GeomToStep/GeomToStep_MakeBoundedSurface.hxx

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

src/GeomToStep/GeomToStep_MakeCircle.hxx

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

src/GeomToStep/GeomToStep_MakeConic.hxx

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

src/GeomToStep/GeomToStep_MakeConicalSurface.hxx

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

src/GeomToStep/GeomToStep_MakeCurve.hxx

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

src/GeomToStep/GeomToStep_MakeCylindricalSurface.hxx

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

src/GeomToStep/GeomToStep_MakeElementarySurface.hxx

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

src/GeomToStep/GeomToStep_MakeEllipse.hxx

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

src/GeomToStep/GeomToStep_MakeLine.hxx

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

src/GeomToStep/GeomToStep_MakeParabola.hxx

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

src/GeomToStep/GeomToStep_MakePlane.hxx

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

src/GeomToStep/GeomToStep_MakePolyline.hxx

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

src/GeomToStep/GeomToStep_MakeRectangularTrimmedSurface.hxx

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

src/GeomToStep/GeomToStep_MakeSphericalSurface.hxx

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

src/GeomToStep/GeomToStep_MakeSurface.hxx

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

src/GeomToStep/GeomToStep_MakeSurfaceOfLinearExtrusion.hxx

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

src/GeomToStep/GeomToStep_MakeSurfaceOfRevolution.hxx

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

src/GeomToStep/GeomToStep_MakeSweptSurface.hxx

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

src/GeomToStep/GeomToStep_MakeToroidalSurface.hxx

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

src/GeomToStep/GeomToStep_MakeVector.hxx

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

src/GeomToStep/GeomToStep_Root.hxx

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

src/Graphic3d/Graphic3d_TransModeFlags.hxx

@@ -25,15 +25,8 @@ 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,12 +58,6 @@ 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.
@@ -116,9 +110,6 @@ 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; }
 
@@ -306,32 +297,28 @@ 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 Standard_Boolean theToApplyProjPers = false) const;
+                               const Standard_Integer theViewportHeight) const;
 
   //! Apply transformation persistence on specified matrices.
-  //! @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).
+  //! @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
   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 Standard_Boolean theToApplyProjPers = true) const;
+              const gp_Pnt* theAnchor = NULL) const;
 
   //! Dumps the content of me into the stream
   Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
@@ -381,50 +368,41 @@ 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 Standard_Boolean theToApplyProjPers) const
+                                     const gp_Pnt* theAnchor) 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 = aCamera->Tile().IsValid() ? aCamera->Tile().TotalSize.y() : theViewportHeight;
+  const Standard_Integer aVPSizeY = theCamera->Tile().IsValid() ? theCamera->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) != 0)
+  if (myMode == Graphic3d_TMF_TriedronPers)
   {
     // reset Z focus for trihedron persistence
-    const Standard_Real aFocus = aCamera->IsOrthographic()
-                               ? aCamera->Distance()
-                               : (aCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
-                                ? Standard_Real(aCamera->ZFocus() * aCamera->Distance())
-                                : Standard_Real(aCamera->ZFocus()));
+    const Standard_Real aFocus = theCamera->IsOrthographic()
+                               ? theCamera->Distance()
+                               : (theCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
+                                ? Standard_Real(theCamera->ZFocus() * theCamera->Distance())
+                                : Standard_Real(theCamera->ZFocus()));
 
     // scale factor to pixels
-    const gp_XYZ aViewDim = aCamera->ViewDimensions (aFocus);
+    const gp_XYZ aViewDim = theCamera->ViewDimensions (aFocus);
     const Standard_Real aScale = Abs(aViewDim.Y()) / Standard_Real(aVPSizeY);
-    const gp_Dir aForward = aCamera->Direction();
-    gp_XYZ aCenter = aCamera->Center().XYZ() + aForward.XYZ() * (aFocus - aCamera->Distance());
+    const gp_Dir aForward = theCamera->Direction();
+    gp_XYZ aCenter = theCamera->Center().XYZ() + aForward.XYZ() * (aFocus - theCamera->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 (aCamera->Up());
-      const gp_XYZ aDeltaX = aSide.XYZ() * (Abs(aViewDim.X()) * aCamera->NDC2dOffsetX() - anOffsetX);
+      const gp_Dir aSide   = aForward.Crossed (theCamera->Up());
+      const gp_XYZ aDeltaX = aSide.XYZ() * (Abs(aViewDim.X()) * theCamera->NDC2dOffsetX() - anOffsetX);
       if ((myParams.Params2d.Corner & Aspect_TOTP_RIGHT) != 0)
       {
         aCenter += aDeltaX;
@@ -437,7 +415,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 = aCamera->Up().XYZ() * (Abs(aViewDim.Y()) * aCamera->NDC2dOffsetY() - anOffsetY);
+      const gp_XYZ aDeltaY = theCamera->Up().XYZ() * (Abs(aViewDim.Y()) * theCamera->NDC2dOffsetY() - anOffsetY);
       if ((myParams.Params2d.Corner & Aspect_TOTP_TOP) != 0)
       {
         aCenter += aDeltaY;
@@ -448,24 +426,27 @@ 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) != 0)
+  else if (myMode == Graphic3d_TMF_2d)
   {
-    const Standard_Real aFocus = aCamera->IsOrthographic()
-                               ? aCamera->Distance()
-                               : (aCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
-                                ? Standard_Real(aCamera->ZFocus() * aCamera->Distance())
-                                : Standard_Real(aCamera->ZFocus()));
+    const Standard_Real aFocus = theCamera->IsOrthographic()
+                               ? theCamera->Distance()
+                               : (theCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
+                                ? Standard_Real(theCamera->ZFocus() * theCamera->Distance())
+                                : Standard_Real(theCamera->ZFocus()));
 
     // scale factor to pixels
-    const gp_XYZ        aViewDim = aCamera->ViewDimensions (aFocus);
+    const gp_XYZ        aViewDim = theCamera->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() * aCamera->NDC2dOffsetX() + (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale);
+      aCenter.SetX (-aViewDim.X() * theCamera->NDC2dOffsetX() + (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale);
       if ((myParams.Params2d.Corner & Aspect_TOTP_RIGHT) != 0)
       {
         aCenter.SetX (-aCenter.X());
@@ -473,24 +454,26 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     }
     if ((myParams.Params2d.Corner & (Aspect_TOTP_TOP | Aspect_TOTP_BOTTOM)) != 0)
     {
-      aCenter.SetY (-aViewDim.Y() * aCamera->NDC2dOffsetY() + (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale);
+      aCenter.SetY (-aViewDim.Y() * theCamera->NDC2dOffsetY() + (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale);
       if ((myParams.Params2d.Corner & Aspect_TOTP_TOP) != 0)
       {
         aCenter.SetY (-aCenter.Y());
       }
     }
 
-    aWorldView.InitIdentity();
-    Graphic3d_TransformUtils::Translate (aWorldView, aCenter.X(), aCenter.Y(), aCenter.Z());
-    Graphic3d_TransformUtils::Scale     (aWorldView, aScale,      aScale,      aScale);
+    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;
   }
   else if ((myMode & Graphic3d_TMF_CameraPers) != 0)
   {
-    aWorldView.InitIdentity();
+    theWorldView.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());
@@ -520,19 +503,12 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     if ((myMode & Graphic3d_TMF_ZoomPers) != 0)
     {
       // lock zooming
-      Standard_Real aScale = persistentScale (aCamera, theViewportWidth, theViewportHeight);
+      Standard_Real aScale = persistentScale (theCamera, 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);
 }
 
 // =======================================================================
@@ -579,7 +555,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, false);
+  NCollection_Mat4<T> aTPers = Compute (theCamera, theProjection, theWorldView, theViewportWidth, theViewportHeight);
   if (aTPers.IsIdentity()
   || !theBoundingBox.IsValid())
   {
@@ -618,8 +594,7 @@ 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 Standard_Boolean theToApplyProjPers) const
+                                                      const Standard_Integer theViewportHeight) const
 {
   if (myMode == Graphic3d_TMF_None)
   {
@@ -635,7 +610,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, NULL, theToApplyProjPers);
+  Apply (theCamera, theProjection, aWorldView, theViewportWidth, theViewportHeight);
   return anUnviewMat * aWorldView;
 }
 

src/IMeshData/IMeshData_Edge.hxx

@@ -52,6 +52,10 @@ public:
     const IMeshData::IFacePtr& theDFace,
     const TopAbs_Orientation   theOrientation) const = 0;
 
+  //! Returns an array of pcurves indices for the specified discrete face.
+  Standard_EXPORT virtual const IMeshData::ListOfInteger& GetPCurves (
+    const IMeshData::IFacePtr& theDFace) const = 0;
+
   //! Returns pcurve with the given index.
   Standard_EXPORT virtual const IMeshData::IPCurveHandle& GetPCurve (
     const Standard_Integer theIndex) const = 0;

src/Image/Image_PixMap.cxx

@@ -17,6 +17,7 @@
 
 #include <NCollection_AlignedAllocator.hxx>
 #include <Standard_ProgramError.hxx>
+#include <Message.hxx>
 
 #include <algorithm>
 
@@ -829,6 +830,42 @@ void Image_PixMap::ToBlackWhite (Image_PixMap& theImage)
   }
 }
 
+// =======================================================================
+// function : ColorKeying
+// purpose  :
+// =======================================================================
+void Image_PixMap::ColorKeying(const Quantity_Color& theKey, Image_PixMap& theImage)
+{
+  if (theImage.myImgFormat != Image_Format_RGBA && theImage.myImgFormat != Image_Format_BGRA)
+  {
+    Message::SendWarning("Warning: Image format should support alpha channel");
+  }
+
+  const Standard_Byte aRed = (Standard_Byte) (theKey.Red() * 255);
+  const Standard_Byte aGreen = (Standard_Byte) (theKey.Green() * 255);
+  const Standard_Byte aBlue = (Standard_Byte) (theKey.Blue() * 255);
+
+  if (theImage.myImgFormat == Image_Format_RGBA)
+  {
+    for (Standard_Size i = 0; i < theImage.myData.Size(); i += 4)
+    {
+      if (theImage.myData.ChangeData()[i] == aRed && theImage.myData.ChangeData()[i + 1] == aGreen && theImage.myData.ChangeData()[i + 2] == aBlue)
+      {
+        theImage.myData.ChangeData()[i + 3] = 0;
+      }
+    }
+  }
+  if (theImage.myImgFormat == Image_Format_BGRA)
+  {
+    for (Standard_Size i = 0; i < theImage.myData.Size(); i += 4)
+    {
+      if (theImage.myData.ChangeData()[i] == aBlue && theImage.myData.ChangeData()[i + 1] == aGreen && theImage.myData.ChangeData()[i + 2] == aRed)
+      {
+        theImage.myData.ChangeData()[i + 3] = 0;
+      }
+    }
+  }
+}
 // =======================================================================
 // function : FlipY
 // purpose  :

src/Image/Image_PixMap.hxx

@@ -51,6 +51,9 @@ public:
   //! Convert image to Black/White.
   Standard_EXPORT static void ToBlackWhite (Image_PixMap& theImage);
 
+  //! Isolating a foreground object against a background area of uniform color 
+  Standard_EXPORT static void ColorKeying(const Quantity_Color& theKey, Image_PixMap& theImage);
+
   //! Reverse line order as it draws it from bottom to top.
   Standard_EXPORT static bool FlipY (Image_PixMap& theImage);
 

src/RWStepAP214/RWStepAP214_GeneralModule.cxx

@@ -98,8 +98,6 @@
 #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>
@@ -327,7 +325,6 @@
 #include <RWStepRepr_RWMaterialDesignation.hxx>
 #include <RWStepRepr_RWMaterialProperty.hxx>
 #include <RWStepRepr_RWMaterialPropertyRepresentation.hxx>
-#include <RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx>
 #include <RWStepRepr_RWMeasureRepresentationItem.hxx>
 #include <RWStepRepr_RWProductConcept.hxx>
 #include <RWStepRepr_RWProductDefinitionShape.hxx>
@@ -573,8 +570,6 @@
 #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>
@@ -790,7 +785,6 @@
 #include <StepRepr_ConfigurationEffectivity.hxx>
 #include <StepRepr_ConstructiveGeometryRepresentation.hxx>
 #include <StepRepr_ConstructiveGeometryRepresentationRelationship.hxx>
-#include <StepRepr_MechanicalDesignAndDraughtingRelationship.hxx>
 #include <StepRepr_DataEnvironment.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
 #include <StepRepr_Extension.hxx>
@@ -1194,9 +1188,7 @@ 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>
@@ -5884,27 +5876,6 @@ 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;
-  case 824:
-  {
-    DeclareAndCast(StepRepr_MechanicalDesignAndDraughtingRelationship, anEnt, ent);
-    RWStepRepr_RWMechanicalDesignAndDraughtingRelationship aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
   default : break;
   }
 }
@@ -8214,21 +8185,6 @@ 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;
-   case 824:
-     ent = new StepRepr_MechanicalDesignAndDraughtingRelationship;
-     break;
 
   default: 
     return Standard_False;

src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx

@@ -188,8 +188,6 @@ 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>
@@ -624,8 +622,6 @@ 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>
@@ -641,7 +637,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepShape_RWManifoldSurfaceShapeRepresentation.hxx>
 #include <RWStepRepr_RWMappedItem.hxx>
 #include <RWStepBasic_RWMeasureWithUnit.hxx>
-#include <RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx>
 #include <RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx>
 #include <RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx>
 // Removed from Rev2 to Rev4 : <RWStepVisual_RWMechanicalDesignPresentationArea.hxx>
@@ -1360,9 +1355,7 @@ 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>
@@ -1413,9 +1406,7 @@ 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>
@@ -1432,7 +1423,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepRepr_CharacterizedRepresentation.hxx>
 #include <StepRepr_ConstructiveGeometryRepresentation.hxx>
 #include <StepRepr_ConstructiveGeometryRepresentationRelationship.hxx>
-#include <StepRepr_MechanicalDesignAndDraughtingRelationship.hxx>
 
 #include <RWStepVisual_RWTessellatedAnnotationOccurrence.hxx>
 #include <RWStepVisual_RWTessellatedItem.hxx>
@@ -2362,11 +2352,6 @@ 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");
-static TCollection_AsciiString Reco_MechanicalDesignAndDraughtingRelationship("MECHANICAL_DESIGN_AND_DRAUGHTING_RELATIONSHIP");
 
 // -- Definition of the libraries --
 
@@ -3124,11 +3109,6 @@ 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);
-  typenums.Bind(Reco_MechanicalDesignAndDraughtingRelationship, 824);
 
   
 //    SHORT NAMES
@@ -5117,11 +5097,6 @@ 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;
-  case 824: return Reco_MechanicalDesignAndDraughtingRelationship;
   default : return PasReco;
   }
 }
@@ -10731,41 +10706,6 @@ 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;
-  case 824:
-  {
-    DeclareAndCast(StepRepr_MechanicalDesignAndDraughtingRelationship, anent, ent);
-    RWStepRepr_RWMechanicalDesignAndDraughtingRelationship aTool;
-    aTool.ReadStep(data, num, ach, anent);
-  }
-  break;
   default: 
     ach->AddFail("Type Mismatch when reading - Entity");
   }
@@ -16317,41 +16257,6 @@ 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;
-  case 824:
-  {
-    DeclareAndCast(StepRepr_MechanicalDesignAndDraughtingRelationship, anent, ent);
-    RWStepRepr_RWMechanicalDesignAndDraughtingRelationship aTool;
-    aTool.WriteStep(SW, anent);
-  }
-  break;
   default:
     return;
   }

src/RWStepBasic/FILES

@@ -108,10 +108,6 @@ 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_RWConversionBasedUnit.cxx

@@ -16,74 +16,72 @@
 #include <RWStepBasic_RWConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 
 RWStepBasic_RWConversionBasedUnit::RWStepBasic_RWConversionBasedUnit () {}
 
-void RWStepBasic_RWConversionBasedUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnit)& ent) const
+void RWStepBasic_RWConversionBasedUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
+                                                 const Standard_Integer num,
+                                                 Handle(Interface_Check)& ach,
+                                                 const Handle(StepBasic_ConversionBasedUnit)& ent) const
 {
 
 
-	// --- Number of Parameter Control ---
+  // --- Number of Parameter Control ---
 
-	if (!data->CheckNbParams(num,3,ach,"conversion_based_unit")) return;
+  if (!data->CheckNbParams(num,3,ach,"conversion_based_unit")) return;
 
-	// --- inherited field : dimensions ---
+  // --- inherited field : dimensions ---
 
-	Handle(StepBasic_DimensionalExponents) aDimensions;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
-	data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+  Handle(StepBasic_DimensionalExponents) aDimensions;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
+  data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
 
-	// --- own field : name ---
+  // --- own field : name ---
 
-	Handle(TCollection_HAsciiString) aName;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
-	data->ReadString (num,2,"name",ach,aName);
+  Handle(TCollection_HAsciiString) aName;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
+  data->ReadString (num,2,"name",ach,aName);
 
-	// --- own field : conversionFactor ---
+  // --- own field : conversionFactor ---
 
-	Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
-	data->ReadEntity(num, 3,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 3, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
-	//--- Initialisation of the read entity ---
+  //--- Initialisation of the read entity ---
 
 
-	ent->Init(aDimensions, aName, aConversionFactor);
+  ent->Init(aDimensions, aName, aConversionFactor);
 }
 
 
 void RWStepBasic_RWConversionBasedUnit::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepBasic_ConversionBasedUnit)& ent) const
+    (StepData_StepWriter& SW,
+     const Handle(StepBasic_ConversionBasedUnit)& ent) const
 {
 
-	// --- inherited field dimensions ---
+  // --- inherited field dimensions ---
 
-	SW.Send(ent->Dimensions());
+  SW.Send(ent->Dimensions());
 
-	// --- own field : name ---
+  // --- own field : name ---
 
-	SW.Send(ent->Name());
+  SW.Send(ent->Name());
 
-	// --- own field : conversionFactor ---
+  // --- own field : conversionFactor ---
 
-	SW.Send(ent->ConversionFactor());
+  SW.Send(ent->ConversionFactor());
 }
 
 
 void RWStepBasic_RWConversionBasedUnit::Share(const Handle(StepBasic_ConversionBasedUnit)& ent, Interface_EntityIterator& iter) const
 {
 
-	iter.GetOneItem(ent->Dimensions());
+  iter.GetOneItem(ent->Dimensions());
 
 
-	iter.GetOneItem(ent->ConversionFactor());
+  iter.GetOneItem(ent->ConversionFactor());
 }
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cxx

@@ -19,7 +19,6 @@
 #include <RWStepBasic_RWConversionBasedUnitAndAreaUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 
@@ -28,9 +27,9 @@ RWStepBasic_RWConversionBasedUnitAndAreaUnit::RWStepBasic_RWConversionBasedUnitA
 }
 
 void RWStepBasic_RWConversionBasedUnitAndAreaUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
-							    const Standard_Integer num0,
-							    Handle(Interface_Check)& ach,
-							    const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const
+                                                   const Standard_Integer num0,
+                                                   Handle(Interface_Check)& ach,
+                                                   const Handle(StepBasic_ConversionBasedUnitAndAreaUnit)& ent) const
 {
   Standard_Integer num = num0;
   //data->NamedForComplex("AREA_UNIT",num0,num,ach);
@@ -43,15 +42,15 @@ void RWStepBasic_RWConversionBasedUnitAndAreaUnit::ReadStep(const Handle(StepDat
   data->ReadString (num,1,"name",ach,aName);
   
   // --- field : conversionFactor ---
-  Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-  data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
   num = data->NextForComplex(num);
   
   if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
   Handle(StepBasic_DimensionalExponents) aDimensions;
   data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
   
-  ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName, aConversionFactor);
 }
 
 void RWStepBasic_RWConversionBasedUnitAndAreaUnit::WriteStep(StepData_StepWriter& SW,

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx

@@ -17,96 +17,95 @@
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 
 RWStepBasic_RWConversionBasedUnitAndLengthUnit::RWStepBasic_RWConversionBasedUnitAndLengthUnit () {}
 
 void RWStepBasic_RWConversionBasedUnitAndLengthUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num0,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
+    (const Handle(StepData_StepReaderData)& data,
+     const Standard_Integer num0,
+     Handle(Interface_Check)& ach,
+     const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
 {
 
-	Standard_Integer num = num0;
+  Standard_Integer num = num0;
 
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
+  if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
 
-	// --- field : name ---
+  // --- field : name ---
 
-	Handle(TCollection_HAsciiString) aName;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
-	data->ReadString (num,1,"name",ach,aName);
+  Handle(TCollection_HAsciiString) aName;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
+  data->ReadString (num,1,"name",ach,aName);
 
-	// --- field : conversionFactor ---
+  // --- field : conversionFactor ---
 
-	Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
-	data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of plex component LengthUnit ---
+  // --- Instance of plex component LengthUnit ---
 
-	if (!data->CheckNbParams(num,0,ach,"length_unit")) return;
+  if (!data->CheckNbParams(num,0,ach,"length_unit")) return;
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
-	// --- field : dimensions ---
+  if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
+  // --- field : dimensions ---
 
 
-	Handle(StepBasic_DimensionalExponents) aDimensions;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
-	data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+  Handle(StepBasic_DimensionalExponents) aDimensions;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
+  data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
 
-	//--- Initialisation of the red entity ---
+  //--- Initialisation of the red entity ---
 
-	ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName,aConversionFactor);
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndLengthUnit::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
+    (StepData_StepWriter& SW,
+     const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent) const
 {
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	SW.StartEntity("CONVERSION_BASED_UNIT");
-	// --- field : name ---
+  SW.StartEntity("CONVERSION_BASED_UNIT");
+  // --- field : name ---
 
-	SW.Send(ent->Name());
-	// --- field : conversionFactor ---
+  SW.Send(ent->Name());
+  // --- field : conversionFactor ---
 
-	SW.Send(ent->ConversionFactor());
+  SW.Send(ent->ConversionFactor());
 
-	// --- Instance of plex component LengthUnit ---
+  // --- Instance of plex component LengthUnit ---
 
-	SW.StartEntity("LENGTH_UNIT");
+  SW.StartEntity("LENGTH_UNIT");
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	SW.StartEntity("NAMED_UNIT");
-	// --- field : dimensions ---
+  SW.StartEntity("NAMED_UNIT");
+  // --- field : dimensions ---
 
-	SW.Send(ent->Dimensions());
+  SW.Send(ent->Dimensions());
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndLengthUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndLengthUnit)& ent, Interface_EntityIterator& iter) const
 {
 
-	iter.GetOneItem(ent->Dimensions());
+  iter.GetOneItem(ent->Dimensions());
 
 
-	iter.GetOneItem(ent->ConversionFactor());
+  iter.GetOneItem(ent->ConversionFactor());
 }
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cxx

@@ -17,7 +17,6 @@
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MassUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 
@@ -36,10 +35,10 @@ RWStepBasic_RWConversionBasedUnitAndMassUnit::RWStepBasic_RWConversionBasedUnitA
 //=======================================================================
 
 void RWStepBasic_RWConversionBasedUnitAndMassUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num0,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const
+    (const Handle(StepData_StepReaderData)& data,
+     const Standard_Integer num0,
+     Handle(Interface_Check)& ach,
+     const Handle(StepBasic_ConversionBasedUnitAndMassUnit)& ent) const
 {
 
   Standard_Integer num = num0;
@@ -51,9 +50,9 @@ void RWStepBasic_RWConversionBasedUnitAndMassUnit::ReadStep
   //szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
   data->ReadString (num,1,"name",ach,aName);
   // --- field : conversionFactor ---
-  Handle(StepBasic_MeasureWithUnit) aConversionFactor;
   //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
-  data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
   num = data->NextForComplex(num);
 
@@ -70,7 +69,7 @@ void RWStepBasic_RWConversionBasedUnitAndMassUnit::ReadStep
   data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
 
   //--- Initialisation of the red entity ---
-  ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName, aConversionFactor);
 }
 
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cxx

@@ -17,7 +17,6 @@
 #include <RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_PlaneAngleUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
@@ -25,71 +24,72 @@
 RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit () {}
 
 void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num0,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
+   (const Handle(StepData_StepReaderData)& data,
+     const Standard_Integer num0,
+     Handle(Interface_Check)& ach,
+     const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
 {
         // sln 09.10.2001. BUC61003. Correction of looking for items of complex entity in case of them  do not saticfy to alphabetical order
         // CONVERSION_BASED_UNIT
-	Standard_Integer num = 0;//num0;
-	data->NamedForComplex("CONVERSION_BASED_UNIT", "CNBSUN",num0,num,ach);
-	if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
-       	Handle(TCollection_HAsciiString) aName;
-	data->ReadString (num,1,"name",ach,aName);
-        Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-	data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
-        
-        // NAMED_UNIT
-        //num = 0; //gka TRJ9 c2-id-214.stp
-	data->NamedForComplex("NAMED_UNIT", "NMDUNT",num0,num,ach);
-        if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
-	Handle(StepBasic_DimensionalExponents) aDimensions;
-	data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+  Standard_Integer num = 0;//num0;
+  data->NamedForComplex("CONVERSION_BASED_UNIT", "CNBSUN",num0,num,ach);
+  if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
+    Handle(TCollection_HAsciiString) aName;
+  data->ReadString (num,1,"name",ach,aName);
 
-        // PLANE_ANGLE_UNIT
-        //num = 0; //gka
-	data->NamedForComplex("PLANE_ANGLE_UNIT", "PLANUN",num0,num,ach);
-        if (!data->CheckNbParams(num,0,ach,"plane_angle_unit")) return;
-        
-	ent->Init(aDimensions,aName,aConversionFactor);
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
+
+  // NAMED_UNIT
+  //num = 0; //gka TRJ9 c2-id-214.stp
+  data->NamedForComplex("NAMED_UNIT", "NMDUNT",num0,num,ach);
+  if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
+  Handle(StepBasic_DimensionalExponents) aDimensions;
+  data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+
+  // PLANE_ANGLE_UNIT
+  //num = 0; //gka
+  data->NamedForComplex("PLANE_ANGLE_UNIT", "PLANUN",num0,num,ach);
+  if (!data->CheckNbParams(num,0,ach,"plane_angle_unit")) return;
+
+  ent->Init(aDimensions,aName,aConversionFactor);
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
+    (StepData_StepWriter& SW,
+     const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent) const
 {
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	SW.StartEntity("CONVERSION_BASED_UNIT");
-	// --- field : name ---
+  SW.StartEntity("CONVERSION_BASED_UNIT");
+  // --- field : name ---
 
-	SW.Send(ent->Name());
-	// --- field : conversionFactor ---
+  SW.Send(ent->Name());
+  // --- field : conversionFactor ---
 
-	SW.Send(ent->ConversionFactor());
+  SW.Send(ent->ConversionFactor());
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	SW.StartEntity("NAMED_UNIT");
-	// --- field : dimensions ---
+  SW.StartEntity("NAMED_UNIT");
+  // --- field : dimensions ---
 
-	SW.Send(ent->Dimensions());
+  SW.Send(ent->Dimensions());
 
-	// --- Instance of plex component PlaneAngleUnit ---
+  // --- Instance of plex component PlaneAngleUnit ---
 
-	SW.StartEntity("PLANE_ANGLE_UNIT");
+  SW.StartEntity("PLANE_ANGLE_UNIT");
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)& ent, Interface_EntityIterator& iter) const
 {
 
-	iter.GetOneItem(ent->Dimensions());
+  iter.GetOneItem(ent->Dimensions());
 
 
-	iter.GetOneItem(ent->ConversionFactor());
+  iter.GetOneItem(ent->ConversionFactor());
 }
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cxx

@@ -16,7 +16,6 @@
 #include <RWStepBasic_RWConversionBasedUnitAndRatioUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndRatioUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_RatioUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
@@ -24,89 +23,89 @@
 RWStepBasic_RWConversionBasedUnitAndRatioUnit::RWStepBasic_RWConversionBasedUnitAndRatioUnit () {}
 
 void RWStepBasic_RWConversionBasedUnitAndRatioUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num0,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
+    (const Handle(StepData_StepReaderData)& data,
+     const Standard_Integer num0,
+     Handle(Interface_Check)& ach,
+     const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
 {
 
-	Standard_Integer num = num0;
+  Standard_Integer num = num0;
 
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
+  if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
 
-	// --- field : name ---
+  // --- field : name ---
 
-	Handle(TCollection_HAsciiString) aName;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
-	data->ReadString (num,1,"name",ach,aName);
+  Handle(TCollection_HAsciiString) aName;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
+  data->ReadString (num,1,"name",ach,aName);
 
-	// --- field : conversionFactor ---
+  // --- field : conversionFactor ---
 
-	Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
-	data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity(num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
+  if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
 
-	// --- field : dimensions ---
+  // --- field : dimensions ---
 
-	Handle(StepBasic_DimensionalExponents) aDimensions;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
-	data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+  Handle(StepBasic_DimensionalExponents) aDimensions;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
+  data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of plex component RatioUnit ---
+  // --- Instance of plex component RatioUnit ---
 
-	if (!data->CheckNbParams(num,0,ach,"ratio_unit")) return;
+  if (!data->CheckNbParams(num,0,ach,"ratio_unit")) return;
 
-	//--- Initialisation of the red entity ---
+  //--- Initialisation of the red entity ---
 
-	ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName, aConversionFactor);
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndRatioUnit::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
+    (StepData_StepWriter& SW,
+     const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent) const
 {
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	SW.StartEntity("CONVERSION_BASED_UNIT");
-	// --- field : name ---
+  SW.StartEntity("CONVERSION_BASED_UNIT");
+  // --- field : name ---
 
-	SW.Send(ent->Name());
-	// --- field : conversionFactor ---
+  SW.Send(ent->Name());
+  // --- field : conversionFactor ---
 
-	SW.Send(ent->ConversionFactor());
+  SW.Send(ent->ConversionFactor());
 
-	// --- Instance of plex component RatioUnit ---
+  // --- Instance of plex component RatioUnit ---
 
-	SW.StartEntity("RATIO_UNIT");
+  SW.StartEntity("RATIO_UNIT");
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	SW.StartEntity("NAMED_UNIT");
-	// --- field : dimensions ---
+  SW.StartEntity("NAMED_UNIT");
+  // --- field : dimensions ---
 
-	SW.Send(ent->Dimensions());
+  SW.Send(ent->Dimensions());
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndRatioUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndRatioUnit)& ent, Interface_EntityIterator& iter) const
 {
 
-	iter.GetOneItem(ent->Dimensions());
+  iter.GetOneItem(ent->Dimensions());
 
 
-	iter.GetOneItem(ent->ConversionFactor());
+  iter.GetOneItem(ent->ConversionFactor());
 }
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cxx

@@ -16,7 +16,6 @@
 #include <RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_SolidAngleUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
@@ -24,89 +23,89 @@
 RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit () {}
 
 void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num0,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
+    (const Handle(StepData_StepReaderData)& data,
+     const Standard_Integer num0,
+     Handle(Interface_Check)& ach,
+     const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
 {
 
-	Standard_Integer num = num0;
+  Standard_Integer num = num0;
 
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
+  if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
 
-	// --- field : name ---
+  // --- field : name ---
 
-	Handle(TCollection_HAsciiString) aName;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
-	data->ReadString (num,1,"name",ach,aName);
+  Handle(TCollection_HAsciiString) aName;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
+  data->ReadString (num,1,"name",ach,aName);
 
-	// --- field : conversionFactor ---
+  // --- field : conversionFactor ---
 
-	Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
-	data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
-	// --- field : dimensions ---
+  if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
+  // --- field : dimensions ---
 
 
-	Handle(StepBasic_DimensionalExponents) aDimensions;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
-	data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+  Handle(StepBasic_DimensionalExponents) aDimensions;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
+  data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of plex component SolidAngleUnit ---
+  // --- Instance of plex component SolidAngleUnit ---
 
-	if (!data->CheckNbParams(num,0,ach,"solid_angle_unit")) return;
+  if (!data->CheckNbParams(num,0,ach,"solid_angle_unit")) return;
 
-	//--- Initialisation of the red entity ---
+  //--- Initialisation of the red entity ---
 
-	ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName,aConversionFactor);
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
+    (StepData_StepWriter& SW,
+     const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent) const
 {
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	SW.StartEntity("CONVERSION_BASED_UNIT");
-	// --- field : name ---
+  SW.StartEntity("CONVERSION_BASED_UNIT");
+  // --- field : name ---
 
-	SW.Send(ent->Name());
-	// --- field : conversionFactor ---
+  SW.Send(ent->Name());
+  // --- field : conversionFactor ---
 
-	SW.Send(ent->ConversionFactor());
+  SW.Send(ent->ConversionFactor());
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	SW.StartEntity("NAMED_UNIT");
-	// --- field : dimensions ---
+  SW.StartEntity("NAMED_UNIT");
+  // --- field : dimensions ---
 
-	SW.Send(ent->Dimensions());
+  SW.Send(ent->Dimensions());
 
-	// --- Instance of plex component SolidAngleUnit ---
+  // --- Instance of plex component SolidAngleUnit ---
 
-	SW.StartEntity("SOLID_ANGLE_UNIT");
+  SW.StartEntity("SOLID_ANGLE_UNIT");
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndSolidAngleUnit)& ent, Interface_EntityIterator& iter) const
 {
 
-	iter.GetOneItem(ent->Dimensions());
+  iter.GetOneItem(ent->Dimensions());
 
 
-	iter.GetOneItem(ent->ConversionFactor());
+  iter.GetOneItem(ent->ConversionFactor());
 }
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cxx

@@ -16,7 +16,6 @@
 #include <RWStepBasic_RWConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_TimeUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
@@ -24,89 +23,88 @@
 RWStepBasic_RWConversionBasedUnitAndTimeUnit::RWStepBasic_RWConversionBasedUnitAndTimeUnit () {}
 
 void RWStepBasic_RWConversionBasedUnitAndTimeUnit::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num0,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
+     (const Handle(StepData_StepReaderData)& data,
+     const Standard_Integer num0,
+     Handle(Interface_Check)& ach,
+     const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
 {
 
-	Standard_Integer num = num0;
+  Standard_Integer num = num0;
 
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
+  if (!data->CheckNbParams(num,2,ach,"conversion_based_unit")) return;
 
-	// --- field : name ---
+  // --- field : name ---
 
-	Handle(TCollection_HAsciiString) aName;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
-	data->ReadString (num,1,"name",ach,aName);
+  Handle(TCollection_HAsciiString) aName;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat1 =` not needed
+  data->ReadString (num,1,"name",ach,aName);
 
-	// --- field : conversionFactor ---
+  // --- field : conversionFactor ---
 
-	Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
-	data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
-	// --- field : dimensions ---
+  if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
+  // --- field : dimensions ---
 
 
-	Handle(StepBasic_DimensionalExponents) aDimensions;
-	//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
-	data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
+  Handle(StepBasic_DimensionalExponents) aDimensions;
+  //szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
+  data->ReadEntity(num, 1,"dimensions", ach, STANDARD_TYPE(StepBasic_DimensionalExponents), aDimensions);
 
-	num = data->NextForComplex(num);
+  num = data->NextForComplex(num);
 
-	// --- Instance of plex component TimeUnit ---
+  // --- Instance of plex component TimeUnit ---
 
-	if (!data->CheckNbParams(num,0,ach,"time_unit")) return;
+  if (!data->CheckNbParams(num,0,ach,"time_unit")) return;
 
-	//--- Initialisation of the red entity ---
+  //--- Initialisation of the red entity ---
 
-	ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName, aConversionFactor);
 }
 
 
-void RWStepBasic_RWConversionBasedUnitAndTimeUnit::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
+void RWStepBasic_RWConversionBasedUnitAndTimeUnit::WriteStep(StepData_StepWriter& SW,
+                                                   const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
 {
 
-	// --- Instance of plex component ConversionBasedUnit ---
+  // --- Instance of plex component ConversionBasedUnit ---
 
-	SW.StartEntity("CONVERSION_BASED_UNIT");
-	// --- field : name ---
+  SW.StartEntity("CONVERSION_BASED_UNIT");
+  // --- field : name ---
 
-	SW.Send(ent->Name());
-	// --- field : conversionFactor ---
+  SW.Send(ent->Name());
+  // --- field : conversionFactor ---
 
-	SW.Send(ent->ConversionFactor());
+  SW.Send(ent->ConversionFactor());
 
-	// --- Instance of plex component TimeUnit ---
+  // --- Instance of plex component TimeUnit ---
 
-	SW.StartEntity("TIME_UNIT");
+  SW.StartEntity("TIME_UNIT");
 
-	// --- Instance of common supertype NamedUnit ---
+  // --- Instance of common supertype NamedUnit ---
 
-	SW.StartEntity("NAMED_UNIT");
-	// --- field : dimensions ---
+  SW.StartEntity("NAMED_UNIT");
+  // --- field : dimensions ---
 
-	SW.Send(ent->Dimensions());
+  SW.Send(ent->Dimensions());
 }
 
 
 void RWStepBasic_RWConversionBasedUnitAndTimeUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent, Interface_EntityIterator& iter) const
 {
 
-	iter.GetOneItem(ent->Dimensions());
+  iter.GetOneItem(ent->Dimensions());
 
 
-	iter.GetOneItem(ent->ConversionFactor());
+  iter.GetOneItem(ent->ConversionFactor());
 }
 

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cxx

@@ -19,7 +19,6 @@
 #include <RWStepBasic_RWConversionBasedUnitAndVolumeUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndVolumeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 
@@ -28,9 +27,9 @@ RWStepBasic_RWConversionBasedUnitAndVolumeUnit::RWStepBasic_RWConversionBasedUni
 }
 
 void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
-							      const Standard_Integer num0,
-							      Handle(Interface_Check)& ach,
-							      const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
+                                                              const Standard_Integer num0,
+                                                              Handle(Interface_Check)& ach,
+                                                              const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
 {
   Standard_Integer num = num0;
   // --- Instance of plex component ConversionBasedUnit ---
@@ -39,8 +38,8 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(const Handle(StepD
   data->ReadString (num,1,"name",ach,aName);
   
   // --- field : conversionFactor ---
-  Handle(StepBasic_MeasureWithUnit) aConversionFactor;
-  data->ReadEntity(num, 2,"conversion_factor", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aConversionFactor);
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 2, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
   
   num = data->NextForComplex(num);
   if (!data->CheckNbParams(num,1,ach,"named_unit")) return;
@@ -50,11 +49,11 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::ReadStep(const Handle(StepD
   data->NamedForComplex("VOLUME_UNIT","VLMUNT",num0,num,ach);
   if (!data->CheckNbParams(num,0,ach,"volume_unit")) return;
   
-  ent->Init(aDimensions,aName,aConversionFactor);
+  ent->Init(aDimensions,aName, aConversionFactor);
 }
 
 void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::WriteStep(StepData_StepWriter& SW,
-							     const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
+                   const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent) const
 {
   SW.StartEntity("CONVERSION_BASED_UNIT");
   SW.Send(ent->Name());
@@ -65,7 +64,7 @@ void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::WriteStep(StepData_StepWrit
 }
   
 void RWStepBasic_RWConversionBasedUnitAndVolumeUnit::Share(const Handle(StepBasic_ConversionBasedUnitAndVolumeUnit)& ent, 
-							   Interface_EntityIterator& iter) const
+                                                           Interface_EntityIterator& iter) const
 {
   iter.GetOneItem(ent->Dimensions());
   iter.GetOneItem(ent->ConversionFactor());

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx

@@ -1,87 +0,0 @@
-// 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

@@ -1,60 +0,0 @@
-// 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

@@ -1,103 +0,0 @@
-// 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

@@ -1,60 +0,0 @@
-// 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_RWGeneralPropertyRelationship_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/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWAngularityTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_AngularityTolerance.hxx>
@@ -54,8 +53,8 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +77,7 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWCircularRunoutTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_CircularRunoutTolerance.hxx>
@@ -54,8 +53,8 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +77,7 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWCoaxialityTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_CoaxialityTolerance.hxx>
@@ -54,8 +53,8 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +77,7 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWConcentricityTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ConcentricityTolerance.hxx>
@@ -54,8 +53,8 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +77,7 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWCylindricityTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_CylindricityTolerance.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -61,7 +60,7 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWFlatnessTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
@@ -35,7 +34,6 @@ RWStepDimTol_RWFlatnessTolerance::RWStepDimTol_RWFlatnessTolerance ()
 //function : ReadStep
 //purpose  : 
 //=======================================================================
-
 void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReaderData)& data,
                                                  const Standard_Integer num,
                                                  Handle(Interface_Check)& ach,
@@ -52,8 +50,8 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -61,7 +59,7 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx

@@ -17,7 +17,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@@ -51,8 +50,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRef::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx

@@ -18,7 +18,6 @@
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@@ -53,8 +52,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx

@@ -17,7 +17,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@@ -52,8 +51,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx

@@ -15,7 +15,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@@ -50,8 +49,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx

@@ -51,8 +51,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx

@@ -18,7 +18,6 @@
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
@@ -51,8 +50,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
   

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx

@@ -17,7 +17,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthMod.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
@@ -50,8 +49,10 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMod::ReadStep
   data->ReadString (num, 1, "name", ach, aName);
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
+
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeometricTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWGeometricTolerance::ReadStep (const Handle(StepData_StepRead
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "description", ach, aDescription);
 
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWGeometricToleranceWithDatumReference.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
@@ -53,8 +52,8 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -77,7 +76,7 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aDatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx>
@@ -53,8 +52,8 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit::
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
 
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDefinedUnit.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedUnit::ReadStep (const Handle(St
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
 
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx

@@ -21,7 +21,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithMaximumTolerance.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -54,8 +53,8 @@ void RWStepDimTol_RWGeometricToleranceWithMaximumTolerance::
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
 
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@@ -54,8 +53,8 @@ void RWStepDimTol_RWGeometricToleranceWithModifiers::
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
 
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWLineProfileTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_LineProfileTolerance.hxx>
@@ -51,8 +50,8 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +59,7 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWModifiedGeometricTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
@@ -51,8 +50,8 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -72,7 +71,7 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aModifier);
 }

src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWParallelismTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ParallelismTolerance.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +75,7 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWPerpendicularityTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PerpendicularityTolerance.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +75,7 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWPositionTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PositionTolerance.hxx>
@@ -51,8 +50,8 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +59,7 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWRoundnessTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_RoundnessTolerance.hxx>
@@ -51,8 +50,8 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +59,7 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWStraightnessTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_StraightnessTolerance.hxx>
@@ -51,8 +50,8 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +59,7 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWSurfaceProfileTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_SurfaceProfileTolerance.hxx>
@@ -51,8 +50,8 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +59,7 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect);
 }
 

src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWSymmetryTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_SymmetryTolerance.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +75,7 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx

@@ -18,7 +18,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepDimTol_RWTotalRunoutTolerance.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_TotalRunoutTolerance.hxx>
@@ -52,8 +51,8 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe
   Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);
 
-  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +75,7 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe
   // Initialize entity
   ent->Init(aGeometricTolerance_Name,
             aGeometricTolerance_Description,
-            aGeometricTolerance_Magnitude,
+            aMagnitude,
             aGeometricTolerance_TolerancedShapeAspect,
             aGeometricToleranceWithDatumReference_DatumSystem);
 }

src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx

@@ -51,8 +51,8 @@ void RWStepDimTol_RWUnequallyDisposedGeometricTolerance::
   Handle(TCollection_HAsciiString) aDescription;
   data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);
 
-  Handle(StepBasic_MeasureWithUnit) aMagnitude;
-  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
+  Handle(Standard_Transient) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(Standard_Transient), aMagnitude);
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepRepr/FILES

@@ -8,8 +8,6 @@ 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
@@ -72,8 +70,6 @@ RWStepRepr_RWMaterialPropertyRepresentation.cxx
 RWStepRepr_RWMaterialPropertyRepresentation.hxx
 RWStepRepr_RWMeasureRepresentationItem.cxx
 RWStepRepr_RWMeasureRepresentationItem.hxx
-RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx
-RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx
 RWStepRepr_RWParallelOffset.cxx
 RWStepRepr_RWParallelOffset.hxx
 RWStepRepr_RWParametricRepresentationContext.cxx
@@ -92,8 +88,6 @@ 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

@@ -1,50 +0,0 @@
-// 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

@@ -1,45 +0,0 @@
-// 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_RWMakeFromUsageOption.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepRepr_RWMakeFromUsageOption.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_MakeFromUsageOption.hxx>
@@ -74,8 +73,8 @@ void RWStepRepr_RWMakeFromUsageOption::ReadStep (const Handle(StepData_StepReade
   Handle(TCollection_HAsciiString) aRankingRationale;
   data->ReadString (num, 7, "ranking_rationale", ach, aRankingRationale);
 
-  Handle(StepBasic_MeasureWithUnit) aQuantity;
-  data->ReadEntity (num, 8, "quantity", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQuantity);
+  Handle(Standard_Transient) aQuantity;
+  data->ReadEntity (num, 8, "quantity", ach, STANDARD_TYPE(Standard_Transient), aQuantity);
 
   // Initialize entity
   ent->Init(aProductDefinitionRelationship_Id,

src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.cxx

@@ -1,78 +0,0 @@
-// 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 <Standard_Type.hxx>
-#include <Interface_EntityIterator.hxx>
-#include <RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_Representation.hxx>
-#include <StepRepr_MechanicalDesignAndDraughtingRelationship.hxx>
-
-RWStepRepr_RWMechanicalDesignAndDraughtingRelationship::
-  RWStepRepr_RWMechanicalDesignAndDraughtingRelationship() {}
-
-void RWStepRepr_RWMechanicalDesignAndDraughtingRelationship::ReadStep
-  (const Handle(StepData_StepReaderData)& theData,
-   const Standard_Integer theNum,
-   Handle(Interface_Check)& theAch,
-   const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt) const
-{
-  // Number of Parameter Control
-  if (!theData->CheckNbParams(theNum, 4, theAch, "mechanical_design_and_draughting_relationship")) return;
-
-  // Inherited field : name
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString (theNum, 1, "name", theAch, aName);
-
-  // Inherited field : description
-  Handle(TCollection_HAsciiString) aDescription;
-  if (theData->IsParamDefined (theNum, 2)) {
-    theData->ReadString (theNum, 2, "description", theAch, aDescription);
-  }
-  // Inherited field : rep_1
-  Handle(StepRepr_Representation) aRep1;
-  theData->ReadEntity(theNum, 3, "rep_1", theAch, STANDARD_TYPE(StepRepr_Representation), aRep1);
-
-  // Inherited field : rep_2
-  Handle(StepRepr_Representation) aRep2;
-  theData->ReadEntity(theNum, 4, "rep_2", theAch, STANDARD_TYPE(StepRepr_Representation), aRep2);
-
-// Initialisation of the read entity
-  theEnt->Init(aName, aDescription, aRep1, aRep2);
-}
-
-void RWStepRepr_RWMechanicalDesignAndDraughtingRelationship::WriteStep
-  (StepData_StepWriter& theSW,
-   const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt) const
-{
-  // Inherited field : name
-  theSW.Send(theEnt->Name());
-
-  // Inherited field : description
-  theSW.Send(theEnt->Description());
-
-  // Inherited field : rep_1
-  theSW.Send(theEnt->Rep1());
-
-  // Inherited field : rep_2
-  theSW.Send(theEnt->Rep2());
-}
-
-void RWStepRepr_RWMechanicalDesignAndDraughtingRelationship::Share
-  (const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt,
-   Interface_EntityIterator& theIter) const
-{
-  theIter.GetOneItem(theEnt->Rep1());
-  theIter.GetOneItem(theEnt->Rep2());
-}

src/RWStepRepr/RWStepRepr_RWMechanicalDesignAndDraughtingRelationship.hxx

@@ -1,50 +0,0 @@
-// 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_RWMechanicalDesignAndDraughtingRelationship_HeaderFile
-#define _RWStepRepr_RWMechanicalDesignAndDraughtingRelationship_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Integer.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepRepr_MechanicalDesignAndDraughtingRelationship;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-
-//! Read & Write Module for MechanicalDesignAndDraughtingRelationship
-class RWStepRepr_RWMechanicalDesignAndDraughtingRelationship
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  Standard_EXPORT RWStepRepr_RWMechanicalDesignAndDraughtingRelationship();
-  
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                const Standard_Integer theNum,
-                                Handle(Interface_Check)& theAch,
-                                const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt) const;
-  
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
-                                 const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt) const;
-  
-  Standard_EXPORT void Share(const Handle(StepRepr_MechanicalDesignAndDraughtingRelationship)& theEnt,
-                             Interface_EntityIterator& theIter) const;
-
-};
-#endif // _RWStepRepr_RWMechanicalDesignAndDraughtingRelationship_HeaderFile

src/RWStepRepr/RWStepRepr_RWParallelOffset.cxx

@@ -16,7 +16,6 @@
 #include <RWStepRepr_RWParallelOffset.hxx>
 
 #include <Interface_EntityIterator.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_ParallelOffset.hxx>
@@ -62,8 +61,8 @@ void RWStepRepr_RWParallelOffset::ReadStep (const Handle(StepData_StepReaderData
   
   // Own fields of ParallelOffset
   
-  Handle(StepBasic_MeasureWithUnit) anOffset;
-  data->ReadEntity (num, 5, "offset", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), anOffset);
+  Handle(Standard_Transient) anOffset;
+  data->ReadEntity(num, 5, "offset", ach, STANDARD_TYPE(Standard_Transient), anOffset);
 
   // Initialize entity
   ent->Init(aShapeAspect_Name,

src/RWStepRepr/RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx

@@ -17,7 +17,6 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
@@ -79,8 +78,8 @@ void RWStepRepr_RWQuantifiedAssemblyComponentUsage::ReadStep (const Handle(StepD
 
   // Own fields of QuantifiedAssemblyComponentUsage
 
-  Handle(StepBasic_MeasureWithUnit) aQuantity;
-  data->ReadEntity (num, 7, "quantity", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aQuantity);
+  Handle(Standard_Transient) aQuantity;
+  data->ReadEntity (num, 7, "quantity", ach, STANDARD_TYPE(Standard_Transient), aQuantity);
 
   // Initialize entity
   ent->Init(aProductDefinitionRelationship_Id,

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx

@@ -1,50 +0,0 @@
-// 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

@@ -1,46 +0,0 @@
-// 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/RWStepShape/RWStepShape_RWMeasureQualification.cxx

@@ -15,7 +15,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <RWStepShape_RWMeasureQualification.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_MeasureQualification.hxx>
@@ -24,57 +23,53 @@
 
 RWStepShape_RWMeasureQualification::RWStepShape_RWMeasureQualification () {}
 
-void RWStepShape_RWMeasureQualification::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
-	 const Standard_Integer num,
-	 Handle(Interface_Check)& ach,
-	 const Handle(StepShape_MeasureQualification)& ent) const
+void RWStepShape_RWMeasureQualification::ReadStep(const Handle(StepData_StepReaderData)& data,
+                                                  const Standard_Integer num,
+                                                  Handle(Interface_Check)& ach,
+                                                  const Handle(StepShape_MeasureQualification)& ent) const
 {
 
+  // --- Number of Parameter Control ---
 
-	// --- Number of Parameter Control ---
+  if (!data->CheckNbParams(num,4,ach,"measure_qualification")) return;
 
-	if (!data->CheckNbParams(num,4,ach,"measure_qualification")) return;
+  // --- own field : name ---
 
-	// --- own field : name ---
+  Handle(TCollection_HAsciiString) aName;
+  data->ReadString (num,1,"name",ach,aName);
 
-	Handle(TCollection_HAsciiString) aName;
-	data->ReadString (num,1,"name",ach,aName);
+  // --- own field : description ---
 
-	// --- own field : description ---
+  Handle(TCollection_HAsciiString) aDescr;
+  data->ReadString (num,2,"description",ach,aDescr);
 
-	Handle(TCollection_HAsciiString) aDescr;
-	data->ReadString (num,2,"description",ach,aDescr);
+  // --- own field : qualified_measure ---
 
-	// --- own field : qualified_measure ---
+  Handle(Standard_Transient) aQualifiedMeasure;
+  data->ReadEntity (num, 3, "qualified_measure", ach, STANDARD_TYPE(Standard_Transient), aQualifiedMeasure);
 
-	Handle(StepBasic_MeasureWithUnit) aQM;
-	data->ReadEntity (num,3,"qualified_measure",ach,
-			  STANDARD_TYPE(StepBasic_MeasureWithUnit),aQM);
+  // --- own field : qualifiers ---
 
-	// --- own field : qualifiers ---
+  Handle(StepShape_HArray1OfValueQualifier) quals;
+  Standard_Integer nsub4;
+  if (data->ReadSubList (num,4,"qualifiers",ach,nsub4)) {
+    Standard_Integer nb4 = data->NbParams(nsub4);
+    quals = new StepShape_HArray1OfValueQualifier (1,nb4);
+    for (Standard_Integer i4 = 1; i4 <= nb4; i4 ++) {
+      StepShape_ValueQualifier VQ;
+      if (data->ReadEntity (nsub4,i4,"qualifier",ach,VQ))
+        quals->SetValue (i4,VQ);
+    }
+  }
 
-	Handle(StepShape_HArray1OfValueQualifier) quals;
-	Standard_Integer nsub4;
-	if (data->ReadSubList (num,4,"qualifiers",ach,nsub4)) {
-	  Standard_Integer nb4 = data->NbParams(nsub4);
-	  quals = new StepShape_HArray1OfValueQualifier (1,nb4);
-	  for (Standard_Integer i4 = 1; i4 <= nb4; i4 ++) {
-	    StepShape_ValueQualifier VQ;
-	    if (data->ReadEntity (nsub4,i4,"qualifier",ach,VQ))
-	      quals->SetValue (i4,VQ);
-	  }
-	}
+  //--- Initialisation of the read entity ---
 
-	//--- Initialisation of the read entity ---
-
-	ent->Init(aName, aDescr, aQM, quals);
+  ent->Init(aName, aDescr, aQualifiedMeasure, quals);
 }
 
 
-void RWStepShape_RWMeasureQualification::WriteStep
-	(StepData_StepWriter& SW,
-	 const Handle(StepShape_MeasureQualification)& ent) const
+void RWStepShape_RWMeasureQualification::WriteStep(StepData_StepWriter& SW,
+                                                   const Handle(StepShape_MeasureQualification)& ent) const
 {
   SW.Send(ent->Name());
   SW.Send(ent->Description());