0024909: Modeling Algorithms - SIGSEGV in buildsweep

Update algorithm.

src/BRepFill/BRepFill_CompatibleWires.cxx

@@ -389,13 +389,13 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
 
 
 static Standard_Boolean SearchRoot (const TopoDS_Vertex& V,
-				    const TopTools_DataMapOfShapeListOfShape& Map,
-				    TopoDS_Vertex& VRoot)
+                                    const TopTools_IndexedDataMapOfShapeListOfShape Map,
+                                    TopoDS_Vertex& VRoot)
 {
   Standard_Boolean trouve = Standard_False;
   VRoot.Nullify();
-  TopTools_DataMapIteratorOfDataMapOfShapeListOfShape it;
-  for (it.Initialize(Map); it.More(); it.Next()) {
+  TopTools_IndexedDataMapIteratorOfDataMapOfShapeListOfShape it(Map);
+  for (; it.More(); it.Next()) {
     const TopTools_ListOfShape & List = it.Value();
     TopTools_ListIteratorOfListOfShape itL;
     Standard_Boolean ilyest = Standard_False;
@@ -445,12 +445,12 @@ static Standard_Boolean SearchVertex (const TopTools_ListOfShape& List,
 
 
 static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1,
-					     const gp_Pnt& P2,
-					     Standard_Real percent,
-					     const TopTools_DataMapOfShapeListOfShape& Map,
-					     const TopoDS_Wire&   W,
-					     TopoDS_Vertex& Vsol,
-					     TopoDS_Wire&   newW,
+                                             const gp_Pnt& P2,
+                                             Standard_Real percent,
+                                             const TopTools_IndexedDataMapOfShapeListOfShape& Map,
+                                             const TopoDS_Wire&   W,
+                                             TopoDS_Vertex& Vsol,
+                                             TopoDS_Wire&   newW,
                                              TopTools_DataMapOfShapeSequenceOfShape& theEdgeNewEdges)
 {
 
@@ -976,7 +976,7 @@ void BRepFill_CompatibleWires::
   }
   
   // construction of RMap, map of reports of wire i to wire i-1
-  TopTools_DataMapOfShapeListOfShape RMap;
+  TopTools_IndexedDataMapOfShapeListOfShape RMap;
   RMap.Clear();
   
   // loop on i
@@ -997,7 +997,10 @@ void BRepFill_CompatibleWires::
       // init of RMap for Vi
       TopTools_ListOfShape Init;
       Init.Clear();
-      RMap.Bind(Vi,Init);
+      TopTools_ListOfShape* aShapeList = RMap.ChangeSeek(Vi);
+      if (!aShapeList)
+        aShapeList = &RMap(RMap.Add(Vi, Init));
+      aShapeList->Append(Init);
       
       // it is required to find intersection Vi - wire2
       gp_Pnt Pi = BRep_Tool::Pnt(Vi);
@@ -1019,14 +1022,14 @@ void BRepFill_CompatibleWires::
                                         RMap,TopoDS::Wire(myWork(i-1)),
                                         Vsol,newwire,EdgeNewEdges);
 	if (NewVertex) myWork(i-1) = newwire;
-	RMap(Vi).Append(Vsol);
+	RMap.ChangeFromKey(Vi).Append(Vsol);
       }
       
     } // loop on  ii
   }   // loop on  i
   
   // initialisation of MapVLV, map of correspondences vertex - list of vertices
-  TopTools_DataMapOfShapeListOfShape MapVLV;
+  TopTools_IndexedDataMapOfShapeListOfShape MapVLV;
   SeqOfVertices(TopoDS::Wire(myWork(ideb)),SeqV);
   Standard_Integer SizeMap = SeqV.Length();
   MapVLV.Clear();
@@ -1035,13 +1038,16 @@ void BRepFill_CompatibleWires::
     TopTools_ListOfShape Init;
     Init.Clear();
     Init.Append(Vi);
-    MapVLV.Bind(Vi,Init);
+    TopTools_ListOfShape* aShapeList = MapVLV.ChangeSeek(Vi);
+    if (!aShapeList)
+      aShapeList = &MapVLV(MapVLV.Add(Vi, Init));
+    aShapeList->Append(Init);
     Standard_Integer NbV = 1;
     TopoDS_Vertex V0,V1;
     V0 = Vi;
     Standard_Boolean tantque = SearchRoot(V0,RMap,V1);
     while (tantque) {
-      MapVLV(Vi).Append(V1);
+      MapVLV.ChangeFromKey(Vi).Append(V1);
       NbV++;
       // test on NbV required for looping sections 
       if (V1.IsSame(Vi) || NbV >= myWork.Length()) {
@@ -1076,7 +1082,7 @@ void BRepFill_CompatibleWires::
       VRoot.Nullify();
       Standard_Boolean intersect = Standard_True;
       if (SearchRoot(Vi,MapVLV,VRoot)) {
-	const TopTools_ListOfShape& LVi = MapVLV(VRoot);
+	const TopTools_ListOfShape& LVi = MapVLV.FindFromKey(VRoot);
 	TopoDS_Vertex VonW;
 	VonW.Nullify();
 	intersect = (!SearchVertex(LVi,wire2,VonW));
@@ -1102,7 +1108,7 @@ void BRepFill_CompatibleWires::
 	  NewVertex = EdgeIntersectOnWire(Pos->Value(i+1),Pnew,percent,
                                           MapVLV,TopoDS::Wire(myWork(i+1)),
                                           Vsol,newwire,EdgeNewEdges);
-	  MapVLV(VRoot).Append(Vsol);
+	  MapVLV.ChangeFromKey(VRoot).Append(Vsol);
 	  if (NewVertex) myWork(i+1) = newwire;
 	}
 	
@@ -1129,7 +1135,7 @@ void BRepFill_CompatibleWires::
     Standard_Real U2 = BRep_Tool::Parameter(VL,ECur);
     BRepAdaptor_Curve Curve(ECur);
     gp_Pnt PPs = Curve.Value(0.1*(U1+9*U2));
-    TopTools_ListIteratorOfListOfShape itF(MapVLV(VF)),itL(MapVLV(VL));
+    TopTools_ListIteratorOfListOfShape itF(MapVLV.FindFromKey(VF)),itL(MapVLV.FindFromKey(VL));
     Standard_Integer rang = ideb;
     while (rang < i) {
       itF.Next();
@@ -1149,7 +1155,24 @@ void BRepFill_CompatibleWires::
 	
 	// parse candidate edges
 	Standard_Real scal1,scal2;
-	if ( (V1.IsSame(VVF)&&V2.IsSame(VVL)) || (V2.IsSame(VVF)&&V1.IsSame(VVL)) ) {
+
+  Standard_Boolean isEqual = (V1.IsSame(VVF) && V2.IsSame(VVL)) || (V2.IsSame(VVF) && V1.IsSame(VVL));
+
+  if (!isEqual)
+  {
+    itF = (MapVLV.FindFromKey(VF));
+    itL = (MapVLV.FindFromKey(VL));
+    rang = ideb - 1;
+    while (rang < i) {
+      itF.Next();
+      itL.Next();
+      rang++;
+    }
+    V1 = TopoDS::Vertex(itF.Value()), V2 = TopoDS::Vertex(itL.Value());
+    isEqual = (V1.IsSame(VVF) && V2.IsSame(VVL)) || (V2.IsSame(VVF) && V1.IsSame(VVL));
+  }
+
+  if (isEqual) {
 	  Standard_Real U1param = BRep_Tool::Parameter(VVF,E);
 	  Standard_Real U2param = BRep_Tool::Parameter(VVL,E);
 	  BRepAdaptor_Curve CurveE(E);

src/BRepFill/BRepFill_PipeShell.cxx

@@ -1024,11 +1024,13 @@ void BRepFill_PipeShell::Generated(const TopoDS_Shape&   theShape,
         // place the initial section at the final position 
         Param.Append(V2);
         WSeq.Append(WSeq(ideb));
+        IndSec.Append(WSeq.Length());
       }
       else if (ifin>0) {
         // place the final section at the initial position
         Param.Append(V1);
         WSeq.Append(WSeq(ifin));
+        IndSec.Append(WSeq.Length());
       }
       else {
         // it is necessary to find a medium section to impose by V1 and by V2

src/Extrema/Extrema_ExtCC.cxx

@@ -837,7 +837,9 @@ void Extrema_ExtCC::PrepareResults(const Extrema_ExtElC&  AlgExt,
     if (myIsParallel) {
       PrepareParallelResult(Ut11, Ut12, Ut21, Ut22, AlgExt.SquareDistance());
     }
-    else {
+
+    if(mypoints.IsEmpty())
+    {
       NbExt = AlgExt.NbExt();
       for (i = 1; i <= NbExt; i++) {
 	// Verification de la validite des parametres
@@ -866,6 +868,8 @@ void Extrema_ExtCC::PrepareResults(const Extrema_ExtElC&  AlgExt,
 	    (U2 >= Ut21 - RealEpsilon())  &&
 	    (U2 <= Ut22 + RealEpsilon())) {
 	  Val = AlgExt.SquareDistance(i);
+    if (mypoints.IsEmpty())
+      mySqDist.Clear();
 	  mySqDist.Append(Val);
           if (!theIsInverse)
           {
@@ -911,7 +915,7 @@ void Extrema_ExtCC::PrepareResults(const Extrema_ECC&   AlgExt,
     {
       PrepareParallelResult(Ut11, Ut12, Ut21, Ut22, AlgExt.SquareDistance());
     }
-    else
+    if(mypoints.IsEmpty())
     {
       NbExt = AlgExt.NbExt();
       for (i = 1; i <= NbExt; i++)
@@ -935,6 +939,8 @@ void Extrema_ExtCC::PrepareResults(const Extrema_ECC&   AlgExt,
             (U2 >= Ut21 - RealEpsilon()) &&
             (U2 <= Ut22 + RealEpsilon()))
         {
+          if(mypoints.IsEmpty())
+            mySqDist.Clear();
           Val = AlgExt.SquareDistance(i);
           mySqDist.Append(Val);
           P1.SetValues(U, P1.Value());

src/Interface/Interface_StaticStandards.cxx

@@ -82,7 +82,7 @@ void  Interface_Static::Standards ()
   Interface_Static::Init("XSTEP"  ,"write.surfacecurve.mode", '&',"eval Off");
   Interface_Static::Init("XSTEP"  ,"write.surfacecurve.mode", '&',"eval On");
 //  Interface_Static::Init("XSTEP"  ,"write.surfacecurve.mode", '&',"eval NoAnalytic");
-  Interface_Static::SetIVal ("write.surfacecurve.mode",0);
+  Interface_Static::SetIVal ("write.surfacecurve.mode",1);
 
 //  lastpreci : pour recuperer la derniere valeur codee (cf XSControl)
 //    (0 pour dire : pas codee)

src/RWGltf/RWGltf_CafWriter.cxx

@@ -21,7 +21,6 @@
 #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>
@@ -171,72 +170,6 @@ 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  :
@@ -252,8 +185,7 @@ RWGltf_CafWriter::RWGltf_CafWriter (const TCollection_AsciiString& theFile,
   myToEmbedTexturesInGlb (true),
   myToMergeFaces (false),
   myToSplitIndices16 (false),
-  myBinDataLen64  (0),
-  myToParallel (false)
+  myBinDataLen64  (0)
 {
   myCSTrsf.SetOutputLengthUnit (1.0); // meters
   myCSTrsf.SetOutputCoordinateSystem (RWMesh_CoordinateSystem_glTF);
@@ -605,8 +537,6 @@ 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
@@ -616,7 +546,7 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
     return false;
   }
 
-  Message_ProgressScope aPSentryBin (aScope.Next(), "Binary data", 4);
+  Message_ProgressScope aPSentryBin (theProgress, "Binary data", 4);
   const RWGltf_GltfArrayType anArrTypes[4] =
   {
     RWGltf_GltfArrayType_Position,
@@ -867,6 +797,7 @@ 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);
@@ -874,23 +805,38 @@ 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);
-
-    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)
+    for (size_t aMeshInd = 0; aMeshInd != aMeshes.size(); ++aMeshInd)
     {
-      if (anEncoderBuffers.at(aBuffInd).get() == nullptr)
+      const std::shared_ptr<RWGltf_CafWriter::Mesh>& aCurrentMesh = aMeshes[aMeshInd];
+      if (aCurrentMesh->NodesVec.empty())
       {
-        Message::SendFail(TCollection_AsciiString("Error: mesh not encoded in draco buffer."));
+        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."));
         return false;
       }
+
       RWGltf_GltfBufferView aBuffViewDraco;
-      aBuffViewDraco.Id = (int)aBuffInd;
+      aBuffViewDraco.Id = aBuffId++;
       aBuffViewDraco.ByteOffset = aBinFile->tellp();
-      const draco::EncoderBuffer& anEncoderBuff = *anEncoderBuffers.at(aBuffInd);
-      aBinFile->write(anEncoderBuff.data(), std::streamsize(anEncoderBuff.size()));
+      aBinFile->write (anEncoderBuff.data(), std::streamsize(anEncoderBuff.size()));
       if (!aBinFile->good())
       {
         Message::SendFail (TCollection_AsciiString("File '") + myBinFileNameFull + "' cannot be written");

src/RWGltf/RWGltf_CafWriter.hxx

@@ -125,12 +125,6 @@ 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; }
 
@@ -403,7 +397,6 @@ 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
 };
 

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -3365,17 +3365,17 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
         if (anUnit.IsNull()) continue;
         if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
         Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
-        STEPConstruct_UnitContext anUnitCtxUpperBound;
-        anUnitCtxUpperBound.ComputeFactors(NU);
-        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
-          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
-        {
-          convertAngleValue(anUnitCtxUpperBound, aVal);
-        }
-        else if ((aMWU->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) && anUnitCtxUpperBound.LengthFactor() > 0.) ||
+        STEPConstruct_UnitContext anUnitCtx;
+        anUnitCtx.ComputeFactors(NU);
+        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit)) ||
           aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
         {
-          aVal = aVal * anUnitCtxUpperBound.LengthFactor();
+          aVal = aVal * anUnitCtx.LengthFactor();
+        }
+        else if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
+          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
+        {
+          convertAngleValue(anUnitCtx, aVal);
         }
         aDim3 = aVal;
 
@@ -3401,17 +3401,16 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
         if (anUnit.IsNull()) continue;
         if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
         NU = anUnit.NamedUnit();
-        STEPConstruct_UnitContext anUnitCtxLowerBound;
-        anUnitCtxLowerBound.ComputeFactors(NU);
-        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
+        anUnitCtx.ComputeFactors(NU);
+        if (aMWU->IsKind(STANDARD_TYPE(StepBasic_LengthMeasureWithUnit)) ||
+          aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
+        {
+          aVal = aVal * anUnitCtx.LengthFactor();
+        }
+        else if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) ||
           aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
         {
-          convertAngleValue(anUnitCtxLowerBound, aVal);
-        }
-        else if ((aMWU->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) && anUnitCtxLowerBound.LengthFactor() > 0.) ||
-                 aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
-        {
-          aVal = aVal * anUnitCtxLowerBound.LengthFactor();
+          convertAngleValue(anUnitCtx, aVal);
         }
         aDim2 = Abs(aVal);
       }

src/TopTools/TopTools_IndexedDataMapOfShapeListOfShape.hxx

@@ -23,6 +23,7 @@
 #include <NCollection_IndexedDataMap.hxx>
 
 typedef NCollection_IndexedDataMap<TopoDS_Shape,TopTools_ListOfShape,TopTools_ShapeMapHasher> TopTools_IndexedDataMapOfShapeListOfShape;
+typedef NCollection_IndexedDataMap<TopoDS_Shape, TopTools_ListOfShape, TopTools_ShapeMapHasher>::Iterator TopTools_IndexedDataMapIteratorOfDataMapOfShapeListOfShape;
 
 
 #endif

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, Standard_True);
+        theBRepTrsf.Perform(aShape, 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, Standard_True);
+        aBRepTrsf.Perform(aShape, Standard_True);
         if (!aBRepTrsf.IsDone())
         {
           Standard_SStream aSS;

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 factor [-root label] [-force]: Applies geometrical scale to assembly",
+         "Doc -scale factor [-root label]: Applies geometrical scale to assembly",
          __FILE__, XRescaleGeometry, g);
 
   // Specialized commands

src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx

@@ -383,7 +383,6 @@ 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;
@@ -557,10 +556,6 @@ 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] << "'";
@@ -592,7 +587,6 @@ 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);
@@ -2456,7 +2450,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 [-parallel]=0"
+                   "\n\t\t:            [-unifiedQuantization]=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"
@@ -2466,7 +2460,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)"
@@ -2474,8 +2468,7 @@ 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:   -parallel             use multithreading for Draco compression",
+                   "\n\t\t:   -unifiedQuantization  quantization is applied on each primitive separately if this option is false",
                    __FILE__, WriteGltf, g);
   theCommands.Add ("writegltf",
                    "writegltf shape file",

tests/bugs/modalg_7/bug24909_1

@@ -0,0 +1,22 @@
+puts "========"
+puts "0024909: Modeling Algorithms - SIGSEGV in buildsweep"
+puts "========"
+puts ""
+
+pload MODELING
+circle c1 0 0 0 40
+mkedge e1 c1
+wire w1 e1
+tcopy w1 Sketch002
+tcopy w1 Sketch001
+renamevar w1 Sketch
+trotate Sketch 0 0 0 0. 1. 0. 90
+ttranslate Sketch 0. 0. 75.
+trotate Sketch001 0 0 0 0. 1. 0. 90
+ttranslate Sketch001 0. 0. -75.
+ttranslate Sketch002 50. 0. 0.
+mksweep Sketch002
+setsweep -CF
+addsweep Sketch001
+addsweep Sketch
+buildsweep Sweep

tests/bugs/modalg_7/bug24909_2

@@ -0,0 +1,26 @@
+puts "========"
+puts "0024909: Modeling Algorithms - SIGSEGV in buildsweep"
+puts "========"
+puts ""
+
+pload MODELING
+restore [locate_data_file bug24909_BezCurve.brep] BezCurve
+ttranslate BezCurve 0 -8 0
+explode BezCurve E
+wire Sweep001-0-spine BezCurve_1
+mksweep Sweep001-0-spine
+setsweep -CF
+circle Circle-curve 0 0 0 18
+mkedge Circle-edge Circle-curve 0 0
+wire Circle Circle-edge
+trotate Circle 0 0 0 0.577350269189625731 0.577350269189625731 0.577350269189625731 120
+ttranslate Circle 0 -71 203.5
+addsweep Circle
+circle Circle001-curve 0 0 0 16
+mkedge Circle001-edge Circle001-curve 0 0
+wire Circle001 Circle001-edge
+trotate Circle001 0 0 0 0.577350269189625731 0.577350269189625731 0.577350269189625731 120
+ttranslate Circle001 0 -71 203.5
+addsweep Circle001
+buildsweep Sweep001 -C -S
+

tests/bugs/modalg_7/bug24909_3

@@ -0,0 +1,17 @@
+puts "========"
+puts "0024909: Modeling Algorithms - SIGSEGV in buildsweep"
+puts "========"
+puts ""
+
+pload MODELING
+restore [locate_data_file bug24909_spine.brep]
+renamevar bug24909_spine Sweep-0-spine
+mksweep Sweep-0-spine
+setsweep -CF
+restore [locate_data_file bug24909_Sketch.brep]
+renamevar bug24909_Sketch Sweep-0-section-00-Sketch
+addsweep Sweep-0-section-00-Sketch 
+restore [locate_data_file bug24909_Sketch001.brep]
+renamevar bug24909_Sketch001 Sweep-0-section-01-Sketch001
+addsweep Sweep-0-section-01-Sketch001 
+buildsweep Sweep

tests/bugs/modalg_7/bug24909_4

@@ -0,0 +1,15 @@
+puts "========"
+puts "0024909: Modeling Algorithms - SIGSEGV in buildsweep"
+puts "========"
+puts ""
+
+pload ALL
+circle c1 0 0 0 40
+mkedge e1 c1
+wire w1 e1
+line l1 0 0 0 0 0 20
+mkedge e2 l1 0 10
+wire w2 e2
+mksweep w1
+addsweep w2
+buildsweep sw1

tests/bugs/step/bug33095

@@ -1,32 +0,0 @@
-puts "======="
-puts "0033095: Data Exchange, Step Import - Wrong PMI values when loading a *.stp file in m"
-puts "======="
-
-pload OCAF
-
-catch { Close D_mm }
-catch { Close D_m }
-
-# Read file in mm
-ReadStep D_mm [locate_data_file bug33095_cad_with_pmi.stp]
-set plusMinusTol_mm [XGetDimensionPlusMinusTol D_mm 0:1:4:77]
-
-# Read file in m
-XNewDoc D_m
-XSetLengthUnit D_m m
-ReadStep D_m [locate_data_file bug33095_cad_with_pmi.stp]
-set plusMinusTol_m [XGetDimensionPlusMinusTol D_m 0:1:4:77]
-
-# Checking
-regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_m full lower_m upper_m
-regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_mm full lower_mm upper_mm
-
-set lower_m_to_mm [expr {$lower_m * 1000}]
-set upper_m_to_mm [expr {$upper_m * 1000}]
-
-if {[expr {abs($lower_m_to_mm - $lower_mm)}] > 1e-2} {
- puts "Error: incorrect scaling lower toleranse value"
-}
-if {[expr {abs($upper_m_to_mm - $upper_mm)}] > 1e-2} {
- puts "Error: incorrect scaling upper toleranse value"
-}

tests/bugs/xde/bug33100

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

tests/de_mesh/gltf_write/bull_parallel

@@ -1,13 +0,0 @@
-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"

tests/gdt/import/A3

@@ -12,45 +12,45 @@ set ref_data {
  0:1:1:2:2 Shape.5
  	 0:1:4:1 GeomTolerance.5.1 ( N "Feature Control Frame (4)" T 12 TV 0, V 0.254 )
  0:1:1:2:7 Shape.10
- 	 0:1:4:6 Dimension.10.1 ( N "linear distance" T 2, V 20.827999999999996, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:6 Dimension.10.1 ( N "linear distance" T 2, V 20.827999999999996, VL 2.54, VU 2.54, P 0 )
  0:1:1:2:19 Shape.22
- 	 0:1:4:39 Dimension.22.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:39 Dimension.22.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:35 GeomTolerance.22.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:36 Datum.22.1.1 ( N "Feature Control Frame (40)" )
  	 	 0:1:4:37 Datum.22.1.2 ( N "Feature Control Frame (40)", M 15 )
  	 	 0:1:4:38 Datum.22.1.3 ( N "Feature Control Frame (40)", M 15 )
  0:1:1:2:20 Shape.23
- 	 0:1:4:39 Dimension.23.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:39 Dimension.23.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:35 GeomTolerance.23.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:36 Datum.23.1.1 ( N "Feature Control Frame (40)" )
  	 	 0:1:4:37 Datum.23.1.2 ( N "Feature Control Frame (40)", M 15 )
  	 	 0:1:4:38 Datum.23.1.3 ( N "Feature Control Frame (40)", M 15 )
  0:1:1:2:21 Shape.24
- 	 0:1:4:39 Dimension.24.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:39 Dimension.24.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:35 GeomTolerance.24.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:36 Datum.24.1.1 ( N "Feature Control Frame (40)" )
  	 	 0:1:4:37 Datum.24.1.2 ( N "Feature Control Frame (40)", M 15 )
  	 	 0:1:4:38 Datum.24.1.3 ( N "Feature Control Frame (40)", M 15 )
  0:1:1:2:22 Shape.25
- 	 0:1:4:39 Dimension.25.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:39 Dimension.25.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:35 GeomTolerance.25.1 ( N "Feature Control Frame (40)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:36 Datum.25.1.1 ( N "Feature Control Frame (40)" )
  	 	 0:1:4:37 Datum.25.1.2 ( N "Feature Control Frame (40)", M 15 )
  	 	 0:1:4:38 Datum.25.1.3 ( N "Feature Control Frame (40)", M 15 )
  0:1:1:2:28 Shape.31
- 	 0:1:4:6 Dimension.31.1 ( N "linear distance" T 2, V 20.827999999999996, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:6 Dimension.31.1 ( N "linear distance" T 2, V 20.827999999999996, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:2 GeomTolerance.31.1 ( N "Feature Control Frame (24)" T 12 TV 0, V 0.76200000000000001 )
  	 	 0:1:4:3 Datum.31.1.1 ( N "Feature Control Frame (24)" )
  	 	 0:1:4:4 Datum.31.1.2 ( N "Feature Control Frame (24)" )
  	 	 0:1:4:5 Datum.31.1.3 ( N "Feature Control Frame (24)" )
  0:1:1:2:39 Shape.42
- 	 0:1:4:14 Dimension.42.1 ( N "diameter" T 15, V 50.799999999999997, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:14 Dimension.42.1 ( N "diameter" T 15, V 50.799999999999997, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:15 GeomTolerance.42.1 ( N "Feature Control Frame (16)" T 10 TV 1, V 1.524 )
  	 	 0:1:4:16 Datum.42.1.1 ( N "Feature Control Frame (16)" )
  	 	 0:1:4:17 Datum.42.1.2 ( N "Feature Control Frame (16)" )
  	 	 0:1:4:18 Datum.42.1.3 ( N "Feature Control Frame (16)" )
  0:1:1:2:40 Shape.43
- 	 0:1:4:14 Dimension.43.1 ( N "diameter" T 15, V 50.799999999999997, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:14 Dimension.43.1 ( N "diameter" T 15, V 50.799999999999997, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:15 GeomTolerance.43.1 ( N "Feature Control Frame (16)" T 10 TV 1, V 1.524 )
  	 	 0:1:4:16 Datum.43.1.1 ( N "Feature Control Frame (16)" )
  	 	 0:1:4:17 Datum.43.1.2 ( N "Feature Control Frame (16)" )
@@ -58,7 +58,7 @@ set ref_data {
  0:1:1:2:48 Shape.51
  	 0:1:4:30 Dimension.51.1 ( N "linear distance" T 2, V 19.049999999999997, P 0 )
  0:1:1:2:49 Shape.52
- 	 0:1:4:19 Dimension.52.1 ( N "diameter" T 15, V 38.099999999999994, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:19 Dimension.52.1 ( N "diameter" T 15, V 38.099999999999994, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:20 GeomTolerance.52.1 ( N "Feature Control Frame (18)" T 10 TV 1, V 2.032 )
  	 	 0:1:4:21 Datum.52.1.1 ( N "Feature Control Frame (18)" )
  	 	 0:1:4:22 Datum.52.1.2 ( N "Feature Control Frame (18)" )
@@ -68,7 +68,7 @@ set ref_data {
  	 	 0:1:4:27 Datum.52.2.2 ( N "Feature Control Frame (20)" )
  	 	 0:1:4:28 Datum.52.2.3 ( N "Feature Control Frame (20)" )
  0:1:1:2:50 Shape.53
- 	 0:1:4:19 Dimension.53.1 ( N "diameter" T 15, V 38.099999999999994, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:19 Dimension.53.1 ( N "diameter" T 15, V 38.099999999999994, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:24 Dimension.53.2 ( N "linear distance" T 2, V 38.099999999999994, P 0 )
  	 0:1:4:20 GeomTolerance.53.1 ( N "Feature Control Frame (18)" T 10 TV 1, V 2.032 )
  	 	 0:1:4:21 Datum.53.1.1 ( N "Feature Control Frame (18)" )
@@ -79,49 +79,49 @@ set ref_data {
  	 	 0:1:4:27 Datum.53.2.2 ( N "Feature Control Frame (20)" )
  	 	 0:1:4:28 Datum.53.2.3 ( N "Feature Control Frame (20)" )
  0:1:1:2:51 Shape.54
- 	 0:1:4:29 Dimension.54.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.54.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.54.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.54.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.54.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.54.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:52 Shape.55
- 	 0:1:4:29 Dimension.55.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.55.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.55.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.55.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.55.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.55.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:53 Shape.56
- 	 0:1:4:29 Dimension.56.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.56.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.56.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.56.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.56.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.56.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:54 Shape.57
- 	 0:1:4:29 Dimension.57.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.57.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.57.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.57.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.57.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.57.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:55 Shape.58
- 	 0:1:4:29 Dimension.58.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.58.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.58.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.58.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.58.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.58.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:56 Shape.59
- 	 0:1:4:29 Dimension.59.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.59.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.59.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.59.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.59.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.59.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:57 Shape.60
- 	 0:1:4:29 Dimension.60.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.60.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.60.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.60.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.60.1.2 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:34 Datum.60.1.3 ( N "Feature Control Frame (36)" )
  0:1:1:2:58 Shape.61
- 	 0:1:4:29 Dimension.61.1 ( N "diameter" T 15, V 15.875, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:29 Dimension.61.1 ( N "diameter" T 15, V 15.875, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:31 GeomTolerance.61.1 ( N "Feature Control Frame (36)" T 10 TV 1, V 1.27, MR 1 )
  	 	 0:1:4:32 Datum.61.1.1 ( N "Feature Control Frame (36)" )
  	 	 0:1:4:33 Datum.61.1.2 ( N "Feature Control Frame (36)" )
@@ -137,28 +137,28 @@ set ref_data {
  0:1:1:2:129 Shape.132
  	 0:1:4:1 GeomTolerance.132.1 ( N "Feature Control Frame (4)" T 12 TV 0, V 0.254 )
  0:1:1:2:134 Shape.137
- 	 0:1:4:40 Dimension.137.1 ( N "diameter" T 15, V 27.050999999999998, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:40 Dimension.137.1 ( N "diameter" T 15, V 27.050999999999998, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:41 GeomTolerance.137.1 ( N "Feature Control Frame (30)" T 9 TV 1, V 0.254 )
  	 	 0:1:4:42 Datum.137.1.1 ( N "Feature Control Frame (30)" )
  0:1:1:2:135 Shape.138
- 	 0:1:4:40 Dimension.138.1 ( N "diameter" T 15, V 27.050999999999998, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:40 Dimension.138.1 ( N "diameter" T 15, V 27.050999999999998, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:41 GeomTolerance.138.1 ( N "Feature Control Frame (30)" T 9 TV 1, V 0.254 )
  	 	 0:1:4:42 Datum.138.1.1 ( N "Feature Control Frame (30)" )
  0:1:1:2:153 Shape.156
- 	 0:1:4:7 Dimension.156.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:7 Dimension.156.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:9 GeomTolerance.156.1 ( N "Feature Control Frame (10)" T 9 TV 1, V 0.254 )
  	 	 0:1:4:10 Datum.156.1.1 ( N "Feature Control Frame (10)" )
  0:1:1:2:154 Shape.157
- 	 0:1:4:7 Dimension.157.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:7 Dimension.157.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:9 GeomTolerance.157.1 ( N "Feature Control Frame (10)" T 9 TV 1, V 0.254 )
  	 	 0:1:4:10 Datum.157.1.1 ( N "Feature Control Frame (10)" )
  0:1:1:2:155 Shape.158
- 	 0:1:4:8 Dimension.158.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:8 Dimension.158.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:11 GeomTolerance.158.1 ( N "Feature Control Frame (11)" T 10 TV 1, V 0.50800000000000001 )
  	 	 0:1:4:12 Datum.158.1.1 ( N "Feature Control Frame (11)" )
  	 	 0:1:4:13 Datum.158.1.2 ( N "Feature Control Frame (11)" )
  0:1:1:2:156 Shape.159
- 	 0:1:4:8 Dimension.159.1 ( N "diameter" T 15, V 11.1252, VL 64.515999999999991, VU 64.515999999999991, P 0 )
+ 	 0:1:4:8 Dimension.159.1 ( N "diameter" T 15, V 11.1252, VL 2.54, VU 2.54, P 0 )
  	 0:1:4:11 GeomTolerance.159.1 ( N "Feature Control Frame (11)" T 10 TV 1, V 0.50800000000000001 )
  	 	 0:1:4:12 Datum.159.1.1 ( N "Feature Control Frame (11)" )
  	 	 0:1:4:13 Datum.159.1.2 ( N "Feature Control Frame (11)" )

tests/gdt/import/A5

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