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

src/BRepMesh/BRepMesh_BaseMeshAlgo.cxx

@@ -101,14 +101,19 @@ Standard_Boolean BRepMesh_BaseMeshAlgo::initDataStructure()
     {
       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());
+
+      for (IMeshData::ListOfInteger::Iterator aPCurveIt(aListOfPCurves); aPCurveIt.More(); aPCurveIt.Next())
+      {
+        const IMeshData::IPCurveHandle& aPCurve = aDEdge->GetPCurve (aPCurveIt.Value());
 
         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)
+
+        Standard_Integer aPointIt = 0;
+        for (; aPointIt <= aLastPoint; ++aPointIt)
         {
           const Standard_Integer aNodeIndex = registerNode(
             aCurve->GetPoint(aPointIt),
@@ -134,6 +139,7 @@ Standard_Boolean BRepMesh_BaseMeshAlgo::initDataStructure()
         }
       }
     }
+  }
 
   return Standard_True;
 }

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

@@ -3182,6 +3182,8 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace
     coeff = 0.25;
   }
   else
+  {
+    if (theExtensionMode == 2)
     {
       Standard_Real FaceDU = UF2 - UF1;
       Standard_Real FaceDV = VF2 - VF1;
@@ -3189,6 +3191,15 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace
       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/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/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cxx

@@ -16,14 +16,12 @@
 #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,
+void RWStepBasic_RWConversionBasedUnit::ReadStep(const Handle(StepData_StepReaderData)& data,
                                                  const Standard_Integer num,
                                                  Handle(Interface_Check)& ach,
                                                  const Handle(StepBasic_ConversionBasedUnit)& ent) const
@@ -48,9 +46,9 @@ void RWStepBasic_RWConversionBasedUnit::ReadStep
 
   // --- 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);
+  Handle(Standard_Transient) aConversionFactor;
+  data->ReadEntity (num, 3, "conversion_factor", ach, STANDARD_TYPE(Standard_Transient), aConversionFactor);
 
   //--- Initialisation of the read entity ---
 

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>
 
@@ -43,8 +42,8 @@ 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;

src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cxx

@@ -17,7 +17,6 @@
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 
@@ -45,9 +44,9 @@ void RWStepBasic_RWConversionBasedUnitAndLengthUnit::ReadStep
 
   // --- 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);
 

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>
 
@@ -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);
 

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>
@@ -37,8 +36,9 @@ void RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit::ReadStep
   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);
+
+  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

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>
@@ -45,9 +44,9 @@ void RWStepBasic_RWConversionBasedUnitAndRatioUnit::ReadStep
 
   // --- 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);
 

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>
@@ -45,9 +44,9 @@ void RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit::ReadStep
 
   // --- 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);
 

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>
@@ -45,9 +44,9 @@ void RWStepBasic_RWConversionBasedUnitAndTimeUnit::ReadStep
 
   // --- 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);
 
@@ -73,8 +72,7 @@ void RWStepBasic_RWConversionBasedUnitAndTimeUnit::ReadStep
 }
 
 
-void RWStepBasic_RWConversionBasedUnitAndTimeUnit::WriteStep
-	(StepData_StepWriter& SW,
+void RWStepBasic_RWConversionBasedUnitAndTimeUnit::WriteStep(StepData_StepWriter& SW,
                                                    const Handle(StepBasic_ConversionBasedUnitAndTimeUnit)& ent) const
 {
 

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>
 
@@ -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;

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/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_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/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,14 +23,12 @@
 
 RWStepShape_RWMeasureQualification::RWStepShape_RWMeasureQualification () {}
 
-void RWStepShape_RWMeasureQualification::ReadStep
-	(const Handle(StepData_StepReaderData)& data,
+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 ---
 
   if (!data->CheckNbParams(num,4,ach,"measure_qualification")) return;
@@ -48,9 +45,8 @@ void RWStepShape_RWMeasureQualification::ReadStep
 
   // --- own field : qualified_measure ---
 
-	Handle(StepBasic_MeasureWithUnit) aQM;
-	data->ReadEntity (num,3,"qualified_measure",ach,
-			  STANDARD_TYPE(StepBasic_MeasureWithUnit),aQM);
+  Handle(Standard_Transient) aQualifiedMeasure;
+  data->ReadEntity (num, 3, "qualified_measure", ach, STANDARD_TYPE(Standard_Transient), aQualifiedMeasure);
 
   // --- own field : qualifiers ---
 
@@ -68,12 +64,11 @@ void RWStepShape_RWMeasureQualification::ReadStep
 
   //--- Initialisation of the read entity ---
 
-	ent->Init(aName, aDescr, aQM, quals);
+  ent->Init(aName, aDescr, aQualifiedMeasure, quals);
 }
 
 
-void RWStepShape_RWMeasureQualification::WriteStep
-	(StepData_StepWriter& SW,
+void RWStepShape_RWMeasureQualification::WriteStep(StepData_StepWriter& SW,
                                                    const Handle(StepShape_MeasureQualification)& ent) const
 {
   SW.Send(ent->Name());

src/RWStepShape/RWStepShape_RWToleranceValue.cxx

@@ -14,12 +14,9 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <RWStepShape_RWToleranceValue.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepShape_ToleranceValue.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 RWStepShape_RWToleranceValue::RWStepShape_RWToleranceValue () {}
 
@@ -35,46 +32,20 @@ void RWStepShape_RWToleranceValue::ReadStep
 
   // --- own field : lower_bound ---
 
-	Handle(Standard_Transient) LB;
-	if(!data->ReadEntity (num,1,"lower_bound",ach,
-			  STANDARD_TYPE(StepBasic_MeasureWithUnit),LB))
-  {
-    Handle(StepRepr_MeasureRepresentationItem) aMSR;
-    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU;
-     
-    if(data->ReadEntity (num,1,"lower_bound",ach,
-			  STANDARD_TYPE(StepRepr_MeasureRepresentationItem),aMSR) || 
-      data->ReadEntity (num,1,"lower_bound",ach,STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU))
-    {
-      if(!aMSR.IsNull())
-        LB = aMSR;
-       else if(!aRIMU.IsNull())
-        LB = aRIMU;
-    }
-  }
+  Handle(Standard_Transient) aLowerBound;
+  data->ReadEntity (num, 1, "lower_bound", ach, STANDARD_TYPE(Standard_Transient), aLowerBound);
 
 	// --- own field : upper_bound ---
 
-	Handle(Standard_Transient) UB;
-	if(!data->ReadEntity (num,2,"upper_bound",ach,
-			  STANDARD_TYPE(StepBasic_MeasureWithUnit),UB))
-  {
-     Handle(StepRepr_MeasureRepresentationItem) aMSR1;
-     Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
-    if(data->ReadEntity (num,2,"upper_bound",ach,STANDARD_TYPE(StepRepr_MeasureRepresentationItem),aMSR1) || 
-      data->ReadEntity (num,2,"upper_bound",ach,STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
-    {
-      if(!aMSR1.IsNull())
-        UB = aMSR1;
-      else if(!aRIMU1.IsNull())
-        UB = aRIMU1;
-    }
-  }
+  Handle(Standard_Transient) anUpperBound;
+  data->ReadEntity (num, 2, "upper_bound", ach, STANDARD_TYPE(Standard_Transient), anUpperBound);
 
   //--- Initialisation of the read entity ---
-  if( !LB.IsNull() && !UB.IsNull())
+  if (!aLowerBound.IsNull() && !anUpperBound.IsNull())
+  {
     ach->ClearFails();
-	ent->Init(LB,UB);
+  }
+  ent->Init(aLowerBound, anUpperBound);
 }
 
 

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -16,8 +16,11 @@
 #include <STEPCAFControl_Reader.hxx>
 
 #include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_CartesianPoint.hxx>
+#include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepModel.hxx>
@@ -53,6 +56,7 @@
 #include <STEPControl_ActorRead.hxx>
 #include <STEPControl_Reader.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
+#include <StepGeom_Curve.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepData_Factors.hxx>
 #include <StepDimTol_AngularityTolerance.hxx>
@@ -174,6 +178,7 @@
 #include <TColStd_SequenceOfHAsciiString.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_TreeNode.hxx>
+#include <TDataStd_UAttribute.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 #include <TDocStd_Document.hxx>
@@ -187,6 +192,7 @@
 #include <Transfer_TransientProcess.hxx>
 #include <TransferBRep.hxx>
 #include <UnitsMethods.hxx>
+#include <XCAFDoc.hxx>
 #include <XCAFDoc_Area.hxx>
 #include <XCAFDoc_Centroid.hxx>
 #include <XCAFDoc_ClippingPlaneTool.hxx>
@@ -1953,27 +1959,55 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs(const Handle(XSControl_WorkSes
   return Standard_True;
 }
 
+//=======================================================================
+//function : GetMeasureWithUnit
+//purpose  : 
+//=======================================================================
+static Handle(StepBasic_MeasureWithUnit) GetMeasureWithUnit(const Handle(Standard_Transient)& theMeasure)
+{
+  Handle(StepBasic_MeasureWithUnit) aMeasureWithUnit;
+  if (theMeasure->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
+  {
+    aMeasureWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(theMeasure);
+  }
+  else if (theMeasure->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
+  {
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
+      Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(theMeasure);
+    aMeasureWithUnit = aReprMeasureItem->GetMeasureWithUnit();
+  }
+  return aMeasureWithUnit;
+}
+
 //=======================================================================
 //function : GetMassConversionFactor
 //purpose  : 
 //=======================================================================
-static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& NU,
-  Standard_Real& afact)
+static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& theNUnit,
+                                                Standard_Real& theFact)
+{
+  theFact = 1.;
+  if (!theNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit)))
+  {
+    return Standard_False;
+  }
+  Handle(StepBasic_ConversionBasedUnitAndMassUnit) aCBUMU =
+    Handle(StepBasic_ConversionBasedUnitAndMassUnit)::DownCast(theNUnit);
+  Handle(StepBasic_MeasureWithUnit) aMWUCBU = GetMeasureWithUnit(aCBUMU->ConversionFactor());
+  theFact = aMWUCBU->ValueComponent();
+  StepBasic_Unit anUnit2 = aMWUCBU->UnitComponent();
+  if (anUnit2.CaseNum(anUnit2.Value()) == 1)
   {
-  afact = 1.;
-  if (!NU->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit))) return Standard_False;
-  Handle(StepBasic_ConversionBasedUnitAndMassUnit) CBUMU =
-    Handle(StepBasic_ConversionBasedUnitAndMassUnit)::DownCast(NU);
-  Handle(StepBasic_MeasureWithUnit) MWUCBU = CBUMU->ConversionFactor();
-  afact = MWUCBU->ValueComponent();
-  StepBasic_Unit anUnit2 = MWUCBU->UnitComponent();
-  if (anUnit2.CaseNum(anUnit2.Value()) == 1) {
     Handle(StepBasic_NamedUnit) NU2 = anUnit2.NamedUnit();
-    if (NU2->IsKind(STANDARD_TYPE(StepBasic_SiUnit))) {
+    if (NU2->IsKind(STANDARD_TYPE(StepBasic_SiUnit)))
+    {
       Handle(StepBasic_SiUnit) SU = Handle(StepBasic_SiUnit)::DownCast(NU2);
-      if (SU->Name() == StepBasic_sunGram) {
+      if (SU->Name() == StepBasic_sunGram)
+      {
         if (SU->HasPrefix())
-          afact *= STEPConstruct_UnitContext::ConvertSiPrefix(SU->Prefix());
+        {
+          theFact *= STEPConstruct_UnitContext::ConvertSiPrefix(SU->Prefix());
+        }
       }
     }
   }
@@ -2394,13 +2428,8 @@ void readAnnotation(const Handle(XSControl_TransferReader)& theTR,
   {
     Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;
     aBox.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
-    if (isHasPlane && !aBox.IsOut(aPlaneAxes.Location())) {
-      aPtext = aPlaneAxes.Location();
-    }
-    else {
     aPtext = gp_Pnt((aXmin + aXmax) * 0.5, (aYmin + aYmax) * 0.5, (aZmin + aZmax) * 0.5);
   }
-  }
   else {
     aPtext = aPlaneAxes.Location();
   }
@@ -2427,6 +2456,46 @@ void readAnnotation(const Handle(XSControl_TransferReader)& theTR,
   return;
 }
 
+//=======================================================================
+//function : computePMIReferensePosition
+//purpose  : compute position of shape contains in the shapeAspect
+//=======================================================================
+Standard_Boolean computePMIReferensePosition(const Handle(StepRepr_ShapeAspect)& theReference,
+                                             const Interface_Graph& theGraph,
+                                             gp_Pnt& thePosition)
+{
+  if (theReference.IsNull())
+    return Standard_False;
+  Handle(StepAP242_GeometricItemSpecificUsage) aGISU = NULL;
+  for (Interface_EntityIterator anIt = theGraph.Sharings(theReference); aGISU.IsNull() && anIt.More(); anIt.Next())
+  {
+    aGISU = Handle(StepAP242_GeometricItemSpecificUsage)::DownCast(anIt.Value());
+  }
+  if (aGISU.IsNull() || aGISU->NbIdentifiedItem() == 0)
+    return Standard_False;
+  const Handle(StepRepr_RepresentationItem)& anItem = aGISU->IdentifiedItem()->Value(1);
+  if (anItem->IsKind(STANDARD_TYPE(StepGeom_CartesianPoint)))
+  {
+    Handle(StepGeom_CartesianPoint) aPoint = Handle(StepGeom_CartesianPoint)::DownCast(anItem);
+    thePosition.SetX(aPoint->CoordinatesValue(1));
+    thePosition.SetY(aPoint->CoordinatesValue(2));
+    thePosition.SetZ(aPoint->CoordinatesValue(3));
+    return Standard_True;
+  }
+  else if (anItem->IsKind(STANDARD_TYPE(StepGeom_Axis2Placement3d)))
+  {
+    Handle(StepGeom_Axis2Placement3d) anA2P3D = Handle(StepGeom_Axis2Placement3d)::DownCast(anItem);
+    if (!anA2P3D->Location().IsNull())
+    {
+      thePosition.SetX(anA2P3D->Location()->CoordinatesValue(1));
+      thePosition.SetY(anA2P3D->Location()->CoordinatesValue(2));
+      thePosition.SetZ(anA2P3D->Location()->CoordinatesValue(3));
+      return Standard_True;
+    }
+  }
+  return Standard_False;
+}
+
 //=======================================================================
 //function : readConnectionPoints
 //purpose  : read connection points for given dimension
@@ -2464,82 +2533,32 @@ void readConnectionPoints(const Handle(XSControl_TransferReader)& theTR,
   if (theGDT->IsKind(STANDARD_TYPE(StepShape_DimensionalSize))) {
     // retrieve derived geometry
     Handle(StepShape_DimensionalSize) aDim = Handle(StepShape_DimensionalSize)::DownCast(theGDT);
-    Handle(StepRepr_DerivedShapeAspect) aDSA = Handle(StepRepr_DerivedShapeAspect)::DownCast(aDim->AppliesTo());
-    if (aDSA.IsNull())
-      return;
-    Handle(StepAP242_GeometricItemSpecificUsage) aGISU = NULL;
-    for (Interface_EntityIterator anIt = aGraph.Sharings(aDSA); aGISU.IsNull() && anIt.More(); anIt.Next()) {
-      aGISU = Handle(StepAP242_GeometricItemSpecificUsage)::DownCast(anIt.Value());
-    }
-    if (aGISU.IsNull() || aGISU->NbIdentifiedItem() == 0)
-      return;
-    Handle(StepGeom_CartesianPoint) aPoint = Handle(StepGeom_CartesianPoint)::DownCast(aGISU->IdentifiedItem()->Value(1));
-    if (aPoint.IsNull()) {
-      // try Axis2Placement3d.location instead of CartesianPoint
-      Handle(StepGeom_Axis2Placement3d) anA2P3D =
-        Handle(StepGeom_Axis2Placement3d)::DownCast(aGISU->IdentifiedItem()->Value(1));
-      if (anA2P3D.IsNull())
-        return;
-      aPoint = anA2P3D->Location();
-    }
-
+    gp_Pnt aPnt;
+    if (computePMIReferensePosition(aDim->AppliesTo(), aGraph, aPnt))
+    {
       // set connection point to object
-    gp_Pnt aPnt(aPoint->CoordinatesValue(1) * aFact, aPoint->CoordinatesValue(2) * aFact, aPoint->CoordinatesValue(3) * aFact);
+      aPnt.SetXYZ(aPnt.XYZ() * aFact);
       theDimObject->SetPoint(aPnt);
     }
+  }
   else if (theGDT->IsKind(STANDARD_TYPE(StepShape_DimensionalLocation))) {
     // retrieve derived geometry
     Handle(StepShape_DimensionalLocation) aDim = Handle(StepShape_DimensionalLocation)::DownCast(theGDT);
-    Handle(StepRepr_DerivedShapeAspect) aDSA1 = Handle(StepRepr_DerivedShapeAspect)::DownCast(aDim->RelatingShapeAspect());
-    Handle(StepRepr_DerivedShapeAspect) aDSA2 = Handle(StepRepr_DerivedShapeAspect)::DownCast(aDim->RelatedShapeAspect());
-    if (aDSA1.IsNull() && aDSA2.IsNull())
-      return;
-    Handle(StepAP242_GeometricItemSpecificUsage) aGISU1 = NULL;
-    Handle(StepAP242_GeometricItemSpecificUsage) aGISU2 = NULL;
-    if (!aDSA1.IsNull()) {
-      for (Interface_EntityIterator anIt = aGraph.Sharings(aDSA1); aGISU1.IsNull() && anIt.More(); anIt.Next()) {
-        aGISU1 = Handle(StepAP242_GeometricItemSpecificUsage)::DownCast(anIt.Value());
-      }
-    }
-    if (!aDSA2.IsNull()) {
-      for (Interface_EntityIterator anIt = aGraph.Sharings(aDSA2); aGISU2.IsNull() && anIt.More(); anIt.Next()) {
-        aGISU2 = Handle(StepAP242_GeometricItemSpecificUsage)::DownCast(anIt.Value());
-      }
-    }
-    // first point
-    if (!aGISU1.IsNull() && aGISU1->NbIdentifiedItem() > 0) {
-      Handle(StepGeom_CartesianPoint) aPoint = Handle(StepGeom_CartesianPoint)::DownCast(aGISU1->IdentifiedItem()->Value(1));
-      if (aPoint.IsNull()) {
-        // try Axis2Placement3d.location instead of CartesianPoint
-        Handle(StepGeom_Axis2Placement3d) anA2P3D =
-          Handle(StepGeom_Axis2Placement3d)::DownCast(aGISU1->IdentifiedItem()->Value(1));
-        if (!anA2P3D.IsNull())
-          aPoint = anA2P3D->Location();
-      }
-      if (!aPoint.IsNull()) {
+    gp_Pnt aPnt;
+    if (computePMIReferensePosition(aDim->RelatingShapeAspect(), aGraph, aPnt))
+    {
       // set connection point to object
-        gp_Pnt aPnt(aPoint->CoordinatesValue(1) * aFact, aPoint->CoordinatesValue(2) * aFact, aPoint->CoordinatesValue(3) * aFact);
+      aPnt.SetXYZ(aPnt.XYZ() * aFact);
       theDimObject->SetPoint(aPnt);
     }
-    }
-    // second point
-    if (!aGISU2.IsNull() && aGISU2->NbIdentifiedItem() > 0) {
-      Handle(StepGeom_CartesianPoint) aPoint = Handle(StepGeom_CartesianPoint)::DownCast(aGISU2->IdentifiedItem()->Value(1));
-      if (aPoint.IsNull()) {
-        // try Axis2Placement3d.location instead of CartesianPoint
-        Handle(StepGeom_Axis2Placement3d) anA2P3D =
-          Handle(StepGeom_Axis2Placement3d)::DownCast(aGISU2->IdentifiedItem()->Value(1));
-        if (!anA2P3D.IsNull())
-          aPoint = anA2P3D->Location();
-      }
-      if (!aPoint.IsNull()) {
+    if (computePMIReferensePosition(aDim->RelatedShapeAspect(), aGraph, aPnt))
+    {
       // set connection point to object
-        gp_Pnt aPnt(aPoint->CoordinatesValue(1) * aFact, aPoint->CoordinatesValue(2) * aFact, aPoint->CoordinatesValue(3) * aFact);
+      aPnt.SetXYZ(aPnt.XYZ() * aFact);
       theDimObject->SetPoint2(aPnt);
     }
   }
 }
-}
 
 //=======================================================================
 //function : ReadDatums
@@ -3350,24 +3369,32 @@ TDF_Label STEPCAFControl_Reader::createGDTObjectInXCAF(const Handle(Standard_Tra
             aDGTTool->SetDimTol(shL, 1, arr, aName, DimSize->Name());
           }
           // read tolerances and datums
-          else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeometricTolerance))) {
+          else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeometricTolerance)))
+          {
             Handle(StepDimTol_GeometricTolerance) GT =
               Handle(StepDimTol_GeometricTolerance)::DownCast(theEnt);
             // read common data for tolerance
             //Standard_Real dim = GT->Magnitude()->ValueComponent();
-            Handle(StepBasic_MeasureWithUnit) dim3 = GT->Magnitude();
-            if (dim3.IsNull()) continue;
-            Standard_Real dim = dim3->ValueComponent();
-            StepBasic_Unit anUnit = GT->Magnitude()->UnitComponent();
+            if (GT->Magnitude().IsNull())
+            {
+              continue;
+            }
+            Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(GT->Magnitude());
+            if (aMWU.IsNull())
+            {
+              continue;
+            }
+            Standard_Real aVal = aMWU->ValueComponent();
+            StepBasic_Unit anUnit = aMWU->UnitComponent();
             if (anUnit.IsNull()) continue;
             if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
             Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
             STEPConstruct_UnitContext anUnitCtx;
             anUnitCtx.ComputeFactors(NU, theLocalFactors);
-            dim = dim * anUnitCtx.LengthFactor();
+            aVal = aVal * anUnitCtx.LengthFactor();
             //std::cout<<"GeometricTolerance: Magnitude = "<<dim<<std::endl;
             Handle(TColStd_HArray1OfReal) arr = new TColStd_HArray1OfReal(1, 1);
-            arr->SetValue(1, dim);
+            arr->SetValue(1, aVal);
             Handle(TCollection_HAsciiString) aName = GT->Name();
             Handle(TCollection_HAsciiString) aDescription = GT->Description();
             Handle(StepShape_AdvancedFace) AF = Handle(StepShape_AdvancedFace)::DownCast(RI);
@@ -3469,65 +3496,15 @@ TDF_Label STEPCAFControl_Reader::createGDTObjectInXCAF(const Handle(Standard_Tra
   TDF_LabelSequence aShLS1, aShLS2;
 
   // Collect shapes
-  for (Standard_Integer i = aSeqRI1.Lower(); i <= aSeqRI1.Upper();i++)
+  for (NCollection_Sequence<Handle(Standard_Transient)>::Iterator anIter1(aSeqRI1);
+       anIter1.More(); anIter1.Next())
   {
-    Standard_Integer anIndex = FindShapeIndexForDGT(aSeqRI1.Value(i), theWS);
-    TopoDS_Shape aSh;
-    if (anIndex > 0) {
-      Handle(Transfer_Binder) aBinder = aTP->MapItem(anIndex);
-      aSh = TransferBRep::ShapeResult(aBinder);
+    findReferenceGeometry(anIter1.Value(), aSTool, aShLS1, theLocalFactors);
   }
-    if (!aSh.IsNull())
+  for (NCollection_Sequence<Handle(Standard_Transient)>::Iterator anIter2(aSeqRI2);
+       anIter2.More(); anIter2.Next())
   {
-      TDF_Label aShL;
-      aSTool->Search(aSh, aShL, Standard_True, Standard_True, Standard_True);
-      if (aShL.IsNull() && aSh.ShapeType() == TopAbs_WIRE)
-      {
-        TopExp_Explorer ex(aSh, TopAbs_EDGE, TopAbs_SHAPE);
-        while (ex.More())
-        {
-          TDF_Label edgeL;
-          aSTool->Search(ex.Current(), edgeL, Standard_True, Standard_True, Standard_True);
-          if (!edgeL.IsNull())
-            aShLS1.Append(edgeL);
-          ex.Next();
-        }
-      }
-      if (!aShL.IsNull())
-        aShLS1.Append(aShL);
-    }
-  }
-  if (!aSeqRI2.IsEmpty())
-  {
-    //for dimensional location
-    for (Standard_Integer i = aSeqRI2.Lower(); i <= aSeqRI2.Upper();i++)
-    {
-      Standard_Integer anIndex = FindShapeIndexForDGT(aSeqRI2.Value(i), theWS);
-      TopoDS_Shape aSh;
-      if (anIndex > 0) {
-        Handle(Transfer_Binder) aBinder = aTP->MapItem(anIndex);
-        aSh = TransferBRep::ShapeResult(aBinder);
-      }
-      if (!aSh.IsNull())
-      {
-        TDF_Label aShL;
-        aSTool->Search(aSh, aShL, Standard_True, Standard_True, Standard_True);
-        if (aShL.IsNull() && aSh.ShapeType() == TopAbs_WIRE)
-        {
-          TopExp_Explorer ex(aSh, TopAbs_EDGE, TopAbs_SHAPE);
-          while (ex.More())
-          {
-            TDF_Label edgeL;
-            aSTool->Search(ex.Current(), edgeL, Standard_True, Standard_True, Standard_True);
-            if (!edgeL.IsNull())
-              aShLS2.Append(edgeL);
-            ex.Next();
-          }
-        }
-        if (!aShL.IsNull())
-          aShLS2.Append(aShL);
-      }
-    }
+    findReferenceGeometry(anIter2.Value(), aSTool, aShLS2, theLocalFactors);
   }
 
   if (!aShLS1.IsEmpty())
@@ -3588,6 +3565,184 @@ TDF_Label STEPCAFControl_Reader::createGDTObjectInXCAF(const Handle(Standard_Tra
   return aGDTL;
 }
 
+//=======================================================================
+//function : findReferenceGeometry
+//purpose  :
+//=======================================================================
+Standard_Boolean STEPCAFControl_Reader::findReferenceGeometry(const Handle(Standard_Transient)& theShapeStart,
+                                                              const Handle(XCAFDoc_ShapeTool)& theShTool,
+                                                              TDF_LabelSequence& theShLabelSeq,
+                                                              const StepData_Factors& theLocalFactors)
+{
+  const Handle(XSControl_TransferReader)& aTR = myReader.WS()->TransferReader();
+  const Handle(Transfer_TransientProcess)& aTP = aTR->TransientProcess();
+  TopoDS_Shape aSh = TransferBRep::ShapeResult(aTP, theShapeStart);
+  if (!aSh.IsNull())
+  {
+    TDF_Label aShL;
+    theShTool->Search(aSh, aShL, Standard_True, Standard_True, Standard_True);
+    if (aShL.IsNull() && aSh.ShapeType() == TopAbs_WIRE)
+    {
+      for (TopExp_Explorer anExp(aSh, TopAbs_EDGE, TopAbs_SHAPE);
+           anExp.More(); anExp.Next())
+      {
+        TDF_Label anEdgeL;
+        theShTool->Search(anExp.Current(), anEdgeL, Standard_True, Standard_True, Standard_True);
+        if (!anEdgeL.IsNull())
+        {
+          theShLabelSeq.Append(anEdgeL);
+        }
+      }
+    }
+    if (!aShL.IsNull())
+    {
+      theShLabelSeq.Append(aShL);
+      return Standard_True;
+    }
+  }
+
+  TDF_Label aFindResultL;
+  if (myGDTMap.Find(theShapeStart, aFindResultL))
+  {
+    theShLabelSeq.Append(aFindResultL);
+    return Standard_True;
+  }
+  const Handle(StepGeom_GeometricRepresentationItem)& aGeomItem =
+    Handle(StepGeom_GeometricRepresentationItem)::DownCast(theShapeStart);
+  if (aGeomItem.IsNull())
+  {
+    return Standard_False;
+  }
+  if (theShapeStart->IsKind(STANDARD_TYPE(StepGeom_Curve)))
+  {
+    const Handle(StepGeom_Curve)& aStepCurve = Handle(StepGeom_Curve)::DownCast(theShapeStart);
+    Handle(Geom_Curve) aCurve = StepToGeom::MakeCurve(aStepCurve, theLocalFactors);
+    if (aCurve.IsNull())
+    {
+      return Standard_False;
+    }
+    BRepBuilderAPI_MakeEdge aMaker;
+    if (aCurve->IsKind(STANDARD_TYPE(Geom_Line)))
+    {
+      const Standard_Real aScale = theLocalFactors.LengthFactor();
+      aMaker.Init(aCurve, 0, 1. * aScale);
+    }
+    else
+    {
+      aMaker.Init(aCurve);
+    }
+    if (aMaker.IsDone())
+    {
+      aSh = aMaker.Shape();
+    }
+  }
+  else if (theShapeStart->IsKind(STANDARD_TYPE(StepGeom_Surface)))
+  {
+    const Handle(StepGeom_Surface)& aStepSurface = Handle(StepGeom_Surface)::DownCast(theShapeStart);
+    Handle(Geom_Surface) aSurface = StepToGeom::MakeSurface(aStepSurface, theLocalFactors);
+    if (aSurface.IsNull())
+    {
+      return Standard_False;
+    }
+    BRepBuilderAPI_MakeFace aMaker;
+    if (aSurface->IsKind(STANDARD_TYPE(Geom_Plane)))
+    {
+      const Standard_Real aScale = theLocalFactors.LengthFactor();
+      aMaker.Init(aSurface, 0., 1. * aScale, 0., 1. * aScale, Precision::Confusion());
+    }
+    else
+    {
+      aMaker.Init(aSurface, Standard_True, Precision::Confusion());
+    }
+    if (aMaker.IsDone())
+    {
+      aSh = aMaker.Shape();
+    }
+  }
+  if (aSh.IsNull())
+  {
+    return Standard_False;
+  }
+  if (mySupplementalLabel.IsNull())
+  {
+    mySupplementalLabel = theShTool->NewShape();
+    TDataStd_Name::Set(mySupplementalLabel, "Supplemental Geometry");
+    TDataStd_UAttribute::Set(mySupplementalLabel, XCAFDoc::SupplementalContainerGUID());
+  }
+  TDF_Label aSupGeomLabel = theShTool->AddComponent(mySupplementalLabel, aSh);
+  if (aSupGeomLabel.IsNull())
+  {
+    return Standard_False;
+  }
+  TDataStd_UAttribute::Set(aSupGeomLabel, XCAFDoc::SupplementalGeometryGUID());
+
+  if (!aGeomItem->Name().IsNull())
+  {
+    TDataStd_Name::Set(aSupGeomLabel, aGeomItem->Name()->String());
+    TDF_Label aReferredShapeL;
+    theShTool->GetReferredShape(aSupGeomLabel, aReferredShapeL);
+    TDataStd_Name::Set(aReferredShapeL, aGeomItem->Name()->String());
+    TDataStd_UAttribute::Set(aReferredShapeL, XCAFDoc::SupplementalGeometryGUID());
+  }
+  TDF_Label aRefL;
+  const Interface_Graph& aGraph = aTP->Graph();
+  for (Interface_EntityIterator anIter(aGraph.Sharings(theShapeStart));
+       anIter.More() && aRefL.IsNull(); anIter.Next())
+  {
+    Handle(StepAP242_GeometricItemSpecificUsage) aPGISU =
+      Handle(StepAP242_GeometricItemSpecificUsage)::DownCast(anIter.Value());
+    if (aPGISU.IsNull())
+    {
+      continue;
+    }
+    Handle(StepRepr_ShapeAspect) aShAspect = aPGISU->Definition().ShapeAspect();
+    if (aShAspect.IsNull())
+    {
+      continue;
+    }
+    Handle(StepRepr_ProductDefinitionShape) aRefPDS =  aShAspect->OfShape();
+    if (aRefPDS.IsNull())
+    {
+      continue;
+    }
+    TopoDS_Shape aRefSh = TransferBRep::ShapeResult(aTP, aRefPDS->Definition().Value());
+    theShTool->Search(aRefSh, aRefL, Standard_True, Standard_True, Standard_False);
+  }
+
+  if (aRefL.IsNull())
+  {
+    TDF_LabelSequence aFreeShapes;
+    theShTool->GetFreeShapes(aFreeShapes);
+    for(TDF_LabelSequence::Iterator anIter(aFreeShapes); anIter.More() && aRefL.IsNull(); anIter.Next())
+    {
+      const TDF_Label aLabel = anIter.Value();
+      Handle(TDataStd_UAttribute) aSupGeomAttr;
+      if (aLabel.FindAttribute(XCAFDoc::SupplementalContainerGUID(), aSupGeomAttr))
+      {
+        continue;
+      }
+      TopoDS_Shape aTmpShape = theShTool->GetShape(aLabel);
+      if (!aTmpShape.IsNull())
+      {
+        aRefL = aLabel;
+      }
+    }
+  }
+  if (aRefL.IsNull())
+  {
+    return Standard_False;
+  }
+
+  // set reference
+  Handle(TDataStd_TreeNode) aMainNode = TDataStd_TreeNode::Set(aRefL, XCAFDoc::SupplementalRefGUID());
+  Handle(TDataStd_TreeNode) aRefNode = TDataStd_TreeNode::Set(aSupGeomLabel, XCAFDoc::SupplementalRefGUID());
+  aRefNode->Remove(); // abv: fix against bug in TreeNode::Append()
+  aMainNode->Append(aRefNode);
+  myGDTMap.Bind(theShapeStart, aSupGeomLabel);
+  theShLabelSeq.Append(aSupGeomLabel);
+  return Standard_True;
+}
+
 //=======================================================================
 //function : convertAngleValue
 //purpose  : auxiliary
@@ -3769,16 +3924,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
         Handle(Standard_Transient) aUpperBound = aTV->UpperBound();
         if(aUpperBound.IsNull())
           continue;
-        Handle(StepBasic_MeasureWithUnit) aMWU;
-        if(aUpperBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) )
-          aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aUpperBound);
-        else if(aUpperBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)) )
-        {
-          Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem = 
-            Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aUpperBound);
-          aMWU = aReprMeasureItem->GetMeasureWithUnit();
-
-        }
+        Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(aUpperBound);
         if(aMWU.IsNull())
           continue;
         Standard_Real aVal = aMWU->ValueComponent();
@@ -3805,15 +3951,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
         if(aLowerBound.IsNull())
           continue;
 
-        if(aLowerBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) )
-          aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aLowerBound);
-        else if(aLowerBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)) )
-        {
-          Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem = 
-            Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aLowerBound);
-          aMWU = aReprMeasureItem->GetMeasureWithUnit();
-
-        }
+        aMWU = GetMeasureWithUnit(aLowerBound);
         if(aMWU.IsNull())
           continue;
       
@@ -4175,18 +4313,27 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
   XCAFDimTolObjects_GeomToleranceType aType = XCAFDimTolObjects_GeomToleranceType_None;
   getTolType(theEnt, aType);
   aTolObj->SetType(aType);
-  if (!aTolEnt->Magnitude().IsNull()) {
-    //get value
-    Standard_Real aVal = aTolEnt->Magnitude()->ValueComponent();
-    StepBasic_Unit anUnit = aTolEnt->Magnitude()->UnitComponent();
-    if (anUnit.IsNull()) return;
-    if (!(anUnit.CaseNum(anUnit.Value()) == 1)) return;
-    Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
+  if (!aTolEnt->Magnitude().IsNull())
+  {
+    Handle(StepBasic_MeasureWithUnit) aMWU = GetMeasureWithUnit(aTolEnt->Magnitude());
+    if (!aMWU.IsNull())
+    {
+      // Get value
+      Standard_Real aVal = aMWU->ValueComponent();
+      StepBasic_Unit anUnit = aMWU->UnitComponent();
+      if (!anUnit.IsNull() && anUnit.CaseNum(anUnit.Value()) == 1)
+      {
+        Handle(StepBasic_NamedUnit) aNU = anUnit.NamedUnit();
         STEPConstruct_UnitContext anUnitCtx;
-    anUnitCtx.ComputeFactors(NU, theLocalFactors);
+        anUnitCtx.ComputeFactors(aNU, theLocalFactors);
+        if (anUnitCtx.LengthFactor() > 0.)
+        {
           aVal = aVal * anUnitCtx.LengthFactor();
+        }
+      }
       aTolObj->SetValue(aVal);
     }
+  }
   //get modifiers
   XCAFDimTolObjects_GeomToleranceTypeValue aTypeV = XCAFDimTolObjects_GeomToleranceTypeValue_None;
   Interface_EntityIterator anIter = aGraph.Sharings(aTolEnt);

src/STEPCAFControl/STEPCAFControl_Reader.hxx

@@ -323,6 +323,17 @@ private:
     const Handle(XSControl_WorkSession)& theWS,
     const StepData_Factors& theLocalFactors);
 
+  //! Finds reference geometry or create supplemental geometry label
+  //! @param[in] theShapeStart step entity to get reference
+  //! @param[in] theShTool tool to work with shape labels
+  //! @param[out] theShLabelSeq container to put reference label
+  //! @param[in] theLocalFactors structure to calculate units.
+  //! @return TRUE if a reference is found or supplemental geometry is added
+    Standard_Boolean findReferenceGeometry(const Handle(Standard_Transient)& theShapeStart,
+                                           const Handle(XCAFDoc_ShapeTool)& theShTool,
+                                           TDF_LabelSequence& theShLabelSeq,
+                                           const StepData_Factors& theLocalFactors);
+
   //! Internal method. Read Dimension or GeomTolerance.
   TDF_Label createGDTObjectInXCAF(const Handle(Standard_Transient)& theEnt,
     const Handle(TDocStd_Document)& theDoc,
@@ -339,6 +350,7 @@ private:
   STEPControl_Reader myReader;
   NCollection_DataMap<TCollection_AsciiString, Handle(STEPCAFControl_ExternFile)> myFiles;
   XCAFDoc_DataMapOfShapeLabel myMap;
+  TDF_Label mySupplementalLabel;
   Standard_Boolean myColorMode;
   Standard_Boolean myNameMode;
   Standard_Boolean myLayerMode;

src/STEPCAFControl/STEPCAFControl_Writer.cxx

@@ -25,6 +25,8 @@
 #include <BRep_Builder.hxx>
 #include <GeomToStep_MakeAxis2Placement3d.hxx>
 #include <GeomToStep_MakeCartesianPoint.hxx>
+#include <GeomToStep_MakeCurve.hxx>
+#include <GeomToStep_MakeSurface.hxx>
 #include <HeaderSection_FileSchema.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_Static.hxx>
@@ -93,6 +95,7 @@
 #include <StepDimTol_TotalRunoutTolerance.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_CartesianPoint.hxx>
+#include <StepGeom_Curve.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
@@ -175,6 +178,7 @@
 #include <TDF_Label.hxx>
 #include <TDF_LabelSequence.hxx>
 #include <TDocStd_Document.hxx>
+#include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
@@ -595,6 +599,12 @@ Standard_Boolean STEPCAFControl_Writer::transfer(STEPControl_Writer& theWriter,
     if (myLabels.IsBound(aCurL))
       continue; // already processed
 
+    Handle(TDataStd_UAttribute) aSupGeomAttr;
+    if (aCurL.FindAttribute(XCAFDoc::SupplementalContainerGUID(), aSupGeomAttr))
+    {
+      continue;
+    }
+
     TopoDS_Shape aCurShape = XCAFDoc_ShapeTool::GetShape(aCurL);
     if (aCurShape.IsNull())
       continue;
@@ -2520,6 +2530,111 @@ Handle(StepRepr_ShapeAspect) STEPCAFControl_Writer::writeShapeAspect(const Handl
   return aSA;
 }
 
+//=======================================================================
+//function : WriteSupplementalGeometry
+//purpose  :
+//=======================================================================
+Handle(StepRepr_ShapeAspect) WriteSupplementalGeometry(const Handle(XSControl_WorkSession)& WS,
+                                                       const Handle(StepRepr_ConstructiveGeometryRepresentation)& theCGRepr,
+                                                       const TDF_Label& theLabel,
+                                                       const TopoDS_Shape& theShape,
+                                                       Handle(StepRepr_RepresentationContext)& theRC,
+                                                       Handle(StepAP242_GeometricItemSpecificUsage)& theGISU,
+                                                       NCollection_Vector<Handle(StepGeom_GeometricRepresentationItem)>& theGeomItems,
+                                                       const StepData_Factors& theLocalFactors)
+{
+  Handle(StepRepr_ShapeAspect) aResSA;
+  // Get working data
+  const Handle(Interface_InterfaceModel)& aModel = WS->Model();
+  const Handle(XSControl_TransferWriter)& aTW = WS->TransferWriter();
+  const Handle(Transfer_FinderProcess)& aFP = aTW->FinderProcess();
+  const Handle(Interface_HGraph) aHGraph = WS->HGraph();
+  if (aHGraph.IsNull())
+  {
+    return aResSA;
+  }
+  Interface_Graph aGraph = aHGraph->Graph();
+
+  // Shape_Aspect
+  Handle(TCollection_HAsciiString) aName = new TCollection_HAsciiString();
+  Handle(TDataStd_Name) aNameAttr;
+  if (theLabel.FindAttribute(TDataStd_Name::GetID(), aNameAttr))
+  {
+    aName = new TCollection_HAsciiString(TCollection_AsciiString(aNameAttr->Get()));
+  }
+  Handle(TCollection_HAsciiString) aDescription = new TCollection_HAsciiString();
+
+  Handle(TDataStd_TreeNode) aRefNode;
+  if (!theLabel.FindAttribute(XCAFDoc::SupplementalRefGUID(), aRefNode)
+      || aRefNode->Father().IsNull() || aRefNode->Father()->Label().IsNull())
+  {
+    return aResSA;
+  }
+  TopoDS_Shape aMainShape = XCAFDoc_ShapeTool::GetShape(aRefNode->Father()->Label());
+  TopLoc_Location aLoc;
+  TColStd_SequenceOfTransient aSeqRI;
+  FindEntities(aFP, aMainShape, aLoc, aSeqRI);
+  if (aSeqRI.Length() <= 0)
+  {
+    aFP->Messenger()->SendInfo() << "Warning: Cannot find RI for " << aMainShape.TShape()->DynamicType()->Name() << std::endl;
+    return aResSA;
+  }
+
+  Handle(StepRepr_ProductDefinitionShape) aPDS;
+  Handle(StepRepr_RepresentationContext) aRC;
+  Handle(Standard_Transient) anEnt = aSeqRI.Value(1);
+  aPDS = FindPDS(aGraph, anEnt, aRC);
+  if (aPDS.IsNull())
+    return aResSA;
+
+  theRC = aRC;
+
+  Handle(StepGeom_GeometricRepresentationItem) anIdentifiedItem;
+  if (theShape.ShapeType() == TopAbs_FACE)
+  {
+    const TopoDS_Face& aFace = TopoDS::Face(theShape);
+    const Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
+    GeomToStep_MakeSurface aMaker(aSurf, theLocalFactors);
+    if (aMaker.IsDone())
+    {
+      anIdentifiedItem = aMaker.Value();
+    }
+  }
+  else if (theShape.ShapeType() == TopAbs_EDGE)
+  {
+    const TopoDS_Edge& anEdge = TopoDS::Edge(theShape);
+    Standard_Real aTmpFirst, aTmpLast;
+    const Handle(Geom_Curve) aCurv = BRep_Tool::Curve(anEdge, aTmpFirst, aTmpLast);
+    GeomToStep_MakeCurve aMaker(aCurv, theLocalFactors);
+    if (aMaker.IsDone())
+    {
+      anIdentifiedItem = aMaker.Value();
+    }
+  }
+  if (anIdentifiedItem.IsNull())
+  {
+    return aResSA;
+  }
+  aResSA = new StepRepr_ShapeAspect();
+  aResSA->Init(aName, aDescription, aPDS, StepData_LTrue);
+  // Geometric_Item_Specific_Usage
+  Handle(StepAP242_GeometricItemSpecificUsage) aGISU = new StepAP242_GeometricItemSpecificUsage();
+  StepAP242_ItemIdentifiedRepresentationUsageDefinition aDefinition;
+  aDefinition.SetValue(aResSA);
+  Handle(StepRepr_HArray1OfRepresentationItem) anReprItems = new StepRepr_HArray1OfRepresentationItem(1, 1);
+
+  anIdentifiedItem->SetName(aName);
+  theGISU = aGISU;
+  anReprItems->SetValue(1, anIdentifiedItem);
+  theGeomItems.Append(anIdentifiedItem);
+
+  // Set entities to model
+  aGISU->Init(aName, aDescription, aDefinition, theCGRepr, anReprItems);
+  aModel->AddWithRefs(aResSA);
+  aModel->AddWithRefs(aGISU);
+  return aResSA;
+}
+
 //=======================================================================
 //function : writePresentation
 //purpose  : auxiliary (write annotation plane and presentation)
@@ -3106,7 +3221,7 @@ static void WriteDerivedGeometry(const Handle(XSControl_WorkSession)& theWS,
                                  const Handle(StepRepr_ConstructiveGeometryRepresentation)& theRepr,
                                  Handle(StepRepr_ShapeAspect)& theFirstSA,
                                  Handle(StepRepr_ShapeAspect)& theSecondSA,
-                                 NCollection_Vector<Handle(StepGeom_CartesianPoint)>& thePnts,
+                                 NCollection_Vector<Handle(StepGeom_GeometricRepresentationItem)>& theGeoms,
                                  const StepData_Factors& theLocalFactors)
 {
   const Handle(Interface_InterfaceModel)& aModel = theWS->Model();
@@ -3115,7 +3230,7 @@ static void WriteDerivedGeometry(const Handle(XSControl_WorkSession)& theWS,
   {
     GeomToStep_MakeCartesianPoint aPointMaker(theObject->GetPoint(), theLocalFactors.LengthFactor());
     Handle(StepGeom_CartesianPoint) aPoint = aPointMaker.Value();
-    thePnts.Append(aPoint);
+    theGeoms.Append(aPoint);
     Handle(StepRepr_DerivedShapeAspect) aDSA = new StepRepr_DerivedShapeAspect();
     aDSA->Init(new TCollection_HAsciiString(), new TCollection_HAsciiString(), theFirstSA->OfShape(), StepData_LFalse);
     Handle(StepAP242_GeometricItemSpecificUsage) aGISU = new StepAP242_GeometricItemSpecificUsage();
@@ -3136,7 +3251,7 @@ static void WriteDerivedGeometry(const Handle(XSControl_WorkSession)& theWS,
   {
     GeomToStep_MakeCartesianPoint aPointMaker(theObject->GetPoint2(), theLocalFactors.LengthFactor());
     Handle(StepGeom_CartesianPoint) aPoint = aPointMaker.Value();
-    thePnts.Append(aPoint);
+    theGeoms.Append(aPoint);
     Handle(StepRepr_DerivedShapeAspect) aDSA = new StepRepr_DerivedShapeAspect();
     aDSA->Init(new TCollection_HAsciiString(), new TCollection_HAsciiString(), theFirstSA->OfShape(), StepData_LFalse);
     Handle(StepAP242_GeometricItemSpecificUsage) aGISU = new StepAP242_GeometricItemSpecificUsage();
@@ -3439,14 +3554,30 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio
   aLMWU->Init(aValueMember, aUnit);
   aModel->AddWithRefs(aLMWU);
 
+  // Auxiliary entities for derived geometry
+  Handle(StepRepr_ConstructiveGeometryRepresentation) aCGRepr =
+    new StepRepr_ConstructiveGeometryRepresentation();
+  Handle(StepRepr_ConstructiveGeometryRepresentationRelationship) aCGReprRel =
+    new StepRepr_ConstructiveGeometryRepresentationRelationship();
+  NCollection_Vector<Handle(StepGeom_GeometricRepresentationItem)> aConnectionGeometry;
+
   // Geometric_Tolerance target
   Handle(StepRepr_ShapeAspect) aMainSA;
   Handle(StepRepr_RepresentationContext) dummyRC;
   Handle(StepAP242_GeometricItemSpecificUsage) dummyGISU;
   if (theShapeSeqL.Length() == 1)
   {
-    TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(theShapeSeqL.Value(1));
+    const TDF_Label& aShLabel = theShapeSeqL.Value(1);
+    Handle(TDataStd_UAttribute) aSupAttr;
+    TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShLabel);
+    if (aShLabel.FindAttribute(XCAFDoc::SupplementalGeometryGUID(), aSupAttr))
+    {
+      aMainSA = WriteSupplementalGeometry(theWS, aCGRepr, aShLabel, aShape, dummyRC, dummyGISU, aConnectionGeometry, theLocalFactors);
+    }
+    else
+    {
       aMainSA = writeShapeAspect(theWS, theGeomTolL, aShape, dummyRC, dummyGISU);
+    }
     aModel->AddWithRefs(aMainSA);
   }
   else
@@ -3455,8 +3586,18 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio
     for (TDF_LabelSequence::Iterator aShIter(theShapeSeqL);
          aShIter.More(); aShIter.Next())
     {
-      TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShIter.Value());
-      Handle(StepRepr_ShapeAspect) aSA = writeShapeAspect(theWS, theGeomTolL, aShape, dummyRC, dummyGISU);
+      const TDF_Label& aShLabel = aShIter.Value();
+      Handle(TDataStd_UAttribute) aSupAttr;
+      TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShLabel);
+      Handle(StepRepr_ShapeAspect) aSA;
+      if (aShLabel.FindAttribute(XCAFDoc::SupplementalGeometryGUID(), aSupAttr))
+      {
+        aSA = WriteSupplementalGeometry(theWS, aCGRepr, aShLabel, aShape, dummyRC, dummyGISU, aConnectionGeometry, theLocalFactors);
+      }
+      else
+      {
+        aSA = writeShapeAspect(theWS, theGeomTolL, aShape, dummyRC, dummyGISU);
+      }
       if (aSA.IsNull())
         continue;
       if (aCSA.IsNull())
@@ -3471,6 +3612,17 @@ void STEPCAFControl_Writer::writeGeomTolerance(const Handle(XSControl_WorkSessio
     }
     aMainSA = aCSA;
   }
+
+  // Write Derived geometry
+  if (aConnectionGeometry.Length() > 0)
+  {
+    Handle(StepRepr_HArray1OfRepresentationItem) anItems = new StepRepr_HArray1OfRepresentationItem(1, aConnectionGeometry.Length());
+    for (Standard_Integer i = 0; i < aConnectionGeometry.Length(); i++)
+      anItems->SetValue(i + 1, aConnectionGeometry(i));
+    aCGRepr->Init(new TCollection_HAsciiString(), anItems, dummyRC);
+    aCGReprRel->Init(new TCollection_HAsciiString(), new TCollection_HAsciiString(), dummyGISU->UsedRepresentation(), aCGRepr);
+    aModel->AddWithRefs(aCGReprRel);
+  }
   StepDimTol_GeometricToleranceTarget aGTTarget;
   aGTTarget.SetValue(aMainSA);
 
@@ -4078,7 +4230,7 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
     new StepRepr_ConstructiveGeometryRepresentation();
   Handle(StepRepr_ConstructiveGeometryRepresentationRelationship) aCGReprRel =
     new StepRepr_ConstructiveGeometryRepresentationRelationship();
-  NCollection_Vector<Handle(StepGeom_CartesianPoint)> aConnectionPnts;
+  NCollection_Vector<Handle(StepGeom_GeometricRepresentationItem)> aConnectionGeometry;
   Handle(StepRepr_RepresentationContext) dummyRC;
   Handle(StepAP242_GeometricItemSpecificUsage) dummyGISU;
   for (TDF_LabelSequence::Iterator aDGTIter(aDGTLabels);
@@ -4108,8 +4260,17 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
     Handle(StepRepr_ShapeAspect) aFirstSA, aSecondSA;
     if (aFirstShapeL.Length() == 1)
     {
-      TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aFirstShapeL.Value(1));
+      const TDF_Label& aShLabel = aFirstShapeL.Value(1);
+      TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShLabel);
+      Handle(TDataStd_UAttribute) aSupAttr;
+      if (aShLabel.FindAttribute(XCAFDoc::SupplementalGeometryGUID(), aSupAttr))
+      {
+        aFirstSA = WriteSupplementalGeometry(theWS,aCGRepr, aShLabel, aShape, dummyRC, dummyGISU,aConnectionGeometry, theLocalFactors);
+      }
+      else
+      {
         aFirstSA = writeShapeAspect(theWS, aDimensionL, aShape, dummyRC, dummyGISU);
+      }
       if (aRC.IsNull() && !dummyRC.IsNull())
         aRC = dummyRC;
     }
@@ -4118,8 +4279,18 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
       Handle(StepRepr_CompositeShapeAspect) aCSA;
       for (Standard_Integer shIt = 1; shIt <= aFirstShapeL.Length(); shIt++)
       {
-        TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aFirstShapeL.Value(shIt));
-        Handle(StepRepr_ShapeAspect) aSA = writeShapeAspect(theWS, aDimensionL, aShape, dummyRC, dummyGISU);
+        const TDF_Label& aShLabel = aFirstShapeL.Value(shIt);
+        TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShLabel);
+        Handle(TDataStd_UAttribute) aSupAttr;
+        Handle(StepRepr_ShapeAspect) aSA;
+        if (aShLabel.FindAttribute(XCAFDoc::SupplementalGeometryGUID(), aSupAttr))
+        {
+          aSA = WriteSupplementalGeometry(theWS, aCGRepr, aShLabel, aShape, dummyRC, dummyGISU, aConnectionGeometry, theLocalFactors);
+        }
+        else
+        {
+          aSA = writeShapeAspect(theWS, aDimensionL, aShape, dummyRC, dummyGISU);
+        }
         if (aSA.IsNull())
           continue;
         if (aCSA.IsNull())
@@ -4138,8 +4309,17 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
     }
     if (aSecondShapeL.Length() == 1)
     {
-      TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aSecondShapeL.Value(1));
+      const TDF_Label& aShLabel = aSecondShapeL.Value(1);
+      TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShLabel);
+      Handle(TDataStd_UAttribute) aSupAttr;
+      if (aShLabel.FindAttribute(XCAFDoc::SupplementalGeometryGUID(), aSupAttr))
+      {
+        aSecondSA = WriteSupplementalGeometry(theWS, aCGRepr, aShLabel, aShape, dummyRC, dummyGISU, aConnectionGeometry, theLocalFactors);
+      }
+      else
+      {
         aSecondSA = writeShapeAspect(theWS, aDimensionL, aShape, dummyRC, dummyGISU);
+      }
       if (aRC.IsNull() && !dummyRC.IsNull())
         aRC = dummyRC;
     }
@@ -4148,8 +4328,18 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
       Handle(StepRepr_CompositeShapeAspect) aCSA;
       for (Standard_Integer shIt = 1; shIt <= aSecondShapeL.Length(); shIt++)
       {
-        TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aSecondShapeL.Value(shIt));
-        Handle(StepRepr_ShapeAspect) aSA = writeShapeAspect(theWS, aDimensionL, aShape, dummyRC, dummyGISU);
+        const TDF_Label& aShLabel = aSecondShapeL.Value(shIt);
+        TopoDS_Shape aShape = XCAFDoc_ShapeTool::GetShape(aShLabel);
+        Handle(TDataStd_UAttribute) aSupAttr;
+        Handle(StepRepr_ShapeAspect) aSA;
+        if (aShLabel.FindAttribute(XCAFDoc::SupplementalGeometryGUID(), aSupAttr))
+        {
+          aSA = WriteSupplementalGeometry(theWS, aCGRepr, aShLabel, aShape, dummyRC, dummyGISU, aConnectionGeometry, theLocalFactors);
+        }
+        else
+        {
+          aSA = writeShapeAspect(theWS, aDimensionL, aShape, dummyRC, dummyGISU);
+        }
         if (aCSA.IsNull() && !aSA.IsNull())
         {
           aCSA = new StepRepr_CompositeShapeAspect();
@@ -4177,7 +4367,7 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
     // Write dimensions
     StepShape_DimensionalCharacteristic aDimension;
     if (anObject->HasPoint() || anObject->HasPoint2())
-      WriteDerivedGeometry(theWS, anObject, aCGRepr, aFirstSA, aSecondSA, aConnectionPnts, theLocalFactors);
+      WriteDerivedGeometry(theWS, anObject, aCGRepr, aFirstSA, aSecondSA, aConnectionGeometry, theLocalFactors);
     XCAFDimTolObjects_DimensionType aDimType = anObject->GetType();
     if (STEPCAFControl_GDTProperty::IsDimensionalLocation(aDimType))
     {
@@ -4257,11 +4447,11 @@ Standard_Boolean STEPCAFControl_Writer::writeDGTsAP242(const Handle(XSControl_Wo
                       anObject->GetPlane(), anObject->GetPointTextAttach(), aDimension.Value(), theLocalFactors);
   }
   // Write Derived geometry
-  if (aConnectionPnts.Length() > 0)
+  if (aConnectionGeometry.Length() > 0)
   {
-    Handle(StepRepr_HArray1OfRepresentationItem) anItems = new StepRepr_HArray1OfRepresentationItem(1, aConnectionPnts.Length());
-    for (Standard_Integer i = 0; i < aConnectionPnts.Length(); i++)
-      anItems->SetValue(i + 1, aConnectionPnts(i));
+    Handle(StepRepr_HArray1OfRepresentationItem) anItems = new StepRepr_HArray1OfRepresentationItem(1, aConnectionGeometry.Length());
+    for (Standard_Integer i = 0; i < aConnectionGeometry.Length(); i++)
+      anItems->SetValue(i + 1, aConnectionGeometry(i));
     aCGRepr->Init(new TCollection_HAsciiString(), anItems, dummyRC);
     aCGReprRel->Init(new TCollection_HAsciiString(), new TCollection_HAsciiString(), dummyGISU->UsedRepresentation(), aCGRepr);
     aModel->AddWithRefs(aCGReprRel);

src/STEPConstruct/STEPConstruct_UnitContext.cxx

@@ -39,6 +39,7 @@
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 //=======================================================================
@@ -116,12 +117,12 @@ void STEPConstruct_UnitContext::Init(const Standard_Real Tol3d,
     Handle(StepBasic_DimensionalExponents) theDimExp = new StepBasic_DimensionalExponents;
     theDimExp->Init ( 1., 0., 0., 0., 0., 0., 0. );
 
-    Handle(TCollection_HAsciiString) convName = new TCollection_HAsciiString ( uName );
-    Handle(StepBasic_ConversionBasedUnitAndLengthUnit) convUnit =
+    Handle(TCollection_HAsciiString) aConvName = new TCollection_HAsciiString(uName);
+    Handle(StepBasic_ConversionBasedUnitAndLengthUnit) aConvUnit =
       new StepBasic_ConversionBasedUnitAndLengthUnit;
-    convUnit->Init ( theDimExp, convName, measure );
+    aConvUnit->Init(theDimExp, aConvName, measure);
 
-    lengthUnit = convUnit;
+    lengthUnit = aConvUnit;
   }
   else lengthUnit = siUnit;
   
@@ -282,12 +283,11 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepRepr
 } 
 
 
-Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasic_NamedUnit)& aUnit,
+Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasic_NamedUnit)& theUnit,
                                                            const StepData_Factors& theLocalFactors)
 {
-
   //:f3 abv 8 Apr 98: ProSTEP TR8 tr8_as_sd_sw: the case of unrecognized entity
-  if ( aUnit.IsNull() ) 
+  if (theUnit.IsNull())
     return -1;
 
   Standard_Integer status = 0;
@@ -296,33 +296,47 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
   
   Standard_Real parameter= 0.;
   Standard_Boolean parameterDone = Standard_False;
-  if(aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnit))) {
-    Handle(StepBasic_ConversionBasedUnit) theCBU =
-      Handle(StepBasic_ConversionBasedUnit)::DownCast(aUnit);
+  if(theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnit)))
+  {
+    Handle(StepBasic_ConversionBasedUnit) aCBU =
+      Handle(StepBasic_ConversionBasedUnit)::DownCast(theUnit);
 //    Handle(StepBasic_DimensionalExponents) theDimExp = theCBU->Dimensions();
-    Handle(StepBasic_MeasureWithUnit) theMWU;
-    if(!theCBU.IsNull()) {
-       theMWU = theCBU->ConversionFactor();
+    Handle(StepBasic_MeasureWithUnit) aMWU;
+    if(!aCBU.IsNull())
+    {
+      Handle(Standard_Transient) aConvFactor = aCBU->ConversionFactor();
+      if (aConvFactor->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
+      {
+        aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aConvFactor);
+      }
+      else if (aConvFactor->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
+      {
+        Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
+          Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aConvFactor);
+        aMWU = aReprMeasureItem->GetMeasureWithUnit();
+      }
       // sln 8.10.2001: the case of unrecognized entity
-       if(theMWU.IsNull())
+      if(aMWU.IsNull())
         return -1;
       //if (!theMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit))) { gka
       //  return 2;
       //}
-      Handle(StepBasic_NamedUnit) theTargetUnit = theMWU->UnitComponent().NamedUnit();
+      Handle(StepBasic_NamedUnit) theTargetUnit = aMWU->UnitComponent().NamedUnit();
       //StepBasic_Unit theTargetUnit = theMWU->UnitComponent();
       Standard_Real theSIPFactor = 1.;
 
       //:f5 abv 24 Apr 98: ProSTEP TR8 tr8_bv1_tc: INCHES
-//gka   Handle(StepBasic_SiUnitAndLengthUnit) theSUALU =
+      //gka
+      //Handle(StepBasic_SiUnitAndLengthUnit) theSUALU =
       //Handle(StepBasic_SiUnitAndLengthUnit)::DownCast(theTargetUnit);
       //Handle(StepBasic_SiUnit) theSIU;
       //if ( ! theSUALU.IsNull() ) theSIU = Handle(StepBasic_SiUnit)::DownCast(theSUALU);
-    Handle(StepBasic_SiUnit) theSIU =  //f5
-      Handle(StepBasic_SiUnit)::DownCast(theTargetUnit);//f5
+      Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(theTargetUnit); //f5
 
-      if (!theSIU.IsNull()) {
-	if (theSIU->HasPrefix()) {
+      if (!theSIU.IsNull())
+      {
+        if (theSIU->HasPrefix())
+        {
           // Treat the prefix
           StepBasic_SiPrefix aPrefix = theSIU->Prefix();
           theSIPFactor = ConvertSiPrefix(aPrefix);
@@ -332,11 +346,12 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
         //std::cout << "The SiUnitNameFactor is :";
         //std::cout << theSIUNF << std::endl;
       }
-      else {
+      else
+      {
         //std::cout << "Recursive algo required - Aborted" << std::endl;
         return 3;
       }
-      Standard_Real theMVAL = theMWU->ValueComponent();
+      Standard_Real theMVAL = aMWU->ValueComponent();
       theFactor = theSIPFactor * theMVAL; // * theSIUNF * pow(10.,theLExp)
     }
     parameter = theFactor;
@@ -350,8 +365,9 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
 #endif
     }
   }
-  else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnit))) {
-    Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(aUnit);
+  else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnit)))
+  {
+    Handle(StepBasic_SiUnit) theSIU = Handle(StepBasic_SiUnit)::DownCast(theUnit);
     Standard_Real theSIPFactor = 1.;
     if (theSIU->HasPrefix()) {
       // Treat the prefix
@@ -385,8 +401,9 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
   }
   
   const Standard_Real aCascadeUnit = theLocalFactors.CascadeUnit();
-  if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit))||
-      aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit))) {
+  if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit))||
+      theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit)))
+  {
 #ifdef METER
     lengthFactor = parameter;
 #else
@@ -401,18 +418,21 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
 #endif    
     }
   }  // end of LengthUnit
-  else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndPlaneAngleUnit))||
-	   aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndPlaneAngleUnit))) {
+  else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndPlaneAngleUnit)) ||
+           theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndPlaneAngleUnit)))
+  {
     planeAngleFactor = parameter;
     planeAngleDone = Standard_True;	
   }  // end of PlaneAngleUnit
-  else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndSolidAngleUnit))||
-	   aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndSolidAngleUnit))) {
+  else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndSolidAngleUnit)) ||
+           theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndSolidAngleUnit)))
+  {
     solidAngleFactor = parameter;
     solidAngleDone = Standard_True;
   }  // end of SolidAngleUnit 
-  else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndAreaUnit)) ||
-	   aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndAreaUnit))) {
+  else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndAreaUnit)) ||
+           theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndAreaUnit)))
+  {
     Standard_Real af;
 #ifdef METER   
     af = parameter;
@@ -422,8 +442,9 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi
     areaDone = Standard_True;
     areaFactor = pow(af,2);
   }
-  else if (aUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndVolumeUnit)) ||
-	   aUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndVolumeUnit))) {
+  else if (theUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndVolumeUnit)) ||
+           theUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndVolumeUnit)))
+  {
     Standard_Real af;
 #ifdef METER   
     af = parameter;

src/STEPControl/STEPControl_ActorRead.cxx

@@ -17,6 +17,7 @@
 //gka,abv 14.04.99 S4136: maintain unit context, precision and maxtolerance values
 
 #include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
 #include <BRepCheck_Shell.hxx>
 #include <BRepCheck_Status.hxx>
 #include <Geom_Axis2Placement.hxx>
@@ -30,8 +31,10 @@
 #include <Interface_Static.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_ProgressScope.hxx>
+#include <OSD_Parallel.hxx>
 #include <OSD_Timer.hxx>
 #include <Precision.hxx>
+#include <ShapeProcess_ShapeContext.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Transient.hxx>
@@ -334,7 +337,10 @@ Handle(Transfer_Binder)  STEPControl_ActorRead::Transfer
   }
   // [END] Get version of preprocessor (to detect I-Deas case) (ssv; 23.11.2010)
   Standard_Boolean aTrsfUse = (aStepModel->InternalParameters.ReadRootTransformation == 1);
-  return TransferShape(start, TP, aLocalFactors, Standard_True, aTrsfUse, theProgress);
+  auto aResult = TransferShape(start, TP, aLocalFactors, Standard_True, aTrsfUse, theProgress);
+  if (Interface_Static::IVal("read.step.parallel.healing") == 0)
+    PostHealing(TP);
+  return aResult;
 }
 
 
@@ -1486,6 +1492,8 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
     mappedShape = myShapeBuilder.Value();
     // Apply ShapeFix (on manifold shapes only. Non-manifold topology is processed separately: ssv; 13.11.2010)
     if (isManifold && aHasGeom) 
+    {
+      if (Interface_Static::IVal("read.step.parallel.healing") != 0)
       {
         Handle(Standard_Transient) info;
         mappedShape =
@@ -1495,6 +1503,9 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
             aPS.Next());
         XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems);
       }
+      else
+        myShapesToHeal.Add(mappedShape);
+    }
   }
   found = !mappedShape.IsNull();
   if (found && shbinder.IsNull()) shbinder = new TransferBRep_ShapeBinder (mappedShape);
@@ -2137,3 +2148,67 @@ TopoDS_Shape STEPControl_ActorRead::TransferRelatedSRR(const Handle(Transfer_Tra
   }
   return aResult;
 }
+
+//=======================================================================
+// Method  : PostHealing
+// Purpose : postprocess shape healing
+//=======================================================================
+Standard_EXPORT void STEPControl_ActorRead::PostHealing(const Handle(Transfer_TransientProcess)& TP)
+{
+  NCollection_Array1<Handle(ShapeProcess_ShapeContext)> aInfos(1, myShapesToHeal.Size());
+  NCollection_Array1<TopTools_DataMapOfShapeShape> aOrigToCopyMapArr(1, myShapesToHeal.Size());
+  NCollection_Array1<TopTools_DataMapOfShapeShape> aCopyToOrigMapArr(1, myShapesToHeal.Size());
+
+  auto aForLoop = [&](const int i) {
+    auto& anOrig = myShapesToHeal.FindKey(i);
+    BRepBuilderAPI_Copy aCurCopy(anOrig, true, true);
+    TopoDS_Shape aCopy = aCurCopy.Shape();
+    // Collect all the modified shapes in Copy() for further update of binders not to lost attached attributes
+    for (int aTypeIt = anOrig.ShapeType() + 1; aTypeIt <= TopAbs_VERTEX; aTypeIt++)
+    {
+      for (TopExp_Explorer anExp(anOrig, (TopAbs_ShapeEnum)aTypeIt); anExp.More(); anExp.Next())
+      {
+        const TopoDS_Shape& aSx = anExp.Current();
+        const TopoDS_Shape& aModifShape = aCurCopy.ModifiedShape(aSx);
+        aOrigToCopyMapArr.ChangeValue(i).Bind(aSx, aModifShape);
+        aCopyToOrigMapArr.ChangeValue(i).Bind(aModifShape, aSx);
+      }
+    }
+    Handle(Standard_Transient) anInfo;
+    aCopy = XSAlgo::AlgoContainer()->ProcessShape(aCopy, myPrecision, myMaxTol,
+      "read.step.resource.name",
+      "read.step.sequence", aInfos[i],
+      Message_ProgressRange());
+    *(Handle(TopoDS_TShape)&)anOrig.TShape() = *aCopy.TShape();
+  };
+  OSD_Parallel::For(1, myShapesToHeal.Size() + 1, aForLoop);
+
+  // Update Shape context for correct attributes attaching
+  Handle(ShapeProcess_ShapeContext) aFullContext = new ShapeProcess_ShapeContext(TopoDS_Shape(), "", "");
+  TopTools_DataMapOfShapeShape& aHealedMap = (TopTools_DataMapOfShapeShape&)aFullContext->Map();
+
+  // Copy maps to the common binders map
+  for (int i = 1; i <= aOrigToCopyMapArr.Size(); i++)
+  {
+    const auto& aForwMap = aOrigToCopyMapArr.Value(i);
+    const auto& aRevMap = aCopyToOrigMapArr.Value(i);
+    Handle(ShapeProcess_ShapeContext) aContext = aInfos.Value(i);
+
+    for (TopTools_DataMapOfShapeShape::Iterator aMapIt(aForwMap); aMapIt.More(); aMapIt.Next())
+    {
+      aHealedMap.Bind(aMapIt.Key(), aMapIt.Value());
+    }
+    for (TopTools_DataMapOfShapeShape::Iterator anIter(aContext->Map()); anIter.More(); anIter.Next())
+    {
+      TopoDS_Shape aShape;
+      if (aRevMap.Find(anIter.Key(), aShape))
+      {
+        aHealedMap.Bind(aShape, anIter.Value());
+      }
+    }
+  }
+
+  XSAlgo::AlgoContainer()->MergeTransferInfo(TP, aFullContext);
+
+  CleanShapesToHeal();
+}

src/STEPControl/STEPControl_ActorRead.hxx

@@ -26,6 +26,7 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <Message_ProgressRange.hxx>
+#include <NCollection_IndexedMap.hxx>
 #include <Interface_InterfaceModel.hxx>
 
 class StepRepr_Representation;
@@ -115,7 +116,14 @@ public:
                                                  const StepData_Factors& theLocalFactors);
 
 
+  //! Heals the collected during transferring shapes
+  Standard_EXPORT void PostHealing(const Handle(Transfer_TransientProcess)& TP);
 
+  //! Cleans collected for post healing shapes.
+  inline void CleanShapesToHeal()
+  {
+    myShapesToHeal.Clear();
+  }
 
   DEFINE_STANDARD_RTTIEXT(STEPControl_ActorRead,Transfer_ActorOfTransientProcess)
 
@@ -219,6 +227,7 @@ private:
   Standard_Real myMaxTol;
   Handle(StepRepr_Representation) mySRContext;
   Handle(Interface_InterfaceModel) myModel;
+  NCollection_IndexedMap<TopoDS_Shape> myShapesToHeal;
 
 };
 

src/STEPControl/STEPControl_Controller.cxx

@@ -272,6 +272,12 @@ STEPControl_Controller::STEPControl_Controller ()
     Interface_Static::Init("step", "read.step.root.transformation", '&', "eval ON");
     Interface_Static::SetCVal("read.step.root.transformation", "ON");
 
+    Interface_Static::Init("step", "read.step.parallel.healing", 'e', "");
+    Interface_Static::Init("step", "read.step.parallel.healing", '&', "enum 0");
+    Interface_Static::Init("step", "read.step.parallel.healing", '&', "eval ON");
+    Interface_Static::Init("step", "read.step.parallel.healing", '&', "eval OFF");
+    Interface_Static::SetCVal("read.step.parallel.healing", "ON");
+
     // STEP file encoding for names translation
     // Note: the numbers should be consistent with Resource_FormatType enumeration
     Interface_Static::Init("step", "read.step.codepage", 'e', "");

src/STEPControl/STEPControl_Reader.cxx

@@ -48,6 +48,7 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepRepr_RepresentationMap.hxx>
 #include <StepRepr_RepresentationRelationship.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_ManifoldSolidBrep.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
@@ -681,7 +682,8 @@ Standard_Boolean STEPControl_Reader::findUnits(
   Handle(StepBasic_HArray1OfNamedUnit) anUnits = aContext->Units();
   Standard_Integer nbU = aContext->NbUnits();
   Standard_Integer nbFind = 0;
-  for (Standard_Integer i = 1; i <= nbU; i++) {
+  for (Standard_Integer i = 1; i <= nbU; i++)
+  {
     Handle(StepBasic_NamedUnit) aNamedUnit = aContext->UnitsValue(i);
     Handle(StepBasic_ConversionBasedUnit) aConvUnit =
       Handle(StepBasic_ConversionBasedUnit)::DownCast(aNamedUnit);
@@ -690,8 +692,18 @@ Standard_Boolean STEPControl_Reader::findUnits(
     Standard_Real anUnitFact = 0;
     if(!aConvUnit.IsNull())
     {
-      Handle(StepBasic_MeasureWithUnit) aMeasWithUnit = 
-        aConvUnit->ConversionFactor();
+      Handle(StepBasic_MeasureWithUnit) aMeasWithUnit;
+      Handle(Standard_Transient) aConvFactor = aConvUnit->ConversionFactor();
+      if (aConvFactor->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
+      {
+        aMeasWithUnit = Handle(StepBasic_MeasureWithUnit)::DownCast(aConvFactor);
+      }
+      else if (aConvFactor->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
+      {
+        Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
+          Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aConvFactor);
+        aMeasWithUnit = aReprMeasureItem->GetMeasureWithUnit();
+      }
 
        if(aMeasWithUnit.IsNull())
          continue;

src/StepBasic/StepBasic_ConversionBasedUnit.cxx

@@ -14,42 +14,40 @@
 
 #include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnit,StepBasic_NamedUnit)
 
 StepBasic_ConversionBasedUnit::StepBasic_ConversionBasedUnit ()  {}
 
-void StepBasic_ConversionBasedUnit::Init(
-	const Handle(StepBasic_DimensionalExponents)& aDimensions,
-	const Handle(TCollection_HAsciiString)& aName,
-	const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                         const Handle(TCollection_HAsciiString)& theName,
+                                         const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- classe own fields ---
-	name = aName;
-	conversionFactor = aConversionFactor;
+  myName = theName;
+  myConversionFactor = theConversionFactor;
   // --- classe inherited fields ---
-	StepBasic_NamedUnit::Init(aDimensions);
+  StepBasic_NamedUnit::Init(theDimensions);
 }
 
 
-void StepBasic_ConversionBasedUnit::SetName(const Handle(TCollection_HAsciiString)& aName)
+void StepBasic_ConversionBasedUnit::SetName(const Handle(TCollection_HAsciiString)& theName)
 {
-	name = aName;
+  myName = theName;
 }
 
 Handle(TCollection_HAsciiString) StepBasic_ConversionBasedUnit::Name() const
 {
-	return name;
+  return myName;
 }
 
-void StepBasic_ConversionBasedUnit::SetConversionFactor(const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnit::SetConversionFactor(const Handle(Standard_Transient)& theConversionFactor)
 {
-	conversionFactor = aConversionFactor;
+  myConversionFactor = theConversionFactor;
 }
 
-Handle(StepBasic_MeasureWithUnit) StepBasic_ConversionBasedUnit::ConversionFactor() const
+Handle(Standard_Transient) StepBasic_ConversionBasedUnit::ConversionFactor() const
 {
-	return conversionFactor;
+  return myConversionFactor;
 }

src/StepBasic/StepBasic_ConversionBasedUnit.hxx

@@ -22,7 +22,6 @@
 
 #include <StepBasic_NamedUnit.hxx>
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepBasic_DimensionalExponents;
 
 
@@ -39,15 +38,17 @@ public:
   //! Returns a ConversionBasedUnit
   Standard_EXPORT StepBasic_ConversionBasedUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& aName);
+  Standard_EXPORT void SetName (const Handle(TCollection_HAsciiString)& theName);
   
   Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
   
-  Standard_EXPORT void SetConversionFactor (const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void SetConversionFactor (const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT Handle(StepBasic_MeasureWithUnit) ConversionFactor() const;
+  Standard_EXPORT Handle(Standard_Transient) ConversionFactor() const;
 
 
 
@@ -62,8 +63,8 @@ protected:
 private:
 
 
-  Handle(TCollection_HAsciiString) name;
-  Handle(StepBasic_MeasureWithUnit) conversionFactor;
+  Handle(TCollection_HAsciiString) myName;
+  Handle(Standard_Transient) myConversionFactor;
 
 
 };

src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx

@@ -16,33 +16,32 @@
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ConversionBasedUnit)
 
 StepBasic_ConversionBasedUnitAndLengthUnit::StepBasic_ConversionBasedUnitAndLengthUnit ()  {}
 
-void StepBasic_ConversionBasedUnitAndLengthUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
-						      const Handle(TCollection_HAsciiString)& aName,
-						      const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnitAndLengthUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                                      const Handle(TCollection_HAsciiString)& theName,
+                                                      const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- ANDOR component fields ---
-  StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
+  StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
   
   // --- ANDOR component fields ---
-  lengthUnit = new StepBasic_LengthUnit();
-  lengthUnit->Init(aDimensions);
+  myLengthUnit = new StepBasic_LengthUnit();
+  myLengthUnit->Init(theDimensions);
 }
 
 
-void StepBasic_ConversionBasedUnitAndLengthUnit::SetLengthUnit(const Handle(StepBasic_LengthUnit)& aLengthUnit)
+void StepBasic_ConversionBasedUnitAndLengthUnit::SetLengthUnit(const Handle(StepBasic_LengthUnit)& theLengthUnit)
 {
-  lengthUnit = aLengthUnit;
+  myLengthUnit = theLengthUnit;
 }
 
 Handle(StepBasic_LengthUnit) StepBasic_ConversionBasedUnitAndLengthUnit::LengthUnit() const
 {
-  return lengthUnit;
+  return myLengthUnit;
 }
 

src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx

@@ -24,7 +24,6 @@
 class StepBasic_LengthUnit;
 class StepBasic_DimensionalExponents;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 
 
 class StepBasic_ConversionBasedUnitAndLengthUnit;
@@ -40,9 +39,11 @@ public:
   //! Returns a ConversionBasedUnitAndLengthUnit
   Standard_EXPORT StepBasic_ConversionBasedUnitAndLengthUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetLengthUnit (const Handle(StepBasic_LengthUnit)& aLengthUnit);
+  Standard_EXPORT void SetLengthUnit (const Handle(StepBasic_LengthUnit)& theLengthUnit);
   
   Standard_EXPORT Handle(StepBasic_LengthUnit) LengthUnit() const;
 
@@ -59,7 +60,7 @@ protected:
 private:
 
 
-  Handle(StepBasic_LengthUnit) lengthUnit;
+  Handle(StepBasic_LengthUnit) myLengthUnit;
 
 
 };

src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx

@@ -16,7 +16,6 @@
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MassUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndMassUnit,StepBasic_ConversionBasedUnit)
@@ -35,17 +34,16 @@ StepBasic_ConversionBasedUnitAndMassUnit::StepBasic_ConversionBasedUnitAndMassUn
 //purpose  : 
 //=======================================================================
 
-void StepBasic_ConversionBasedUnitAndMassUnit::Init
-  (const Handle(StepBasic_DimensionalExponents)& aDimensions,
-   const Handle(TCollection_HAsciiString)& aName,
-   const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnitAndMassUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                                    const Handle(TCollection_HAsciiString)& theName,
+                                                    const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- ANDOR component fields ---
-  StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
+  StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
   
   // --- ANDOR component fields ---
-  massUnit = new StepBasic_MassUnit();
-  massUnit->Init(aDimensions);
+  myMassUnit = new StepBasic_MassUnit();
+  myMassUnit->Init(theDimensions);
 }
 
 
@@ -54,10 +52,9 @@ void StepBasic_ConversionBasedUnitAndMassUnit::Init
 //purpose  : 
 //=======================================================================
 
-void StepBasic_ConversionBasedUnitAndMassUnit::SetMassUnit
-  (const Handle(StepBasic_MassUnit)& aMassUnit)
+void StepBasic_ConversionBasedUnitAndMassUnit::SetMassUnit(const Handle(StepBasic_MassUnit)& theMassUnit)
 {
-  massUnit = aMassUnit;
+  myMassUnit = theMassUnit;
 }
 
 
@@ -68,6 +65,6 @@ void StepBasic_ConversionBasedUnitAndMassUnit::SetMassUnit
 
 Handle(StepBasic_MassUnit) StepBasic_ConversionBasedUnitAndMassUnit::MassUnit() const
 {
-  return massUnit;
+  return myMassUnit;
 }
 

src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx

@@ -23,7 +23,6 @@
 class StepBasic_MassUnit;
 class StepBasic_DimensionalExponents;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 
 
 class StepBasic_ConversionBasedUnitAndMassUnit;
@@ -39,9 +38,11 @@ public:
   //! Returns a ConversionBasedUnitAndLengthUnit
   Standard_EXPORT StepBasic_ConversionBasedUnitAndMassUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetMassUnit (const Handle(StepBasic_MassUnit)& aMassUnit);
+  Standard_EXPORT void SetMassUnit (const Handle(StepBasic_MassUnit)& theMassUnit);
   
   Standard_EXPORT Handle(StepBasic_MassUnit) MassUnit() const;
 
@@ -58,7 +59,7 @@ protected:
 private:
 
 
-  Handle(StepBasic_MassUnit) massUnit;
+  Handle(StepBasic_MassUnit) myMassUnit;
 
 
 };

src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx

@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_PlaneAngleUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
@@ -25,26 +24,26 @@ StepBasic_ConversionBasedUnitAndPlaneAngleUnit::StepBasic_ConversionBasedUnitAnd
 {
 }
 
-void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
-							  const Handle(TCollection_HAsciiString)& aName,
-							  const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                                          const Handle(TCollection_HAsciiString)& theName,
+                                                          const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- ANDOR component fields ---
-  StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
+  StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
 	
   // --- ANDOR component fields ---
-  planeAngleUnit = new StepBasic_PlaneAngleUnit();
-  planeAngleUnit->Init(aDimensions);
+  myPlaneAngleUnit = new StepBasic_PlaneAngleUnit();
+  myPlaneAngleUnit->Init(theDimensions);
 }
 
 
-void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::SetPlaneAngleUnit(const Handle(StepBasic_PlaneAngleUnit)& aPlaneAngleUnit)
+void StepBasic_ConversionBasedUnitAndPlaneAngleUnit::SetPlaneAngleUnit(const Handle(StepBasic_PlaneAngleUnit)& thePlaneAngleUnit)
 {
-  planeAngleUnit = aPlaneAngleUnit;
+  myPlaneAngleUnit = thePlaneAngleUnit;
 }
 
 Handle(StepBasic_PlaneAngleUnit) StepBasic_ConversionBasedUnitAndPlaneAngleUnit::PlaneAngleUnit() const
 {
-  return planeAngleUnit;
+  return myPlaneAngleUnit;
 }
 

src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx

@@ -24,7 +24,6 @@
 class StepBasic_PlaneAngleUnit;
 class StepBasic_DimensionalExponents;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 
 
 class StepBasic_ConversionBasedUnitAndPlaneAngleUnit;
@@ -40,9 +39,11 @@ public:
   //! Returns a ConversionBasedUnitAndPlaneAngleUnit
   Standard_EXPORT StepBasic_ConversionBasedUnitAndPlaneAngleUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetPlaneAngleUnit (const Handle(StepBasic_PlaneAngleUnit)& aPlaneAngleUnit);
+  Standard_EXPORT void SetPlaneAngleUnit (const Handle(StepBasic_PlaneAngleUnit)& thePlaneAngleUnit);
   
   Standard_EXPORT Handle(StepBasic_PlaneAngleUnit) PlaneAngleUnit() const;
 
@@ -59,7 +60,7 @@ protected:
 private:
 
 
-  Handle(StepBasic_PlaneAngleUnit) planeAngleUnit;
+  Handle(StepBasic_PlaneAngleUnit) myPlaneAngleUnit;
 
 
 };

src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx

@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_ConversionBasedUnitAndRatioUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_RatioUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
@@ -25,25 +24,25 @@ StepBasic_ConversionBasedUnitAndRatioUnit::StepBasic_ConversionBasedUnitAndRatio
 {
 }
 
-void StepBasic_ConversionBasedUnitAndRatioUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
-						     const Handle(TCollection_HAsciiString)& aName,
-						     const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnitAndRatioUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                                     const Handle(TCollection_HAsciiString)& theName,
+                                                     const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- ANDOR component fields ---
-  StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
+  StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
 	
   // --- ANDOR component fields ---
-  ratioUnit = new StepBasic_RatioUnit();
-  ratioUnit->Init(aDimensions);
+  myRatioUnit = new StepBasic_RatioUnit();
+  myRatioUnit->Init(theDimensions);
 }
 
 
-void StepBasic_ConversionBasedUnitAndRatioUnit::SetRatioUnit(const Handle(StepBasic_RatioUnit)& aRatioUnit)
+void StepBasic_ConversionBasedUnitAndRatioUnit::SetRatioUnit(const Handle(StepBasic_RatioUnit)& theRatioUnit)
 {
-  ratioUnit = aRatioUnit;
+  myRatioUnit = theRatioUnit;
 }
 
 Handle(StepBasic_RatioUnit) StepBasic_ConversionBasedUnitAndRatioUnit::RatioUnit() const
 {
-  return ratioUnit;
+  return myRatioUnit;
 }

src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx

@@ -24,7 +24,6 @@
 class StepBasic_RatioUnit;
 class StepBasic_DimensionalExponents;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 
 
 class StepBasic_ConversionBasedUnitAndRatioUnit;
@@ -40,9 +39,11 @@ public:
   //! Returns a ConversionBasedUnitAndRatioUnit
   Standard_EXPORT StepBasic_ConversionBasedUnitAndRatioUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetRatioUnit (const Handle(StepBasic_RatioUnit)& aRatioUnit);
+  Standard_EXPORT void SetRatioUnit (const Handle(StepBasic_RatioUnit)& theRatioUnit);
   
   Standard_EXPORT Handle(StepBasic_RatioUnit) RatioUnit() const;
 
@@ -59,7 +60,7 @@ protected:
 private:
 
 
-  Handle(StepBasic_RatioUnit) ratioUnit;
+  Handle(StepBasic_RatioUnit) myRatioUnit;
 
 
 };

src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx

@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_SolidAngleUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
@@ -25,26 +24,26 @@ StepBasic_ConversionBasedUnitAndSolidAngleUnit::StepBasic_ConversionBasedUnitAnd
 {
 }
 
-void StepBasic_ConversionBasedUnitAndSolidAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
-							  const Handle(TCollection_HAsciiString)& aName,
-							  const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnitAndSolidAngleUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                                          const Handle(TCollection_HAsciiString)& theName,
+                                                          const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- ANDOR component fields ---
-  StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
+  StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
 
   // --- ANDOR component fields ---
-  solidAngleUnit = new StepBasic_SolidAngleUnit();
-  solidAngleUnit->Init(aDimensions);
+  mySolidAngleUnit = new StepBasic_SolidAngleUnit();
+  mySolidAngleUnit->Init(theDimensions);
 }
 
 
-void StepBasic_ConversionBasedUnitAndSolidAngleUnit::SetSolidAngleUnit(const Handle(StepBasic_SolidAngleUnit)& aSolidAngleUnit)
+void StepBasic_ConversionBasedUnitAndSolidAngleUnit::SetSolidAngleUnit(const Handle(StepBasic_SolidAngleUnit)& theSolidAngleUnit)
 {
-  solidAngleUnit = aSolidAngleUnit;
+  mySolidAngleUnit = theSolidAngleUnit;
 }
 
 Handle(StepBasic_SolidAngleUnit) StepBasic_ConversionBasedUnitAndSolidAngleUnit::SolidAngleUnit() const
 {
-  return solidAngleUnit;
+  return mySolidAngleUnit;
 }
 

src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx

@@ -24,7 +24,6 @@
 class StepBasic_SolidAngleUnit;
 class StepBasic_DimensionalExponents;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 
 
 class StepBasic_ConversionBasedUnitAndSolidAngleUnit;
@@ -40,9 +39,11 @@ public:
   //! Returns a ConversionBasedUnitAndSolidAngleUnit
   Standard_EXPORT StepBasic_ConversionBasedUnitAndSolidAngleUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetSolidAngleUnit (const Handle(StepBasic_SolidAngleUnit)& aSolidAngleUnit);
+  Standard_EXPORT void SetSolidAngleUnit (const Handle(StepBasic_SolidAngleUnit)& theSolidAngleUnit);
   
   Standard_EXPORT Handle(StepBasic_SolidAngleUnit) SolidAngleUnit() const;
 
@@ -59,7 +60,7 @@ protected:
 private:
 
 
-  Handle(StepBasic_SolidAngleUnit) solidAngleUnit;
+  Handle(StepBasic_SolidAngleUnit) mySolidAngleUnit;
 
 
 };

src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx

@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_TimeUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
@@ -25,26 +24,26 @@ StepBasic_ConversionBasedUnitAndTimeUnit::StepBasic_ConversionBasedUnitAndTimeUn
 {
 }
 
-void StepBasic_ConversionBasedUnitAndTimeUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions,
-						    const Handle(TCollection_HAsciiString)& aName,
-						    const Handle(StepBasic_MeasureWithUnit)& aConversionFactor)
+void StepBasic_ConversionBasedUnitAndTimeUnit::Init(const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                                                    const Handle(TCollection_HAsciiString)& theName,
+                                                    const Handle(Standard_Transient)& theConversionFactor)
 {
   // --- ANDOR component fields ---
-  StepBasic_ConversionBasedUnit::Init(aDimensions, aName, aConversionFactor);
+  StepBasic_ConversionBasedUnit::Init(theDimensions, theName, theConversionFactor);
   
   // --- ANDOR component fields ---
-  timeUnit = new StepBasic_TimeUnit();
-  timeUnit->Init(aDimensions);
+  myTimeUnit = new StepBasic_TimeUnit();
+  myTimeUnit->Init(theDimensions);
 }
 
 
-void StepBasic_ConversionBasedUnitAndTimeUnit::SetTimeUnit(const Handle(StepBasic_TimeUnit)& aTimeUnit)
+void StepBasic_ConversionBasedUnitAndTimeUnit::SetTimeUnit(const Handle(StepBasic_TimeUnit)& theTimeUnit)
 {
-  timeUnit = aTimeUnit;
+  myTimeUnit = theTimeUnit;
 }
 
 Handle(StepBasic_TimeUnit) StepBasic_ConversionBasedUnitAndTimeUnit::TimeUnit() const
 {
-  return timeUnit;
+  return myTimeUnit;
 }
 

src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx

@@ -24,7 +24,6 @@
 class StepBasic_TimeUnit;
 class StepBasic_DimensionalExponents;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 
 
 class StepBasic_ConversionBasedUnitAndTimeUnit;
@@ -40,9 +39,11 @@ public:
   //! Returns a ConversionBasedUnitAndTimeUnit
   Standard_EXPORT StepBasic_ConversionBasedUnitAndTimeUnit();
   
-  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& aDimensions, const Handle(TCollection_HAsciiString)& aName, const Handle(StepBasic_MeasureWithUnit)& aConversionFactor);
+  Standard_EXPORT void Init (const Handle(StepBasic_DimensionalExponents)& theDimensions,
+                             const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(Standard_Transient)& theConversionFactor);
   
-  Standard_EXPORT void SetTimeUnit (const Handle(StepBasic_TimeUnit)& aTimeUnit);
+  Standard_EXPORT void SetTimeUnit (const Handle(StepBasic_TimeUnit)& theTimeUnit);
   
   Standard_EXPORT Handle(StepBasic_TimeUnit) TimeUnit() const;
 
@@ -59,7 +60,7 @@ protected:
 private:
 
 
-  Handle(StepBasic_TimeUnit) timeUnit;
+  Handle(StepBasic_TimeUnit) myTimeUnit;
 
 
 };

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx

@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -39,7 +38,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRef::StepDimTol_GeoTolAndGeoTolWthDatRef()
 void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const StepDimTol_GeometricToleranceType theType)
@@ -60,7 +59,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const StepDimTol_GeometricToleranceType theType)

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx

@@ -24,7 +24,6 @@
 class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithDatumReference;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -41,16 +40,16 @@ public:
   
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                              const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                              const StepDimTol_GeometricToleranceType theType);
 
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
-                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& aMagnitude, 
-                             const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
-                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
+                             const Handle(TCollection_HAsciiString)& theDescription,
+                             const Handle(Standard_Transient)& theMagnitude,
+                             const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
                              const StepDimTol_GeometricToleranceType theType);
 
   inline void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR){

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx

@@ -15,7 +15,6 @@
 
 
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@@ -41,7 +40,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTo
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -61,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx

@@ -26,7 +26,6 @@ class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
 class StepBasic_LengthMeasureWithUnit;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -42,7 +41,7 @@ public:
   
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                              const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -51,7 +50,7 @@ public:
 
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
                              const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& aMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx

@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@@ -40,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::StepDimTol_GeoTolAndGeoTolWt
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -63,7 +62,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx

@@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -42,7 +41,7 @@ public:
   
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                              const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -50,7 +49,7 @@ public:
 
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
                              const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& aMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx

@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
@@ -37,19 +36,19 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::StepDimTol_GeoTolAndGe
 //=======================================================================
 
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
-  (const Handle(TCollection_HAsciiString)& aName,
-   const Handle(TCollection_HAsciiString)& aDescription,
-   const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
-   const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect,
-   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
-   const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
+  (const Handle(TCollection_HAsciiString)& theName,
+   const Handle(TCollection_HAsciiString)& theDescription,
+   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
+   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
+   const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT)
 {
-  SetName(aName);
-  SetDescription(aDescription);
-  SetMagnitude(aMagnitude);
-  SetTolerancedShapeAspect(aTolerancedShapeAspect);
-  myGeometricToleranceWithDatumReference = aGTWDR;
-  myModifiedGeometricTolerance = aMGT;
+  SetName(theName);
+  SetDescription(theDescription);
+  SetMagnitude(theMagnitude);
+  SetTolerancedShapeAspect(theTolerancedShapeAspect);
+  myGeometricToleranceWithDatumReference = theGTWDR;
+  myModifiedGeometricTolerance = theMGT;
 }
 
 //=======================================================================
@@ -58,19 +57,19 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
 //=======================================================================
 
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
-  (const Handle(TCollection_HAsciiString)& aName,
-   const Handle(TCollection_HAsciiString)& aDescription,
-   const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
-   const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
-   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
-   const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
+  (const Handle(TCollection_HAsciiString)& theName,
+   const Handle(TCollection_HAsciiString)& theDescription,
+   const Handle(Standard_Transient)& theMagnitude,
+   const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
+   const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT)
 {
-  SetName(aName);
-  SetDescription(aDescription);
-  SetMagnitude(aMagnitude);
-  SetTolerancedShapeAspect(aTolerancedShapeAspect);
-  myGeometricToleranceWithDatumReference = aGTWDR;
-  myModifiedGeometricTolerance = aMGT;
+  SetName(theName);
+  SetDescription(theDescription);
+  SetMagnitude(theMagnitude);
+  SetTolerancedShapeAspect(theTolerancedShapeAspect);
+  myGeometricToleranceWithDatumReference = theGTWDR;
+  myModifiedGeometricTolerance = theMGT;
 }
 
 
@@ -80,9 +79,9 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
 //=======================================================================
 
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::SetGeometricToleranceWithDatumReference
-  (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR) 
+  (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR)
 {
-  myGeometricToleranceWithDatumReference = aGTWDR;
+  myGeometricToleranceWithDatumReference = theGTWDR;
 }
 
 
@@ -103,9 +102,9 @@ Handle(StepDimTol_GeometricToleranceWithDatumReference) StepDimTol_GeoTolAndGeoT
 //=======================================================================
 
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::SetModifiedGeometricTolerance
-  (const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT) 
+  (const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT)
 {
-  myModifiedGeometricTolerance = aMGT;
+  myModifiedGeometricTolerance = theMGT;
 }
 
 
@@ -126,9 +125,9 @@ Handle(StepDimTol_ModifiedGeometricTolerance) StepDimTol_GeoTolAndGeoTolWthDatRe
 //=======================================================================
 
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::SetPositionTolerance
-  (const Handle(StepDimTol_PositionTolerance)& aPT) 
+  (const Handle(StepDimTol_PositionTolerance)& thePT)
 {
-  myPositionTolerance = aPT;
+  myPositionTolerance = thePT;
 }
 
 

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx

@@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_ModifiedGeometricTolerance;
 class StepDimTol_PositionTolerance;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -41,19 +40,29 @@ public:
   
   Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol();
   
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, const Handle(StepBasic_MeasureWithUnit)& aMagnitude, const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(TCollection_HAsciiString)& theDescription,
+                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
+                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
+                             const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT);
 
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aDescription, const Handle(StepBasic_MeasureWithUnit)& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(TCollection_HAsciiString)& theDescription,
+                             const Handle(Standard_Transient)& theMagnitude,
+                             const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
+                             const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT);
 
-  Standard_EXPORT void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR);
+  Standard_EXPORT void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR);
   
   Standard_EXPORT Handle(StepDimTol_GeometricToleranceWithDatumReference) GetGeometricToleranceWithDatumReference() const;
   
-  Standard_EXPORT void SetModifiedGeometricTolerance (const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
+  Standard_EXPORT void SetModifiedGeometricTolerance (const Handle(StepDimTol_ModifiedGeometricTolerance)& theMGT);
   
   Standard_EXPORT Handle(StepDimTol_ModifiedGeometricTolerance) GetModifiedGeometricTolerance() const;
   
-  Standard_EXPORT void SetPositionTolerance (const Handle(StepDimTol_PositionTolerance)& aPT);
+  Standard_EXPORT void SetPositionTolerance (const Handle(StepDimTol_PositionTolerance)& thePT);
   
   Standard_EXPORT Handle(StepDimTol_PositionTolerance) GetPositionTolerance() const;
 

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx

@@ -39,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::StepDimTol_GeoTolAndGeoTolW
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const StepDimTol_GeometricToleranceType theType,
@@ -58,7 +58,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
    const StepDimTol_GeometricToleranceType theType,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx

@@ -24,7 +24,6 @@ class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_UnequallyDisposedGeometricTolerance;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -41,17 +40,17 @@ public:
   
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                              const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                              const StepDimTol_GeometricToleranceType theType,
                              const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& theUDGT);
 
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
-                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& aMagnitude, 
-                             const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
-                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(TCollection_HAsciiString)& theDescription,
+                             const Handle(Standard_Transient)& theMagnitude,
+                             const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
                              const StepDimTol_GeometricToleranceType theType,
                              const Handle(StepDimTol_UnequallyDisposedGeometricTolerance)& theUDGT);
 

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx

@@ -13,9 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -40,7 +38,7 @@ StepDimTol_GeoTolAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTolWthMaxTol()
 void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
    const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
@@ -58,7 +56,7 @@ void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
 void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
    const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx

@@ -25,7 +25,6 @@ class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
 class StepBasic_LengthMeasureWithUnit;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -42,17 +41,17 @@ public:
   
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
                              const Handle(TCollection_HAsciiString)& theDescription,
-                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
                              const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
                              const StepDimTol_GeometricToleranceType theType);
 
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
-                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& aMagnitude, 
-                             const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
-                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(TCollection_HAsciiString)& theDescription,
+                             const Handle(Standard_Transient)& theMagnitude,
+                             const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
                              const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
                              const StepDimTol_GeometricToleranceType theType);
                              

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx

@@ -39,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthMod::StepDimTol_GeoTolAndGeoTolWthMod()
 void StepDimTol_GeoTolAndGeoTolWthMod::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
    const StepDimTol_GeometricToleranceType theType)
@@ -60,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthMod::Init
 void StepDimTol_GeoTolAndGeoTolWthMod::Init
   (const Handle(TCollection_HAsciiString)& theName,
    const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
+   const Handle(Standard_Transient)& theMagnitude,
    const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
    const StepDimTol_GeometricToleranceType theType)

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx

@@ -41,16 +41,16 @@ public:
   
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
                              const Handle(TCollection_HAsciiString)& theDescription,
-                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                             const Handle(Standard_Transient)& theMagnitude,
                              const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
                              const StepDimTol_GeometricToleranceType theType);
 
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
-                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(StepBasic_MeasureWithUnit)& aMagnitude, 
-                             const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
-                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
+  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName,
+                             const Handle(TCollection_HAsciiString)& theDescription,
+                             const Handle(Standard_Transient)& theMagnitude,
+                             const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
                              const StepDimTol_GeometricToleranceType theType);
 
   inline void SetGeometricToleranceWithModifiers (const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM) {

src/StepDimTol/StepDimTol_GeometricTolerance.cxx

@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -38,7 +37,7 @@ StepDimTol_GeometricTolerance::StepDimTol_GeometricTolerance ()
 
 void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theName,
                                           const Handle(TCollection_HAsciiString) &theDescription,
-                                          const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+                                          const Handle(Standard_Transient)& theMagnitude,
                                           const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect)
 {
 
@@ -58,7 +57,7 @@ void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString)
 
 void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theName,
                                           const Handle(TCollection_HAsciiString) &theDescription,
-                                          const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+                                          const Handle(Standard_Transient)& theMagnitude,
                                           const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect)
 {
 
@@ -116,7 +115,7 @@ void StepDimTol_GeometricTolerance::SetDescription (const Handle(TCollection_HAs
 //purpose  : 
 //=======================================================================
 
-Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () const
+Handle(Standard_Transient) StepDimTol_GeometricTolerance::Magnitude() const
 {
   return myMagnitude;
 }
@@ -126,7 +125,7 @@ Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () co
 //purpose  : 
 //=======================================================================
 
-void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(StepBasic_MeasureWithUnit) &theMagnitude)
+void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(Standard_Transient)& theMagnitude)
 {
   myMagnitude = theMagnitude;
 }

src/StepDimTol/StepDimTol_GeometricTolerance.hxx

@@ -21,10 +21,9 @@
 
 #include <Standard_Transient.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
-class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
-class StepRepr_ShapeAspect;
 
+class TCollection_HAsciiString;
+class StepRepr_ShapeAspect;
 
 class StepDimTol_GeometricTolerance;
 DEFINE_STANDARD_HANDLE(StepDimTol_GeometricTolerance, Standard_Transient)
@@ -42,13 +41,13 @@ public:
   //! Initialize all fields (own and inherited) AP214
   Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                            const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                            const Handle(Standard_Transient)& theMagnitude,
                             const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect);
 
     //! Initialize all fields (own and inherited) AP242
   Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                            const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                            const Handle(Standard_Transient)& theMagnitude,
                             const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect);
   
   //! Returns field Name
@@ -64,10 +63,10 @@ public:
   Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& theDescription);
   
   //! Returns field Magnitude
-  Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Magnitude() const;
+  Standard_EXPORT Handle(Standard_Transient) Magnitude() const;
 
   //! Set field Magnitude
-  Standard_EXPORT void SetMagnitude (const Handle(StepBasic_MeasureWithUnit)& theMagnitude);
+  Standard_EXPORT void SetMagnitude(const Handle(Standard_Transient)& theMagnitude);
 
   //! Returns field TolerancedShapeAspect
   //! Note: in AP214(203) type of this attribute can be only StepRepr_ShapeAspect
@@ -94,7 +93,7 @@ private:
 
   Handle(TCollection_HAsciiString) myName;
   Handle(TCollection_HAsciiString) myDescription;
-  Handle(StepBasic_MeasureWithUnit) myMagnitude;
+  Handle(Standard_Transient) myMagnitude;
   StepDimTol_GeometricToleranceTarget myTolerancedShapeAspect;
 
 

src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx

@@ -38,7 +38,7 @@ StepDimTol_GeometricToleranceWithDatumReference::StepDimTol_GeometricToleranceWi
 
 void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
                                                             const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
-                                                            const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
+                                                            const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
                                                             const Handle(StepRepr_ShapeAspect) &theGeometricTolerance_TolerancedShapeAspect,
                                                             const Handle(StepDimTol_HArray1OfDatumReference) &theDatumSystem)
 {
@@ -62,7 +62,7 @@ void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollec
 
 void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
                                                             const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
-                                                            const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
+                                                            const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
                                                             const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect,
                                                             const Handle(StepDimTol_HArray1OfDatumSystemOrReference) &theDatumSystem)
 {

src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx

@@ -44,14 +44,14 @@ public:
   //! Initialize all fields (own and inherited) AP214
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name, 
     const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description, 
-    const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude, 
+    const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
     const Handle(StepRepr_ShapeAspect)& theGeometricTolerance_TolerancedShapeAspect, 
     const Handle(StepDimTol_HArray1OfDatumReference)& theDatumSystem);
 
   //! Initialize all fields (own and inherited) AP242
   Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name, 
     const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description, 
-    const Handle(StepBasic_MeasureWithUnit)& theGeometricTolerance_Magnitude, 
+    const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
     const StepDimTol_GeometricToleranceTarget& theGeometricTolerance_TolerancedShapeAspect, 
     const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem);
   

src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx

@@ -34,7 +34,7 @@ StepDimTol_GeometricToleranceWithDefinedAreaUnit::StepDimTol_GeometricToleranceW
 void StepDimTol_GeometricToleranceWithDefinedAreaUnit::
   Init (const Handle(TCollection_HAsciiString) &theName,
         const Handle(TCollection_HAsciiString) &theDescription,
-        const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+        const Handle(Standard_Transient)& theMagnitude,
         const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
         const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize,
         const StepDimTol_AreaUnitType theUnitType,

src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx

@@ -42,7 +42,7 @@ public:
   //! Initialize all fields (own and inherited)
   Standard_EXPORT   void Init(const Handle(TCollection_HAsciiString)& theName, 
                               const Handle(TCollection_HAsciiString)& theDescription, 
-                              const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                              const Handle(Standard_Transient)& theMagnitude,
                               const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, 
                               const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize, 
                               const StepDimTol_AreaUnitType theAreaType, const Standard_Boolean theHasSecondUnitSize, 

src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx

@@ -36,7 +36,7 @@ StepDimTol_GeometricToleranceWithDefinedUnit::StepDimTol_GeometricToleranceWithD
 
 void StepDimTol_GeometricToleranceWithDefinedUnit::Init (const Handle(TCollection_HAsciiString) &theName,
                                                          const Handle(TCollection_HAsciiString) &theDescription,
-                                                         const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+                                                         const Handle(Standard_Transient)& theMagnitude,
                                                          const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect,
                                                          const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize)
 {
@@ -51,7 +51,7 @@ void StepDimTol_GeometricToleranceWithDefinedUnit::Init (const Handle(TCollectio
 
 void StepDimTol_GeometricToleranceWithDefinedUnit::Init (const Handle(TCollection_HAsciiString) &theName,
                                                          const Handle(TCollection_HAsciiString) &theDescription,
-                                                         const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+                                                         const Handle(Standard_Transient)& theMagnitude,
                                                          const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
                                                          const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize)
 {

src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx

@@ -22,7 +22,6 @@
 
 class StepBasic_LengthMeasureWithUnit;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepRepr_ShapeAspect;
 
@@ -38,10 +37,18 @@ public:
   Standard_EXPORT StepDimTol_GeometricToleranceWithDefinedUnit();
   
   //! Initialize all fields (own and inherited) AP214
-  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
+  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName,
+                               const Handle(TCollection_HAsciiString)& theDescription,
+                               const Handle(Standard_Transient)& theMagnitude,
+                               const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
+                               const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize);
   
   //! Initialize all fields (own and inherited) AP242
-  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
+  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName,
+                               const Handle(TCollection_HAsciiString)& theDescription,
+                               const Handle(Standard_Transient)& theMagnitude,
+                               const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                               const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
 
   //! Returns field UnitSize
   inline Handle(StepBasic_LengthMeasureWithUnit) UnitSize () const

src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx

@@ -37,7 +37,7 @@ StepDimTol_GeometricToleranceWithMaximumTolerance::StepDimTol_GeometricTolerance
 void StepDimTol_GeometricToleranceWithMaximumTolerance::
   Init (const Handle(TCollection_HAsciiString) &theName,
         const Handle(TCollection_HAsciiString) &theDescription,
-        const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+        const Handle(Standard_Transient)& theMagnitude,
         const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
         const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers,
         const Handle(StepBasic_LengthMeasureWithUnit) &theMaximumUpperTolerance)

src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx

@@ -22,7 +22,6 @@
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_HArray1OfGeometricToleranceModifier;
 
@@ -38,7 +37,12 @@ public:
   Standard_EXPORT StepDimTol_GeometricToleranceWithMaximumTolerance();
   
   //! Initialize all fields (own and inherited)
-  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(TCollection_HAsciiString)& theDescription, const Handle(StepBasic_MeasureWithUnit)& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers, const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
+  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName,
+                               const Handle(TCollection_HAsciiString)& theDescription,
+                               const Handle(Standard_Transient)& theMagnitude,
+                               const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect,
+                               const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers,
+                               const Handle(StepBasic_LengthMeasureWithUnit)& theUnitSize) ;
   
   //! Returns field MaximumUpperTolerance
   inline Handle(StepBasic_LengthMeasureWithUnit) MaximumUpperTolerance () const

src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx

@@ -36,7 +36,7 @@ StepDimTol_GeometricToleranceWithModifiers::StepDimTol_GeometricToleranceWithMod
 
 void StepDimTol_GeometricToleranceWithModifiers::Init (const Handle(TCollection_HAsciiString) &theName,
                                                        const Handle(TCollection_HAsciiString) &theDescription,
-                                                       const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
+                                                       const Handle(Standard_Transient)& theMagnitude,
                                                        const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
                                                        const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers)
 {

src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx

@@ -23,7 +23,6 @@
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 
 class StepDimTol_GeometricToleranceWithModifiers;
@@ -40,7 +39,7 @@ public:
   //! Initialize all fields (own and inherited)
   Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName, 
                                const Handle(TCollection_HAsciiString)& theDescription, 
-                               const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
+                               const Handle(Standard_Transient)& theMagnitude,
                                const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, 
                                const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers) ;
   

src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx

@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -38,7 +37,7 @@ StepDimTol_ModifiedGeometricTolerance::StepDimTol_ModifiedGeometricTolerance ()
 
 void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
                                                   const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
-                                                  const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
+                                                  const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
                                                   const Handle(StepRepr_ShapeAspect) &theGeometricTolerance_TolerancedShapeAspect,
                                                   const StepDimTol_LimitCondition theModifier)
 {
@@ -57,7 +56,7 @@ void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsci
 
 void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
                                                   const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
-                                                  const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
+                                                  const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
                                                   const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect,
                                                   const StepDimTol_LimitCondition theModifier)
 {