0033099: Data Exchange, Step Import - Wrong PMI values in GDT

Fixed magnitude class to handle main GDT value.

src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx

@@ -24,6 +24,8 @@
 #include <StepDimTol_AngularityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWAngularityTolerance
@@ -54,8 +56,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +93,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

@@ -24,6 +24,8 @@
 #include <StepDimTol_CircularRunoutTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWCircularRunoutTolerance
@@ -54,8 +56,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +93,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

@@ -24,6 +24,8 @@
 #include <StepDimTol_CoaxialityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWCoaxialityTolerance
@@ -54,8 +56,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +93,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

@@ -24,6 +24,8 @@
 #include <StepDimTol_ConcentricityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWConcentricityTolerance
@@ -54,8 +56,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -78,7 +93,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

@@ -22,6 +22,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_CylindricityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWCylindricityTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -61,7 +76,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

@@ -22,6 +22,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWFlatnessTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -61,7 +76,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

@@ -23,6 +23,8 @@
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRef
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx

@@ -25,6 +25,8 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol
@@ -53,8 +55,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx

@@ -24,6 +24,8 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx

@@ -22,6 +22,8 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol
@@ -50,8 +52,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx

@@ -23,6 +23,8 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_UnequallyDisposedGeometricTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx

@@ -23,6 +23,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
   

src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx

@@ -22,6 +22,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthMod
@@ -50,8 +52,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);
 

src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx

@@ -22,6 +22,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx

@@ -23,6 +23,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricToleranceWithDatumReference
@@ -53,8 +55,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -77,7 +92,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

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit
@@ -53,8 +55,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDefinedUnit.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricToleranceWithDefinedUnit
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx

@@ -22,6 +22,8 @@
 #include <StepDimTol_GeometricToleranceWithMaximumTolerance.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -54,8 +56,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx

@@ -22,6 +22,8 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -54,8 +56,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_LineProfileTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWLineProfileTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +75,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

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWModifiedGeometricTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -72,7 +87,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

@@ -22,6 +22,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ParallelismTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWParallelismTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +91,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

@@ -22,6 +22,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PerpendicularityTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWPerpendicularityTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +91,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

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PositionTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWPositionTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +75,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

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_RoundnessTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWRoundnessTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +75,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

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_StraightnessTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWStraightnessTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +75,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

@@ -21,6 +21,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_SurfaceProfileTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWSurfaceProfileTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -60,7 +75,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

@@ -22,6 +22,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_SymmetryTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWSymmetryTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +91,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

@@ -22,6 +22,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_TotalRunoutTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWTotalRunoutTolerance
@@ -52,8 +54,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +91,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

@@ -19,6 +19,8 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_UnequallyDisposedGeometricTolerance.hxx>
+#include <StepRepr_MeasureRepresentationItem.hxx>
+#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWUnequallyDisposedGeometricTolerance
@@ -51,8 +53,21 @@ 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;
+  if (!data->ReadEntity(num, 3, "magnitude", ach,
+      STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude))
+  {
+    Handle(StepRepr_MeasureRepresentationItem) aMSR1;
+    Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
+    if (data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_MeasureRepresentationItem), aMSR1) ||
+        data->ReadEntity(num, 3, "magnitude", ach, STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
+    {
+      if (!aMSR1.IsNull())
+        aMagnitude = aMSR1;
+      else if (!aRIMU1.IsNull())
+        aMagnitude = aRIMU1;
+    }
+  }
 
   StepDimTol_GeometricToleranceTarget aTolerancedShapeAspect;
   data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aTolerancedShapeAspect);

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -2930,15 +2930,34 @@ 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;
+            if (GT->Magnitude().IsNull())
+            {
+              continue;
+            }
+            Handle(Standard_Transient) aMagnitude = GT->Magnitude();
+            Handle(StepBasic_MeasureWithUnit) dim3;
+            if (aMagnitude->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
+            {
+              dim3 = Handle(StepBasic_MeasureWithUnit)::DownCast(aMagnitude);
+            }
+            else if (aMagnitude->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
+            {
+              Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
+                Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aMagnitude);
+              dim3 = aReprMeasureItem->GetMeasureWithUnit();
+            }
+            if (dim3.IsNull())
+            {
+              continue;
+            }
             Standard_Real dim = dim3->ValueComponent();
-            StepBasic_Unit anUnit = GT->Magnitude()->UnitComponent();
+            StepBasic_Unit anUnit = dim3->UnitComponent();
             if (anUnit.IsNull()) continue;
             if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
             Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
@@ -3752,17 +3771,37 @@ 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();
-    STEPConstruct_UnitContext anUnitCtx;
-    anUnitCtx.ComputeFactors(NU);
-    aVal = aVal * anUnitCtx.LengthFactor();
-    aTolObj->SetValue(aVal);
+  if (!aTolEnt->Magnitude().IsNull())
+  {
+    Handle(Standard_Transient) aMagnitude = aTolEnt->Magnitude();
+    Handle(StepBasic_MeasureWithUnit) aMWU;
+    if (aMagnitude->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)))
+    {
+      aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aMagnitude);
+    }
+    else if (aMagnitude->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)))
+    {
+      Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
+        Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aMagnitude);
+      aMWU = aReprMeasureItem->GetMeasureWithUnit();
+    }
+    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) NU = anUnit.NamedUnit();
+        STEPConstruct_UnitContext anUnitCtx;
+        anUnitCtx.ComputeFactors(NU);
+        if (anUnitCtx.LengthFactor() > 0.)
+        {
+          aVal = aVal * anUnitCtx.LengthFactor();
+        }
+      }
+      aTolObj->SetValue(aVal);
+    }
   }
   //get modifiers
   XCAFDimTolObjects_GeomToleranceTypeValue aTypeV = XCAFDimTolObjects_GeomToleranceTypeValue_None;

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx

@@ -13,8 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -39,7 +37,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 +58,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,14 +40,14 @@ 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 Handle(Standard_Transient)& aMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
                              const StepDimTol_GeometricToleranceType theType);

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.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_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@@ -41,7 +39,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 +59,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)& aMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx

@@ -13,8 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@@ -40,7 +38,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 +61,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)& aMagnitude,
                              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>
@@ -39,7 +38,7 @@ 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(Standard_Transient)& aMagnitude,
    const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
    const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
@@ -60,7 +59,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
   (const Handle(TCollection_HAsciiString)& aName,
    const Handle(TCollection_HAsciiString)& aDescription,
-   const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
+   const Handle(Standard_Transient)& aMagnitude,
    const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect,
    const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
    const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)

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,9 +40,9 @@ 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)& aName, const Handle(TCollection_HAsciiString)& aDescription, const Handle(Standard_Transient)& aMagnitude, const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
 
-  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)& aName, const Handle(TCollection_HAsciiString)& aDescription, const Handle(Standard_Transient)& aMagnitude, const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT);
 
   Standard_EXPORT void SetGeometricToleranceWithDatumReference (const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR);
   

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,7 +40,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 StepDimTol_GeometricToleranceType theType,
@@ -49,7 +48,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)& aMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR, 
                              const StepDimTol_GeometricToleranceType theType,

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,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_GeometricToleranceWithModifiers)& theGTWM,
                              const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
@@ -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)& aMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
                              const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,

src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx

@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -39,7 +38,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 +59,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

@@ -24,7 +24,6 @@
 class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;
 
 
@@ -41,14 +40,14 @@ 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 Handle(Standard_Transient)& aMagnitude,
                              const StepDimTol_GeometricToleranceTarget& aTolerancedShapeAspect, 
                              const Handle(StepDimTol_GeometricToleranceWithModifiers)& aGTWM,
                              const StepDimTol_GeometricToleranceType theType);

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

@@ -16,7 +16,6 @@
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
 #include <Standard_Type.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
@@ -38,7 +37,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 +61,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

@@ -23,7 +23,6 @@
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepRepr_ShapeAspect;
 
@@ -44,14 +43,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

@@ -24,7 +24,6 @@
 
 class StepBasic_LengthMeasureWithUnit;
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 
 class StepDimTol_GeometricToleranceWithDefinedAreaUnit;
@@ -42,7 +41,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,10 @@ 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,7 @@ 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)
 {

src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx

@@ -22,7 +22,6 @@
 #include <StepDimTol_LimitCondition.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepRepr_ShapeAspect;
 
@@ -43,14 +42,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 StepDimTol_LimitCondition theModifier);
 
   //! 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 StepDimTol_LimitCondition theModifier);
 

src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx

@@ -36,7 +36,7 @@ StepDimTol_UnequallyDisposedGeometricTolerance::StepDimTol_UnequallyDisposedGeom
 
 void StepDimTol_UnequallyDisposedGeometricTolerance::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) &theDisplacement)
 {

src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx

@@ -22,7 +22,6 @@
 #include <StepDimTol_GeometricTolerance.hxx>
 
 class TCollection_HAsciiString;
-class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 
 class StepDimTol_UnequallyDisposedGeometricTolerance;
@@ -37,7 +36,7 @@ public:
   Standard_EXPORT StepDimTol_UnequallyDisposedGeometricTolerance();
   
   //! 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(StepBasic_LengthMeasureWithUnit)& theDisplacement) ;
+  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)& theDisplacement) ;
 
   //! Returns field Displacement
   inline Handle(StepBasic_LengthMeasureWithUnit) Displacement () const