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

Fixed magnitude class to handle main GDT value.
0033095: Data Exchange, Step Import - Wrong PMI values when loading a *.stp file in m
2025-08-24 13:50:49 +03:00 · 2022-08-12 15:02:44 +03:00 · 2022-08-11 10:43:32 +03:00 · 2022-08-04 17:50:46 +03:00 · 2022-08-02 17:13:03 +03:00
68 changed files with 776 additions and 232 deletions
--- a/src/Font/Font_TextFormatter.cxx
+++ b/src/Font/Font_TextFormatter.cxx
@@ -60,6 +60,7 @@ Font_TextFormatter::Font_TextFormatter()
  myAlignY (Graphic3d_VTA_TOP),
  myTabSize (8),
  myWrappingWidth (0.0f),
+  myIsWordWrapping (true),
  myLastSymbolWidth (0.0f),
  myMaxSymbolWidth (0.0f),
  //
@@ -249,6 +250,7 @@ void Font_TextFormatter::Format()
    }
  }

+  Standard_Utf32Char aCharPrev = 0;
  for (Font_TextFormatter::Iterator aFormatterIt(*this);
       aFormatterIt.More(); aFormatterIt.Next())
  {
@@ -269,12 +271,30 @@ void Font_TextFormatter::Format()
      Font_Rect aBndBox;
      GlyphBoundingBox (aRectIter, aBndBox);
      const Standard_ShortReal aNextXPos = aBndBox.Right - BottomLeft (aFirstCornerId).x();
-      if (aNextXPos > aMaxLineWidth) // wrap the line and do processing of the symbol
+      Standard_Boolean isCurWordFits = true;
+      if(myIsWordWrapping && IsSeparatorSymbol(aCharPrev))
+      {
+        for (Font_TextFormatter::Iterator aWordIt = aFormatterIt; aWordIt.More(); aWordIt.Next())
+        {
+          if (IsSeparatorSymbol(aWordIt.Symbol()))
+          {
+            break;
+          }
+          float aWordWidthPx = myCorners[aWordIt.SymbolPosition()].x() - myCorners[aRectIter].x();
+          if (aNextXPos + aWordWidthPx > aMaxLineWidth)
+          {
+            isCurWordFits = false;
+            break;
+          }
+        }
+      }
+      if (aNextXPos > aMaxLineWidth || !isCurWordFits) // wrap the line and do processing of the symbol
      {
        const Standard_Integer aLastRect = aRectIter - 1; // last rect on current line
        newLine (aLastRect, aMaxLineWidth);
      }
    }
+    aCharPrev = aCharThis;
  }

  myBndWidth = aMaxLineWidth;
--- a/src/Font/Font_TextFormatter.hxx
+++ b/src/Font/Font_TextFormatter.hxx
@@ -220,6 +220,12 @@ public:
  //! Returns text maximum width, zero means that the text is not bounded by width
  Standard_ShortReal Wrapping() const { return myWrappingWidth; }

+  //! returns TRUE when trying not to break words when wrapping text
+  Standard_Boolean WordWrapping () const { return myIsWordWrapping; }
+
+  //! returns TRUE when trying not to break words when wrapping text
+  void SetWordWrapping (const Standard_Boolean theIsWordWrapping)  { myIsWordWrapping = theIsWordWrapping; }
+
  //! @return width of formatted text.
  inline Standard_ShortReal ResultWidth() const
  {
@@ -274,6 +280,14 @@ public:
    return Standard_False;
  }

+  //! Returns true if the symbol separates words when wrapping is enabled
+  static Standard_Boolean IsSeparatorSymbol (const Standard_Utf32Char& theSymbol)
+  {
+    return theSymbol == '\x0A'    // new line
+        || theSymbol == ' '       // space
+        || theSymbol == '\x09';   // tab
+  }
+
  DEFINE_STANDARD_RTTIEXT (Font_TextFormatter, Standard_Transient)

 protected: //! @name class auxiliary methods
@@ -288,6 +302,7 @@ protected: //! @name configuration
  Graphic3d_VerticalTextAlignment   myAlignY;  //!< vertical   alignment style
  Standard_Integer                  myTabSize; //!< horizontal tabulation width (number of space symbols)
  Standard_ShortReal                myWrappingWidth; //!< text is wrapped by the width if defined (more 0)
+  Standard_Boolean                  myIsWordWrapping;  //!< if TRUE try not to break words when wrapping text (true by default)
  Standard_ShortReal                myLastSymbolWidth; //!< width of the last symbol
  Standard_ShortReal                myMaxSymbolWidth; //!< maximum symbol width of the formatter string

--- a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
+++ b/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);

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
+++ b/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);

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
+++ b/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);

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
+++ b/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);

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
+++ b/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);

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.cxx
+++ b/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);
  
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthMod.cxx
+++ b/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);

--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricTolerance.cxx
+++ b/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);
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDatumReference.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
+++ b/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);
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedUnit.cxx
+++ b/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);
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
+++ b/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);
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithModifiers.cxx
+++ b/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);
--- a/src/RWStepDimTol/RWStepDimTol_RWLineProfileTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
+++ b/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);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
+++ b/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);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
+++ b/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);
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/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();
@@ -3365,17 +3384,17 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
        if (anUnit.IsNull()) continue;
        if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
        Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
-        STEPConstruct_UnitContext anUnitCtx;
-        anUnitCtx.ComputeFactors(NU);
-        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit)) ||
-          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
-        {
-          aVal = aVal * anUnitCtx.LengthFactor();
-        }
-        else if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
+        STEPConstruct_UnitContext anUnitCtxUpperBound;
+        anUnitCtxUpperBound.ComputeFactors(NU);
+        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
        {
-          convertAngleValue(anUnitCtx, aVal);
+          convertAngleValue(anUnitCtxUpperBound, aVal);
+        }
+        else if ((aMWU->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) && anUnitCtxUpperBound.LengthFactor() > 0.) ||
+          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
+        {
+          aVal = aVal * anUnitCtxUpperBound.LengthFactor();
        }
        aDim3 = aVal;

@@ -3401,16 +3420,17 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
        if (anUnit.IsNull()) continue;
        if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
        NU = anUnit.NamedUnit();
-        anUnitCtx.ComputeFactors(NU);
-        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit)) ||
-          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
-        {
-          aVal = aVal * anUnitCtx.LengthFactor();
-        }
-        else if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
+        STEPConstruct_UnitContext anUnitCtxLowerBound;
+        anUnitCtxLowerBound.ComputeFactors(NU);
+        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
        {
-          convertAngleValue(anUnitCtx, aVal);
+          convertAngleValue(anUnitCtxLowerBound, aVal);
+        }
+        else if ((aMWU->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) && anUnitCtxLowerBound.LengthFactor() > 0.) ||
+                 aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
+        {
+          aVal = aVal * anUnitCtxLowerBound.LengthFactor();
        }
        aDim2 = Abs(aVal);
      }
@@ -3751,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;
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
+++ b/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)
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx
+++ b/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);
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
+++ b/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)
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
+++ b/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);
  
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
+++ b/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)
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx
+++ b/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);
--- a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
+++ b/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;
 }
--- a/src/StepDimTol/StepDimTol_GeometricTolerance.hxx
+++ b/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;


--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
+++ b/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)
 {
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx
+++ b/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);
  
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx
+++ b/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,
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
+++ b/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, 
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx
+++ b/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)
 {
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
+++ b/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
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx
+++ b/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)
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
+++ b/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
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx
+++ b/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)
 {
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
+++ b/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) ;
  
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
+++ b/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)
 {
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
+++ b/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);

--- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx
+++ b/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)
 {
--- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
+++ b/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
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -2500,6 +2500,11 @@ static int VDrawText (Draw_Interpretor& theDI,
      }
      aTextFormatter->SetWrapping ((Standard_ShortReal)Draw::Atof(theArgVec[++anArgIt]));
    }
+    else if (aParam == "-wordwrapping")
+    {
+      const bool isWordWrapping = Draw::ParseOnOffNoIterator(theArgsNb, theArgVec, anArgIt);
+      aTextFormatter->SetWordWrapping(isWordWrapping);
+    }
    else if (aParam == "-aspect"
          && anArgIt + 1 < theArgsNb)
    {
@@ -6925,6 +6930,7 @@ vdrawtext name text
          [-zoom {0|1}]=0
          [-height height]=16
          [-wrapping width]=40
+          [-wordwrapping {0|1}]=1
          [-aspect {regular|bold|italic|boldItalic}]=regular
          [-font font]=Times
          [-2d] [-perspos {X Y Z}]={0 0 0}
--- a/tests/bugs/step/bug33095
+++ b/tests/bugs/step/bug33095
@@ -0,0 +1,32 @@
+puts "======="
+puts "0033095: Data Exchange, Step Import - Wrong PMI values when loading a *.stp file in m"
+puts "======="
+
+pload OCAF
+
+catch { Close D_mm }
+catch { Close D_m }
+
+# Read file in mm
+ReadStep D_mm [locate_data_file bug33095_cad_with_pmi.stp]
+set plusMinusTol_mm [XGetDimensionPlusMinusTol D_mm 0:1:4:77]
+
+# Read file in m
+XNewDoc D_m
+XSetLengthUnit D_m m
+ReadStep D_m [locate_data_file bug33095_cad_with_pmi.stp]
+set plusMinusTol_m [XGetDimensionPlusMinusTol D_m 0:1:4:77]
+
+# Checking
+regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_m full lower_m upper_m
+regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_mm full lower_mm upper_mm
+
+set lower_m_to_mm [expr {$lower_m * 1000}]
+set upper_m_to_mm [expr {$upper_m * 1000}]
+
+if {[expr {abs($lower_m_to_mm - $lower_mm)}] > 1e-2} {
+ puts "Error: incorrect scaling lower toleranse value"
+}
+if {[expr {abs($upper_m_to_mm - $upper_mm)}] > 1e-2} {
+ puts "Error: incorrect scaling upper toleranse value"
+}
--- a/tests/gdt/import/A3
+++ b/tests/gdt/import/A3
@@ -12,45 +12,45 @@ set ref_data {
 0:1:1:2:2 Shape.5
 	 0:1:4:1 GeomTolerance.5.1 ( N "Feature Control Frame (4)" T 12 TV 0, V 0.254 )
 0:1:1:2:7 Shape.10
- 	 0:1:4:6 Dimension.10.1 ( N "linear distance" T 2, V 20.827999999999996, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:6 Dimension.10.1 ( N "linear distance" T 2, V 20.827999999999996, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 0:1:1:2:19 Shape.22
- 	 0:1:4:39 Dimension.22.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:39 Dimension.22.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:35 GeomTolerance.22.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:36 Datum.22.1.1 ( N "Feature Control Frame (40)" )
 	 	 0:1:4:37 Datum.22.1.2 ( N "Feature Control Frame (40)", M 15 )
 	 	 0:1:4:38 Datum.22.1.3 ( N "Feature Control Frame (40)", M 15 )
 0:1:1:2:20 Shape.23
- 	 0:1:4:39 Dimension.23.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:39 Dimension.23.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:35 GeomTolerance.23.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:36 Datum.23.1.1 ( N "Feature Control Frame (40)" )
 	 	 0:1:4:37 Datum.23.1.2 ( N "Feature Control Frame (40)", M 15 )
 	 	 0:1:4:38 Datum.23.1.3 ( N "Feature Control Frame (40)", M 15 )
 0:1:1:2:21 Shape.24
- 	 0:1:4:39 Dimension.24.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:39 Dimension.24.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:35 GeomTolerance.24.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:36 Datum.24.1.1 ( N "Feature Control Frame (40)" )
 	 	 0:1:4:37 Datum.24.1.2 ( N "Feature Control Frame (40)", M 15 )
 	 	 0:1:4:38 Datum.24.1.3 ( N "Feature Control Frame (40)", M 15 )
 0:1:1:2:22 Shape.25
- 	 0:1:4:39 Dimension.25.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:39 Dimension.25.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:35 GeomTolerance.25.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:36 Datum.25.1.1 ( N "Feature Control Frame (40)" )
 	 	 0:1:4:37 Datum.25.1.2 ( N "Feature Control Frame (40)", M 15 )
 	 	 0:1:4:38 Datum.25.1.3 ( N "Feature Control Frame (40)", M 15 )
 0:1:1:2:28 Shape.31
- 	 0:1:4:6 Dimension.31.1 ( N "linear distance" T 2, V 20.827999999999996, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:6 Dimension.31.1 ( N "linear distance" T 2, V 20.827999999999996, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:2 GeomTolerance.31.1 ( N "Feature Control Frame (24)" T 12 TV 0, V 0.76200000000000001 )
 	 	 0:1:4:3 Datum.31.1.1 ( N "Feature Control Frame (24)" )
 	 	 0:1:4:4 Datum.31.1.2 ( N "Feature Control Frame (24)" )
 	 	 0:1:4:5 Datum.31.1.3 ( N "Feature Control Frame (24)" )
 0:1:1:2:39 Shape.42
- 	 0:1:4:14 Dimension.42.1 ( N "diameter" T 15, V 50.799999999999997, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:14 Dimension.42.1 ( N "diameter" T 15, V 50.799999999999997, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:15 GeomTolerance.42.1 ( N "Feature Control Frame (16)" T 10 TV 1, V 1.524 )
 	 	 0:1:4:16 Datum.42.1.1 ( N "Feature Control Frame (16)" )
 	 	 0:1:4:17 Datum.42.1.2 ( N "Feature Control Frame (16)" )
 	 	 0:1:4:18 Datum.42.1.3 ( N "Feature Control Frame (16)" )
 0:1:1:2:40 Shape.43
- 	 0:1:4:14 Dimension.43.1 ( N "diameter" T 15, V 50.799999999999997, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:14 Dimension.43.1 ( N "diameter" T 15, V 50.799999999999997, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:15 GeomTolerance.43.1 ( N "Feature Control Frame (16)" T 10 TV 1, V 1.524 )
 	 	 0:1:4:16 Datum.43.1.1 ( N "Feature Control Frame (16)" )
 	 	 0:1:4:17 Datum.43.1.2 ( N "Feature Control Frame (16)" )
@@ -58,7 +58,7 @@ set ref_data {
 0:1:1:2:48 Shape.51
 	 0:1:4:30 Dimension.51.1 ( N "linear distance" T 2, V 19.049999999999997, P 0 )
 0:1:1:2:49 Shape.52
- 	 0:1:4:19 Dimension.52.1 ( N "diameter" T 15, V 38.099999999999994, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:19 Dimension.52.1 ( N "diameter" T 15, V 38.099999999999994, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:20 GeomTolerance.52.1 ( N "Feature Control Frame (18)" T 10 TV 1, V 2.032 )
 	 	 0:1:4:21 Datum.52.1.1 ( N "Feature Control Frame (18)" )
 	 	 0:1:4:22 Datum.52.1.2 ( N "Feature Control Frame (18)" )
@@ -68,7 +68,7 @@ set ref_data {
 	 	 0:1:4:27 Datum.52.2.2 ( N "Feature Control Frame (20)" )
 	 	 0:1:4:28 Datum.52.2.3 ( N "Feature Control Frame (20)" )
 0:1:1:2:50 Shape.53
- 	 0:1:4:19 Dimension.53.1 ( N "diameter" T 15, V 38.099999999999994, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:19 Dimension.53.1 ( N "diameter" T 15, V 38.099999999999994, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:24 Dimension.53.2 ( N "linear distance" T 2, V 38.099999999999994, P 0 )
 	 0:1:4:20 GeomTolerance.53.1 ( N "Feature Control Frame (18)" T 10 TV 1, V 2.032 )
 	 	 0:1:4:21 Datum.53.1.1 ( N "Feature Control Frame (18)" )
@@ -79,49 +79,49 @@ set ref_data {
 	 	 0:1:4:27 Datum.53.2.2 ( N "Feature Control Frame (20)" )
 	 	 0:1:4:28 Datum.53.2.3 ( N "Feature Control Frame (20)" )
 0:1:1:2:51 Shape.54
- 	 0:1:4:29 Dimension.54.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.54.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.54.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.54.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.54.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.54.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:52 Shape.55
- 	 0:1:4:29 Dimension.55.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.55.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.55.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.55.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.55.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.55.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:53 Shape.56
- 	 0:1:4:29 Dimension.56.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.56.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.56.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.56.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.56.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.56.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:54 Shape.57
- 	 0:1:4:29 Dimension.57.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.57.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.57.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.57.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.57.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.57.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:55 Shape.58
- 	 0:1:4:29 Dimension.58.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.58.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.58.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.58.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.58.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.58.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:56 Shape.59
- 	 0:1:4:29 Dimension.59.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.59.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.59.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.59.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.59.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.59.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:57 Shape.60
- 	 0:1:4:29 Dimension.60.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.60.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.60.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.60.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.60.1.2 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:34 Datum.60.1.3 ( N "Feature Control Frame (36)" )
 0:1:1:2:58 Shape.61
- 	 0:1:4:29 Dimension.61.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:29 Dimension.61.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:31 GeomTolerance.61.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
 	 	 0:1:4:32 Datum.61.1.1 ( N "Feature Control Frame (36)" )
 	 	 0:1:4:33 Datum.61.1.2 ( N "Feature Control Frame (36)" )
@@ -137,28 +137,28 @@ set ref_data {
 0:1:1:2:129 Shape.132
 	 0:1:4:1 GeomTolerance.132.1 ( N "Feature Control Frame (4)" T 12 TV 0, V 0.254 )
 0:1:1:2:134 Shape.137
- 	 0:1:4:40 Dimension.137.1 ( N "diameter" T 15, V 27.050999999999998, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:40 Dimension.137.1 ( N "diameter" T 15, V 27.050999999999998, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:41 GeomTolerance.137.1 ( N "Feature Control Frame (30)" T 9 TV 1, V 0.254 )
 	 	 0:1:4:42 Datum.137.1.1 ( N "Feature Control Frame (30)" )
 0:1:1:2:135 Shape.138
- 	 0:1:4:40 Dimension.138.1 ( N "diameter" T 15, V 27.050999999999998, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:40 Dimension.138.1 ( N "diameter" T 15, V 27.050999999999998, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:41 GeomTolerance.138.1 ( N "Feature Control Frame (30)" T 9 TV 1, V 0.254 )
 	 	 0:1:4:42 Datum.138.1.1 ( N "Feature Control Frame (30)" )
 0:1:1:2:153 Shape.156
- 	 0:1:4:7 Dimension.156.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:7 Dimension.156.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:9 GeomTolerance.156.1 ( N "Feature Control Frame (10)" T 9 TV 1, V 0.254 )
 	 	 0:1:4:10 Datum.156.1.1 ( N "Feature Control Frame (10)" )
 0:1:1:2:154 Shape.157
- 	 0:1:4:7 Dimension.157.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:7 Dimension.157.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:9 GeomTolerance.157.1 ( N "Feature Control Frame (10)" T 9 TV 1, V 0.254 )
 	 	 0:1:4:10 Datum.157.1.1 ( N "Feature Control Frame (10)" )
 0:1:1:2:155 Shape.158
- 	 0:1:4:8 Dimension.158.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:8 Dimension.158.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:11 GeomTolerance.158.1 ( N "Feature Control Frame (11)" T 10 TV 1, V 0.50800000000000001 )
 	 	 0:1:4:12 Datum.158.1.1 ( N "Feature Control Frame (11)" )
 	 	 0:1:4:13 Datum.158.1.2 ( N "Feature Control Frame (11)" )
 0:1:1:2:156 Shape.159
- 	 0:1:4:8 Dimension.159.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:8 Dimension.159.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 	 0:1:4:11 GeomTolerance.159.1 ( N "Feature Control Frame (11)" T 10 TV 1, V 0.50800000000000001 )
 	 	 0:1:4:12 Datum.159.1.1 ( N "Feature Control Frame (11)" )
 	 	 0:1:4:13 Datum.159.1.2 ( N "Feature Control Frame (11)" )
--- a/tests/gdt/import/A5
+++ b/tests/gdt/import/A5
@@ -10,9 +10,9 @@ set ref_data {
 NbOfDatumTarget         : 2

 0:1:1:2:2 Shape.5
- 	 0:1:4:14 Dimension.5.1 ( N "linear distance" T 2, V 127, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:14 Dimension.5.1 ( N "linear distance" T 2, V 127, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 0:1:1:2:8 Shape.11
- 	 0:1:4:14 Dimension.11.1 ( N "linear distance" T 2, V 127, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:14 Dimension.11.1 ( N "linear distance" T 2, V 127, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 0:1:1:2:9 Shape.12
 	 0:1:4:1 GeomTolerance.12.1 ( N "Feature Control Frame (11)" T 13 TV 0, V 0.127 )
 0:1:1:2:66 Shape.69
@@ -57,9 +57,9 @@ set ref_data {
 	 0:1:4:7 GeomTolerance.203.1 ( N "Feature Control Frame (4)" T 2 TV 0, V 0.050799999999999998 )
 	 	 0:1:4:8 Datum.203.1.1 ( N "Feature Control Frame (4)" )
 0:1:1:2:206 Shape.209
- 	 0:1:4:11 Dimension.209.1 ( N "linear distance" T 2, V 254, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:11 Dimension.209.1 ( N "linear distance" T 2, V 254, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 0:1:1:2:207 Shape.210
- 	 0:1:4:11 Dimension.210.1 ( N "linear distance" T 2, V 254, VL 2.54, VU 2.54, P 0 )
+ 	 0:1:4:11 Dimension.210.1 ( N "linear distance" T 2, V 254, VL 64.515999999999991, VU 64.515999999999991, P 0 )
 0:1:1:3:1 Shape.211
 	 0:1:4:1 GeomTolerance.211.1 ( N "Feature Control Frame (11)" T 13 TV 0, V 0.127 )
 }
--- a/tests/opengl/data/text/text_wrapped
+++ b/tests/opengl/data/text/text_wrapped
@@ -4,21 +4,30 @@ puts ""
 puts "==========="

 pload MODELING VISUALIZATION
-vinit View1
+vinit View1 -width 500
 vclear
 vaxo

-box b1 10 0 360 10 180 40
+box b1 10 0 460 10 180 40
 vdisplay b1
-vdrawtext t1 "Top text on plane yOz\n(not wrapped)" -pos 10 5 400 -color green -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1
+vdrawtext t1 "Top text on plane yOz\n(not wrapped)" -pos 10 5 500 -color green -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1

-box b2 10 0 240 10 130 60
+box b2 10 0 340 10 130 60
 vdisplay b2
-vdrawtext t2 "Top text on plane yOz\n(wrapping=120)" -pos 10 5 300 -color green -wrapping 120 -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1
+vdrawtext t2 "Top text on plane yOz\n(wrapping=120)" -pos 10 5 400 -color green -wrapping 120 -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1

-box b3 10 0 60 10 60 150
+box b3 10 0 160 10 60 150
 vdisplay b3
-vdrawtext t3 "Top text on plane yOz\n(wrapping=50)" -pos 10 5 200 -color green -wrapping 50 -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1
+vdrawtext t3 "Top text on plane yOz\n(wrapping=50)" -pos 10 5 300 -color green -wrapping 50 -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1
+
+box b4 10 200 400 10 130 100
+vdisplay b4
+vdrawtext t4 "Top text on plane yOz\n(wrapping=120, word wrapping disabled)" -pos 10 205 500 -color green -wrapping 120 -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1 -wordwrapping 0
+
+box b5 10 200 160 10 60 200
+vdisplay b5
+vdrawtext t5 "Top text on plane yOz\n(wrapping=50, word wrapping disabled)" -pos 10 205 350 -color green -wrapping 50 -plane 1 0 0 0 1 0 -valign top -font SansFont -zoom 1 -wordwrapping 0
+

 vright
 vfit
Author	SHA1	Message	Date
dpasukhi	0f455fa7c4	0033099: Data Exchange, Step Import - Wrong PMI values in GDT Fixed magnitude class to handle main GDT value.	2022-08-12 15:02:44 +03:00
dpasukhi	621ed3bc36	0033095: Data Exchange, Step Import - Wrong PMI values when loading a *.stp file in m Fixed problem with dimension tolerance values (upper/lower) - Update supported type for tolerance measure unit, now we can handle base class	2022-08-11 10:43:32 +03:00
mzernova	81d569625e	0033084: Visualization - Cylindrical prism is selectable only by its base when extruded in some directions Fixed bounding boxes for Select3D_SensitiveCylinder. Added display of Select3D_SensitiveCylinder presentation using the "vsensdis" command. Added test vselect/bugs/bug33084.	2022-08-04 17:50:46 +03:00
ngavrilo	6072d3093c	0032992: Visualization - Font_TextFormatter should wrap words when possible	2022-08-02 17:13:03 +03:00