33150 fix(?) for wrong translate of 2dCurve

26920 fix exception call in fillet(wrong choice of face)
0032957: Add Standard_Noexcept definition
2025-09-08 14:17:06 +03:00 · 2022-09-30 10:58:48 +03:00 · 2022-09-30 10:57:43 +03:00 · 2022-08-18 11:55:14 +03:00 · 2022-08-13 13:53:14 +03:00 · 2022-08-12 19:04:03 +03:00
79 changed files with 370 additions and 690 deletions
--- a/src/ChFi3d/ChFi3d_Builder_0.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_0.cxx
@@ -3238,7 +3238,9 @@ Standard_Boolean ChFi3d_ComputeCurves(const Handle(Adaptor3d_Surface)&   S1,
              Pc2->Value(Uf).Coord(x,y);
              x = Pardeb(3) - x;
              y = Pardeb(4) - y;
-              if(Abs(x) > tol2d || Abs(y) > tol2d) Pc2->Translate(gp_Vec2d(x,y));
+
+              if(Abs(x) > tol2d || Abs(y) > tol2d) 
+                Pc2->Translate(gp_Vec2d(-6.2831853, 0));
              tolreached = ChFi3d_EvalTolReached(S1,Pc1,S2,Pc2,C3d);
              return Standard_True;
            }
--- a/src/ChFi3d/ChFi3d_Builder_C1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx
@@ -2708,7 +2708,14 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
            TopoDS_Edge aLocalEdge = edgesau;
            if (edgesau.Orientation() != orient)
              aLocalEdge.Reverse();
-            C2dint1 = BRep_Tool::CurveOnSurface(aLocalEdge,Face[0],ubid,vbid);
+            C2dint1 = BRep_Tool::CurveOnSurface(aLocalEdge, Face[0], ubid, vbid);
+
+            if (C2dint1.IsNull())
+            {
+              //std::swap(Face[0], facesau);
+              C2dint1 = BRep_Tool::CurveOnSurface(aLocalEdge, facesau, ubid, vbid);
+
+            }
          }
        }
        else {
@@ -2718,7 +2725,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
 	//// for periodic 3d curves ////
 	if (cad.IsPeriodic())
 	{
-	  gp_Pnt2d P2d = BRep_Tool::Parameters( Vtx, Face[0] );
+          gp_Pnt2d P2d = BRep_Tool::Parameters(Vtx, facesau);
 	  Geom2dAPI_ProjectPointOnCurve Projector( P2d, C2dint1 );
 	  par = Projector.LowerDistanceParameter();
 	  Standard_Real shift = par-ParVtx;
--- a/src/NCollection/NCollection_AliasedArray.hxx
+++ b/src/NCollection/NCollection_AliasedArray.hxx
@@ -18,6 +18,7 @@
 #include <Standard_OutOfMemory.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_TypeMismatch.hxx>
+#include <Standard_Macro.hxx>

 //! Defines an array of values of configurable size.
 //! For instance, this class allows defining an array of 32-bit or 64-bit integer values with bitness determined in runtime.
@@ -63,7 +64,7 @@ public:
  }

  //! Move constructor
-  NCollection_AliasedArray (NCollection_AliasedArray&& theOther) noexcept
+  NCollection_AliasedArray (NCollection_AliasedArray&& theOther) Standard_Noexcept
  : myData (theOther.myData), myStride (theOther.myStride), mySize (theOther.mySize), myDeletable (theOther.myDeletable)
  {
    theOther.myDeletable = false;
--- a/src/Poly/Poly_ArrayOfNodes.hxx
+++ b/src/Poly/Poly_ArrayOfNodes.hxx
@@ -17,6 +17,7 @@
 #include <NCollection_AliasedArray.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec3f.hxx>
+#include <Standard_Macro.hxx>

 //! Defines an array of 3D nodes of single/double precision configurable at construction time.
 class Poly_ArrayOfNodes : public NCollection_AliasedArray<>
@@ -85,14 +86,14 @@ public:
  Poly_ArrayOfNodes& operator= (const Poly_ArrayOfNodes& theOther) { return Assign (theOther); }

  //! Move constructor
-  Poly_ArrayOfNodes (Poly_ArrayOfNodes&& theOther) noexcept
+  Poly_ArrayOfNodes (Poly_ArrayOfNodes&& theOther) Standard_Noexcept
  : NCollection_AliasedArray (std::move (theOther))
  {
    //
  }

  //! Move assignment operator; @sa Move()
-  Poly_ArrayOfNodes& operator= (Poly_ArrayOfNodes&& theOther) noexcept
+  Poly_ArrayOfNodes& operator= (Poly_ArrayOfNodes&& theOther) Standard_Noexcept
  {
    return Move (theOther);
  }
--- a/src/Poly/Poly_ArrayOfUVNodes.hxx
+++ b/src/Poly/Poly_ArrayOfUVNodes.hxx
@@ -17,6 +17,7 @@
 #include <NCollection_AliasedArray.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2f.hxx>
+#include <Standard_Macro.hxx>

 //! Defines an array of 2D nodes of single/double precision configurable at construction time.
 class Poly_ArrayOfUVNodes : public NCollection_AliasedArray<>
@@ -85,14 +86,14 @@ public:
  Poly_ArrayOfUVNodes& operator= (const Poly_ArrayOfUVNodes& theOther) { return Assign (theOther); }

  //! Move constructor
-  Poly_ArrayOfUVNodes (Poly_ArrayOfUVNodes&& theOther) noexcept
+  Poly_ArrayOfUVNodes (Poly_ArrayOfUVNodes&& theOther) Standard_Noexcept
  : NCollection_AliasedArray (std::move (theOther))
  {
    //
  }

  //! Move assignment operator; @sa Move()
-  Poly_ArrayOfUVNodes& operator= (Poly_ArrayOfUVNodes&& theOther) noexcept
+  Poly_ArrayOfUVNodes& operator= (Poly_ArrayOfUVNodes&& theOther) Standard_Noexcept
  {
    return Move (theOther);
  }
--- a/src/RWGltf/RWGltf_CafWriter.cxx
+++ b/src/RWGltf/RWGltf_CafWriter.cxx
@@ -21,6 +21,7 @@
 #include <NCollection_DataMap.hxx>
 #include <OSD_FileSystem.hxx>
 #include <OSD_File.hxx>
+#include <OSD_Parallel.hxx>
 #include <OSD_Path.hxx>
 #include <OSD_Timer.hxx>
 #include <RWGltf_GltfAccessorLayout.hxx>
@@ -170,6 +171,72 @@ namespace
 #endif
 }

+#ifdef HAVE_DRACO
+//! Functor for parallel execution of encoding meshes to Draco buffers.
+class DracoEncodingFunctor
+{
+public:
+
+  DracoEncodingFunctor (const Message_ProgressRange& theProgress,
+                        draco::Encoder& theDracoEncoder,
+                        const std::vector<std::shared_ptr<RWGltf_CafWriter::Mesh>>& theMeshes,
+                        std::vector<std::shared_ptr<draco::EncoderBuffer>>& theEncoderBuffers)
+  : myProgress(theProgress, "Draco compression", Max(1, int(theMeshes.size()))),
+    myDracoEncoder(&theDracoEncoder),
+    myRanges(0, int(theMeshes.size()) - 1),
+    myMeshes(&theMeshes),
+    myEncoderBuffers(&theEncoderBuffers)
+  { 
+    for (int anIndex = 0; anIndex != int(theMeshes.size()); ++anIndex)
+    {
+      myRanges.SetValue(anIndex, myProgress.Next());
+    }
+  }
+
+  void operator () (int theMeshIndex) const
+  {
+    const std::shared_ptr<RWGltf_CafWriter::Mesh>& aCurrentMesh = myMeshes->at(theMeshIndex);
+    if (aCurrentMesh->NodesVec.empty())
+    {
+      return;
+    }
+
+    Message_ProgressScope aScope(myRanges[theMeshIndex], NULL, 1);
+
+    draco::Mesh aMesh;
+    writeNodesToDracoMesh (aMesh, aCurrentMesh->NodesVec);
+
+    if (!aCurrentMesh->NormalsVec.empty())
+    {
+      writeNormalsToDracoMesh (aMesh, aCurrentMesh->NormalsVec);
+    }
+
+    if (!aCurrentMesh->TexCoordsVec.empty())
+    {
+      writeTexCoordsToDracoMesh (aMesh, aCurrentMesh->TexCoordsVec);
+    }
+
+    writeIndicesToDracoMesh (aMesh, aCurrentMesh->IndicesVec);
+
+    std::shared_ptr<draco::EncoderBuffer> anEncoderBuffer = std::make_shared<draco::EncoderBuffer>();
+    draco::Status aStatus = myDracoEncoder->EncodeMeshToBuffer (aMesh, anEncoderBuffer.get());
+    if (aStatus.ok())
+    {
+      myEncoderBuffers->at(theMeshIndex) = anEncoderBuffer;
+    }
+
+    aScope.Next();
+  }
+
+private:
+  Message_ProgressScope   myProgress;
+  draco::Encoder*         myDracoEncoder;
+  NCollection_Array1<Message_ProgressRange>                   myRanges;
+  const std::vector<std::shared_ptr<RWGltf_CafWriter::Mesh>>* myMeshes;
+  std::vector<std::shared_ptr<draco::EncoderBuffer>>*         myEncoderBuffers;
+};
+#endif
+
 //================================================================
 // Function : Constructor
 // Purpose  :
@@ -185,7 +252,8 @@ RWGltf_CafWriter::RWGltf_CafWriter (const TCollection_AsciiString& theFile,
  myToEmbedTexturesInGlb (true),
  myToMergeFaces (false),
  myToSplitIndices16 (false),
-  myBinDataLen64  (0)
+  myBinDataLen64  (0),
+  myToParallel (false)
 {
  myCSTrsf.SetOutputLengthUnit (1.0); // meters
  myCSTrsf.SetOutputCoordinateSystem (RWMesh_CoordinateSystem_glTF);
@@ -537,6 +605,8 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
  myBinDataMap.Clear();
  myBinDataLen64 = 0;

+  Message_ProgressScope aScope(theProgress, "Write binary data", myDracoParameters.DracoCompression ? 2 : 1);
+
  const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
  std::shared_ptr<std::ostream> aBinFile = aFileSystem->OpenOStream (myBinFileNameFull, std::ios::out | std::ios::binary);
  if (aBinFile.get() == NULL
@@ -546,7 +616,7 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
    return false;
  }

-  Message_ProgressScope aPSentryBin (theProgress, "Binary data", 4);
+  Message_ProgressScope aPSentryBin (aScope.Next(), "Binary data", 4);
  const RWGltf_GltfArrayType anArrTypes[4] =
  {
    RWGltf_GltfArrayType_Position,
@@ -797,7 +867,6 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
 #ifdef HAVE_DRACO
    OSD_Timer aDracoTimer;
    aDracoTimer.Start();
-    int aBuffId = 0;
    draco::Encoder aDracoEncoder;
    aDracoEncoder.SetAttributeQuantization (draco::GeometryAttribute::POSITION,  myDracoParameters.QuantizePositionBits);
    aDracoEncoder.SetAttributeQuantization (draco::GeometryAttribute::NORMAL,    myDracoParameters.QuantizeNormalBits);
@@ -805,38 +874,23 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
    aDracoEncoder.SetAttributeQuantization (draco::GeometryAttribute::COLOR,     myDracoParameters.QuantizeColorBits);
    aDracoEncoder.SetAttributeQuantization (draco::GeometryAttribute::GENERIC,   myDracoParameters.QuantizeGenericBits);
    aDracoEncoder.SetSpeedOptions (myDracoParameters.CompressionLevel, myDracoParameters.CompressionLevel);
-    for (size_t aMeshInd = 0; aMeshInd != aMeshes.size(); ++aMeshInd)
+
+    std::vector<std::shared_ptr<draco::EncoderBuffer>> anEncoderBuffers(aMeshes.size());
+    DracoEncodingFunctor aFunctor (aScope.Next(), aDracoEncoder, aMeshes, anEncoderBuffers);
+    OSD_Parallel::For (0, int(aMeshes.size()), aFunctor, !myToParallel);
+
+    for (size_t aBuffInd = 0; aBuffInd != anEncoderBuffers.size(); ++aBuffInd)
    {
-      const std::shared_ptr<RWGltf_CafWriter::Mesh>& aCurrentMesh = aMeshes[aMeshInd];
-      if (aCurrentMesh->NodesVec.empty())
+      if (anEncoderBuffers.at(aBuffInd).get() == nullptr)
      {
-        continue;
-      }
-
-      draco::Mesh aDracoMesh;
-      writeNodesToDracoMesh (aDracoMesh, aCurrentMesh->NodesVec);
-      if (!aCurrentMesh->NormalsVec.empty())
-      {
-        writeNormalsToDracoMesh (aDracoMesh, aCurrentMesh->NormalsVec);
-      }
-      if (!aCurrentMesh->TexCoordsVec.empty())
-      {
-        writeTexCoordsToDracoMesh (aDracoMesh, aCurrentMesh->TexCoordsVec);
-      }
-      writeIndicesToDracoMesh (aDracoMesh, aCurrentMesh->IndicesVec);
-
-      draco::EncoderBuffer anEncoderBuff;
-      draco::Status aStatus = aDracoEncoder.EncodeMeshToBuffer (aDracoMesh, &anEncoderBuff);
-      if (!aStatus.ok())
-      {
-        Message::SendFail (TCollection_AsciiString("Error: mesh cannot be encoded in draco buffer."));
+        Message::SendFail(TCollection_AsciiString("Error: mesh not encoded in draco buffer."));
        return false;
      }
-
      RWGltf_GltfBufferView aBuffViewDraco;
-      aBuffViewDraco.Id = aBuffId++;
+      aBuffViewDraco.Id = (int)aBuffInd;
      aBuffViewDraco.ByteOffset = aBinFile->tellp();
-      aBinFile->write (anEncoderBuff.data(), std::streamsize(anEncoderBuff.size()));
+      const draco::EncoderBuffer& anEncoderBuff = *anEncoderBuffers.at(aBuffInd);
+      aBinFile->write(anEncoderBuff.data(), std::streamsize(anEncoderBuff.size()));
      if (!aBinFile->good())
      {
        Message::SendFail (TCollection_AsciiString("File '") + myBinFileNameFull + "' cannot be written");
--- a/src/RWGltf/RWGltf_CafWriter.hxx
+++ b/src/RWGltf/RWGltf_CafWriter.hxx
@@ -125,6 +125,12 @@ public:
  //! May reduce binary data size thanks to smaller triangle indexes.
  void SetSplitIndices16 (bool theToSplit) { myToSplitIndices16 = theToSplit; }

+  //! Return TRUE if multithreaded optimizations are allowed; FALSE by default.
+  bool ToParallel() const { return myToParallel; }
+
+  //! Setup multithreaded execution.
+  void SetParallel (bool theToParallel) { myToParallel = theToParallel; }
+
  //! Return Draco parameters
  const RWGltf_DracoParameters& CompressionParameters() const { return myDracoParameters; }

@@ -397,6 +403,7 @@ protected:
  int64_t                                       myBinDataLen64;      //!< length of binary file

  std::vector<RWGltf_GltfBufferView>            myBuffViewsDraco;    //!< vector of buffers view with compression data
+  Standard_Boolean                              myToParallel;        //!< flag to use multithreading; FALSE by default
  RWGltf_DracoParameters                        myDracoParameters;   //!< Draco parameters
 };

--- a/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWAngularityTolerance.cxx
@@ -24,8 +24,6 @@
 #include <StepDimTol_AngularityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWAngularityTolerance
@@ -56,21 +54,8 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -93,7 +78,7 @@ void RWStepDimTol_RWAngularityTolerance::ReadStep (const Handle(StepData_StepRea
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCircularRunoutTolerance.cxx
@@ -24,8 +24,6 @@
 #include <StepDimTol_CircularRunoutTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWCircularRunoutTolerance
@@ -56,21 +54,8 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -93,7 +78,7 @@ void RWStepDimTol_RWCircularRunoutTolerance::ReadStep (const Handle(StepData_Ste
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCoaxialityTolerance.cxx
@@ -24,8 +24,6 @@
 #include <StepDimTol_CoaxialityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWCoaxialityTolerance
@@ -56,21 +54,8 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -93,7 +78,7 @@ void RWStepDimTol_RWCoaxialityTolerance::ReadStep (const Handle(StepData_StepRea
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWConcentricityTolerance.cxx
@@ -24,8 +24,6 @@
 #include <StepDimTol_ConcentricityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWConcentricityTolerance
@@ -56,21 +54,8 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -93,7 +78,7 @@ void RWStepDimTol_RWConcentricityTolerance::ReadStep (const Handle(StepData_Step
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWCylindricityTolerance.cxx
@@ -22,8 +22,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_CylindricityTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWCylindricityTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +61,7 @@ void RWStepDimTol_RWCylindricityTolerance::ReadStep (const Handle(StepData_StepR
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWFlatnessTolerance.cxx
@@ -22,8 +22,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWFlatnessTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -76,7 +61,7 @@ void RWStepDimTol_RWFlatnessTolerance::ReadStep (const Handle(StepData_StepReade
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRef.cxx
@@ -23,8 +23,6 @@
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRef
@@ -53,21 +51,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRef::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +25,6 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol
@@ -55,21 +53,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +24,6 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod
@@ -54,21 +52,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +22,6 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol
@@ -52,21 +50,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +23,6 @@
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_UnequallyDisposedGeometricTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol
@@ -53,21 +51,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +23,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol
@@ -53,21 +51,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +22,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeoTolAndGeoTolWthMod
@@ -52,21 +50,8 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthMod::ReadStep
  data->ReadString (num, 1, "name", ach, aName);
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);
-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);
  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,8 +22,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWGeometricTolerance::ReadStep (const Handle(StepData_StepRead
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "description", ach, aDescription);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);

  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,8 +23,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeometricToleranceWithDatumReference
@@ -55,21 +53,8 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -92,7 +77,7 @@ void RWStepDimTol_RWGeometricToleranceWithDatumReference::ReadStep (const Handle
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aDatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit.cxx
@@ -21,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit
@@ -55,21 +53,8 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedAreaUnit::
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);

  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,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithDefinedUnit.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeometricToleranceWithDefinedUnit
@@ -54,21 +52,8 @@ void RWStepDimTol_RWGeometricToleranceWithDefinedUnit::ReadStep (const Handle(St
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);

  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,8 +22,6 @@
 #include <StepDimTol_GeometricToleranceWithMaximumTolerance.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -56,21 +54,8 @@ void RWStepDimTol_RWGeometricToleranceWithMaximumTolerance::
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);

  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,8 +22,6 @@
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
@@ -56,21 +54,8 @@ void RWStepDimTol_RWGeometricToleranceWithModifiers::
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);

  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,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_LineProfileTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWLineProfileTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -75,7 +60,7 @@ void RWStepDimTol_RWLineProfileTolerance::ReadStep (const Handle(StepData_StepRe
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWModifiedGeometricTolerance.cxx
@@ -21,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWModifiedGeometricTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -87,7 +72,7 @@ void RWStepDimTol_RWModifiedGeometricTolerance::ReadStep (const Handle(StepData_
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aModifier);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWParallelismTolerance.cxx
@@ -22,8 +22,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_ParallelismTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWParallelismTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -91,7 +76,7 @@ void RWStepDimTol_RWParallelismTolerance::ReadStep (const Handle(StepData_StepRe
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPerpendicularityTolerance.cxx
@@ -22,8 +22,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PerpendicularityTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWPerpendicularityTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -91,7 +76,7 @@ void RWStepDimTol_RWPerpendicularityTolerance::ReadStep (const Handle(StepData_S
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWPositionTolerance.cxx
@@ -21,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_PositionTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWPositionTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -75,7 +60,7 @@ void RWStepDimTol_RWPositionTolerance::ReadStep (const Handle(StepData_StepReade
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRoundnessTolerance.cxx
@@ -21,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_RoundnessTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWRoundnessTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -75,7 +60,7 @@ void RWStepDimTol_RWRoundnessTolerance::ReadStep (const Handle(StepData_StepRead
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWStraightnessTolerance.cxx
@@ -21,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_StraightnessTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWStraightnessTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -75,7 +60,7 @@ void RWStepDimTol_RWStraightnessTolerance::ReadStep (const Handle(StepData_StepR
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWSurfaceProfileTolerance.cxx
@@ -21,8 +21,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_SurfaceProfileTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWSurfaceProfileTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -75,7 +60,7 @@ void RWStepDimTol_RWSurfaceProfileTolerance::ReadStep (const Handle(StepData_Ste
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect);
 }

--- a/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWSymmetryTolerance.cxx
@@ -22,8 +22,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_SymmetryTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWSymmetryTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -91,7 +76,7 @@ void RWStepDimTol_RWSymmetryTolerance::ReadStep (const Handle(StepData_StepReade
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWTotalRunoutTolerance.cxx
@@ -22,8 +22,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_TotalRunoutTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWTotalRunoutTolerance
@@ -54,21 +52,8 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe
  Handle(TCollection_HAsciiString) aGeometricTolerance_Description;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aGeometricTolerance_Description);

-  Handle(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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aGeometricTolerance_Magnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aGeometricTolerance_Magnitude);

  StepDimTol_GeometricToleranceTarget aGeometricTolerance_TolerancedShapeAspect;
  data->ReadEntity (num, 4, "geometric_tolerance.toleranced_shape_aspect", ach, aGeometricTolerance_TolerancedShapeAspect);
@@ -91,7 +76,7 @@ void RWStepDimTol_RWTotalRunoutTolerance::ReadStep (const Handle(StepData_StepRe
  // Initialize entity
  ent->Init(aGeometricTolerance_Name,
            aGeometricTolerance_Description,
-            aMagnitude,
+            aGeometricTolerance_Magnitude,
            aGeometricTolerance_TolerancedShapeAspect,
            aGeometricToleranceWithDatumReference_DatumSystem);
 }
--- a/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWUnequallyDisposedGeometricTolerance.cxx
@@ -19,8 +19,6 @@
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepDimTol_UnequallyDisposedGeometricTolerance.hxx>
-#include <StepRepr_MeasureRepresentationItem.hxx>
-#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>

 //=======================================================================
 //function : RWStepDimTol_RWUnequallyDisposedGeometricTolerance
@@ -53,21 +51,8 @@ void RWStepDimTol_RWUnequallyDisposedGeometricTolerance::
  Handle(TCollection_HAsciiString) aDescription;
  data->ReadString (num, 2, "geometric_tolerance.description", ach, aDescription);

-  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;
-    }
-  }
+  Handle(StepBasic_MeasureWithUnit) aMagnitude;
+  data->ReadEntity (num, 3, "geometric_tolerance.magnitude", ach, STANDARD_TYPE(StepBasic_MeasureWithUnit), aMagnitude);

  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,34 +2930,15 @@ 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();
-            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;
-            }
+            Handle(StepBasic_MeasureWithUnit) dim3 = GT->Magnitude();
+            if (dim3.IsNull()) continue;
            Standard_Real dim = dim3->ValueComponent();
-            StepBasic_Unit anUnit = dim3->UnitComponent();
+            StepBasic_Unit anUnit = GT->Magnitude()->UnitComponent();
            if (anUnit.IsNull()) continue;
            if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
            Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
@@ -3771,37 +3752,17 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
  XCAFDimTolObjects_GeomToleranceType aType = XCAFDimTolObjects_GeomToleranceType_None;
  getTolType(theEnt, aType);
  aTolObj->SetType(aType);
-  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);
-    }
+  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);
  }
  //get modifiers
  XCAFDimTolObjects_GeomToleranceTypeValue aTypeV = XCAFDimTolObjects_GeomToleranceTypeValue_None;
--- a/src/Standard/Standard_Handle.hxx
+++ b/src/Standard/Standard_Handle.hxx
@@ -18,6 +18,7 @@
 #include <Standard_Std.hxx>
 #include <Standard_Stream.hxx>
 #include <Standard_Transient.hxx>
+#include <Standard_Macro.hxx>

 class Standard_Transient;

@@ -71,7 +72,7 @@ namespace opencascade {
    }

    //! Move constructor
-    handle (handle&& theHandle) noexcept : entity(theHandle.entity)
+    handle (handle&& theHandle) Standard_Noexcept : entity(theHandle.entity)
    {
      theHandle.entity = 0;
    }
@@ -112,7 +113,7 @@ namespace opencascade {
    }

    //! Move operator
-    handle& operator= (handle&& theHandle) noexcept
+    handle& operator= (handle&& theHandle) Standard_Noexcept
    {
      std::swap (this->entity, theHandle.entity);
      return *this;
--- a/src/Standard/Standard_Macro.hxx
+++ b/src/Standard/Standard_Macro.hxx
@@ -315,5 +315,21 @@
  #define Standard_ATOMIC(theType) theType
 #endif

+//! @def Standard_Noexcept
+//! Definition of Standard_Noexcept:
+//! if noexcept is accessible, Standard_Noexcept is "noexcept" and "throw()" otherwise.
+#ifdef _MSC_VER
+  #if _MSC_VER >= 1900
+    #define Standard_Noexcept noexcept
+  #else
+    #define Standard_Noexcept throw()
+  #endif
+#else
+  #if __cplusplus >= 201103L
+    #define Standard_Noexcept noexcept
+  #else
+    #define Standard_Noexcept throw()
+  #endif
+#endif

 #endif
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
@@ -13,6 +13,8 @@
 // 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>
@@ -37,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRef::StepDimTol_GeoTolAndGeoTolWthDatRef()
 void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
   const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
   const StepDimTol_GeometricToleranceType theType)
@@ -58,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRef::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +24,7 @@
 class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithDatumReference;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -40,14 +41,14 @@ public:
  
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& aMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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,7 +13,9 @@
 // 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>
@@ -39,7 +41,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTo
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
   const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
   const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -59,7 +61,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +26,7 @@ class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
 class StepBasic_LengthMeasureWithUnit;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -41,7 +42,7 @@ public:
  
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
                             const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -50,7 +51,7 @@ public:

  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(Standard_Transient)& aMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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,6 +13,8 @@
 // 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>
@@ -38,7 +40,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::StepDimTol_GeoTolAndGeoTolWt
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
   const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR,
   const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -61,7 +63,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +25,7 @@ class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -41,7 +42,7 @@ public:
  
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
                             const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
@@ -49,7 +50,7 @@ public:

  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(Standard_Transient)& aMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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,6 +12,7 @@
 // commercial license or contractual agreement.


+#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
@@ -38,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::StepDimTol_GeoTolAndGe
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
  (const Handle(TCollection_HAsciiString)& aName,
   const Handle(TCollection_HAsciiString)& aDescription,
-   const Handle(Standard_Transient)& aMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& aMagnitude,
   const Handle(StepRepr_ShapeAspect)& aTolerancedShapeAspect,
   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& aGTWDR,
   const Handle(StepDimTol_ModifiedGeometricTolerance)& aMGT)
@@ -59,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
 void StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol::Init
  (const Handle(TCollection_HAsciiString)& aName,
   const Handle(TCollection_HAsciiString)& aDescription,
-   const Handle(Standard_Transient)& aMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +25,7 @@ class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_ModifiedGeometricTolerance;
 class StepDimTol_PositionTolerance;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -40,9 +41,9 @@ public:
  
  Standard_EXPORT StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol();
  
-  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 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 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(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +24,7 @@ class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithDatumReference;
 class StepDimTol_UnequallyDisposedGeometricTolerance;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -40,7 +41,7 @@ public:
  
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
                             const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                             const Handle(StepDimTol_GeometricToleranceWithDatumReference)& theGTWDR, 
                             const StepDimTol_GeometricToleranceType theType,
@@ -48,7 +49,7 @@ public:

  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(Standard_Transient)& aMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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,7 +13,9 @@
 // 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>
@@ -38,7 +40,7 @@ StepDimTol_GeoTolAndGeoTolWthMaxTol::StepDimTol_GeoTolAndGeoTolWthMaxTol()
 void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
   const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
   const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
   const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
@@ -56,7 +58,7 @@ void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
 void StepDimTol_GeoTolAndGeoTolWthMaxTol::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +25,7 @@ class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
 class StepBasic_LengthMeasureWithUnit;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -41,7 +42,7 @@ public:
  
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
                             const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect, 
                             const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
                             const Handle(StepBasic_LengthMeasureWithUnit)& theMaxTol,
@@ -49,7 +50,7 @@ public:

  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& aName, 
                             const Handle(TCollection_HAsciiString)& aDescription, 
-                             const Handle(Standard_Transient)& aMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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,6 +14,7 @@
 // commercial license or contractual agreement.


+#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -38,7 +39,7 @@ StepDimTol_GeoTolAndGeoTolWthMod::StepDimTol_GeoTolAndGeoTolWthMod()
 void StepDimTol_GeoTolAndGeoTolWthMod::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& theMagnitude,
   const Handle(StepRepr_ShapeAspect)& theTolerancedShapeAspect,
   const Handle(StepDimTol_GeometricToleranceWithModifiers)& theGTWM,
   const StepDimTol_GeometricToleranceType theType)
@@ -59,7 +60,7 @@ void StepDimTol_GeoTolAndGeoTolWthMod::Init
 void StepDimTol_GeoTolAndGeoTolWthMod::Init
  (const Handle(TCollection_HAsciiString)& theName,
   const Handle(TCollection_HAsciiString)& theDescription,
-   const Handle(Standard_Transient)& theMagnitude,
+   const Handle(StepBasic_MeasureWithUnit)& 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,6 +24,7 @@
 class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_GeometricToleranceWithModifiers;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;


@@ -40,14 +41,14 @@ public:
  
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, 
                             const Handle(TCollection_HAsciiString)& theDescription, 
-                             const Handle(Standard_Transient)& theMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& aMagnitude,
+                             const Handle(StepBasic_MeasureWithUnit)& 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,6 +15,7 @@

 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2

+#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -37,7 +38,7 @@ StepDimTol_GeometricTolerance::StepDimTol_GeometricTolerance ()

 void StepDimTol_GeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theName,
                                          const Handle(TCollection_HAsciiString) &theDescription,
-                                          const Handle(Standard_Transient) &theMagnitude,
+                                          const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
                                          const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect)
 {

@@ -57,7 +58,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(Standard_Transient) &theMagnitude,
+                                          const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
                                          const Handle(StepRepr_ShapeAspect) &theTolerancedShapeAspect)
 {

@@ -115,7 +116,7 @@ void StepDimTol_GeometricTolerance::SetDescription (const Handle(TCollection_HAs
 //purpose  : 
 //=======================================================================

-Handle(Standard_Transient) StepDimTol_GeometricTolerance::Magnitude () const
+Handle(StepBasic_MeasureWithUnit) StepDimTol_GeometricTolerance::Magnitude () const
 {
  return myMagnitude;
 }
@@ -125,7 +126,7 @@ Handle(Standard_Transient) StepDimTol_GeometricTolerance::Magnitude () const
 //purpose  : 
 //=======================================================================

-void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(Standard_Transient) &theMagnitude)
+void StepDimTol_GeometricTolerance::SetMagnitude (const Handle(StepBasic_MeasureWithUnit) &theMagnitude)
 {
  myMagnitude = theMagnitude;
 }
--- a/src/StepDimTol/StepDimTol_GeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricTolerance.hxx
@@ -21,10 +21,11 @@

 #include <Standard_Transient.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
-
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepRepr_ShapeAspect;

+
 class StepDimTol_GeometricTolerance;
 DEFINE_STANDARD_HANDLE(StepDimTol_GeometricTolerance, Standard_Transient)

@@ -41,13 +42,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(Standard_Transient)& theMagnitude,
+                            const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& theMagnitude,
+                            const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
                            const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect);
  
  //! Returns field Name
@@ -63,10 +64,10 @@ public:
  Standard_EXPORT void SetDescription (const Handle(TCollection_HAsciiString)& theDescription);
  
  //! Returns field Magnitude
-  Standard_EXPORT Handle(Standard_Transient) Magnitude() const;
+  Standard_EXPORT Handle(StepBasic_MeasureWithUnit) Magnitude() const;
  
  //! Set field Magnitude
-  Standard_EXPORT void SetMagnitude (const Handle(Standard_Transient)& theMagnitude);
+  Standard_EXPORT void SetMagnitude (const Handle(StepBasic_MeasureWithUnit)& theMagnitude);
  
  //! Returns field TolerancedShapeAspect
  //! Note: in AP214(203) type of this attribute can be only StepRepr_ShapeAspect
@@ -93,7 +94,7 @@ private:

  Handle(TCollection_HAsciiString) myName;
  Handle(TCollection_HAsciiString) myDescription;
-  Handle(Standard_Transient) myMagnitude;
+  Handle(StepBasic_MeasureWithUnit) myMagnitude;
  StepDimTol_GeometricToleranceTarget myTolerancedShapeAspect;


--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
@@ -16,6 +16,7 @@
 // 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>
@@ -37,7 +38,7 @@ StepDimTol_GeometricToleranceWithDatumReference::StepDimTol_GeometricToleranceWi

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

 void StepDimTol_GeometricToleranceWithDatumReference::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
                                                            const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
-                                                            const Handle(Standard_Transient) &theGeometricTolerance_Magnitude,
+                                                            const Handle(StepBasic_MeasureWithUnit) &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,6 +23,7 @@
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepRepr_ShapeAspect;

@@ -43,14 +44,14 @@ public:
  //! Initialize all fields (own and inherited) AP214
  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theGeometricTolerance_Name, 
    const Handle(TCollection_HAsciiString)& theGeometricTolerance_Description, 
-    const Handle(Standard_Transient)& theGeometricTolerance_Magnitude,
+    const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& theGeometricTolerance_Magnitude,
+    const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient) &theMagnitude,
+        const Handle(StepBasic_MeasureWithUnit) &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,6 +24,7 @@

 class StepBasic_LengthMeasureWithUnit;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;

 class StepDimTol_GeometricToleranceWithDefinedAreaUnit;
@@ -41,7 +42,7 @@ public:
  //! Initialize all fields (own and inherited)
  Standard_EXPORT   void Init(const Handle(TCollection_HAsciiString)& theName, 
                              const Handle(TCollection_HAsciiString)& theDescription, 
-                              const Handle(Standard_Transient)& theMagnitude,
+                              const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient) &theMagnitude,
+                                                         const Handle(StepBasic_MeasureWithUnit) &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(Standard_Transient) &theMagnitude,
+                                                         const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
                                                         const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
                                                         const Handle(StepBasic_LengthMeasureWithUnit) &theUnitSize)
 {
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
@@ -22,6 +22,7 @@

 class StepBasic_LengthMeasureWithUnit;
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepRepr_ShapeAspect;

@@ -37,10 +38,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(Standard_Transient)& 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(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& 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(StepBasic_MeasureWithUnit)& 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(Standard_Transient) &theMagnitude,
+        const Handle(StepBasic_MeasureWithUnit) &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,6 +22,7 @@
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>

 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepDimTol_HArray1OfGeometricToleranceModifier;

@@ -37,7 +38,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(Standard_Transient)& 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(StepBasic_MeasureWithUnit)& 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(Standard_Transient) &theMagnitude,
+                                                       const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
                                                       const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
                                                       const Handle(StepDimTol_HArray1OfGeometricToleranceModifier) &theModifiers)
 {
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
@@ -23,6 +23,7 @@
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>

 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;

 class StepDimTol_GeometricToleranceWithModifiers;
@@ -39,7 +40,7 @@ public:
  //! Initialize all fields (own and inherited)
  Standard_EXPORT   void Init (const Handle(TCollection_HAsciiString)& theName, 
                               const Handle(TCollection_HAsciiString)& theDescription, 
-                               const Handle(Standard_Transient)& theMagnitude,
+                               const Handle(StepBasic_MeasureWithUnit)& theMagnitude, 
                               const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, 
                               const Handle(StepDimTol_HArray1OfGeometricToleranceModifier)& theModifiers) ;
  
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
@@ -15,6 +15,7 @@

 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2

+#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepRepr_ShapeAspect.hxx>
@@ -37,7 +38,7 @@ StepDimTol_ModifiedGeometricTolerance::StepDimTol_ModifiedGeometricTolerance ()

 void StepDimTol_ModifiedGeometricTolerance::Init (const Handle(TCollection_HAsciiString) &theGeometricTolerance_Name,
                                                  const Handle(TCollection_HAsciiString) &theGeometricTolerance_Description,
-                                                  const Handle(Standard_Transient) &theGeometricTolerance_Magnitude,
+                                                  const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
                                                  const Handle(StepRepr_ShapeAspect) &theGeometricTolerance_TolerancedShapeAspect,
                                                  const StepDimTol_LimitCondition theModifier)
 {
@@ -56,7 +57,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(Standard_Transient) &theGeometricTolerance_Magnitude,
+                                                  const Handle(StepBasic_MeasureWithUnit) &theGeometricTolerance_Magnitude,
                                                  const StepDimTol_GeometricToleranceTarget &theGeometricTolerance_TolerancedShapeAspect,
                                                  const StepDimTol_LimitCondition theModifier)
 {
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
@@ -22,6 +22,7 @@
 #include <StepDimTol_LimitCondition.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
 class StepRepr_ShapeAspect;

@@ -42,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(Standard_Transient)& theGeometricTolerance_Magnitude,
+    const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient)& theGeometricTolerance_Magnitude,
+    const Handle(StepBasic_MeasureWithUnit)& 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(Standard_Transient) &theMagnitude,
+                                                           const Handle(StepBasic_MeasureWithUnit) &theMagnitude,
                                                           const StepDimTol_GeometricToleranceTarget &theTolerancedShapeAspect,
                                                           const Handle(StepBasic_LengthMeasureWithUnit) &theDisplacement)
 {
--- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
@@ -22,6 +22,7 @@
 #include <StepDimTol_GeometricTolerance.hxx>

 class TCollection_HAsciiString;
+class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;

 class StepDimTol_UnequallyDisposedGeometricTolerance;
@@ -36,7 +37,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(Standard_Transient)& 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(StepBasic_MeasureWithUnit)& theMagnitude, const StepDimTol_GeometricToleranceTarget& theTolerancedShapeAspect, const Handle(StepBasic_LengthMeasureWithUnit)& theDisplacement) ;

  //! Returns field Displacement
  inline Handle(StepBasic_LengthMeasureWithUnit) Displacement () const
--- a/src/TCollection/TCollection_AsciiString.hxx
+++ b/src/TCollection/TCollection_AsciiString.hxx
@@ -26,6 +26,7 @@
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_IStream.hxx>
+#include <Standard_Macro.hxx>
 class TCollection_ExtendedString;

 //! Class defines a variable-length sequence of 8-bit characters.
@@ -74,7 +75,7 @@ public:
  Standard_EXPORT TCollection_AsciiString(const TCollection_AsciiString& astring);

  //! Move constructor
-  TCollection_AsciiString (TCollection_AsciiString&& theOther) noexcept
+  TCollection_AsciiString (TCollection_AsciiString&& theOther) Standard_Noexcept
  : mystring (theOther.mystring),
    mylength (theOther.mylength)
  {
@@ -276,7 +277,7 @@ void operator = (const TCollection_AsciiString& fromwhere)
  Standard_EXPORT void Swap (TCollection_AsciiString& theOther);

  //! Move assignment operator
-  TCollection_AsciiString& operator= (TCollection_AsciiString&& theOther) noexcept { Swap (theOther); return *this; }
+  TCollection_AsciiString& operator= (TCollection_AsciiString&& theOther) Standard_Noexcept { Swap (theOther); return *this; }

  //! Frees memory allocated by AsciiString.
  Standard_EXPORT ~TCollection_AsciiString();
--- a/src/TCollection/TCollection_ExtendedString.hxx
+++ b/src/TCollection/TCollection_ExtendedString.hxx
@@ -31,6 +31,7 @@
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_PCharacter.hxx>
+#include <Standard_Macro.hxx>
 class TCollection_AsciiString;


@@ -98,7 +99,7 @@ public:
  Standard_EXPORT TCollection_ExtendedString(const TCollection_ExtendedString& astring);

  //! Move constructor
-  TCollection_ExtendedString (TCollection_ExtendedString&& theOther) noexcept
+  TCollection_ExtendedString (TCollection_ExtendedString&& theOther) Standard_Noexcept
  : mystring (theOther.mystring),
    mylength (theOther.mylength)
  {
@@ -153,7 +154,7 @@ void operator = (const TCollection_ExtendedString& fromwhere)
  Standard_EXPORT void Swap (TCollection_ExtendedString& theOther);

  //! Move assignment operator
-  TCollection_ExtendedString& operator= (TCollection_ExtendedString&& theOther) noexcept { Swap (theOther); return *this; }
+  TCollection_ExtendedString& operator= (TCollection_ExtendedString&& theOther) Standard_Noexcept { Swap (theOther); return *this; }

  //! Frees memory allocated by ExtendedString.
  Standard_EXPORT ~TCollection_ExtendedString();
--- a/src/TopLoc/TopLoc_SListOfItemLocation.hxx
+++ b/src/TopLoc/TopLoc_SListOfItemLocation.hxx
@@ -21,6 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>

+#include <Standard_Macro.hxx>
 class TopLoc_SListNodeOfItemLocation;
 class TopLoc_ItemLocation;

@@ -69,13 +70,13 @@ public:
  }
  
  //! Move constructor
-  TopLoc_SListOfItemLocation (TopLoc_SListOfItemLocation&& theOther) noexcept
+  TopLoc_SListOfItemLocation (TopLoc_SListOfItemLocation&& theOther) Standard_Noexcept
    : myNode(std::move (theOther.myNode))
  {
  }

  //! Move operator
-  TopLoc_SListOfItemLocation& operator= (TopLoc_SListOfItemLocation&& theOther) noexcept
+  TopLoc_SListOfItemLocation& operator= (TopLoc_SListOfItemLocation&& theOther) Standard_Noexcept
  {
    myNode = std::move (theOther.myNode);
    return *this;
--- a/src/XCAFDoc/XCAFDoc_Editor.cxx
+++ b/src/XCAFDoc/XCAFDoc_Editor.cxx
@@ -515,7 +515,7 @@ static void rescaleDimensionRefLabels(const TDF_LabelSequence& theRefLabels,
      if (aL.FindAttribute(TNaming_NamedShape::GetID(), aNS))
      {
        TopoDS_Shape aShape = aNS->Get();
-        theBRepTrsf.Perform(aShape, Standard_True);
+        theBRepTrsf.Perform(aShape, Standard_True, Standard_True);
        if (!theBRepTrsf.IsDone())
        {
          Standard_SStream aSS;
@@ -664,7 +664,7 @@ Standard_Boolean XCAFDoc_Editor::RescaleGeometry(const TDF_Label& theLabel,
      if (aNodeType == XCAFDoc_AssemblyGraph::NodeType_Part)
      {
        const TopoDS_Shape aShape = aShapeTool->GetShape(aLabel);
-        aBRepTrsf.Perform(aShape, Standard_True);
+        aBRepTrsf.Perform(aShape, Standard_True, Standard_True);
        if (!aBRepTrsf.IsDone())
        {
          Standard_SStream aSS;
--- a/src/XDEDRAW/XDEDRAW.cxx
+++ b/src/XDEDRAW/XDEDRAW.cxx
@@ -1836,7 +1836,7 @@ void XDEDRAW::Init(Draw_Interpretor& di)
         "Doc [-names]: Prints number of assembly instances",
         __FILE__, XDumpNomenclature, g);
  di.Add("XRescaleGeometry",
-         "Doc -scale factor [-root label]: Applies geometrical scale to assembly",
+         "Doc factor [-root label] [-force]: Applies geometrical scale to assembly",
         __FILE__, XRescaleGeometry, g);

  // Specialized commands
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
@@ -383,6 +383,7 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI,
  RWMesh_CoordinateSystem aSystemCoordSys = RWMesh_CoordinateSystem_Zup;
  bool toForceUVExport = false, toEmbedTexturesInGlb = true;
  bool toMergeFaces = false, toSplitIndices16 = false;
+  bool isParallel = false;
  RWMesh_NameFormat aNodeNameFormat = RWMesh_NameFormat_InstanceOrProduct;
  RWMesh_NameFormat aMeshNameFormat = RWMesh_NameFormat_Product;
  RWGltf_DracoParameters aDracoParameters;
@@ -556,6 +557,10 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI,
    {
      aDracoParameters.UnifiedQuantization = Draw::ParseOnOffIterator(theNbArgs, theArgVec, anArgIter);
    }
+    else if (anArgCase == "-parallel")
+    {
+      isParallel = Draw::ParseOnOffIterator(theNbArgs, theArgVec, anArgIter);
+    }
    else
    {
      Message::SendFail() << "Syntax error at '" << theArgVec[anArgIter] << "'";
@@ -587,6 +592,7 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI,
  aWriter.SetToEmbedTexturesInGlb (toEmbedTexturesInGlb);
  aWriter.SetMergeFaces (toMergeFaces);
  aWriter.SetSplitIndices16 (toSplitIndices16);
+  aWriter.SetParallel(isParallel);
  aWriter.SetCompressionParameters(aDracoParameters);
  aWriter.ChangeCoordinateSystemConverter().SetInputLengthUnit (aScaleFactorM);
  aWriter.ChangeCoordinateSystemConverter().SetInputCoordinateSystem (aSystemCoordSys);
@@ -2450,7 +2456,7 @@ void  XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands)
                   "\n\t\t:            [-meshNameFormat {empty|product|instance|instOrProd|prodOrInst|prodAndInst|verbose}]=product"
                   "\n\t\t:            [-draco]=0 [-compressionLevel {0-10}]=7 [-quantizePositionBits Value]=14 [-quantizeNormalBits Value]=10"
                   "\n\t\t:            [-quantizeTexcoordBits Value]=12 [-quantizeColorBits Value]=8 [-quantizeGenericBits Value]=12"
-                   "\n\t\t:            [-unifiedQuantization]=0"
+                   "\n\t\t:            [-unifiedQuantization]=0 [-parallel]=0"
                   "\n\t\t: Write XDE document into glTF file."
                   "\n\t\t:   -trsfFormat       preferred transformation format"
                   "\n\t\t:   -systemCoordSys   system coordinate system; Zup when not specified"
@@ -2460,7 +2466,7 @@ void  XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands)
                   "\n\t\t:   -texturesSeparate write textures to separate files"
                   "\n\t\t:   -nodeNameFormat   name format for Nodes"
                   "\n\t\t:   -meshNameFormat   name format for Meshes"
-                   "\n\t\t:   -draco use Draco  compression 3D geometric meshes"
+                   "\n\t\t:   -draco            use Draco compression 3D geometric meshes"
                   "\n\t\t:   -compressionLevel draco compression level [0-10] (by default 7), a value of 0 will apply sequential encoding and preserve face order"
                   "\n\t\t:   -quantizePositionBits quantization bits for position attribute when using Draco compression (by default 14)"
                   "\n\t\t:   -quantizeNormalBits   quantization bits for normal attribute when using Draco compression (by default 10)"
@@ -2468,7 +2474,8 @@ void  XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands)
                   "\n\t\t:   -quantizeColorBits    quantization bits for color attribute when using Draco compression (by default 8)"
                   "\n\t\t:   -quantizeGenericBits  quantization bits for skinning attribute (joint indices and joint weights)"
                   "\n                        and custom attributes when using Draco compression (by default 12)"
-                   "\n\t\t:   -unifiedQuantization  quantization is applied on each primitive separately if this option is false",
+                   "\n\t\t:   -unifiedQuantization  quantization is applied on each primitive separately if this option is false"
+                   "\n\t\t:   -parallel             use multithreading for Draco compression",
                   __FILE__, WriteGltf, g);
  theCommands.Add ("writegltf",
                   "writegltf shape file",
--- a/tests/bugs/modalg_7/bug26920
+++ b/tests/bugs/modalg_7/bug26920
@@ -0,0 +1,13 @@
+puts "========"
+puts "0026920: BRepBuidlerAPI_MakeFillet crash 2"
+puts "========"
+
+restore C:/WORK/opencascade/bugs/CR26920/bug26920.brep b1
+explode b1 e
+fillet result b1 0.25 b1_15
+
+checkprops result -s 1653.78
+checkshape result
+
+checknbshapes result -vertex 20 -edge 31 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 80
+checkview -display result -2d -path ${imagedir}/${test_image}.png
--- a/tests/bugs/xde/bug33100
+++ b/tests/bugs/xde/bug33100
@@ -0,0 +1,15 @@
+puts "0033100: Modeling Algorithms - XCAFDoc_Editor::RescaleGeometry does not rescale triangulations"
+
+pload DCAF
+Close d -silent
+ReadStep d [locate_data_file "bug33100_window.step"]
+
+XGetOneShape a d
+set ref_diag [eval distpp [bounding a]]
+
+XRescaleGeometry d 1000
+
+XGetOneShape a d
+set diag [eval distpp [bounding a]]
+
+checkreal "bounding box diagonal" $diag [expr $ref_diag * 1000] 0 0.001
--- a/tests/de_mesh/gltf_write/bull_parallel
+++ b/tests/de_mesh/gltf_write/bull_parallel
@@ -0,0 +1,13 @@
+puts "========"
+puts "0032867: Data Exchange - Implement Draco compression for writing glTF"
+puts "Test case exporting model into glb (binary glTF) file."
+puts "========"
+
+Close D0 -silent
+ReadGltf D0 [locate_data_file bug32867_bull.glb]
+
+set aGltfFile1 "${imagedir}/${casename}_tmp1.glb"
+
+WriteGltf D0 "$aGltfFile1" -draco on -parallel
+
+ReadGltf D "$aGltfFile1"
Author	SHA1	Message	Date
mgerus	6acb227333	33150 fix(?) for wrong translate of 2dCurve	2022-09-30 10:58:48 +03:00
mgerus	5d0249c145	26920 fix exception call in fillet(wrong choice of face)	2022-09-30 10:57:43 +03:00
ddzama	1a1739b200	0032957: Add Standard_Noexcept definition into Standard_Macro.hxx and employ Standard_Noexcept.	2022-08-18 11:55:14 +03:00
msv	fd5c113a03	0033100: Modeling Algorithms - XCAFDoc_Editor::RescaleGeometry does not rescale triangulations Make XCAFDoc_Editor::RescaleGeometry to pass the flag theCopyMesh==true in call to BRepBuilderAPI_Transform::Perform. Correct the help of the command XRescaleGeometry.	2022-08-13 13:53:14 +03:00
ichesnok	f74f684b16	0032979: Data Exchange, RWGltf_CafWriter - support multi-threaded Draco compression 'MultiThread' field was added to structure RWGltf_DracoParameters for using multithreading. Class CafWriter_DracoEncodingFunctor was added for multithreaded compression.	2022-08-12 19:04:03 +03:00