// fix

Going to test on CAD format import

adm/scripts/cmake_custom.bat

@@ -44,7 +44,7 @@ rem set USE_D3D=OFF
 rem set USE_FFMPEG=OFF
 set USE_FREEIMAGE=ON
 rem set USE_GLES2=OFF
-set USE_RAPIDJSON=ON
+rem set USE_RAPIDJSON=OFF
 rem set USE_DRACO=OFF
 rem set USE_TBB=OFF
 rem set USE_VTK=OFF

adm/scripts/cmake_custom.sh

@@ -36,7 +36,7 @@ BUILD_CPP_STANDARD=C++14
 #USE_FFMPEG=OFF
 USE_FREEIMAGE=ON
 #USE_GLES2=OFF
-USE_RAPIDJSON=ON
+#USE_RAPIDJSON=OFF
 #USE_DRACO=OFF
 #USE_TBB=OFF
 #USE_VTK=OFF

adm/scripts/wasm_build.bat

@@ -128,6 +128,9 @@ if ["%toPack%"] == ["1"] (
 
   "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%"
 )
+if not ["%1"] == ["-nopause"] (
+  pause
+)
 
 goto :eof
 
@@ -281,6 +284,7 @@ if ["%toCMake%"] == ["1"] (
 
   if errorlevel 1 (
     popd
+    pause
     exit /B
     goto :eof
   )
@@ -295,6 +299,7 @@ if ["%toMake%"] == ["1"] (
   if errorlevel 1 (
     type "%aLogFileSmpl%"
     popd
+    pause
     exit /B
     goto :eof
   )
@@ -306,6 +311,7 @@ if ["%toInstall%"] == ["1"] (
   if errorlevel 1 (
     type "%aLogFileSmpl%"
     popd
+    pause
     exit /B
     goto :eof
   )

dox/user_guides/step/step.md

@@ -1653,13 +1653,6 @@ For each Saved View OCCT STEP Reader will retrieve the following attributes:
 - clipping planes (single plane of combination of planes);
 - front and back plane clipping.
 
-### User defined attributes
-Attributes are implemented in accordance with <a href="https://www.mbx-if.org/documents/rec_prac_user_def_attributes_v18.pdf">Recommended practices for User Defined Attributes</a> section 4, 5, 6.1-6.3 and 7.
-Attributes can be read for shapes at levels:
-- Part/Product Level;
-- Component Instances in an Assembly;
-- Geometry Level.
-
 @subsection occt_step_7_3 Writing to STEP
 
 The translation from XDE to STEP can be initialized as follows: 
@@ -1737,8 +1730,5 @@ Interface_Static::SetIVal("write.step.schema", 5));
 ### Saved views
 Saved Views are not exported by OCCT.
 
-### User defined attributes
-Attributes can be imported from STEP.
-
 
 

src/Approx/Approx_BSplComputeLine.gxx

@@ -808,11 +808,8 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
   const Standard_Integer aNbp = lastP - firstP + 1;
 
 
-  // The first parameter should always be zero according to all the logic below,
-  // so division by any value will give zero anyway, so it should never be scaled
-  // to avoid case when there is only one parameter in the array thus division by zero happens.
-  TheParameters(firstP) = 0.0;
   if (aNbp == 2) {
+    TheParameters(firstP) = 0.0;
     TheParameters(lastP) = 1.0;
   }
   else if (Par == Approx_ChordLength || Par == Approx_Centripetal)
@@ -823,6 +820,7 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
     if (nbP3d == 0) mynbP3d = 1;
     if (nbP2d == 0) mynbP2d = 1;
 
+    TheParameters(firstP) = 0.0;
     dist = 0.0;
     TColgp_Array1OfPnt tabP(1, mynbP3d);
     TColgp_Array1OfPnt tabPP(1, mynbP3d);
@@ -863,10 +861,10 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
         TheParameters(i) = TheParameters(i - 1) + Sqrt(dist);
       }
     }
-    for (i = firstP + 1; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
+    for (i = firstP; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
   }
   else {
-    for (i = firstP + 1; i <= lastP; i++) {
+    for (i = firstP; i <= lastP; i++) {
       TheParameters(i) = (Standard_Real(i) - firstP) /
         (Standard_Real(lastP - Standard_Real(firstP)));
     }

src/BRepClass/BRepClass_FaceExplorer.cxx

@@ -96,7 +96,7 @@ Standard_Boolean BRepClass_FaceExplorer::CheckPoint(gp_Pnt2d& thePoint)
   else
   {
     Standard_Real anEpsilon = Epsilon(aDistance);
-    if (anEpsilon > Max (myUMax - myUMin, myVMax - myVMin) && anEpsilon > 1e-100)
+    if (anEpsilon > Max (myUMax - myUMin, myVMax - myVMin))
     {
       gp_Vec2d aLinVec(aCenterPnt, thePoint);
       gp_Dir2d aLinDir(aLinVec);

src/BRepTools/BRepTools_GTrsfModification.cxx

@@ -308,15 +308,10 @@ Standard_Boolean BRepTools_GTrsfModification::NewTriangulation(const TopoDS_Face
   // modify normals
   if (theTriangulation->HasNormals())
   {
-    for (Standard_Integer anInd = 1; anInd <= theTriangulation->NbNodes(); ++anInd)
+    for (Standard_Integer anInd = 1; anInd <= theTriangulation->NbTriangles(); ++anInd)
     {
       gp_Dir aNormal = theTriangulation->Normal(anInd);
-      gp_Mat aMat = aGTrsf.VectorialPart();
-      aMat.SetDiagonal(1., 1., 1.);
-      gp_Trsf aTrsf;
-      aTrsf.SetForm(gp_Rotation);
-      (gp_Mat&)aTrsf.HVectorialPart() = aMat;
-      aNormal.Transform(aTrsf);
+      aNormal.Transform(aGTrsf.Trsf());
       theTriangulation->SetNormal(anInd, aNormal);
     }
   }

src/BSplCLib/BSplCLib_2.cxx

@@ -515,13 +515,8 @@ BSplCLib::EvalBsplineBasis
       //
       // this should be always invertible if ii is correctly computed 
       //
-      const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
-      if (Abs (aScale) < gp::Resolution())
-      {
-        return 2;
-      }
-
-      Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) / aScale;
+      Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) 
+	/ (FlatKnots(ii + pp)   - FlatKnots(ii - qq + pp + 1)) ; 
       Saved = Factor *    BsplineBasis(1,pp) ;
       BsplineBasis(1,pp) *= (1.0e0 - Factor) ;
       BsplineBasis(1,pp) += BsplineBasis(1,qq) ;
@@ -541,13 +536,7 @@ BSplCLib::EvalBsplineBasis
     }
 
     for (pp = 1 ; pp <= qq - 1 ; pp++) {
-      const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
-      if (Abs (aScale) < gp::Resolution())
-      {
-        return 2;
-      }
-
-      Inverse = 1.0e0 / aScale;
+      Inverse = 1.0e0 / (FlatKnots(ii + pp)  - FlatKnots(ii - qq + pp + 1)) ;
       Factor  =  (Parameter - FlatKnots(ii - qq + pp + 1)) * Inverse ;
       Saved = Factor *                 BsplineBasis(1,pp) ;
       BsplineBasis(1,pp) *= (1.0e0 - Factor) ;

src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx

@@ -33,7 +33,6 @@
 #include <Storage_Schema.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
-#include <TDataStd_TreeNode.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
@@ -325,16 +324,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
   // read sub-tree of the root label
   if (!theFilter.IsNull())
     theFilter->StartIteration();
-  const auto aStreamStartPosition = theIStream.tellg();
-  Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, Standard_False, aPS.Next());
-  if (!myUnresolvedLinks.IsEmpty())
-  {
-    // In case we have skipped some linked TreeNodes before getting to
-    // their children.
-    theFilter->StartIteration();
-    theIStream.seekg(aStreamStartPosition, std::ios_base::beg);
-    nbRead += ReadSubTree(theIStream, aData->Root(), theFilter, aQuickPart, Standard_True, aPS.Next());
-  }
+  Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, aPS.Next());
   if (!aPS.More()) 
   {
     myReaderStatus = PCDM_RS_UserBreak;
@@ -383,7 +373,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
   const TDF_Label& theLabel,
   const Handle(PCDM_ReaderFilter)& theFilter,
   const Standard_Boolean& theQuickPart,
-  const Standard_Boolean theReadMissing,
   const Message_ProgressRange& theRange)
 {
   Standard_Integer nbRead = 0;
@@ -404,7 +393,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     aLabelSize = InverseUint64(aLabelSize);
 #endif
     // no one sub-label is needed, so, skip everything
-    if (aSkipAttrs && !theFilter->IsSubPassed() && myUnresolvedLinks.IsEmpty())
+    if (aSkipAttrs && !theFilter->IsSubPassed())
     {
       aLabelSize -= sizeof (uint64_t);
       theIS.seekg (aLabelSize, std::ios_base::cur);
@@ -414,11 +403,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     }
   }
 
-  if (theReadMissing)
-  {
-    aSkipAttrs = Standard_True;
-  }
-  const auto anAttStartPosition = theIS.tellg();
   // Read attributes:
   for (theIS >> myPAtt;
     theIS && myPAtt.TypeId() > 0 &&             // not an end marker ?
@@ -431,12 +415,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
       myReaderStatus = PCDM_RS_UserBreak;
       return -1;
     }
-    if (myUnresolvedLinks.Remove(myPAtt.Id()) && aSkipAttrs)
-    {
-      aSkipAttrs = Standard_False;
-      theIS.seekg(anAttStartPosition, std::ios_base::beg);
-      continue;
-    }
     if (aSkipAttrs)
     {
       if (myPAtt.IsDirect()) // skip direct written stream
@@ -509,17 +487,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
           aDriver->TypeName(), Message_Warning);
       }
       else if (!isBound)
-      {
         myRelocTable.Bind(anID, tAtt);
-        Handle(TDataStd_TreeNode) aNode = Handle(TDataStd_TreeNode)::DownCast(tAtt);
-        if (!theFilter.IsNull() && !aNode.IsNull() && !aNode->Father().IsNull() && aNode->Father()->IsNew())
-        {
-          Standard_Integer anUnresolvedLink;
-          myPAtt.SetPosition(BP_HEADSIZE);
-          myPAtt >> anUnresolvedLink;
-          myUnresolvedLinks.Add(anUnresolvedLink);
-        }
-      }
     }
     else if (!myMapUnsupported.Contains(myPAtt.TypeId()))
       myMsgDriver->Send(aMethStr + "warning: type ID not registered in header: "
@@ -554,7 +522,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     // read sub-tree
     if (!theFilter.IsNull())
       theFilter->Down (aTag);
-    Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, theReadMissing, aPS.Next());
+    Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, aPS.Next());
     // check for error
     if (nbSubRead == -1)
       return -1;

src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx

@@ -80,7 +80,6 @@ protected:
      const TDF_Label& theData, 
      const Handle(PCDM_ReaderFilter)& theFilter,
      const Standard_Boolean& theQuickPart,
-     const Standard_Boolean theReadMissing,
      const Message_ProgressRange& theRanges = Message_ProgressRange());
   
   
@@ -126,7 +125,6 @@ private:
   BinObjMgt_Persistent myPAtt;
   TColStd_MapOfInteger myMapUnsupported;
   BinLDrivers_VectorOfDocumentSection mySections;
-  NCollection_Map<Standard_Integer> myUnresolvedLinks;
 
 
 };

src/DE/DE_Wrapper.cxx

@@ -538,6 +538,7 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
       {
         theProvider = aNode->BuildProvider();
         aNode->GlobalParameters = GlobalParameters;
+        theProvider->SetNode(aNode);
         return Standard_True;
       }
     }

src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx

@@ -125,7 +125,7 @@ Handle(DE_ConfigurationNode) DEXCAFCascade_ConfigurationNode::Copy() const
 //=======================================================================
 Handle(DE_Provider) DEXCAFCascade_ConfigurationNode::BuildProvider()
 {
-  return new DEXCAFCascade_Provider (this);
+  return new DEXCAFCascade_Provider();
 }
 
 //=======================================================================

src/GeomLib/GeomLib_IsPlanarSurface.cxx

@@ -76,28 +76,22 @@ static Standard_Boolean Controle(const TColgp_Array1OfPnt& Poles,
       Standard_Real umin, umax, vmin, vmax;
       S->Bounds(umin, umax, vmin, vmax);
       S->D1( (umin+umax)/2, (vmin+vmax)/2, P, DU, DV);
-
-      if (DU.SquareMagnitude() > gp::Resolution() &&
-          DV.SquareMagnitude() > gp::Resolution())
-      {
-        // On prend DX le plus proche possible de DU
-        gp_Dir du(DU);
-        Standard_Real Angle1 = du.Angle(DX);
-        Standard_Real Angle2 = du.Angle(DY);
-        if (Angle1 > M_PI/2) Angle1 = M_PI-Angle1;
-        if (Angle2 > M_PI/2) Angle2 = M_PI-Angle2;
-        if (Angle2 < Angle1)
-        {
-          du = DY; DY = DX; DX = du;
-        }
-        if (DX.Angle(DU) > M_PI/2) DX.Reverse();
-        if (DY.Angle(DV) > M_PI/2) DY.Reverse();
-
-        gp_Ax3 axe(Bary, DX^DY, DX);
-        Plan.SetPosition(axe);
-        Plan.SetLocation(Bary);
-        IsPlan = Standard_True;
+      // On prend DX le plus proche possible de DU
+      gp_Dir du(DU);
+      Standard_Real Angle1 = du.Angle(DX);
+      Standard_Real Angle2 = du.Angle(DY);
+      if (Angle1 > M_PI/2) Angle1 = M_PI-Angle1;
+      if (Angle2 > M_PI/2) Angle2 = M_PI-Angle2;
+      if (Angle2 < Angle1) {
+	du = DY; DY = DX; DX = du;
       }
+      if (DX.Angle(DU) > M_PI/2) DX.Reverse();
+      if (DY.Angle(DV) > M_PI/2) DY.Reverse();      
+
+      gp_Ax3 axe(Bary, DX^DY, DX);
+      Plan.SetPosition(axe);
+      Plan.SetLocation(Bary);
+      IsPlan = Standard_True;
     }
   }   
   return IsPlan;

src/NCollection/NCollection_Array2.hxx

@@ -179,10 +179,10 @@ public:
   Standard_Integer NbColumns() const { return myUpperCol - myLowerCol + 1; }
 
   //! Returns length of the row, i.e. number of columns
-  Standard_Integer RowLength() const { return NbColumns(); }
+  Standard_Integer RowLength() const { return NbRows(); }
 
   //! Returns length of the column, i.e. number of rows
-  Standard_Integer ColLength() const { return NbRows(); }
+  Standard_Integer ColLength() const { return NbColumns(); }
 
   //! LowerRow
   Standard_Integer LowerRow (void) const

src/RWMesh/RWMesh_CafReader.cxx

@@ -370,16 +370,6 @@ Standard_Boolean RWMesh_CafReader::addShapeIntoDoc (CafDocumentTools& theTools,
     return Standard_False;
   }
 
-  if (toMakeAssembly)
-  {
-    TDF_Label aRefLabel;
-    theTools.ShapeTool->GetReferredShape(aNewLabel, aRefLabel);
-    if (!aRefLabel.IsNull())
-    {
-      theTools.OriginalShapeMap.Bind(theShape, aRefLabel);
-    }
-  }
-
   // if new label is a reference get referred shape
   TDF_Label aNewRefLabel = aNewLabel;
   theTools.ShapeTool->GetReferredShape (aNewLabel, aNewRefLabel);

src/RWMesh/RWMesh_CafReader.hxx

@@ -56,7 +56,6 @@ public:
     Handle(XCAFDoc_ColorTool)       ColorTool;
     Handle(XCAFDoc_VisMaterialTool) VisMaterialTool;
     NCollection_DataMap<TopoDS_Shape, TDF_Label, TopTools_ShapeMapHasher> ComponentMap;
-    NCollection_DataMap<TopoDS_Shape, TDF_Label, TopTools_ShapeMapHasher> OriginalShapeMap;
   };
 
 public:

src/RWStepAP214/RWStepAP214_GeneralModule.cxx

@@ -98,8 +98,6 @@
 #include <RWStepBasic_RWExternalIdentificationAssignment.hxx>
 #include <RWStepBasic_RWExternallyDefinedItem.hxx>
 #include <RWStepBasic_RWGeneralProperty.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
 #include <RWStepBasic_RWGroupRelationship.hxx>
 #include <RWStepBasic_RWIdentificationAssignment.hxx>
 #include <RWStepBasic_RWIdentificationRole.hxx>
@@ -572,8 +570,6 @@
 #include <StepBasic_ExternalIdentificationAssignment.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepBasic_IdentificationAssignment.hxx>
@@ -1192,9 +1188,7 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -5873,20 +5867,6 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN,
     aTool.Share(anEnt, iter);
   }
   break;
-  case 819:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyAssociation aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
-  case 820:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyRelationship aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
   default : break;
   }
 }
@@ -8193,18 +8173,6 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid
    case 818:
      ent = new StepVisual_CubicBezierTriangulatedFace;
      break;
-   case 819:
-     ent = new StepBasic_GeneralPropertyAssociation;
-     break;
-   case 820:
-     ent = new StepBasic_GeneralPropertyRelationship;
-     break;
-   case 821:
-     ent = new StepRepr_BooleanRepresentationItem;
-     break;
-   case 822:
-     ent = new StepRepr_RealRepresentationItem;
-     break;
 
   default: 
     return Standard_False;

src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx

@@ -188,8 +188,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
@@ -622,8 +620,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx>
 #include <RWStepRepr_RWGlobalUnitAssignedContext.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
 #include <RWStepBasic_RWGroup.hxx>
 #include <RWStepBasic_RWGroupRelationship.hxx>
 #include <RWStepShape_RWHalfSpaceSolid.hxx>
@@ -1357,9 +1353,7 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx>
-#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
 #include <RWStepRepr_RWIntegerRepresentationItem.hxx>
-#include <RWStepRepr_RWRealRepresentationItem.hxx>
 #include <RWStepRepr_RWValueRepresentationItem.hxx>
 #include <RWStepRepr_RWValueRepresentationItem.hxx>
 #include <RWStepAP242_RWDraughtingModelItemAssociation.hxx>
@@ -1410,9 +1404,7 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -2357,10 +2349,6 @@ static TCollection_AsciiString Reco_ComplexTriangulatedFace("COMPLEX_TRIANGULATE
 static TCollection_AsciiString Reco_ComplexTriangulatedSurfaceSet("COMPLEX_TRIANGULATED_SURFACE_SET");
 static TCollection_AsciiString Reco_CubicBezierTessellatedEdge("CUBIC_BEZIER_TESSELLATED_EDGE");
 static TCollection_AsciiString Reco_CubicBezierTriangulatedFace("CUBIC_BEZIER_TRIANGULATED_FACE");
-static TCollection_AsciiString Reco_GeneralPropertyAssociation("GENERAL_PROPERTY_ASSOCIATION");
-static TCollection_AsciiString Reco_GeneralPropertyRelationship("GENERAL_PROPERTY_RELATIONSHIP");
-static TCollection_AsciiString Reco_BooleanRepresentationItem("BOOLEAN_REPRESENTATION_ITEM");
-static TCollection_AsciiString Reco_RealRepresentationItem("REAL_REPRESENTATION_ITEM");
 
 // -- Definition of the libraries --
 
@@ -3117,10 +3105,6 @@ RWStepAP214_ReadWriteModule::RWStepAP214_ReadWriteModule ()
   typenums.Bind(Reco_ComplexTriangulatedSurfaceSet, 816);
   typenums.Bind(Reco_CubicBezierTessellatedEdge, 817);
   typenums.Bind(Reco_CubicBezierTriangulatedFace, 818);
-  typenums.Bind(Reco_GeneralPropertyAssociation, 819);
-  typenums.Bind(Reco_GeneralPropertyRelationship, 820);
-  typenums.Bind(Reco_BooleanRepresentationItem, 821);
-  typenums.Bind(Reco_RealRepresentationItem, 822);
 
   
 //    SHORT NAMES
@@ -5108,10 +5092,6 @@ const TCollection_AsciiString& RWStepAP214_ReadWriteModule::StepType
   case 816: return Reco_ComplexTriangulatedSurfaceSet;
   case 817: return Reco_CubicBezierTessellatedEdge;
   case 818: return Reco_CubicBezierTriangulatedFace;
-  case 819: return Reco_GeneralPropertyAssociation;
-  case 820: return Reco_GeneralPropertyRelationship;
-  case 821: return Reco_BooleanRepresentationItem;
-  case 822: return Reco_RealRepresentationItem;
   default : return PasReco;
   }
 }
@@ -10714,34 +10694,6 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN,
     aTool.ReadStep(data, num, ach, anEnt);
   }
   break;
-  case 819:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyAssociation aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  case 820:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyRelationship aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepRepr_BooleanRepresentationItem, anent, ent);
-    RWStepRepr_RWBooleanRepresentationItem aTool;
-    aTool.ReadStep(data, num, ach, anent);
-  }
-  break;
-  case 822:
-  {
-    DeclareAndCast(StepRepr_RealRepresentationItem, anent, ent);
-    RWStepRepr_RWRealRepresentationItem aTool;
-    aTool.ReadStep(data, num, ach, anent);
-  }
-  break;
   default: 
     ach->AddFail("Type Mismatch when reading - Entity");
   }
@@ -16286,34 +16238,6 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN,
     aTool.WriteStep(SW, anEnt);
   }
   break;
-  case 819:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyAssociation aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
-  case 820:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyRelationship aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepRepr_BooleanRepresentationItem, anent, ent);
-    RWStepRepr_RWBooleanRepresentationItem aTool;
-    aTool.WriteStep(SW, anent);
-  }
-  break;
-  case 822:
-  {
-    DeclareAndCast(StepRepr_RealRepresentationItem, anent, ent);
-    RWStepRepr_RWRealRepresentationItem aTool;
-    aTool.WriteStep(SW, anent);
-  }
-  break;
   default:
     return;
   }

src/RWStepBasic/FILES

@@ -108,10 +108,6 @@ RWStepBasic_RWExternalSource.cxx
 RWStepBasic_RWExternalSource.hxx
 RWStepBasic_RWGeneralProperty.cxx
 RWStepBasic_RWGeneralProperty.hxx
-RWStepBasic_RWGeneralPropertyAssociation.cxx
-RWStepBasic_RWGeneralPropertyAssociation.hxx
-RWStepBasic_RWGeneralPropertyRelationship.cxx
-RWStepBasic_RWGeneralPropertyRelationship.hxx
 RWStepBasic_RWGroup.cxx
 RWStepBasic_RWGroup.hxx
 RWStepBasic_RWGroupAssignment.cxx

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx

@@ -1,87 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_PropertyDefinition.hxx>
-
-//=======================================================================
-//function : RWStepBasic_RWGeneralPropertyAssociation
-//purpose  : 
-//=======================================================================
-RWStepBasic_RWGeneralPropertyAssociation::RWStepBasic_RWGeneralPropertyAssociation()
-{
-}
-
-//=======================================================================
-//function : ReadStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyAssociation::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                        const Standard_Integer theNum,
-                                                        Handle(Interface_Check)& theAch,
-                                                        const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams(theNum, 4, theAch, "general_property_association")) return;
-
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(theNum, 1, "name", theAch, aName);
-
-  Handle(TCollection_HAsciiString) aDescription;
-  theData->ReadString(theNum, 2, "description", theAch, aDescription);
-
-  Handle(StepBasic_GeneralProperty) aGeneralProperty;
-  theData->ReadEntity(theNum, 3, "base_definition", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aGeneralProperty);
-
-  Handle(StepRepr_PropertyDefinition) aPropertyDefinition;
-  theData->ReadEntity(theNum, 4, "derived_definition", theAch, STANDARD_TYPE(StepRepr_PropertyDefinition), aPropertyDefinition);
-
-  // Initialize entity
-  theEnt->Init(aName,
-               aDescription,
-               aGeneralProperty,
-               aPropertyDefinition);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyAssociation::WriteStep (StepData_StepWriter& theSW,
-                                                          const Handle(StepBasic_GeneralPropertyAssociation) &theEnt) const
-{
-  theSW.Send(theEnt->Name());
-
-  theSW.Send(theEnt->Description());
-
-  theSW.Send(theEnt->GeneralProperty());
-
-  theSW.Send(theEnt->PropertyDefinition());
-}
-
-//=======================================================================
-//function : Share
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyAssociation::Share(const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
-                                                     Interface_EntityIterator& theIter) const
-{
-  theIter.AddItem(theEnt->GeneralProperty());
-
-  theIter.AddItem(theEnt->PropertyDefinition());
-}

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.hxx

@@ -1,60 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
-#define _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Integer.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepBasic_GeneralProperty;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-class StepBasic_GeneralPropertyAssociation;
-
-//! Read & Write tool for GeneralPropertyAssociation
-class RWStepBasic_RWGeneralPropertyAssociation
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralPropertyAssociation();
-  
-  //! Reads GeneralPropertyAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
-  
-  //! Writes GeneralPropertyAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
-  
-  //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
-                              Interface_EntityIterator& theIter) const;
-
-protected:
-
-private:
-
-};
-
-#endif // _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile

src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx

@@ -1,103 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_PropertyDefinition.hxx>
-
-//=======================================================================
-//function : RWStepBasic_RWGeneralPropertyRelationship
-//purpose  : 
-//=======================================================================
-RWStepBasic_RWGeneralPropertyRelationship::RWStepBasic_RWGeneralPropertyRelationship()
-{
-}
-
-//=======================================================================
-//function : ReadStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyRelationship::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                         const Standard_Integer theNum,
-                                                         Handle(Interface_Check)& theAch,
-                                                         const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams(theNum, 4, theAch, "general_property_association")) return;
-
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(theNum, 1, "name", theAch, aName);
-
-  Handle(TCollection_HAsciiString) aDescription;
-  Standard_Boolean hasDescription = Standard_True;
-  if (theData->IsParamDefined(theNum, 2))
-  {
-    theData->ReadString(theNum, 2, "description", theAch, aDescription);
-  }
-  else
-  {
-    hasDescription = Standard_False;
-  }
-
-  Handle(StepBasic_GeneralProperty) aRelatingGeneralProperty;
-  theData->ReadEntity(theNum, 3, "relating_property", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aRelatingGeneralProperty);
-
-  Handle(StepBasic_GeneralProperty) aRelatedGeneralProperty;
-  theData->ReadEntity(theNum, 4, "related_property", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aRelatedGeneralProperty);
-
-  // Initialize entity
-  theEnt->Init(aName,
-               hasDescription,
-               aDescription,
-               aRelatingGeneralProperty,
-               aRelatedGeneralProperty);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyRelationship::WriteStep(StepData_StepWriter& theSW,
-                                                          const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const
-{
-  theSW.Send(theEnt->Name());
-
-  if (theEnt->HasDescription())
-  {
-    theSW.Send(theEnt->Description());
-  }
-  else
-  {
-    theSW.SendUndef();
-  }
-
-  theSW.Send(theEnt->RelatingGeneralProperty());
-
-  theSW.Send(theEnt->RelatedGeneralProperty());
-}
-
-//=======================================================================
-//function : Share
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyRelationship::Share(const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
-                                                      Interface_EntityIterator& theIter) const
-{
-  theIter.AddItem(theEnt->RelatingGeneralProperty());
-
-  theIter.AddItem(theEnt->RelatedGeneralProperty());
-}

src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.hxx

@@ -1,60 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepBasic_RWGeneralPropertyRelationship_HeaderFile
-#define _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Integer.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepBasic_GeneralProperty;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-class StepBasic_GeneralPropertyRelationship;
-
-//! Read & Write tool for GeneralPropertyRelationship
-class RWStepBasic_RWGeneralPropertyRelationship
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralPropertyRelationship();
-
-  //! Reads GeneralPropertyAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
-
-  //! Writes GeneralPropertyAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
-
-  //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
-                              Interface_EntityIterator& theIter) const;
-
-protected:
-
-private:
-
-};
-
-#endif // _RWStepBasic_RWGeneralPropertyRelationship_HeaderFile

src/RWStepRepr/FILES

@@ -8,8 +8,6 @@ RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
 RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx
 RWStepRepr_RWBetweenShapeAspect.cxx
 RWStepRepr_RWBetweenShapeAspect.hxx
-RWStepRepr_RWBooleanRepresentationItem.cxx
-RWStepRepr_RWBooleanRepresentationItem.hxx
 RWStepRepr_RWCentreOfSymmetry.cxx
 RWStepRepr_RWCentreOfSymmetry.hxx
 RWStepRepr_RWCharacterizedRepresentation.cxx
@@ -90,8 +88,6 @@ RWStepRepr_RWPropertyDefinitionRepresentation.cxx
 RWStepRepr_RWPropertyDefinitionRepresentation.hxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx
-RWStepRepr_RWRealRepresentationItem.cxx
-RWStepRepr_RWRealRepresentationItem.hxx
 RWStepRepr_RWRepresentation.cxx
 RWStepRepr_RWRepresentation.hxx
 RWStepRepr_RWRepresentationContext.cxx

src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx

@@ -1,50 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-RWStepRepr_RWBooleanRepresentationItem::RWStepRepr_RWBooleanRepresentationItem()
-{
-}
-
-void RWStepRepr_RWBooleanRepresentationItem::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                      const Standard_Integer theNum,
-                                                      Handle(Interface_Check)& theAch,
-                                                      const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams(theNum, 2, theAch, "boolean_representation_item") ) return;
-
-  // --- inherited field : name ---
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString (theNum, 1, "name", theAch, aName);
-
-  // --- own field : value ---
-  Standard_Boolean aValue;
-  theData->ReadBoolean (theNum, 2, "value", theAch, aValue);
-
-  //--- Initialisation of the read entity ---
-  theEnt->Init(aName, aValue);
-}
-
-void RWStepRepr_RWBooleanRepresentationItem::WriteStep(StepData_StepWriter& theSW,
-                                                       const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const
-{
-  theSW.Send(theEnt->Name());
-  theSW.Send(theEnt->Value());
-}

src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.hxx

@@ -1,45 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
-#define _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Boolean.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepRepr_BooleanRepresentationItem;
-class StepData_StepWriter;
-
-
-//! Read & Write Module for BooleanRepresentationItem
-class RWStepRepr_RWBooleanRepresentationItem 
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  Standard_EXPORT RWStepRepr_RWBooleanRepresentationItem();
-  
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
-  
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
-};
-#endif // _RWStepRepr_RWBooleanRepresentationItem_HeaderFile

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx

@@ -1,50 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <RWStepRepr_RWRealRepresentationItem.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-RWStepRepr_RWRealRepresentationItem::RWStepRepr_RWRealRepresentationItem()
-{
-}
-
-void RWStepRepr_RWRealRepresentationItem::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                   const Standard_Integer theNum,
-                                                   Handle(Interface_Check)& theAch,
-                                                   const Handle(StepRepr_RealRepresentationItem)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams (theNum, 2, theAch, "real_representation_item")) return;
-
-  // --- inherited field : name ---
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString (theNum, 1, "name", theAch, aName);
-
-  // --- own field : value ---
-  Standard_Real aValue;
-  theData->ReadReal (theNum, 2, "value", theAch, aValue);
-
-  //--- Initialisation of the read entity ---
-  theEnt->Init(aName, aValue);
-}
-
-void RWStepRepr_RWRealRepresentationItem::WriteStep(StepData_StepWriter& theSW,
-                                                    const Handle(StepRepr_RealRepresentationItem)& theEnt) const
-{
-  theSW.Send(theEnt->Name());
-  theSW.Send(theEnt->Value());
-}

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.hxx

@@ -1,46 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepRepr_RWRealRepresentationItem_HeaderFile
-#define _RWStepRepr_RWRealRepresentationItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Real.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepRepr_RealRepresentationItem;
-class StepData_StepWriter;
-
-
-//! Read & Write Module for RealRepresentationItem
-class RWStepRepr_RWRealRepresentationItem 
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  
-  Standard_EXPORT RWStepRepr_RWRealRepresentationItem();
-  
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
-  
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
-};
-#endif // _RWStepRepr_RWRealRepresentationItem_HeaderFile

src/RWStepVisual/RWStepVisual_RWComplexTriangulatedFace.cxx

@@ -27,7 +27,7 @@
 #include <Standard_Real.hxx>
 #include <StepVisual_FaceOrSurface.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfTransient.hxx>
+#include <TColStd_HArray2OfInteger.hxx>
 
 //=======================================================================
 //function : RWStepVisual_RWComplexTriangulatedFace
@@ -118,16 +118,15 @@ void RWStepVisual_RWComplexTriangulatedFace::ReadStep (const Handle(StepData_Ste
     }
   }
 
-  Handle(TColStd_HArray1OfTransient) aTriangleStrips;
+  Handle(TColStd_HArray2OfInteger) aTriangleStrips;
   Standard_Integer sub7 = 0;
   if (theData->ReadSubList(theNum, 7, "triangle_strips", theCheck, sub7))
   {
     Standard_Integer nb0 = theData->NbParams(sub7);
-    aTriangleStrips = new TColStd_HArray1OfTransient(1, nb0);
+    Standard_Integer nbj0 = theData->NbParams(theData->ParamNumber(sub7,1));
+    aTriangleStrips = new TColStd_HArray2OfInteger(1, nb0, 1, nbj0);
     for (Standard_Integer i0 = 1; i0 <= nb0; i0++)
     {
-      Standard_Integer nbj0 = theData->NbParams(theData->ParamNumber(sub7, i0));
-      Handle(TColStd_HArray1OfInteger) aSingleTriangleStrip = new TColStd_HArray1OfInteger(1, nbj0);
       Standard_Integer subj7 = 0;
       if ( theData->ReadSubList (sub7, i0, "sub-part(triangle_strips)", theCheck, subj7) ) {
         Standard_Integer num4 = subj7;
@@ -135,23 +134,21 @@ void RWStepVisual_RWComplexTriangulatedFace::ReadStep (const Handle(StepData_Ste
         {
           Standard_Integer anIt0;
           theData->ReadInteger(num4, j0, "integer", theCheck, anIt0);
-          aSingleTriangleStrip->SetValue(j0, anIt0);
+          aTriangleStrips->SetValue(i0,j0, anIt0);
         }
-        aTriangleStrips->SetValue(i0, aSingleTriangleStrip);
       }
     }
   }
 
-  Handle(TColStd_HArray1OfTransient) aTriangleFans;
+  Handle(TColStd_HArray2OfInteger) aTriangleFans;
   Standard_Integer sub8 = 0;
   if (theData->ReadSubList(theNum, 8, "triangle_fans", theCheck, sub8))
   {
     Standard_Integer nb0 = theData->NbParams(sub8);
-    aTriangleFans = new TColStd_HArray1OfTransient(1, nb0);
+    Standard_Integer nbj0 = theData->NbParams(theData->ParamNumber(sub8,1));
+    aTriangleFans = new TColStd_HArray2OfInteger(1, nb0, 1, nbj0);
     for (Standard_Integer i0 = 1; i0 <= nb0; i0++)
     {
-      Standard_Integer nbj0 = theData->NbParams(theData->ParamNumber(sub8, i0));
-      Handle(TColStd_HArray1OfInteger) aSingleTriangleFan = new TColStd_HArray1OfInteger(1, nbj0);
       Standard_Integer subj8 = 0;
       if ( theData->ReadSubList (sub8, i0, "sub-part(triangle_fans)", theCheck, subj8) ) {
         Standard_Integer num4 = subj8;
@@ -159,9 +156,8 @@ void RWStepVisual_RWComplexTriangulatedFace::ReadStep (const Handle(StepData_Ste
         {
           Standard_Integer anIt0;
           theData->ReadInteger(num4, j0, "integer", theCheck, anIt0);
-          aSingleTriangleFan->SetValue(j0, anIt0);
+          aTriangleFans->SetValue(i0,j0, anIt0);
         }
-        aTriangleFans->SetValue(i0, aSingleTriangleFan);
       }
     }
   }
@@ -223,14 +219,13 @@ void RWStepVisual_RWComplexTriangulatedFace::WriteStep (StepData_StepWriter& the
   theSW.CloseSub();
 
   theSW.OpenSub();
-  for (Standard_Integer i6 = 1; i6 <= theEnt->NbTriangleStrips(); i6++)
+  for (Standard_Integer i6 = 1; i6 <= theEnt->TriangleStrips()->RowLength(); i6++)
   {
     theSW.NewLine(Standard_False);
     theSW.OpenSub();
-    Handle(TColStd_HArray1OfInteger) aTriangleStrip = Handle(TColStd_HArray1OfInteger)::DownCast(theEnt->TriangleStrips()->Value(i6));
-    for (Standard_Integer j6 = 1; j6 <= aTriangleStrip->Length(); j6++)
+    for (Standard_Integer j6 = 1; j6 <= theEnt->TriangleStrips()->ColLength(); j6++)
     {
-      Standard_Integer Var0 = aTriangleStrip->Value(j6);
+      Standard_Integer Var0 = theEnt->TriangleStrips()->Value(i6,j6);
       theSW.Send(Var0);
     }
     theSW.CloseSub();
@@ -238,14 +233,13 @@ void RWStepVisual_RWComplexTriangulatedFace::WriteStep (StepData_StepWriter& the
   theSW.CloseSub();
 
   theSW.OpenSub();
-  for (Standard_Integer i7 = 1; i7 <= theEnt->NbTriangleFans(); i7++)
+  for (Standard_Integer i7 = 1; i7 <= theEnt->TriangleFans()->RowLength(); i7++)
   {
     theSW.NewLine(Standard_False);
     theSW.OpenSub();
-    Handle(TColStd_HArray1OfInteger) aTriangleFan = Handle(TColStd_HArray1OfInteger)::DownCast(theEnt->TriangleFans()->Value(i7));
-    for (Standard_Integer j7 = 1; j7 <= aTriangleFan->Length(); j7++)
+    for (Standard_Integer j7 = 1; j7 <= theEnt->TriangleFans()->ColLength(); j7++)
     {
-      Standard_Integer Var0 = aTriangleFan->Value(j7);
+      Standard_Integer Var0 = theEnt->TriangleFans()->Value(i7,j7);
       theSW.Send(Var0);
     }
     theSW.CloseSub();

src/RWStepVisual/RWStepVisual_RWTessellatedShapeRepresentation.cxx

@@ -114,13 +114,11 @@ Interface_EntityIterator& theIter) const
 {
 
   // Inherited fields of Representation
-  if (!theEnt->StepRepr_Representation::Items().IsNull())
+
+  for (Standard_Integer i1 = 1; i1 <= theEnt->StepRepr_Representation::Items()->Length(); i1++)
   {
-    for (Standard_Integer i1 = 1; i1 <= theEnt->StepRepr_Representation::Items()->Length(); i1++)
-    {
-      Handle(StepRepr_RepresentationItem) Var0 = theEnt->StepRepr_Representation::Items()->Value(i1);
-      theIter.AddItem(Var0);
-    }
+    Handle(StepRepr_RepresentationItem) Var0 = theEnt->StepRepr_Representation::Items()->Value(i1);
+    theIter.AddItem(Var0);
   }
 
   theIter.AddItem(theEnt->StepRepr_Representation::ContextOfItems());

src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx

@@ -112,8 +112,6 @@ bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext
     theResource->BooleanVal("read.layer", InternalParameters.ReadLayer, aScope);
   InternalParameters.ReadProps =
     theResource->BooleanVal("read.props", InternalParameters.ReadProps, aScope);
-  InternalParameters.ReadMetadata =
-    theResource->BooleanVal("read.metadata", InternalParameters.ReadMetadata, aScope);
 
   InternalParameters.WritePrecisionMode = (WriteMode_PrecisionMode)
     theResource->IntegerVal("write.precision.mode", InternalParameters.WritePrecisionMode, aScope);
@@ -368,12 +366,6 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
   aResult += aScope + "read.props :\t " + InternalParameters.ReadProps + "\n";
   aResult += "!\n";
 
-  aResult += "!\n";
-  aResult += "!Setting up the read.metadata parameter which is used to indicate read Metadata or not\n";
-  aResult += "!Default value: 0(\"OFF\"). Available values: 0(\"OFF\"), 1(\"ON\")\n";
-  aResult += aScope + "read.metadata :\t " + InternalParameters.ReadMetadata + "\n";
-  aResult += "!\n";
-
   aResult += "!\n";
   aResult += "!Write Parameters:\n";
   aResult += "!\n";

src/STEPCAFControl/STEPCAFControl_ConfigurationNode.hxx

@@ -207,7 +207,6 @@ public:
     bool ReadName = true; //<! NameMode is used to indicate read Name or not
     bool ReadLayer = true; //<! LayerMode is used to indicate read Layers or not
     bool ReadProps = true; //<! PropsMode is used to indicate read Validation properties or not
-    bool ReadMetadata = true; //! Parameter for metadata reading
 
     // Write
     WriteMode_PrecisionMode WritePrecisionMode = WriteMode_PrecisionMode_Average; //<! Specifies the mode of writing the resolution value into the STEP file

src/STEPCAFControl/STEPCAFControl_Provider.cxx

@@ -185,7 +185,6 @@ bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
   aReader.SetNameMode(aNode->InternalParameters.ReadName);
   aReader.SetLayerMode(aNode->InternalParameters.ReadLayer);
   aReader.SetPropsMode(aNode->InternalParameters.ReadProps);
-  aReader.SetMetaMode(aNode->InternalParameters.ReadMetadata);
 
   IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
   aReadStat = aReader.ReadFile(thePath.ToCString());

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -30,12 +30,9 @@
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
-#include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_DocumentFile.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepBasic_Product.hxx>
@@ -43,9 +40,6 @@
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
-#include <StepBasic_SiUnitAndMassUnit.hxx>
-#include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
-#include <StepBasic_SiUnitAndTimeUnit.hxx>
 #include <StepData_GlobalFactors.hxx>
 #include <STEPCAFControl_Controller.hxx>
 #include <STEPCAFControl_DataMapOfPDExternFile.hxx>
@@ -135,7 +129,6 @@
 #include <StepShape_DimensionalLocation.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_EdgeLoop.hxx>
-#include <StepShape_GeometricCurveSet.hxx>
 #include <StepShape_GeometricSet.hxx>
 #include <StepShape_HArray1OfFace.hxx>
 #include <StepShape_HArray1OfFaceBound.hxx>
@@ -221,7 +214,6 @@
 #include <XSControl_WorkSession.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
-#include <StepAP242_IdAttribute.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <STEPCAFControl_GDTProperty.hxx>
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
@@ -229,14 +221,6 @@
 #include <StepVisual_TessellatedCurveSet.hxx>
 #include <StepVisual_CoordinatesList.hxx>
 #include <NCollection_Vector.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
-#include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_PropertyDefinitionRelationship.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
-#include <StepRepr_ValueRepresentationItem.hxx>
-
-#include <StepRepr_ShapeAspectRelationship.hxx>
-
 
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
@@ -286,7 +270,6 @@ STEPCAFControl_Reader::STEPCAFControl_Reader()
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
-  myMetaMode(Standard_True),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -307,7 +290,6 @@ STEPCAFControl_Reader::STEPCAFControl_Reader(const Handle(XSControl_WorkSession)
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
-  myMetaMode(Standard_True),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -736,10 +718,6 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader,
   if (GetViewMode())
     ReadViews(reader.WS(), doc);
 
-  // read metadata
-  if (GetMetaMode())
-    ReadMetadata(reader.WS(), doc);
-
   // Expand resulting CAF structure for sub-shapes (optionally with their
   // names) if requested
   ExpandSubShapes(STool, ShapePDMap);
@@ -1739,7 +1717,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs(const Handle(XSControl_WorkSes
 //function : GetMassConversionFactor
 //purpose  : 
 //=======================================================================
-static Standard_Boolean GetMassConversionFactor(const Handle(StepBasic_NamedUnit)& NU,
+static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& NU,
   Standard_Real& afact)
 {
   afact = 1.;
@@ -4837,26 +4815,6 @@ Standard_Boolean STEPCAFControl_Reader::GetPropsMode() const
   return myPropsMode;
 }
 
-//=======================================================================
-//function : SetMetaMode
-//purpose  : 
-//=======================================================================
-
-void STEPCAFControl_Reader::SetMetaMode(const Standard_Boolean theMetaMode)
-{
-  myMetaMode = theMetaMode;
-}
-
-//=======================================================================
-//function : GetMetaMode
-//purpose  : 
-//=======================================================================
-
-Standard_Boolean STEPCAFControl_Reader::GetMetaMode() const
-{
-  return myMetaMode;
-}
-
 //=======================================================================
 //function : SetSHUOMode
 //purpose  : 
@@ -4937,478 +4895,3 @@ Standard_Boolean STEPCAFControl_Reader::GetViewMode() const
 {
   return myViewMode;
 }
-
-//=======================================================================
-//function : ReadMetadata
-//purpose  : 
-//=======================================================================
-Standard_Boolean STEPCAFControl_Reader::ReadMetadata(const Handle(XSControl_WorkSession)& theWS,
-                                                     const Handle(TDocStd_Document)& theDoc) const
-{
-  const Handle(Interface_InterfaceModel)& aModel = theWS->Model();
-  const Handle(XSControl_TransferReader)& aTR = theWS->TransferReader();
-  const Handle(Transfer_TransientProcess)& aTP = aTR->TransientProcess();
-  Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool(theDoc->Main());
-  if (aSTool.IsNull())
-  {
-    return Standard_False;
-  }
-
-  Standard_Integer aNb = aModel->NbEntities();
-  STEPConstruct_Tool aTool(theWS);
-
-  TDF_LabelMap aGeneralLabelMap;
-  NCollection_DataMap<TDF_Label, NCollection_Sequence<Handle(StepRepr_PropertyDefinition)>, TDF_LabelMapHasher> anAttrMap;
-  NCollection_DataMap<TDF_Label, NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>>, TDF_LabelMapHasher> anExtraAttrMap;
-  for (Standard_Integer anEntityInd = 1; anEntityInd <= aNb; ++anEntityInd)
-  {
-    Handle(Standard_Transient) anEntity = aModel->Value(anEntityInd);
-
-    // checking for Product attributes
-    Handle(StepBasic_ProductDefinition) aProdDefinition = Handle(StepBasic_ProductDefinition)::DownCast(anEntity);
-    if (!aProdDefinition.IsNull())
-    {
-      Handle(Transfer_Binder) aBinder = aTP->Find(aProdDefinition);
-      if (!aBinder.IsNull())
-      {
-        TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBinder);
-        if (!aShape.IsNull())
-        {
-          TDF_Label aShapeLabel;
-          if (myMap.Find(aShape, aShapeLabel))
-          {
-            aGeneralLabelMap.Add(aShapeLabel);
-            NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>> anAttrSeq;
-            Handle(StepBasic_Product) aProduct = aProdDefinition->Formation()->OfProduct();
-            anAttrSeq.Append({ "ProductID", aProduct->Id() });
-            anAttrSeq.Append({ "ProductName", aProduct->Name() });
-            anAttrSeq.Append({ "Description", aProduct->Description() });
-            anAttrSeq.Append({ "ProductDefinition", aProdDefinition->Description() });
-            anExtraAttrMap.Bind(aShapeLabel, anAttrSeq);
-          }
-        }
-      }
-    }
-
-    // checking for User Defined Attributes
-    Handle(StepBasic_GeneralProperty) aGeneralProp = Handle(StepBasic_GeneralProperty)::DownCast(anEntity);
-    if (aGeneralProp.IsNull())
-      continue;
-
-    Handle(StepBasic_GeneralPropertyAssociation) aPropAssociation;
-    NCollection_List< Handle(StepRepr_PropertyDefinition)> aPropDefinitionList;
-    Interface_EntityIterator aSharingListOfGP = theWS->Graph().Sharings(aGeneralProp);
-    for (aSharingListOfGP.Start(); aSharingListOfGP.More(); aSharingListOfGP.Next())
-    {
-      aPropAssociation = Handle(StepBasic_GeneralPropertyAssociation)::DownCast(aSharingListOfGP.Value());
-      if (aPropAssociation.IsNull())
-        continue;
-
-      aPropDefinitionList.Append(aPropAssociation->PropertyDefinition());
-    }
-
-    if (aPropDefinitionList.IsEmpty())
-      continue;
-
-    NCollection_List<Handle(StepRepr_PropertyDefinition)> aGroupedProperties;
-    NCollection_List< Handle(StepRepr_PropertyDefinition)>::Iterator aPropDefIter(aPropDefinitionList);
-    for ( ; aPropDefIter.More(); aPropDefIter.Next())
-    {
-      Handle(StepRepr_PropertyDefinition) aPropDefinition = aPropDefIter.Value();
-
-      // check group of PropertyDefinition
-      Interface_EntityIterator aSharingsListOfPD = theWS->Graph().Sharings(aPropDefinition);
-      for (aSharingsListOfPD.Start(); aSharingsListOfPD.More(); aSharingsListOfPD.Next())
-      {
-        Handle(StepRepr_PropertyDefinitionRelationship) aRel =
-          Handle(StepRepr_PropertyDefinitionRelationship)::DownCast(aSharingsListOfPD.Value());
-        if (aRel.IsNull())
-        {
-          continue;
-        }
-
-        Handle(StepRepr_PropertyDefinition) aGroupedProp = aRel->RelatedPropertyDefinition();
-        if (!aGroupedProp.IsNull())
-        {
-          aGroupedProperties.Append(aGroupedProp);
-        }
-      }
-
-      NCollection_List<Handle(Transfer_Binder)> aBinders;
-      Interface_EntityIterator aSharedListOfPD = theWS->Graph().Shareds(aPropDefinition);
-      for (aSharedListOfPD.Start(); aSharedListOfPD.More(); aSharedListOfPD.Next())
-      {
-        Handle(Transfer_Binder) aBinder;
-        Handle(StepBasic_ProductDefinition) aProductDefinition =
-          Handle(StepBasic_ProductDefinition)::DownCast(aSharedListOfPD.Value());
-        if (!aProductDefinition.IsNull())
-        {
-          aBinder = aTP->Find(aProductDefinition);
-          if (!aBinder.IsNull())
-          {
-            aBinders.Append(aBinder);
-          }
-          continue;
-        }
-
-        Handle(StepRepr_ProductDefinitionShape) aProductDefinitionShape =
-          Handle(StepRepr_ProductDefinitionShape)::DownCast(aSharedListOfPD.Value());
-        if (!aProductDefinitionShape.IsNull())
-        {
-          Handle(StepBasic_ProductDefinition) aProductDef =
-            aProductDefinitionShape->Definition().ProductDefinition();
-          aBinder = aTP->Find(aProductDef);
-          if (!aBinder.IsNull())
-          {
-            aBinders.Append(aBinder);
-          }
-          continue;
-        }
-
-        Handle(StepRepr_NextAssemblyUsageOccurrence) aNextAssembUsOcc =
-          Handle(StepRepr_NextAssemblyUsageOccurrence)::DownCast(aSharedListOfPD.Value());
-        if (!aNextAssembUsOcc.IsNull())
-        {
-          aBinder = aTP->Find(aNextAssembUsOcc);
-          if (!aBinder.IsNull())
-          {
-            aBinders.Append(aBinder);
-          }
-          continue;
-        }
-
-        Handle(StepRepr_ShapeAspect) aShapeAspect =
-          Handle(StepRepr_ShapeAspect)::DownCast(aSharedListOfPD.Value());
-        if (!aShapeAspect.IsNull())
-        {
-          TDF_Label aLabel;
-          if (!aBinder.IsNull())
-          {
-            TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBinder);
-            if (aShape.IsNull())
-              continue;
-
-            if (myMap.IsBound(aShape))
-            {
-              aLabel = myMap.Find(aShape);
-            }
-          }
-          Interface_EntityIterator aSharedListOfSA = theWS->Graph().Sharings(aShapeAspect);
-          for (aSharedListOfSA.Start(); aSharedListOfSA.More(); aSharedListOfSA.Next())
-          {
-            Handle(StepAP242_DraughtingModelItemAssociation) aDMIA =
-              Handle(StepAP242_DraughtingModelItemAssociation)::DownCast(aSharedListOfSA.Value());
-            if (!aDMIA.IsNull())
-              break;
-
-            Handle(StepAP242_ItemIdentifiedRepresentationUsage) anItemIdentUsage =
-              Handle(StepAP242_ItemIdentifiedRepresentationUsage)::DownCast(aSharedListOfSA.Value());
-            if (!anItemIdentUsage.IsNull())
-            {
-              for (Standard_Integer anIndex = 1; anIndex <= anItemIdentUsage->NbIdentifiedItem(); ++anIndex)
-              {
-                Handle(StepRepr_RepresentationItem) aReprItem = anItemIdentUsage->IdentifiedItemValue(anIndex);
-                if (aReprItem.IsNull())
-                  continue;
-                aBinder = aTP->Find(aReprItem);
-                if (!aBinder.IsNull())
-                {
-                  aBinders.Append(aBinder);
-                }
-              }
-              continue;
-            }
-
-            Handle(StepRepr_PropertyDefinition) aPropDef =
-              Handle(StepRepr_PropertyDefinition)::DownCast(aSharedListOfSA.Value());
-            if (!aPropDef.IsNull() && aPropDef != aPropDefinition)
-            {
-              Interface_EntityIterator aSharingListOfPD = theWS->Graph().Sharings(aPropDef);
-              for (aSharingListOfPD.Start(); aSharingListOfPD.More(); aSharingListOfPD.Next())
-              {
-                Handle(StepShape_ShapeDefinitionRepresentation) aShDef =
-                  Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(aSharingListOfPD.Value());
-                if (aShDef.IsNull())
-                  continue;
-
-                findReprItems(theWS, aShDef, aBinders);
-              }
-              continue;
-            }
-
-            Handle(StepShape_ShapeDefinitionRepresentation) aShapeDefRepr =
-              Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(aSharedListOfSA.Value());
-            if (!aShapeDefRepr.IsNull())
-            {
-              findReprItems(theWS, aShapeDefRepr, aBinders);
-            }
-          }
-        }
-      }
-
-      if (aBinders.IsEmpty())
-        continue;
-
-      TDF_LabelSequence aLabelSeq;
-      NCollection_List<Handle(Transfer_Binder)>::Iterator aBindIt(aBinders);
-      for (; aBindIt.More(); aBindIt.Next())
-      {
-        TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBindIt.Value());
-        if (aShape.IsNull())
-          continue;
-
-        TDF_Label aShapeLabel;
-        if (myMap.Find(aShape, aShapeLabel))
-        {
-          aLabelSeq.Append(aShapeLabel);
-          aGeneralLabelMap.Add(aShapeLabel);
-        }
-      }
-
-      // fill user defined attribute map
-      for (TDF_LabelSequence::Iterator aLabelIt(aLabelSeq); aLabelIt.More(); aLabelIt.Next())
-      {
-        NCollection_Sequence<Handle(StepRepr_PropertyDefinition)>* aPropSeqPtr = anAttrMap.ChangeSeek(aLabelIt.Value());
-        if (aPropSeqPtr == NULL)
-        {
-          NCollection_Sequence<Handle(StepRepr_PropertyDefinition)> aPropSeq;
-          aPropSeqPtr = anAttrMap.Bound(aLabelIt.Value(), aPropSeq);
-        }
-        aPropSeqPtr->Append(aPropDefinition);
-        if (!aGroupedProperties.IsEmpty())
-        {
-          NCollection_List<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(aGroupedProperties);
-          for (; aPropIt.More(); aPropIt.Next())
-          {
-            aPropSeqPtr->Append(aPropIt.Value());
-          }
-        }
-      }
-    }
-  }
-
-  // create metadata
-  for (TDF_LabelMap::Iterator aLabelIt(aGeneralLabelMap); aLabelIt.More(); aLabelIt.Next())
-  {
-    Handle(TDataStd_NamedData) anAttr;
-    if (!aLabelIt.Value().FindAttribute(TDataStd_NamedData::GetID(), anAttr))
-    {
-      anAttr = new TDataStd_NamedData;
-      aLabelIt.Value().AddAttribute(anAttr);
-    }
-    NCollection_Sequence<Handle(StepRepr_PropertyDefinition)> anAttrib;
-    if (anAttrMap.Find(aLabelIt.Value(), anAttrib))
-    {
-      NCollection_Sequence<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(anAttrib);
-      for (; aPropIt.More(); aPropIt.Next())
-      {
-        fillAttributes(theWS, aPropIt.Value(), anAttr);
-      }
-    }
-    NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>> aPairSeq;
-    if (anExtraAttrMap.Find(aLabelIt.Value(), aPairSeq))
-    {
-      NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>>::Iterator aSeqIt(aPairSeq);
-      for (; aSeqIt.More(); aSeqIt.Next())
-      {
-        const auto& aPair = aSeqIt.Value();
-        if (aPair.second.IsNull() || aPair.second->String().IsEmpty())
-        {
-          continue;
-        }
-        anAttr->SetString(aPair.first, aPair.second->String());
-      }
-    }
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : findReprItems
-//purpose  : 
-//=======================================================================
-Standard_Boolean STEPCAFControl_Reader::findReprItems(const Handle(XSControl_WorkSession)& theWS,
-                                                      const Handle(StepShape_ShapeDefinitionRepresentation)& theShDefRepr,
-                                                      NCollection_List<Handle(Transfer_Binder)>& theBinders) const
-{
-  Handle(StepRepr_Representation) aRepr = theShDefRepr->UsedRepresentation();
-  if (aRepr.IsNull())
-  {
-    return Standard_False;
-  }
-
-  Handle(Transfer_Binder) aBinder;
-  const Handle(Transfer_TransientProcess)& aTP = theWS->TransferReader()->TransientProcess();
-  Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = aRepr->Items();
-  if (!aReprItems->IsEmpty())
-  {
-    for (Standard_Integer anInd = aReprItems->Lower(); anInd <= aReprItems->Upper(); anInd++)
-    {
-      Handle(StepRepr_RepresentationItem) aReprItem = aReprItems->Value(anInd);
-      aBinder = aTP->Find(aReprItem);
-      if (!aBinder.IsNull())
-      {
-        theBinders.Append(aBinder);
-      }
-    }
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : fillAttributes
-//purpose  : 
-//=======================================================================
-Standard_Boolean STEPCAFControl_Reader::fillAttributes(const Handle(XSControl_WorkSession)& theWS,
-                                                       const Handle(StepRepr_PropertyDefinition)& thePropDef,
-                                                       Handle(TDataStd_NamedData)& theAttr) const
-{
-  // skip if key is null
-  if (thePropDef->Name().IsNull())
-  {
-    return Standard_False;
-  }
-
-  Handle(StepRepr_PropertyDefinitionRepresentation) aPropDefRepr;
-  Interface_EntityIterator aSharingListOfPD = theWS->Graph().Sharings(thePropDef);
-  for (aSharingListOfPD.Start(); aSharingListOfPD.More(); aSharingListOfPD.Next())
-  {
-    aPropDefRepr = Handle(StepRepr_PropertyDefinitionRepresentation)::DownCast(aSharingListOfPD.Value());
-    if (aPropDefRepr.IsNull())
-      continue;
-
-    Handle(StepRepr_Representation) aUsedRepr = aPropDefRepr->UsedRepresentation();
-    if (aUsedRepr.IsNull())
-      continue;
-
-    Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = aUsedRepr->Items();
-    if (!aReprItems.IsNull())
-    {
-      for (Standard_Integer anIndex = aReprItems->Lower(); anIndex <= aReprItems->Upper(); anIndex++)
-      {
-        Handle(StepRepr_RepresentationItem) anItem = aReprItems->Value(anIndex);
-        if (anItem.IsNull())
-          continue;
-
-        if (anItem->IsKind(STANDARD_TYPE(StepRepr_DescriptiveRepresentationItem)))
-        {
-          Handle(StepRepr_DescriptiveRepresentationItem) aDescrItem = Handle(StepRepr_DescriptiveRepresentationItem)::DownCast(anItem);
-          Handle(TCollection_HAsciiString) aDescription = aDescrItem->Description();
-          theAttr->SetString(thePropDef->Name()->ToCString(), aDescription->ToCString());
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_MeasureRepresentationItem)))
-        {
-          Handle(StepRepr_MeasureRepresentationItem) aMeasureItem = Handle(StepRepr_MeasureRepresentationItem)::DownCast(anItem);
-          Standard_Real aValue = aMeasureItem->Measure()->ValueComponent();
-          TCollection_AsciiString aValType = aMeasureItem->Measure()->ValueComponentMember()->Name();
-          StepBasic_Unit anUnit = aMeasureItem->Measure()->UnitComponent();
-          if (!anUnit.IsNull())
-          {
-            Standard_Real aParam = 1.;
-            if (anUnit.Type() == STANDARD_TYPE(StepBasic_DerivedUnit))
-            {
-              Handle(StepBasic_DerivedUnit) aDUnit = anUnit.DerivedUnit();
-              for (Standard_Integer anInd = 1; anInd <= aDUnit->NbElements(); ++anInd)
-              {
-                Handle(StepBasic_DerivedUnitElement) aDUElem = aDUnit->ElementsValue(anInd);
-                Standard_Real anExp = aDUElem->Exponent();
-                Handle(StepBasic_NamedUnit) aNUnit = aDUElem->Unit();
-                if (!aNUnit.IsNull())
-                {
-                  if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit)) ||
-                    aNUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit)))
-                  {
-                    STEPConstruct_UnitContext anUnitCtx;
-                    anUnitCtx.ComputeFactors(aNUnit);
-                    if (aValType == "VOLUME_MEASURE")
-                    {
-                      aParam = pow(anUnitCtx.LengthFactor(), anExp);
-                    }
-                    else
-                    {
-                      aParam = aParam * pow(anUnitCtx.LengthFactor()/1000, anExp);
-                    }
-                  }
-                  else
-                  {
-                    STEPConstruct_UnitContext anUnitCtx;
-                    anUnitCtx.ComputeFactors(aNUnit);
-                    if (anUnitCtx.AreaDone())
-                      aParam = anUnitCtx.AreaFactor();
-                    if (anUnitCtx.LengthDone())
-                    {
-                      Standard_Real aLengthFactor = anUnitCtx.LengthFactor();
-                      aParam *= pow(aLengthFactor, anExp);
-                    }
-                  }
-                }
-              }
-              aValue = aValue * aParam;
-            }
-            else
-            {
-              Handle(StepBasic_NamedUnit) aNUnit = anUnit.NamedUnit();
-              if (!aNUnit.IsNull())
-              {
-                if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit)))
-                {
-                  Standard_Real aFact = 1.;
-                  if (GetMassConversionFactor(aNUnit, aFact))
-                  {
-                    aValue *= aFact;
-                  }
-                }
-                else
-                {
-                  STEPConstruct_UnitContext anUnitCtx;
-                  anUnitCtx.ComputeFactors(aNUnit);
-                  if (anUnitCtx.AreaDone())
-                    aParam = anUnitCtx.AreaFactor();
-                  if (anUnitCtx.VolumeDone())
-                    aParam = anUnitCtx.VolumeFactor();
-                  if (anUnitCtx.LengthDone())
-                    aParam = anUnitCtx.LengthFactor();
-
-                  aValue *= aParam;
-                }
-              }
-            }
-          }
-          theAttr->SetReal(thePropDef->Name()->ToCString(), aValue);
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_ValueRepresentationItem)))
-        {
-          Handle(StepRepr_ValueRepresentationItem) aValueItem = Handle(StepRepr_ValueRepresentationItem)::DownCast(anItem);
-          Handle(StepBasic_MeasureValueMember) aMeasureValueMem = aValueItem->ValueComponentMember();
-          Interface_ParamType aParamType = aMeasureValueMem->ParamType();
-          if (aParamType == Interface_ParamInteger)
-          {
-            theAttr->SetInteger(thePropDef->Name()->ToCString(), aMeasureValueMem->Integer());
-          }
-          else if (aParamType == Interface_ParamReal)
-          {
-            theAttr->SetReal(thePropDef->Name()->ToCString(), aMeasureValueMem->Real());
-          }
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_IntegerRepresentationItem)))
-        {
-          Handle(StepRepr_IntegerRepresentationItem) anIntegerItem = Handle(StepRepr_IntegerRepresentationItem)::DownCast(anItem);
-          theAttr->SetInteger(thePropDef->Name()->ToCString(), anIntegerItem->Value());
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_RealRepresentationItem)))
-        {
-          Handle(StepRepr_RealRepresentationItem) aRealItem = Handle(StepRepr_RealRepresentationItem)::DownCast(anItem);
-          theAttr->SetReal(thePropDef->Name()->ToCString(), aRealItem->Value());
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_BooleanRepresentationItem)))
-        {
-          Handle(StepRepr_BooleanRepresentationItem) aBoolItem = Handle(StepRepr_BooleanRepresentationItem)::DownCast(anItem);
-          theAttr->SetInteger(thePropDef->Name()->ToCString(), aBoolItem->Value());
-        }
-      }
-    }
-  }
-  return Standard_True;
-}

src/STEPCAFControl/STEPCAFControl_Reader.hxx

@@ -28,21 +28,16 @@
 #include <XCAFDimTolObjects_DatumModifWithValue.hxx>
 
 class XSControl_WorkSession;
-class TDataStd_NamedData;
 class TDocStd_Document;
 class STEPCAFControl_ExternFile;
 class TopoDS_Shape;
 class XCAFDoc_ShapeTool;
 class StepRepr_RepresentationItem;
 class Transfer_TransientProcess;
-class StepBasic_NamedUnit;
 class StepShape_ConnectedFaceSet;
-class StepShape_ShapeDefinitionRepresentation;
 class StepRepr_NextAssemblyUsageOccurrence;
-class StepRepr_PropertyDefinition;
 class STEPConstruct_Tool;
 class StepDimTol_Datum;
-class Transfer_Binder;
 
 
 //! Provides a tool to read STEP file and put it into
@@ -160,11 +155,6 @@ public:
   Standard_EXPORT void SetPropsMode (const Standard_Boolean propsmode);
   
   Standard_EXPORT Standard_Boolean GetPropsMode() const;
-
-  //! MetaMode for indicate read Metadata or not.
-  Standard_EXPORT void SetMetaMode(const Standard_Boolean theMetaMode);
-
-  Standard_EXPORT Standard_Boolean GetMetaMode() const;
   
   //! Set SHUO mode for indicate write SHUO or not.
   Standard_EXPORT void SetSHUOMode (const Standard_Boolean shuomode);
@@ -232,11 +222,6 @@ protected:
   //! model and assigns them to corresponding labels in the DECAF
   //! document
   Standard_EXPORT Standard_Boolean ReadValProps (const Handle(XSControl_WorkSession)& WS, const Handle(TDocStd_Document)& doc, const STEPCAFControl_DataMapOfPDExternFile& PDFileMap) const;
-
-  //! Reads metadata assigned to shapes in the STEP model and
-  //! assigns them to corresponding labels in the DECAF document
-  Standard_EXPORT Standard_Boolean ReadMetadata(const Handle(XSControl_WorkSession)& theWS,
-                                                const Handle(TDocStd_Document)& theDoc) const;
   
   //! Reads layers of parts defined in the STEP model and
   //! set reference between shape and layers in the DECAF document
@@ -313,16 +298,6 @@ private:
   void prepareUnits(const Handle(StepData_StepModel)& theModel,
                     const Handle(TDocStd_Document)& theDoc) const;
 
-  //! Find RepresentationItems
-  Standard_Boolean findReprItems(const Handle(XSControl_WorkSession) & theWS,
-                                 const Handle(StepShape_ShapeDefinitionRepresentation) & theShDefRepr,
-                                 NCollection_List<Handle(Transfer_Binder)>& theBinders) const;
-
-  //! Fill metadata
-  Standard_Boolean fillAttributes(const Handle(XSControl_WorkSession)& theWS,
-                                  const Handle(StepRepr_PropertyDefinition)& thePropDef,
-                                  Handle(TDataStd_NamedData)& theAttr) const;
-
 private:
 
   STEPControl_Reader myReader;
@@ -332,7 +307,6 @@ private:
   Standard_Boolean myNameMode;
   Standard_Boolean myLayerMode;
   Standard_Boolean myPropsMode;
-  Standard_Boolean myMetaMode;
   Standard_Boolean mySHUOMode;
   Standard_Boolean myGDTMode;
   Standard_Boolean myMatMode;

src/StepAP214/StepAP214_Protocol.cxx

@@ -158,8 +158,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
 #include <StepGeom_Hyperbola.hxx>
@@ -641,9 +639,7 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -1562,10 +1558,6 @@ StepAP214_Protocol::StepAP214_Protocol ()
   types.Bind(STANDARD_TYPE(StepVisual_ComplexTriangulatedSurfaceSet), 816);
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTessellatedEdge), 817);
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTriangulatedFace), 818);
-  types.Bind(STANDARD_TYPE(StepBasic_GeneralPropertyAssociation), 819);
-  types.Bind(STANDARD_TYPE(StepBasic_GeneralPropertyRelationship), 820);
-  types.Bind(STANDARD_TYPE(StepRepr_BooleanRepresentationItem), 821);
-  types.Bind(STANDARD_TYPE(StepRepr_RealRepresentationItem), 822);
 }
 
 

src/StepBasic/FILES

@@ -135,10 +135,6 @@ StepBasic_ExternalSource.cxx
 StepBasic_ExternalSource.hxx
 StepBasic_GeneralProperty.cxx
 StepBasic_GeneralProperty.hxx
-StepBasic_GeneralPropertyAssociation.cxx
-StepBasic_GeneralPropertyAssociation.hxx
-StepBasic_GeneralPropertyRelationship.cxx
-StepBasic_GeneralPropertyRelationship.hxx
 StepBasic_Group.cxx
 StepBasic_Group.hxx
 StepBasic_GroupAssignment.cxx

src/StepBasic/StepBasic_GeneralPropertyAssociation.cxx

@@ -1,117 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GeneralPropertyAssociation, Standard_Transient)
-
-//=======================================================================
-//function : StepBasic_GeneralPropertyAssociation
-//purpose  : 
-//=======================================================================
-StepBasic_GeneralPropertyAssociation::StepBasic_GeneralPropertyAssociation ()
-{
-}
-
-//=======================================================================
-//function : Init
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyAssociation::Init (const Handle(TCollection_HAsciiString)& aName,
-                                                 const Handle(TCollection_HAsciiString)& aDescription,
-                                                 const Handle(StepBasic_GeneralProperty)& aGeneralProperty,
-                                                 const Handle(StepRepr_PropertyDefinition)& aPropertyDefinition)
-{
-  theName = aName;
-
-  theDescription = aDescription;
-
-  theGeneralProperty = aGeneralProperty;
-
-  thePropertyDefinition = aPropertyDefinition;
-}
-
-//=======================================================================
-//function : Name
-//purpose  : 
-//=======================================================================
-Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyAssociation::Name() const
-{
-  return theName;
-}
-
-//=======================================================================
-//function : SetName
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyAssociation::SetName(const Handle(TCollection_HAsciiString)& aName)
-{
-  theName = aName;
-}
-
-//=======================================================================
-//function : Description
-//purpose  : 
-//=======================================================================
-Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyAssociation::Description() const
-{
-  return theDescription;
-}
-
-//=======================================================================
-//function : SetDescription
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyAssociation::SetDescription (const Handle(TCollection_HAsciiString)& aDescription)
-{
-  theDescription = aDescription;
-}
-
-//=======================================================================
-//function : GeneralProperty
-//purpose  : 
-//=======================================================================
-Handle(StepBasic_GeneralProperty) StepBasic_GeneralPropertyAssociation::GeneralProperty() const
-{
-  return theGeneralProperty;
-}
-
-//=======================================================================
-//function : SetGeneralProperty
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyAssociation::SetGeneralProperty(const Handle(StepBasic_GeneralProperty)& aGeneralProperty)
-{
-  theGeneralProperty = aGeneralProperty;
-}
-
-//=======================================================================
-//function : PropertyDefinition
-//purpose  : 
-//=======================================================================
-
-Handle(StepRepr_PropertyDefinition) StepBasic_GeneralPropertyAssociation::PropertyDefinition() const
-{
-  return thePropertyDefinition;
-}
-
-//=======================================================================
-//function : SetPropertyDefinition
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyAssociation::SetPropertyDefinition(const Handle(StepRepr_PropertyDefinition)& aPropertyDefinition)
-{
-  thePropertyDefinition = aPropertyDefinition;
-}

src/StepBasic/StepBasic_GeneralPropertyAssociation.hxx

@@ -1,84 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepBasic_GeneralPropertyAssociation_HeaderFile
-#define _StepBasic_GeneralPropertyAssociation_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <Standard_Transient.hxx>
-
-class TCollection_HAsciiString;
-class StepBasic_GeneralProperty;
-class StepRepr_PropertyDefinition;
-
-DEFINE_STANDARD_HANDLE(StepBasic_GeneralPropertyAssociation, Standard_Transient)
-
-//! Representation of STEP entity GeneralPropertyAssociation
-class StepBasic_GeneralPropertyAssociation : public Standard_Transient
-{
-
-public:
-
-  
-  //! Empty constructor
-  Standard_EXPORT StepBasic_GeneralPropertyAssociation();
-  
-  //! Initialize all fields (own and inherited)
-  Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& aName,
-                            const Handle(TCollection_HAsciiString)& aDescription,
-                            const Handle(StepBasic_GeneralProperty)& aGeneralProperty,
-                            const Handle(StepRepr_PropertyDefinition)& aPropertyDefinition);
-
-  //! Returns field Name
-  Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
-
-  //! Set field Name
-  Standard_EXPORT void SetName(const Handle(TCollection_HAsciiString)& Name);
-
-  //! Returns field Description
-  Standard_EXPORT Handle(TCollection_HAsciiString) Description() const;
-
-  //! Set field Description
-  Standard_EXPORT void SetDescription(const Handle(TCollection_HAsciiString)& Description);
-
-  //! Returns field GeneralProperty
-  Standard_EXPORT Handle(StepBasic_GeneralProperty) GeneralProperty() const;
-
-  //! Set field GeneralProperty
-  Standard_EXPORT void SetGeneralProperty(const Handle(StepBasic_GeneralProperty)& GeneralProperty);
-
-  //! Returns field PropertyDefinition
-  Standard_EXPORT Handle(StepRepr_PropertyDefinition) PropertyDefinition() const;
-
-  //! Set field PropertyDefinition
-  Standard_EXPORT void SetPropertyDefinition(const Handle(StepRepr_PropertyDefinition)& PropertyDefinition);
-
-  DEFINE_STANDARD_RTTIEXT(StepBasic_GeneralPropertyAssociation, Standard_Transient)
-
-protected:
-
-
-
-
-private:
-
-  Handle(TCollection_HAsciiString) theName;
-  Handle(TCollection_HAsciiString) theDescription;
-  Handle(StepBasic_GeneralProperty) theGeneralProperty;
-  Handle(StepRepr_PropertyDefinition) thePropertyDefinition;
-
-};
-
-#endif // _StepBasic_GeneralPropertyAssociation_HeaderFile

src/StepBasic/StepBasic_GeneralPropertyRelationship.cxx

@@ -1,137 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GeneralPropertyRelationship, Standard_Transient)
-
-//=======================================================================
-//function : StepBasic_GeneralPropertyRelationship
-//purpose  : 
-//=======================================================================
-StepBasic_GeneralPropertyRelationship::StepBasic_GeneralPropertyRelationship ()
-{
-}
-
-//=======================================================================
-//function : Init
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyRelationship::Init(const Handle(TCollection_HAsciiString)& aName,
-                                                 const Standard_Boolean hasDescription,
-                                                 const Handle(TCollection_HAsciiString)& aDescription,
-                                                 const Handle(StepBasic_GeneralProperty)& aRelatingGeneralProperty,
-                                                 const Handle(StepBasic_GeneralProperty)& aRelatedGeneralProperty)
-{
-  theName = aName;
-
-  defDescription = hasDescription;
-  if (defDescription) {
-    theDescription = aDescription;
-  }
-  else theDescription.Nullify();
-
-  theRelatingGeneralProperty = aRelatingGeneralProperty;
-
-  theRelatedGeneralProperty = aRelatedGeneralProperty;
-}
-
-//=======================================================================
-//function : Name
-//purpose  : 
-//=======================================================================
-Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyRelationship::Name() const
-{
-  return theName;
-}
-
-//=======================================================================
-//function : SetName
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyRelationship::SetName(const Handle(TCollection_HAsciiString)& aName)
-{
-  theName = aName;
-}
-
-//=======================================================================
-//function : HasDescription
-//purpose  : 
-//=======================================================================
-Standard_Boolean StepBasic_GeneralPropertyRelationship::HasDescription() const
-{
-  return defDescription;
-}
-
-//=======================================================================
-//function : Description
-//purpose  : 
-//=======================================================================
-Handle(TCollection_HAsciiString) StepBasic_GeneralPropertyRelationship::Description() const
-{
-  return theDescription;
-}
-
-//=======================================================================
-//function : SetDescription
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyRelationship::SetDescription (const Handle(TCollection_HAsciiString)& aDescription)
-{
-  defDescription = true;
-  if (aDescription.IsNull())
-  {
-    defDescription = false;
-  }
-  theDescription = aDescription;
-}
-
-//=======================================================================
-//function : RelatingGeneralProperty
-//purpose  : 
-//=======================================================================
-Handle(StepBasic_GeneralProperty) StepBasic_GeneralPropertyRelationship::RelatingGeneralProperty() const
-{
-  return theRelatingGeneralProperty;
-}
-
-//=======================================================================
-//function : SetRelatingGeneralProperty
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyRelationship::SetRelatingGeneralProperty(const Handle(StepBasic_GeneralProperty)& aRelatingGeneralProperty)
-{
-  theRelatingGeneralProperty = aRelatingGeneralProperty;
-}
-
-//=======================================================================
-//function : RelatedGeneralProperty
-//purpose  : 
-//=======================================================================
-
-Handle(StepBasic_GeneralProperty) StepBasic_GeneralPropertyRelationship::RelatedGeneralProperty() const
-{
-  return theRelatedGeneralProperty;
-}
-
-//=======================================================================
-//function : SetRelatedGeneralProperty
-//purpose  : 
-//=======================================================================
-void StepBasic_GeneralPropertyRelationship::SetRelatedGeneralProperty(const Handle(StepBasic_GeneralProperty)& aRelatedGeneralProperty)
-{
-  theRelatedGeneralProperty = aRelatedGeneralProperty;
-}

src/StepBasic/StepBasic_GeneralPropertyRelationship.hxx

@@ -1,88 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepBasic_GeneralPropertyRelationship_HeaderFile
-#define _StepBasic_GeneralPropertyRelationship_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <Standard_Transient.hxx>
-
-class TCollection_HAsciiString;
-class StepBasic_GeneralProperty;
-
-DEFINE_STANDARD_HANDLE(StepBasic_GeneralPropertyRelationship, Standard_Transient)
-
-//! Representation of STEP entity GeneralPropertyRelationship
-class StepBasic_GeneralPropertyRelationship : public Standard_Transient
-{
-
-public:
-
-  
-  //! Empty constructor
-  Standard_EXPORT StepBasic_GeneralPropertyRelationship();
-  
-  //! Initialize all fields (own and inherited)
-  Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& aName,
-                            const Standard_Boolean hasDescription,
-                            const Handle(TCollection_HAsciiString)& aDescription,
-                            const Handle(StepBasic_GeneralProperty)& aRelatingGeneralProperty,
-                            const Handle(StepBasic_GeneralProperty)& aRelatedGeneralProperty);
-
-  //! Returns field Name
-  Standard_EXPORT Handle(TCollection_HAsciiString) Name() const;
-
-  //! Set field Name
-  Standard_EXPORT void SetName(const Handle(TCollection_HAsciiString)& Name);
-
-  //! Returns True if optional field Description is defined
-  Standard_EXPORT Standard_Boolean HasDescription() const;
-
-  //! Returns field Description
-  Standard_EXPORT Handle(TCollection_HAsciiString) Description() const;
-
-  //! Set field Description
-  Standard_EXPORT void SetDescription(const Handle(TCollection_HAsciiString)& Description);
-
-  //! Returns field RelatingGeneralProperty
-  Standard_EXPORT Handle(StepBasic_GeneralProperty) RelatingGeneralProperty() const;
-
-  //! Set field RelatingGeneralProperty
-  Standard_EXPORT void SetRelatingGeneralProperty(const Handle(StepBasic_GeneralProperty)& RelatingGeneralProperty);
-
-  //! Returns field RelatedGeneralProperty
-  Standard_EXPORT Handle(StepBasic_GeneralProperty) RelatedGeneralProperty() const;
-
-  //! Set field RelatedGeneralProperty
-  Standard_EXPORT void SetRelatedGeneralProperty(const Handle(StepBasic_GeneralProperty)& RelatedGeneralProperty);
-
-  DEFINE_STANDARD_RTTIEXT(StepBasic_GeneralPropertyRelationship, Standard_Transient)
-
-protected:
-
-
-
-
-private:
-
-  Standard_Boolean defDescription;
-  Handle(TCollection_HAsciiString) theName;
-  Handle(TCollection_HAsciiString) theDescription;
-  Handle(StepBasic_GeneralProperty) theRelatingGeneralProperty;
-  Handle(StepBasic_GeneralProperty) theRelatedGeneralProperty;
-
-};
-
-#endif // _StepBasic_GeneralPropertyRelationship_HeaderFile

src/StepBasic/StepBasic_MeasureValueMember.cxx

@@ -62,7 +62,6 @@ Standard_CString StepBasic_MeasureValueMember::Name () const
     case 13 : return "MASS_MEASURE"; 
     case 14 : return "THERMODYNAMIC_TEMPERATURE_MEASURE"; 
     case 15 : return "COUNT_MEASURE";
-    case 16 : return "NUMERIC_MEASURE";
     default : break;
   }
   return "";
@@ -93,7 +92,6 @@ Standard_Boolean  StepBasic_MeasureValueMember::SetName (const Standard_CString
   else if (name[0] == 'M' && !strcmp (name,"MASS_MEASURE"))        thecase = 13;
   else if (name[1] == 'H' && !strcmp (name,"THERMODYNAMIC_TEMPERATURE_MEASURE")) thecase = 14;
   else if (name[2] == 'U' && !strcmp (name,"COUNT_MEASURE"))       thecase = 15;
-  else if (name[0] == 'N' && !strcmp (name,"NUMERIC_MEASURE"))     thecase = 16;
   else return Standard_False;
 
   return Standard_True;

src/StepData/StepData_StepReaderData.cxx

@@ -1000,7 +1000,7 @@ Standard_Boolean StepData_StepReaderData::ReadAny(const Standard_Integer num,
   case Interface_ParamInteger: {
     if (!val.IsNull()) {
       DeclareAndCast(StepData_SelectMember, sm, val);
-      sm->SetReal(Interface_FileReaderData::Fastof(str));
+      sm->SetInteger(atoi(str));
       return Standard_True;
     }
     Handle(StepData_SelectInt) sin = new StepData_SelectInt;
@@ -1358,27 +1358,16 @@ Standard_Boolean StepData_StepReaderData::ReadInteger(const Standard_Integer num
   Standard_Integer& val) const
 {
   Handle(String) errmess;  // Null si pas d erreur
-  Standard_Boolean warn = Standard_False;
   if (nump > 0 && nump <= NbParams(num)) {
     const Interface_FileParameter& FP = Param(num, nump);
-    if (FP.ParamType() == Interface_ParamInteger)
-      val = atoi(FP.CValue());
-    else if (FP.ParamType() == Interface_ParamReal)
-    {
-      val = static_cast<Standard_Integer>(std::round(Interface_FileReaderData::Fastof(FP.CValue())));
-      if (acceptvoid) warn = Standard_True;
-      errmess = new String("Parameter n0.%d (%s) was rounded");
-    }
-    if (FP.ParamType() != Interface_ParamInteger &&
-        FP.ParamType() != Interface_ParamReal)
-      errmess = new String("Parameter n0.%d (%s) not an Integer");
+    if (FP.ParamType() == Interface_ParamInteger)  val = atoi(FP.CValue());
+    else errmess = new String("Parameter n0.%d (%s) not an Integer");
   }
   else errmess = new String("Parameter n0.%d (%s) absent");
 
   if (errmess.IsNull()) return Standard_True;
   sprintf(txtmes, errmess->ToCString(), nump, mess);
-  if (warn) ach->AddWarning(txtmes, errmess->ToCString());
-  else ach->AddFail(txtmes, errmess->ToCString());
+  ach->AddFail(txtmes, errmess->ToCString());
   return Standard_False;
 }
 

src/StepRepr/FILES

@@ -12,8 +12,6 @@ StepRepr_AssemblyComponentUsageSubstitute.cxx
 StepRepr_AssemblyComponentUsageSubstitute.hxx
 StepRepr_BetweenShapeAspect.cxx
 StepRepr_BetweenShapeAspect.hxx
-StepRepr_BooleanRepresentationItem.cxx
-StepRepr_BooleanRepresentationItem.hxx
 StepRepr_CentreOfSymmetry.cxx
 StepRepr_CentreOfSymmetry.hxx
 StepRepr_CharacterizedDefinition.cxx
@@ -112,8 +110,6 @@ StepRepr_PropertyDefinitionRepresentation.cxx
 StepRepr_PropertyDefinitionRepresentation.hxx
 StepRepr_QuantifiedAssemblyComponentUsage.cxx
 StepRepr_QuantifiedAssemblyComponentUsage.hxx
-StepRepr_RealRepresentationItem.cxx
-StepRepr_RealRepresentationItem.hxx
 StepRepr_Representation.cxx
 StepRepr_Representation.hxx
 StepRepr_RepresentationContext.cxx

src/StepRepr/StepRepr_BooleanRepresentationItem.cxx

@@ -1,28 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <StepRepr_BooleanRepresentationItem.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepRepr_BooleanRepresentationItem, StepRepr_RepresentationItem)
-
-StepRepr_BooleanRepresentationItem::StepRepr_BooleanRepresentationItem()
-{
-}
-
-void StepRepr_BooleanRepresentationItem::Init(const Handle(TCollection_HAsciiString)& theName,
-                                              const Standard_Boolean theValue)
-{
-  value = theValue;
-  StepRepr_RepresentationItem::Init(theName);
-}

src/StepRepr/StepRepr_BooleanRepresentationItem.hxx

@@ -1,52 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepRepr_BooleanRepresentationItem_HeaderFile
-#define _StepRepr_BooleanRepresentationItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <StepRepr_RepresentationItem.hxx>
-class TCollection_HAsciiString;
-
-class StepRepr_BooleanRepresentationItem;
-DEFINE_STANDARD_HANDLE(StepRepr_BooleanRepresentationItem, StepRepr_RepresentationItem)
-
-class StepRepr_BooleanRepresentationItem : public StepRepr_RepresentationItem
-{
-public:
-
-  //! Returns a BooleanRepresentationItem
-  Standard_EXPORT StepRepr_BooleanRepresentationItem();
-  
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Standard_Boolean theValue);
-  
-  inline void SetValue(const Standard_Boolean theValue)
-  {
-    value = theValue;
-  }
-  
-  inline Standard_Boolean Value() const 
-  {
-    return value;
-  }
-
-  DEFINE_STANDARD_RTTIEXT(StepRepr_BooleanRepresentationItem, StepRepr_RepresentationItem)
-
-private:
-
-  Standard_Boolean value;
-};
-
-#endif // _StepRepr_BooleanRepresentationItem_HeaderFile

src/StepRepr/StepRepr_RealRepresentationItem.cxx

@@ -1,28 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <StepRepr_RealRepresentationItem.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RealRepresentationItem, StepRepr_RepresentationItem)
-
-StepRepr_RealRepresentationItem::StepRepr_RealRepresentationItem()
-{
-}
-
-void StepRepr_RealRepresentationItem::Init(const Handle(TCollection_HAsciiString)& theName,
-                                              const Standard_Real theValue)
-{
-  value = theValue;
-  StepRepr_RepresentationItem::Init(theName);
-}

src/StepRepr/StepRepr_RealRepresentationItem.hxx

@@ -1,53 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepRepr_RealRepresentationItem_HeaderFile
-#define _StepRepr_RealRepresentationItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <StepRepr_RepresentationItem.hxx>
-class TCollection_HAsciiString;
-
-class StepRepr_RealRepresentationItem;
-DEFINE_STANDARD_HANDLE(StepRepr_RealRepresentationItem, StepRepr_RepresentationItem)
-
-class StepRepr_RealRepresentationItem : public StepRepr_RepresentationItem
-{
-
-public:
-
-  //! Returns a RealRepresentationItem
-  Standard_EXPORT StepRepr_RealRepresentationItem();
-  
-  Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Standard_Real theValue);
-  
-  inline void SetValue(const Standard_Real theValue)
-  {
-    value = theValue;
-  }
-  
-  inline Standard_Real Value() const 
-  {
-    return value;
-  }
-
-  DEFINE_STANDARD_RTTIEXT(StepRepr_RealRepresentationItem, StepRepr_RepresentationItem)
-
-private:
-
-  Standard_Real value;
-};
-
-#endif // _StepRepr_RealRepresentationItem_HeaderFile

src/StepToTopoDS/StepToTopoDS_TranslateFace.cxx

@@ -96,7 +96,7 @@
 // To proceed with I-DEAS-like STP (ssv; 15.11.2010)
 //#define DEBUG
 // ============================================================================
-// Method  : StepToTopoDS_TranslateFace
+// Method  : StepToTopoDS_TranslateFace::StepToTopoDS_TranslateFace
 // Purpose : Empty Constructor
 // ============================================================================
 StepToTopoDS_TranslateFace::StepToTopoDS_TranslateFace()
@@ -540,25 +540,24 @@ StepToTopoDS_TranslateFace::createMesh(const Handle(StepVisual_ComplexTriangulat
 {
   Handle(StepVisual_CoordinatesList) aCoords = theTF->Coordinates();
   Handle(TColgp_HArray1OfXYZ) aNodes = aCoords->Points();
-  Handle(TColStd_HArray1OfTransient) aTriaStrips = theTF->TriangleStrips();
-  Handle(TColStd_HArray1OfTransient) aTriaFans = theTF->TriangleFans();
+  Handle(TColStd_HArray2OfInteger) aTriaStrips = theTF->TriangleStrips();
+  Handle(TColStd_HArray2OfInteger) aTriaFans = theTF->TriangleFans();
   const Standard_Boolean aHasUVNodes = Standard_False;
   const Standard_Boolean aHasNormals = (theTF->NbNormals() > 0);
 
   Standard_Integer aNbTriaStrips = 0;
   for (Standard_Integer i = 1; i <= theTF->NbTriangleStrips(); ++i)
   {
-    Handle(TColStd_HArray1OfInteger) aTriangleStrip = Handle(TColStd_HArray1OfInteger)::DownCast(aTriaStrips->Value(i));
-    for (Standard_Integer j = 3; j <= aTriangleStrip->Length(); j += 2)
+    for (Standard_Integer j = 3; j <= aTriaStrips->UpperCol(); j += 2)
     {
-      if (aTriangleStrip->Value(j) != aTriangleStrip->Value(j - 2) &&
-          aTriangleStrip->Value(j) != aTriangleStrip->Value(j - 1))
+      if (aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 2) &&
+        aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 1))
         ++aNbTriaStrips;
     }
-    for (Standard_Integer j = 4; j <= aTriangleStrip->Length(); j += 2)
+    for (Standard_Integer j = 4; j <= aTriaStrips->UpperCol(); j += 2)
     {
-      if (aTriangleStrip->Value(j) != aTriangleStrip->Value(j - 2) &&
-          aTriangleStrip->Value(j) != aTriangleStrip->Value(j - 1))
+      if (aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 2) &&
+        aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 1))
         ++aNbTriaStrips;
     }
   }
@@ -566,8 +565,12 @@ StepToTopoDS_TranslateFace::createMesh(const Handle(StepVisual_ComplexTriangulat
   Standard_Integer aNbTriaFans = 0;
   for (Standard_Integer i = 1; i <= theTF->NbTriangleFans(); ++i)
   {
-    Handle(TColStd_HArray1OfInteger) aTriangleFan = Handle(TColStd_HArray1OfInteger)::DownCast(aTriaFans->Value(i));
-    aNbTriaFans += aTriangleFan->Length() - 2;
+    Standard_Integer v1 = aTriaStrips->Value(i, 1);
+    for (Standard_Integer j = 3; j <= aTriaStrips->UpperCol(); ++j)
+    {
+      if (aTriaStrips->Value(i, j) != v1 && aTriaStrips->Value(i, j - 1) != v1)
+        ++aNbTriaFans;
+    }
   }
 
   Handle(Poly_Triangulation) aMesh = new Poly_Triangulation(theTF->NbPnindex(), 
@@ -580,42 +583,27 @@ StepToTopoDS_TranslateFace::createMesh(const Handle(StepVisual_ComplexTriangulat
     aMesh->SetNode(j, aLF * aPoint);
   }
 
-  Standard_Integer aTriangleIndex = 1;
-  for (Standard_Integer aTrianStripIndex = 1; aTrianStripIndex <= theTF->NbTriangleStrips(); ++aTrianStripIndex)
+  Standard_Integer k = 1;
+  for (Standard_Integer i = 1; i <= theTF->NbTriangleStrips(); ++i)
   {
-    Handle(TColStd_HArray1OfInteger) aTriangleStrip = Handle(TColStd_HArray1OfInteger)::DownCast(aTriaStrips->Value(aTrianStripIndex));
-    for (Standard_Integer anIndex = 3; anIndex <= aTriangleStrip->Length(); anIndex += 2)
+    for (Standard_Integer j = 3; j <= aTriaStrips->UpperCol(); j += 2)
     {
-      if (aTriangleStrip->Value(anIndex) != aTriangleStrip->Value(anIndex - 2) &&
-          aTriangleStrip->Value(anIndex) != aTriangleStrip->Value(anIndex - 1))
+      if (aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 2) &&
+        aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 1))
       {
-        aMesh->SetTriangle(aTriangleIndex++, Poly_Triangle(aTriangleStrip->Value(anIndex - 2),
-                           aTriangleStrip->Value(anIndex),
-                           aTriangleStrip->Value(anIndex - 1)));
+        aMesh->SetTriangle(k++, Poly_Triangle(aTriaStrips->Value(i, j - 2), 
+                                              aTriaStrips->Value(i, j), 
+                                              aTriaStrips->Value(i, j - 1)));
       }
     }
-    for (Standard_Integer anIndex = 4; anIndex <= aTriangleStrip->Length(); anIndex += 2)
+    for (Standard_Integer j = 4; j <= aTriaStrips->UpperCol(); j += 2)
     {
-      if (aTriangleStrip->Value(anIndex) != aTriangleStrip->Value(anIndex - 2) &&
-          aTriangleStrip->Value(anIndex) != aTriangleStrip->Value(anIndex - 1))
+      if (aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 2) &&
+        aTriaStrips->Value(i, j) != aTriaStrips->Value(i, j - 1))
       {
-        aMesh->SetTriangle(aTriangleIndex++, Poly_Triangle(aTriangleStrip->Value(anIndex - 2),
-                           aTriangleStrip->Value(anIndex - 1),
-                           aTriangleStrip->Value(anIndex)));
-      }
-    }
-  }
-  for (Standard_Integer aTrianFanIndex = 1; aTrianFanIndex <= theTF->NbTriangleFans(); ++aTrianFanIndex)
-  {
-    Handle(TColStd_HArray1OfInteger) aTriangleFan = Handle(TColStd_HArray1OfInteger)::DownCast(aTriaFans->Value(aTrianFanIndex));
-    for (Standard_Integer anIndex = 3; anIndex <= aTriangleFan->Length(); ++anIndex)
-    {
-      if (aTriangleFan->Value(anIndex) != aTriangleFan->Value(anIndex - 2) &&
-        aTriangleFan->Value(anIndex - 1) != aTriangleFan->Value(anIndex - 2))
-      {
-        aMesh->SetTriangle(aTriangleIndex++, Poly_Triangle(aTriangleFan->Value(1),
-          aTriangleFan->Value(anIndex),
-          aTriangleFan->Value(anIndex - 1)));
+        aMesh->SetTriangle(k++, Poly_Triangle(aTriaStrips->Value(i, j - 2),
+                                              aTriaStrips->Value(i, j - 1),
+                                              aTriaStrips->Value(i, j)));
       }
     }
   }

src/StepVisual/StepVisual_ComplexTriangulatedFace.cxx

@@ -39,8 +39,8 @@ void StepVisual_ComplexTriangulatedFace::Init (const Handle(TCollection_HAsciiSt
                                                const Standard_Boolean theHasTessellatedFace_GeometricLink,
                                                const StepVisual_FaceOrSurface& theTessellatedFace_GeometricLink,
                                                const Handle(TColStd_HArray1OfInteger)& thePnindex,
-                                               const Handle(TColStd_HArray1OfTransient)& theTriangleStrips,
-                                               const Handle(TColStd_HArray1OfTransient)& theTriangleFans)
+                                               const Handle(TColStd_HArray2OfInteger)& theTriangleStrips,
+                                               const Handle(TColStd_HArray2OfInteger)& theTriangleFans)
 {
   StepVisual_TessellatedFace::Init(theRepresentationItem_Name,
                                    theTessellatedFace_Coordinates,
@@ -107,7 +107,7 @@ Standard_Integer StepVisual_ComplexTriangulatedFace::PnindexValue(const Standard
 //purpose  : 
 //=======================================================================
 
-Handle(TColStd_HArray1OfTransient) StepVisual_ComplexTriangulatedFace::TriangleStrips () const
+Handle(TColStd_HArray2OfInteger) StepVisual_ComplexTriangulatedFace::TriangleStrips () const
 {
   return myTriangleStrips;
 }
@@ -117,7 +117,7 @@ Handle(TColStd_HArray1OfTransient) StepVisual_ComplexTriangulatedFace::TriangleS
 //purpose  : 
 //=======================================================================
 
-void StepVisual_ComplexTriangulatedFace::SetTriangleStrips(const Handle(TColStd_HArray1OfTransient)& theTriangleStrips)
+void StepVisual_ComplexTriangulatedFace::SetTriangleStrips(const Handle(TColStd_HArray2OfInteger)& theTriangleStrips)
 {
   myTriangleStrips = theTriangleStrips;
 }
@@ -133,7 +133,7 @@ Standard_Integer StepVisual_ComplexTriangulatedFace::NbTriangleStrips() const
   {
     return 0;
   }
-  return myTriangleStrips->Length();
+  return myTriangleStrips->ColLength();
 }
 
 //=======================================================================
@@ -141,7 +141,7 @@ Standard_Integer StepVisual_ComplexTriangulatedFace::NbTriangleStrips() const
 //purpose  : 
 //=======================================================================
 
-Handle(TColStd_HArray1OfTransient) StepVisual_ComplexTriangulatedFace::TriangleFans () const
+Handle(TColStd_HArray2OfInteger) StepVisual_ComplexTriangulatedFace::TriangleFans () const
 {
   return myTriangleFans;
 }
@@ -151,7 +151,7 @@ Handle(TColStd_HArray1OfTransient) StepVisual_ComplexTriangulatedFace::TriangleF
 //purpose  : 
 //=======================================================================
 
-void StepVisual_ComplexTriangulatedFace::SetTriangleFans(const Handle(TColStd_HArray1OfTransient)& theTriangleFans)
+void StepVisual_ComplexTriangulatedFace::SetTriangleFans(const Handle(TColStd_HArray2OfInteger)& theTriangleFans)
 {
   myTriangleFans = theTriangleFans;
 }
@@ -167,5 +167,5 @@ Standard_Integer StepVisual_ComplexTriangulatedFace::NbTriangleFans() const
   {
     return 0;
   }
-  return myTriangleFans->Length();
+  return myTriangleFans->ColLength();
 }

src/StepVisual/StepVisual_ComplexTriangulatedFace.hxx

@@ -22,7 +22,7 @@
 #include <StepVisual_TessellatedFace.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfTransient.hxx>
+#include <TColStd_HArray2OfInteger.hxx>
 
 DEFINE_STANDARD_HANDLE(StepVisual_ComplexTriangulatedFace, StepVisual_TessellatedFace)
 
@@ -43,8 +43,8 @@ public :
                             const Standard_Boolean theHasTessellatedFace_GeometricLink,
                             const StepVisual_FaceOrSurface& theTessellatedFace_GeometricLink,
                             const Handle(TColStd_HArray1OfInteger)& thePnindex,
-                            const Handle(TColStd_HArray1OfTransient)& theTriangleStrips,
-                            const Handle(TColStd_HArray1OfTransient)& theTriangleFans);
+                            const Handle(TColStd_HArray2OfInteger)& theTriangleStrips,
+                            const Handle(TColStd_HArray2OfInteger)& theTriangleFans);
 
   //! Returns field Pnindex
   Standard_EXPORT Handle(TColStd_HArray1OfInteger) Pnindex() const;
@@ -59,19 +59,19 @@ public :
   Standard_EXPORT Standard_Integer PnindexValue(const Standard_Integer theNum) const;
 
   //! Returns field TriangleStrips
-  Standard_EXPORT Handle(TColStd_HArray1OfTransient) TriangleStrips() const;
+  Standard_EXPORT Handle(TColStd_HArray2OfInteger) TriangleStrips() const;
 
   //! Sets field TriangleStrips
-  Standard_EXPORT void SetTriangleStrips (const Handle(TColStd_HArray1OfTransient)& theTriangleStrips);
+  Standard_EXPORT void SetTriangleStrips (const Handle(TColStd_HArray2OfInteger)& theTriangleStrips);
 
   //! Returns number of TriangleStrips
   Standard_EXPORT Standard_Integer NbTriangleStrips() const;
 
   //! Returns field TriangleFans
-  Standard_EXPORT Handle(TColStd_HArray1OfTransient) TriangleFans() const;
+  Standard_EXPORT Handle(TColStd_HArray2OfInteger) TriangleFans() const;
 
   //! Sets field TriangleFans
-  Standard_EXPORT void SetTriangleFans (const Handle(TColStd_HArray1OfTransient)& theTriangleFans);
+  Standard_EXPORT void SetTriangleFans (const Handle(TColStd_HArray2OfInteger)& theTriangleFans);
 
   //! Returns number of TriangleFans
   Standard_EXPORT Standard_Integer NbTriangleFans() const;
@@ -81,8 +81,8 @@ public :
 private:
 
   Handle(TColStd_HArray1OfInteger) myPnindex;
-  Handle(TColStd_HArray1OfTransient) myTriangleStrips;
-  Handle(TColStd_HArray1OfTransient) myTriangleFans;
+  Handle(TColStd_HArray2OfInteger) myTriangleStrips;
+  Handle(TColStd_HArray2OfInteger) myTriangleFans;
 
 };
 

src/XCAFDoc/XCAFDoc_Animation.cxx

@@ -347,7 +347,7 @@ Handle(XCAFAnimObjects_AnimObject) XCAFDoc_Animation::GetObject()  const
     {
       continue;
     }
-    NCollection_Array2<double> aValuesArr(1, aDimAtrArr->Value(2), 1, aDimAtrArr->Value(1));
+    NCollection_Array2<double> aValuesArr(1, aDimAtrArr->Value(1), 1, aDimAtrArr->Value(2));
     int aValuesInd = 1;
     for (NCollection_Array2<double>::Iterator aOperValIter(aValuesArr);
          aOperValIter.More(); aOperValIter.Next(), aValuesInd++)

src/XCAFDoc/XCAFDoc_AnimationTool.cxx

@@ -14,7 +14,6 @@
 #include <XCAFDoc_AnimationTool.hxx>
 
 #include <Standard_GUID.hxx>
-#include <TDataStd_AsciiString.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataStd_TreeNode.hxx>
@@ -57,26 +56,6 @@ namespace
     static Standard_GUID aEndTimeCodeGUID("EF5305A3-961D-48AE-9A78-AC744A110A26");
     return aEndTimeCodeGUID;
   }
-
-  //=======================================================================
-  //function : GetFileLengthUnitGUID
-  //purpose  :
-  //=======================================================================
-  const Standard_GUID& GetFileLengthUnitGUID()
-  {
-    static Standard_GUID aFileLengthUnitGUID("492f5372-9a28-4611-a663-d8394f98df00");
-    return aFileLengthUnitGUID;
-  }
-
-  //=======================================================================
-  //function : GetFileLengthUnitGUID
-  //purpose  :
-  //=======================================================================
-  const Standard_GUID& GetUpAxisGUID()
-  {
-    static Standard_GUID anUpAxisGUID("05d55dd9-7175-44a7-97aa-43909ad6f9c7");
-    return anUpAxisGUID;
-  }
 }
 
 //=======================================================================
@@ -248,66 +227,6 @@ void XCAFDoc_AnimationTool::SetEndTimeCode(const double theCode) const
   TDataStd_Real::Set(BaseLabel(), GetEndTimeCodeGUID(), theCode);
 }
 
-//=======================================================================
-//function : GetFileLengthUnit
-//purpose  :
-//=======================================================================
-bool XCAFDoc_AnimationTool::GetFileLengthUnit(double& theLengthUnit) const
-{
-  Handle(TDataStd_Real) aLengthUnitAttr;
-  if (BaseLabel().FindAttribute(GetFileLengthUnitGUID(), aLengthUnitAttr))
-  {
-    theLengthUnit = aLengthUnitAttr->Get();
-    return true;
-  }
-  return false;
-}
-
-//=======================================================================
-//function : SetFileLengthUnit
-//purpose  :
-//=======================================================================
-void XCAFDoc_AnimationTool::SetFileLengthUnit(const double theLengthUnit) const
-{
-  Handle(TDataStd_Real) aLengthUnitAttr;
-  if (BaseLabel().FindAttribute(GetFileLengthUnitGUID(), aLengthUnitAttr))
-  {
-    aLengthUnitAttr->Set(theLengthUnit);
-    return;
-  }
-  TDataStd_Real::Set(BaseLabel(), GetFileLengthUnitGUID(), theLengthUnit);
-}
-
-//=======================================================================
-//function : GetUpAxis
-//purpose  :
-//=======================================================================
-bool XCAFDoc_AnimationTool::GetUpAxis(TCollection_AsciiString& theAxis) const
-{
-  Handle(TDataStd_AsciiString) anAxisAttr;
-  if (BaseLabel().FindAttribute(GetUpAxisGUID(), anAxisAttr))
-  {
-    theAxis = anAxisAttr->Get();
-    return true;
-  }
-  return false;
-}
-
-//=======================================================================
-//function : SetUpAxis
-//purpose  :
-//=======================================================================
-void XCAFDoc_AnimationTool::SetUpAxis(const TCollection_AsciiString theAxis) const
-{
-  Handle(TDataStd_AsciiString) anAxisAttr;
-  if (BaseLabel().FindAttribute(GetUpAxisGUID(), anAxisAttr))
-  {
-    anAxisAttr->Set(theAxis);
-    return;
-  }
-  TDataStd_AsciiString::Set(BaseLabel(), GetUpAxisGUID(), theAxis);
-}
-
 //=======================================================================
 //function : GetAnimationLabels
 //purpose  :

src/XCAFDoc/XCAFDoc_AnimationTool.hxx

@@ -76,18 +76,6 @@ public:
   //!
   Standard_EXPORT void SetEndTimeCode(const double theCode) const;
 
-  //!
-  Standard_EXPORT bool GetFileLengthUnit(double& theLengthUnit) const;
-
-  //!
-  Standard_EXPORT void SetFileLengthUnit(const double theLengthUnit) const;
-
-  //!
-  Standard_EXPORT bool GetUpAxis(TCollection_AsciiString& theAxis) const;
-
-  //!
-  Standard_EXPORT void SetUpAxis(const TCollection_AsciiString theAxis) const;
-
   //! Returns a sequence of Animation labels currently stored
   //! in the Animation table.
   Standard_EXPORT void GetAnimationLabels(TDF_LabelSequence& theLabels) const;

src/XCAFDoc/XCAFDoc_ShapeTool.cxx

@@ -24,7 +24,6 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_SequenceOfHAsciiString.hxx>
 #include <TDataStd_Name.hxx>
-#include <TDataStd_RealArray.hxx>
 #include <TDataStd_TreeNode.hxx>
 #include <TDataStd_UAttribute.hxx>
 #include <TDF_Attribute.hxx>
@@ -52,21 +51,7 @@
 
 IMPLEMENT_DERIVED_ATTRIBUTE_WITH_TYPE(XCAFDoc_ShapeTool,TDataStd_GenericEmpty,"xcaf","ShapeTool")
 
-namespace
-{
-  static Standard_Boolean THE_AUTO_NAMING_FLAG = Standard_True;
-  static Standard_Boolean THE_UNIFORM_SCALING_SUPPORT_FLAG = Standard_False;
-
-  //=======================================================================
-  //function : GetUniformScaleGUID
-  //purpose  :
-  //=======================================================================
-  const Standard_GUID& GetUniformScaleGUID()
-  {
-    static Standard_GUID anUniformScaleID("D4DA66EA-EBAD-4775-ACEC-1A018C6A4501");
-    return anUniformScaleID;
-  }
-}
+static Standard_Boolean theAutoNaming = Standard_True;
 
 // attribute methods //////////////////////////////////////////////////
 
@@ -427,7 +412,7 @@ void XCAFDoc_ShapeTool::MakeReference (const TDF_Label &L,
   refNode->Remove(); // abv: fix against bug in TreeNode::Append()
   mainNode->Append(refNode);
 
-  if (THE_AUTO_NAMING_FLAG)
+  if (theAutoNaming)
     SetLabelNameByLink(L);
 }
 
@@ -502,7 +487,7 @@ TDF_Label XCAFDoc_ShapeTool::addShape (const TopoDS_Shape& S, const Standard_Boo
 //  }
   A->SetShape(S);
   
-  if (THE_AUTO_NAMING_FLAG)
+  if (theAutoNaming)
     SetLabelNameByShape(ShapeLabel);
 
   // if shape is Compound and flag is set, create assembly
@@ -510,7 +495,7 @@ TDF_Label XCAFDoc_ShapeTool::addShape (const TopoDS_Shape& S, const Standard_Boo
     // mark assembly by assigning UAttribute
     Handle(TDataStd_UAttribute) Uattr;
     Uattr = TDataStd_UAttribute::Set ( ShapeLabel, XCAFDoc::AssemblyGUID() );
-    if (THE_AUTO_NAMING_FLAG)
+    if (theAutoNaming)
       TDataStd_Name::Set(ShapeLabel, TCollection_ExtendedString("ASSEMBLY"));
 
     // iterate on components
@@ -659,89 +644,31 @@ void XCAFDoc_ShapeTool::Init()
 
 //=======================================================================
 //function : SetAutoNaming
-//purpose  :
+//purpose  : 
 //=======================================================================
+
 void XCAFDoc_ShapeTool::SetAutoNaming (const Standard_Boolean V)
 {
-  THE_AUTO_NAMING_FLAG = V;
+  theAutoNaming = V;
 }
 
+
 //=======================================================================
 //function : AutoNaming
-//purpose  :
+//purpose  : 
 //=======================================================================
+
 Standard_Boolean XCAFDoc_ShapeTool::AutoNaming()
 {
-  return THE_AUTO_NAMING_FLAG;
+  return theAutoNaming;
 }
 
-//=======================================================================
-//function : SetUniformScalingSupport
-//purpose  :
-//=======================================================================
-void XCAFDoc_ShapeTool::SetUniformScalingSupport(const Standard_Boolean theSupportFlag)
-{
-  THE_UNIFORM_SCALING_SUPPORT_FLAG = theSupportFlag;
-}
-
-//=======================================================================
-//function : UniformScalingSupport
-//purpose  :
-//=======================================================================
-Standard_Boolean XCAFDoc_ShapeTool::UniformScalingSupport()
-{
-  return THE_UNIFORM_SCALING_SUPPORT_FLAG;
-}
-
-//=======================================================================
-//function : GetShapeUniformScale
-//purpose  :
-//=======================================================================
-Standard_Boolean XCAFDoc_ShapeTool::GetShapeUniformScale(const TDF_Label& theShLabel,
-                                                         double& theDX,
-                                                         double& theDY,
-                                                         double& theDZ)
-{
-  if (theShLabel.IsNull())
-  {
-    return Standard_False;
-  }
-  Handle(TDataStd_RealArray) anArrAttr;
-  if (!theShLabel.FindAttribute(GetUniformScaleGUID(), anArrAttr) ||
-      anArrAttr->Length() != 3)
-  {
-    return Standard_False;
-  }
-  theDX = anArrAttr->Value(1);
-  theDY = anArrAttr->Value(2);
-  theDZ = anArrAttr->Value(3);
-  return true;
-}
-
-//=======================================================================
-//function : SetShapeUniformScale
-//purpose  :
-//=======================================================================
-Standard_Boolean XCAFDoc_ShapeTool::SetShapeUniformScale(const TDF_Label& theShLabel,
-                                                         const double theDX,
-                                                         const double theDY,
-                                                         const double theDZ)
-{
-  if (!IsShape(theShLabel))
-  {
-    return Standard_False;
-  }
-  Handle(TDataStd_RealArray) anArray = TDataStd_RealArray::Set(theShLabel, GetUniformScaleGUID(), 1, 3);
-  anArray->SetValue(1, theDX);
-  anArray->SetValue(2, theDY);
-  anArray->SetValue(3, theDZ);
-  return true;
-}
 
 //=======================================================================
 //function : ComputeShapes
-//purpose  :
+//purpose  : 
 //=======================================================================
+
 void XCAFDoc_ShapeTool::ComputeShapes(const TDF_Label& L)
 {
   TDF_ChildIterator it(L); 
@@ -1595,7 +1522,7 @@ Standard_Boolean XCAFDoc_ShapeTool::SetSHUO (const TDF_LabelSequence& labels,
   
   TDF_TagSource aTag;
   TDF_Label UpperSubL = aTag.NewChild( labels( 1 ) );
-  if (THE_AUTO_NAMING_FLAG) {
+  if (theAutoNaming) {
     TCollection_ExtendedString Entry("SHUO");
     TDataStd_Name::Set(UpperSubL, TCollection_ExtendedString( Entry ));
   }
@@ -1606,7 +1533,7 @@ Standard_Boolean XCAFDoc_ShapeTool::SetSHUO (const TDF_LabelSequence& labels,
   // add other next_usage occurrences.
   for (i = 2; i <= labels.Length(); i++) {
     TDF_Label NextSubL = aTag.NewChild( labels( i ) );
-    if (THE_AUTO_NAMING_FLAG) {
+    if (theAutoNaming) {
       TCollection_ExtendedString EntrySub("SHUO-");
       EntrySub += i;
       TDataStd_Name::Set(NextSubL, TCollection_ExtendedString( EntrySub ));

src/XCAFDoc/XCAFDoc_ShapeTool.hxx

@@ -238,34 +238,6 @@ public:
   //! Returns current auto-naming mode. See SetAutoNaming() for
   //! description.
   Standard_EXPORT static Standard_Boolean AutoNaming();
-
-  //! Sets uniform scaling support mode to <theSupportFlag>.
-  //! If True then some DataExchange components be able to keep
-  //! uniform scale information into special XCAF attribute.
-  //!
-  //! This setting is global; it cannot be made a member function
-  //! as it is used by static methods as well.
-  //! By default, uniform scaling support is disable.
-  //! See also UniformScalingSupport().
-  Standard_EXPORT static void SetUniformScalingSupport (const Standard_Boolean theSupportFlag);
-  
-  //! Returns current niform scaling support mode.
-  //! See SetUniformScalingSupport() for description.
-  Standard_EXPORT static Standard_Boolean UniformScalingSupport();
-
-  //! Gets uniform scale values from the label.
-  //! @return true if scaling is support and attribute is exist
-  Standard_EXPORT static Standard_Boolean GetShapeUniformScale(const TDF_Label& theShLabel,
-                                                               double& theDX,
-                                                               double& theDY,
-                                                               double& theDZ);
-
-  //! Sets uniform scale values on the label.
-  //! @return true if scaling is support and label contains shape
-  Standard_EXPORT static Standard_Boolean SetShapeUniformScale(const TDF_Label& theShLabel,
-                                                               const double theDX,
-                                                               const double theDY,
-                                                               const double theDZ);
   
   //! recursive
   Standard_EXPORT void ComputeShapes (const TDF_Label& L);

src/XDEDRAW/XDEDRAW_Common.cxx

@@ -426,7 +426,7 @@ static Standard_Integer ReadStep(Draw_Interpretor& di, Standard_Integer argc, co
   if (!aModeStr.IsEmpty())
   {
     Standard_Boolean aMode = Standard_True;
-    for (Standard_Integer i = 1; i <= aModeStr.Length(); ++i)
+    for (Standard_Integer i = 1; aModeStr.Value (i); ++i)
     {
       switch (aModeStr.Value (i))
       {
@@ -436,7 +436,6 @@ static Standard_Integer ReadStep(Draw_Interpretor& di, Standard_Integer argc, co
         case 'n' : aReader.SetNameMode  (aMode); break;
         case 'l' : aReader.SetLayerMode (aMode); break;
         case 'v' : aReader.SetPropsMode (aMode); break;
-        case 'm' : aReader.SetMetaMode (aMode); break;
         default:
         {
           Message::SendFail() << "Syntax error at '" << aModeStr << "'\n";

src/gce/gce_MakeCirc.cxx

@@ -53,7 +53,7 @@ gce_MakeCirc::gce_MakeCirc(const gp_Pnt&  P1 ,
 //=========================================================================
   Standard_Real dist1, dist2, dist3, aResolution;
   //
-  aResolution = 1e-12;
+  aResolution = gp::Resolution();
   //
   dist1 = P1.Distance(P2);
   dist2 = P1.Distance(P3);

tests/bugs/moddata_3/bug33567

@@ -1,11 +0,0 @@
-puts "==========================================================="
-puts "0033567: Modeling Data - GeomLib_IsPlanarSurface raises SIGFPE in Release mode"
-puts "==========================================================="
-
-puts "REQUIRED All: Conversion failed"
-
-pload MODELING
-
-restore [locate_data_file bug33567.brep] a
-mksurface s a
-tocanon r s 0.0005

tests/bugs/xde/bug33616

@@ -1,11 +0,0 @@
-puts "========"
-puts "0033616: Data Exchange - Using filter while reading XBF may result in unresolved links"
-puts "========"
-
-pload ALL
-
-XOpen [locate_data_file bug28905_as1-oc-214.xbf] D -read0:1:1:2:1
-XGetShape sh D 0:1:1:2:1
-checknbshapes sh -solid 1
-
-Close D

tests/de_mesh/step_read/A2

@@ -9,4 +9,4 @@ XGetOneShape S D
 
 set nb_faces     273
 set nb_nodes     3788
-set nb_triangles 3377
+set nb_triangles 2893

tests/de_wrapper/configuration/A3

@@ -44,7 +44,6 @@ provider.STEP.OCC.read.color :   1
 provider.STEP.OCC.read.name :    1
 provider.STEP.OCC.read.layer :   1
 provider.STEP.OCC.read.props :   1
-provider.STEP.OCC.read.metadata :   0
 provider.STEP.OCC.write.precision.mode :         0
 provider.STEP.OCC.write.precision.val :  0.0001
 provider.STEP.OCC.write.assembly :       0

tests/de_wrapper/configuration/A4

@@ -44,7 +44,6 @@ provider.STEP.OCC.read.color :   1
 provider.STEP.OCC.read.name :    1
 provider.STEP.OCC.read.layer :   1
 provider.STEP.OCC.read.props :   1
-provider.STEP.OCC.read.metadata :   0
 provider.STEP.OCC.write.precision.mode :         0
 provider.STEP.OCC.write.precision.val :  0.0001
 provider.STEP.OCC.write.assembly :       0

tests/metadata/begin

@@ -1,5 +0,0 @@
-pload DCAF
-pload XDE
-
-cpulimit 1000
-

tests/metadata/end

@@ -1,98 +0,0 @@
-# Set flag dump_file to 1 in order to regenerate script files with actual data
-# used as reference. In this mode all tests intentionally report failure.
-set dump_file 0
-########################################################################
-set mist 0;
-set todo_msg ""
-set todo_mask "puts \"TODO CR00000 ALL: "
-set end_line "\" \n"
-##################################################################
-
-# Read original file
-if { [string length $filename] > 1} {
-  set path_file [locate_data_file $filename]
-  if { [catch { ReadFile D $path_file} catch_result] } {
-    set err_msg "Error: file was not read - exception "
-    puts $err_msg
-    append todo_msg $todo_mask $err_msg $end_line
-    set mist 1
-  }
-} else {
-  set mist 1
-}
-
-# Get information about translation
-if { $mist < 1} {
-  puts ""
-  set prop [ XGetProperties D ] 
-
-  if { [llength $prop] < 0 } {
-      puts " Metadata was NOT provided"
-    }
-}
-if { $mist < 1} {
-  # Close the document
-  if { [catch { Close D } catch_result] } {
-    set err_msg "Error : cannot close a document D - exception"
-    puts $err_msg
-    append todo_msg $todo_mask $err_msg $end_line
-  }
-}
-
-if { $mist != 1 } {
-  puts "" 
-  set result ""
-  append result [format $prop]
-}
-
-set ref_Compare 0
-# Put reference data to the test script file if option "dump" is set
-if { $dump_file == 1 } {
-  set fd_stream  [open $dirname/$groupname/$gridname/$casename w]
-  fconfigure $fd_stream -encoding utf-8
-  puts $fd_stream "# !!!! This file is generated automatically, do not edit manually! See end script"
-  puts $fd_stream "set filename $filename"
-  if { $mist != 1 } {
-    puts $fd_stream "" 
-    puts $fd_stream "set ref_data \{"
-    puts $fd_stream $result
-    puts $fd_stream "\}"
-  }
-  close $fd_stream 
-} elseif { $mist != 1 } {
-  puts "========================== Comparison with reference data ========"
-  
-  # Comparison of reference data with obtained result
-  set ref_list [split $ref_data \n]
-  set cur_list [split $result \n]
-  set nb_ref [llength $ref_list]
-  for { set i 0 } { $i < $nb_ref } { incr i } {
-    set j [expr $i + 1]
-    set refstr [lindex $ref_list $j]
-    set curstr [lindex $cur_list $i]
-    set isOK 1;
-
-    if {[string equal $refstr $curstr] == 0} {
-      incr ref_Compare
-      puts "Reference data - $refstr\n"
-      puts "Current data - $curstr\n"
-      puts "----------------------------------------------\n"
-    }
-  }
-}
-
-if { $dump_file != 0 } {
-    puts "Error : Running in regeneration mode, comparison was not performed!"
-    if { $mist != 1 } {
-      puts "Generation of test file $groupname/$gridname/$casename successful"
-    } else {
-      puts "Generation of reference data failed"
-    }
-} else {
-    if { $ref_Compare >= 1} {
-      puts "Error : differences with reference data found : $ref_Compare"
-    } else {
-      puts "Comparison of current result with reference data - OK\n"
-    }
-}
-puts "TEST COMPLETED"

tests/metadata/grids.list

@@ -1 +0,0 @@
-001 step

tests/metadata/parse.rules

@@ -1,11 +0,0 @@
-FAILED /\bFaulty\b/ error
-IGNORE /Software error/ message in tpstat
-IGNORE /Syntax error/ message in data c
-IGNORE /Transfer error/ message in tpstat
-IGNORE /Operator FixShape failed with exception/ message during reading
-IGNORE /Error on writing file/ message during writing file
-IGNORE /StepFile Error/ message during loading step file
-IGNORE /StepToTopoDS, GeometricSet/exception
-IGNORE /OSD_Exception_ACCESS_VIOLATION/ exception during reading step
-IGNORE /Exception Raised while reading Step File/ exception during reading step file
-IGNORE /Warning: ShapeFix_.* Exception/ internal exceptions caught by FixShape

tests/metadata/step/A1

@@ -1,39 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug28345_30338.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-H_CIP : 55.545955351400004
-ProductID : MVE0300X02S030_ASM
-Description : NOT SPECIFIED
-ProductName : MVE0300X02S030_ASM
-Property for [0:1:1:2]:
-A : 3
-B : 16
-C : 140
-D : 3
-E : 55
-F : 0.29999999999999999
-H : 45
-I : 15
-ProductID : CUT_MVE0300X02S030
-MODELED_BY : 
-DESCRIPTION : 
-Description : NOT SPECIFIED
-ProductName : CUT_MVE0300X02S030
-Property for [0:1:1:3]:
-A : 3
-B : 16
-C : 140
-D : 3
-E : 55
-F : 0.29999999999999999
-H : 45
-I : 15
-ProductID : NOCUT_MVE0300X02S030
-MODELED_BY : 
-DESCRIPTION : 
-Description : NOT SPECIFIED
-ProductName : NOCUT_MVE0300X02S030
-
-}

tests/metadata/step/A2

@@ -1,28 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug28389_CONFIDENTIAL_SHEET_METAL_F3D.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-yCenterOfGravity : 0.1148447698
-Density : 1000
-xCenterOfGravity : -0.12673526900000001
-Mass : 0.13754561600000001
-Izx : 9.3210000000000004e-07
-Izy : -1.2030000000000001e-07
-Ixx : 1.7740000000000001e-06
-Izz : 3.3558999999999999e-06
-Ixy : 2.044e-07
-Ixz : 9.3210000000000004e-07
-OriginX : 0
-OriginY : 0
-OriginZ : 0
-Surface : 0.34595390710000001
-Volume : 0.0001375456
-Iyx : 2.044e-07
-Iyy : 3.6385e-06
-Iyz : -1.2030000000000001e-07
-zCenterOfGravity : -0.056064514900000001
-ProductID : SHEET METAL F3D
-JoggleFormula : 
-
-}

tests/metadata/step/A3

@@ -1,26 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug28444_nist_ftc_06_asme1_ct5240_rd.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-yCenterOfGravity : 0.0289950044
-Density : 1000
-xCenterOfGravity : -0
-Mass : 3.3238733752999998
-Izx : 0
-Izy : -1.3068999999999999e-06
-Ixx : 2.16819e-05
-Izz : 2.63853e-05
-Ixy : 0
-Ixz : 0
-Surface : 0.28317040780000002
-Volume : 0.0033238733999999999
-Iyx : 0
-Iyy : 4.46342e-05
-Iyz : -1.3068999999999999e-06
-zCenterOfGravity : -0.10963042420000001
-Length : 0
-ProductID : NIST PMI FTC 06 ASME1
-Description : NIST PMI test model downloaded from http://go.usa.gov/mGVm
-
-}

tests/metadata/step/A4

@@ -1,618 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug29525_rev_part_neu_01.prt_converted_from_datakit.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-PRO_MP_ALT_MASS DESCRIPTION : NULL
-PROI_REVISION ACCESS : Limited
-CONTI_CLASS DESCRIPTION : -
-PRO_MP_ALT_MASS SOURCE : Alternate Mass Prop
-PRO_MP_TRF_23 DESIGNATED : NO
-BOHR_DURCHM SOURCE : Mass Properties
-PRO_MP_COGY DESCRIPTION : NULL
-PROI_VERSION DESCRIPTION : NULL
-D_FORMAT DESCRIPTION : NULL
-PRO_MP_ALT_INERTIA_ORIGIN DESIGNATED : NO
-METRISCH : JA
-I_ADD_INFO DESIGNATED : YES
-PRO_MP_ALT_IYY ACCESS : Full
-I_USE_STATUS DESCRIPTION : NULL
-D_DESCRIPTION1 ACCESS : Full
-PRO_MP_ALT_VOLUME : ->
-PRO_MP_IZZ SOURCE : Mass Properties
-MP_DENSITY ACCESS : Full
-PTC_WM_TEAM DESCRIPTION : NULL
-I_3D_RELEASE SOURCE : User-Defined
-PTC_WM_LIFECYCLE_STATE DESIGNATED : NO
-GDTA_EINHEITEN_HINWEISE : 12
-D_WEIGHT_CALC SOURCE : User-Defined
-PRO_MP_ALT_IYZ SOURCE : Alternate Mass Prop
-PDMRL ACCESS : Limited
-D_SURFACE : -
-PRO_MP_ALT_IXZ ACCESS : Full
-I_APP_VERSION DESCRIPTION : NULL
-PRO_MP_TRF_43 DESCRIPTION : NULL
-PDMDB ACCESS : Limited
-I_APP_VERSION : CREO2 M210
-PTC_WM_REVISION DESCRIPTION : NULL
-I_LABOR SOURCE : User-Defined
-PROI_LOCATION SOURCE : Alternate Mass Prop
-PTC_WM_LOCATION ACCESS : Limited
-WT_EPMDOC_NUMBER SOURCE : Mass Properties
-D_ECM_DESCRIPTION SOURCE : User-Defined
-D_DOC_SUBTYPE SOURCE : User-Defined
-MC_MODE ACCESS : Full
-PTC_WM_CREATED_BY DESIGNATED : NO
-D_ADD_INFORMATION DESCRIPTION : NULL
-BOHR_TIEFE DESIGNATED : NO
-I_3D_RELEASE DESIGNATED : YES
-CONTI_CLASS SOURCE : User-Defined
-D_DESCRIPTION0 : -
-PRO_MP_ALT_VOLUME SOURCE : Alternate Mass Prop
-D_DESCRIPTION1 : -
-I_NAME_OLD DESIGNATED : YES
-PRO_MP_ALT_MASS DESIGNATED : NO
-GDTA_STANDARD_REF_HINWEISE ACCESS : Full
-XSEC_SRF SOURCE : User-Defined
-D_SURFACE SOURCE : User-Defined
-PRO_MP_CSYS DESIGNATED : NO
-KLASSE : H
-CUSTOMER_PROJ0 : -
-PROI_CREATED_ON : 10/28/08 14:24:55
-PROI_VERSION : 0+
-PRO_MP_TRF_13 DESIGNATED : NO
-PRO_MP_ALT_IXZ DESCRIPTION : NULL
-PRO_MP_IYY DESCRIPTION : NULL
-PRO_MP_IXX DESCRIPTION : NULL
-PRO_MP_ALT_COGZ DESIGNATED : NO
-PROI_VERSION ACCESS : Limited
-PRO_MP_ALT_COGX ACCESS : Full
-MODEL_CHECK SOURCE : User-Defined
-PRO_MP_CSYS : ->
-PRO_MP_AREA ACCESS : Locked
-D_LAST_MODIFIED DESIGNATED : YES
-PRO_MP_TRF_31 SOURCE : Mass Properties
-PTC_WM_REVISION SOURCE : Mass Properties
-STEIGUNG ACCESS : Locked
-D_LOGIN DESIGNATED : YES
-PTC_WM_CREATED_BY SOURCE : Mass Properties
-D_MATNR DESIGNATED : YES
-METRISCH SOURCE : Mass Properties
-PRO_MP_TRF_42 DESCRIPTION : NULL
-PRO_MP_TRF_31 DESCRIPTION : NULL
-PROI_BRANCH SOURCE : Alternate Mass Prop
-PDMDB DESCRIPTION : NULL
-PRO_MP_IYZ DESIGNATED : NO
-PRO_MP_ALT_VOLUME DESCRIPTION : NULL
-PTC_WM_LIFECYCLE DESIGNATED : NO
-PRO_MP_DENSITY : 0.000000
-PRO_MP_TRF_22 SOURCE : Mass Properties
-GEWINDE_DURCHM DESIGNATED : NO
-I_CUSTOMER_PROJ DESCRIPTION : NULL
-PRO_MP_TRF_12 ACCESS : Locked
-I_ECM SOURCE : User-Defined
-PRO_MP_TRF_43 DESIGNATED : NO
-XSEC_SRF DESCRIPTION : NULL
-PRO_MP_TRF_42 ACCESS : Locked
-CUSTOMER_PROJ0 ACCESS : Full
-PTC_WM_CREATED_ON ACCESS : Limited
-PTC_WM_ITERATION ACCESS : Limited
-PROI_LOCATION DESIGNATED : NO
-PDMDB : 
-PRO_MP_TRF_13 SOURCE : Mass Properties
-PTC_WM_TEAM SOURCE : Mass Properties
-KLASSE DESCRIPTION : NULL
-PRO_MP_ALT_IZZ SOURCE : Alternate Mass Prop
-PRO_MP_MASS ACCESS : Locked
-I_NAME_OLD ACCESS : Full
-PRO_MP_ALT_IYZ ACCESS : Full
-PRO_MP_TRF_33 ACCESS : Locked
-PTC_WM_LIFECYCLE_STATE DESCRIPTION : NULL
-PRO_MP_ALT_IYY DESIGNATED : NO
-PRO_MP_TRF_11 DESIGNATED : NO
-PRO_MP_MASS DESCRIPTION : NULL
-D_DEPARTMENT : -
-PDMREV SOURCE : Alternate Mass Prop
-GDTA_EINHEITEN_HINWEISE SOURCE : User-Defined
-D_LOCATION ACCESS : Full
-BOHRER_SPITZENWINKEL ACCESS : Locked
-GDTA_STANDARD_REF_HINWEISE DESCRIPTION : NULL
-PROI_VERSION DESIGNATED : NO
-MC_CONFIG DESCRIPTION : NULL
-D_FORMAT ACCESS : Full
-XSEC_SRF : XSEC_SRF
-PTC_MODIFIED DESCRIPTION : NULL
-PRO_MP_INERTIA_ORIGIN DESCRIPTION : NULL
-I_ECM DESIGNATED : YES
-D_MATNR DESCRIPTION : NULL
-CONTI_CLASS ACCESS : Full
-D_DOC_CLASS SOURCE : User-Defined
-D_SURFACE_TEXT DESCRIPTION : NULL
-D_DOCNR SOURCE : User-Defined
-XSEC_NAME DESCRIPTION : NULL
-PTC_WM_CREATED_BY DESCRIPTION : NULL
-PRO_MP_MASS DESIGNATED : NO
-PRO_MP_IXZ DESIGNATED : NO
-I_CUSTOMER_PROJ DESIGNATED : YES
-PRO_MP_SOURCE SOURCE : Alternate Mass Prop
-GEWINDESERIE DESCRIPTION : NULL
-STEIGUNG DESCRIPTION : NULL
-D_DOC_PART : 000
-PRO_MP_TRF_33 DESIGNATED : NO
-I_USE_STATUS SOURCE : User-Defined
-PRO_MP_COGZ DESCRIPTION : NULL
-D_DOC_TYPE SOURCE : User-Defined
-GEWINDESERIE DESIGNATED : NO
-D_DESCRIPTION1 DESIGNATED : YES
-PROI_RELEASE DESCRIPTION : NULL
-PRO_MP_ALT_IXZ DESIGNATED : NO
-I_CUSTOMER_RELATION SOURCE : User-Defined
-PRO_MP_COGY DESIGNATED : NO
-METRISCH DESIGNATED : NO
-PTC_MODIFIED SOURCE : Alternate Mass Prop
-PRO_MP_ALT_COGY ACCESS : Full
-PROI_CREATED_BY DESIGNATED : NO
-PTC_WM_CREATED_BY ACCESS : Limited
-I_ECM : -
-GEWINDE_TIEFE ACCESS : Locked
-GEWINDE_LÄNGE ACCESS : Locked
-D_LOGIN DESCRIPTION : NULL
-GEWINDEGÄNGE_PRO_INCH ACCESS : Locked
-PRO_MP_TRF_33 DESCRIPTION : NULL
-PTC_WM_MODIFIED_BY DESIGNATED : NO
-PRO_MP_DENSITY SOURCE : Mass Properties
-PTC_WM_TEAM DESIGNATED : NO
-PTC_WM_REVISION : AA
-D_DEPARTMENT DESIGNATED : YES
-PROI_BRANCH : 
-I_APP_VERSION SOURCE : User-Defined
-PRO_MP_INERTIA_ORIGIN : ->
-BOHR_TIEFE ACCESS : Locked
-SCHRAUBEN_GROESSE DESCRIPTION : NULL
-D_DEPARTMENT DESCRIPTION : NULL
-I_CUSTOMER_RELATION : -
-GDTA_EINHEITEN_HINWEISE DESCRIPTION : NULL
-PRO_MP_TRF_23 SOURCE : Mass Properties
-D_DESCRIPTION1 DESCRIPTION : NULL
-PRO_MP_TRF_13 ACCESS : Locked
-CUSTOMER DESIGNATED : YES
-PTC_WM_VERSION ACCESS : Limited
-PRO_MP_TRF_43 ACCESS : Locked
-SCHRAUBEN_GROESSE : M8x1.25
-PRO_MP_IXX ACCESS : Locked
-PTC_ORGANIZATION_ID SOURCE : Mass Properties
-STEIGUNG DESIGNATED : NO
-D_MATERIAL DESCRIPTION : NULL
-PTC_WM_LIFECYCLE_STATE ACCESS : Limited
-PRO_MP_ALT_INERTIA_ORIGIN : PRO_MP_ALT_CSYS
-GEWINDE_TIEFE DESIGNATED : NO
-PRO_MP_IXY SOURCE : Mass Properties
-PTC_ORGANIZATION_ID : Engineering
-D_MATNR SOURCE : User-Defined
-GEWINDESERIE SOURCE : Mass Properties
-D_BASE_UNIT ACCESS : Full
-PRO_MP_SOURCE DESCRIPTION : NULL
-GDTA_EINHEITEN_HINWEISE ACCESS : Full
-PRO_MP_IXY DESCRIPTION : NULL
-PRO_MP_IYZ DESCRIPTION : NULL
-I_RANGE ACCESS : Full
-PROI_CREATED_BY ACCESS : Limited
-D_MATERIAL SOURCE : User-Defined
-KLASSE ACCESS : Locked
-PRO_MP_IYZ ACCESS : Locked
-PTC_WM_MODIFIED_BY DESCRIPTION : NULL
-PTC_WM_ITERATION : 0
-D_DEPARTMENT SOURCE : User-Defined
-PRO_MP_TRF_32 DESCRIPTION : NULL
-PRO_MP_TRF_21 DESCRIPTION : NULL
-MC_ERRORS : 0
-PRO_MP_ALT_AREA DESCRIPTION : NULL
-PTC_WM_LOCATION : 
-PRO_MP_IZZ DESIGNATED : NO
-GEWINDE_DURCHM SOURCE : Mass Properties
-I_ADD_INFO SOURCE : User-Defined
-PRO_MP_IXX : ->
-PRO_MP_IXY : ->
-PDMRL : Planned
-D_DOC_TYPE : -
-PRO_MP_IXZ : ->
-PTC_WM_ITERATION DESCRIPTION : NULL
-PRO_MP_COGX SOURCE : Mass Properties
-MC_ERRORS DESCRIPTION : NULL
-MC_CONFIG SOURCE : User-Defined
-GEWINDEGÄNGE_PRO_INCH DESCRIPTION : NULL
-PDMRL DESCRIPTION : NULL
-PRO_MP_IYY : ->
-BOHR_TIEFE : 17.000000
-D_DESCRIPTION0 DESCRIPTION : NULL
-PRO_MP_IYZ : ->
-I_CUSTOMER_PROJ ACCESS : Full
-D_SURFACE_TEXT SOURCE : User-Defined
-PRO_MP_MASS : ->
-WT_EPMDOC_NUMBER DESCRIPTION : NULL
-PROI_CREATED_BY DESCRIPTION : NULL
-PRO_MP_IZZ : ->
-PRO_MP_CSYS SOURCE : Mass Properties
-PRO_MP_ALT_CSYS : DEFAULT
-GEWINDE_DURCHM DESCRIPTION : NULL
-PDMRL DESIGNATED : NO
-MBD SOURCE : User-Defined
-D_DOC_PART SOURCE : User-Defined
-PRO_MP_TRF_21 DESIGNATED : NO
-PRO_MP_ALT_AREA DESIGNATED : NO
-PRO_MP_ALT_COGZ ACCESS : Full
-PROI_REVISION DESCRIPTION : NULL
-D_LOCATION : -
-PRO_MP_ALT_AREA ACCESS : Full
-PRO_MP_ALT_IXX : ->
-PRO_MP_ALT_IXY : ->
-PTC_WM_TEAM : 
-PRO_MP_INERTIA_ORIGIN SOURCE : Mass Properties
-PRO_MP_ALT_IXZ : ->
-PRO_MP_COGZ ACCESS : Locked
-PDMREV DESIGNATED : NO
-WT_EPMDOC_NUMBER : REV_PART_NEU_01.PRT
-I_3D_RELEASE DESCRIPTION : NULL
-D_WEIGHT_WEIGHED DESCRIPTION : NULL
-D_WEIGHT_WEIGHED ACCESS : Full
-PRO_MP_ALT_IYY : ->
-PRO_MP_ALT_IYZ : ->
-D_DESCRIPTION0 SOURCE : User-Defined
-XSEC_NAME SOURCE : User-Defined
-D_LAST_MODIFIED ACCESS : Full
-PRO_MP_SOURCE : GEOMETRY
-PRO_MP_ALT_IXX ACCESS : Full
-PTC_WM_MODIFIED_ON SOURCE : Mass Properties
-PRO_MP_TRF_21 ACCESS : Locked
-D_WEIGHT_WEIGHED DESIGNATED : YES
-MC_ERRORS SOURCE : User-Defined
-I_RANGE DESIGNATED : YES
-PRO_MP_IYY SOURCE : Mass Properties
-PRO_MP_ALT_IZZ : ->
-I_CUSTOMER_RELATION DESIGNATED : YES
-I_RANGE DESCRIPTION : NULL
-MC_ERRORS DESIGNATED : YES
-PRO_MP_ALT_IXY SOURCE : Alternate Mass Prop
-I_NAME_OLD DESCRIPTION : NULL
-D_DOCNR DESIGNATED : YES
-PRO_MP_ALT_MASS ACCESS : Full
-BOHR_DURCHM ACCESS : Locked
-I_3D_RELEASE : -
-PRO_MP_IXZ SOURCE : Mass Properties
-SCHRAUBEN_GROESSE SOURCE : Mass Properties
-PTC_WM_CREATED_ON DESIGNATED : NO
-PRO_MP_ALT_INERTIA_ORIGIN DESCRIPTION : NULL
-D_ADD_INFORMATION SOURCE : User-Defined
-XSEC_SRF DESIGNATED : NO
-PRO_MP_IZZ ACCESS : Locked
-PDMDB DESIGNATED : NO
-I_3D_RELEASE ACCESS : Full
-D_LAST_MODIFIED DESCRIPTION : NULL
-PRO_MP_ALT_IYZ DESIGNATED : NO
-D_WEIGHT_CALC ACCESS : Full
-PROI_CREATED_ON SOURCE : Alternate Mass Prop
-PRO_MP_TRF_12 DESIGNATED : NO
-PRO_MP_TRF_23 DESCRIPTION : NULL
-CONTI_CLASS DESIGNATED : YES
-I_LABOR ACCESS : Full
-PROI_LOCATION ACCESS : Limited
-PRO_MP_ALT_COGX DESIGNATED : NO
-WT_EPMDOC_NUMBER ACCESS : Limited
-PTC_WM_ITERATION DESIGNATED : NO
-D_ECM_DESCRIPTION ACCESS : Full
-D_DOC_SUBTYPE ACCESS : Full
-CUSTOMER SOURCE : User-Defined
-KLASSE DESIGNATED : NO
-GEWINDEGÄNGE_PRO_INCH DESIGNATED : NO
-MC_CONFIG ACCESS : Full
-MC_CONFIG : -
-PRO_MP_ALT_VOLUME ACCESS : Full
-D_ECM_DESCRIPTION : -
-METRISCH DESCRIPTION : NULL
-D_BASE_UNIT DESCRIPTION : NULL
-BOHRER_SPITZENWINKEL DESIGNATED : NO
-PRO_MP_COGY SOURCE : Mass Properties
-PTC_WM_LIFECYCLE SOURCE : Mass Properties
-D_LOGIN SOURCE : User-Defined
-MP_DENSITY : ->
-PRO_MP_VOLUME SOURCE : Mass Properties
-XSEC_NAME DESIGNATED : NO
-XSEC_SRF ACCESS : Full
-D_SURFACE ACCESS : Full
-PTC_WM_VERSION : AA.0
-PRO_MP_ALT_COGY DESCRIPTION : NULL
-PRO_MP_ALT_CSYS DESCRIPTION : NULL
-GEWINDE_DURCHM : 8.000000
-PTC_WM_MODIFIED_BY SOURCE : Mass Properties
-D_DOC_PART ACCESS : Full
-D_ECM_DESCRIPTION DESCRIPTION : NULL
-PRO_MP_TRF_41 DESIGNATED : NO
-PROI_RELEASE SOURCE : Alternate Mass Prop
-PRO_MP_IXZ DESCRIPTION : NULL
-PRO_MP_TRF_11 SOURCE : Mass Properties
-D_DOC_TYPE DESIGNATED : YES
-PRO_MP_COGZ DESIGNATED : NO
-BOHR_DURCHM : 6.800000
-PRO_MP_TRF_41 SOURCE : Mass Properties
-MODEL_CHECK ACCESS : Full
-BOHR_DURCHM DESIGNATED : NO
-PROI_REVISION SOURCE : Alternate Mass Prop
-D_DESCRIPTION0 ACCESS : Full
-PRO_MP_TRF_31 ACCESS : Locked
-GEWINDE_TIEFE DESCRIPTION : NULL
-PTC_WM_REVISION ACCESS : Limited
-D_ADD_INFORMATION : -
-D_MATERIAL : -
-PRO_MP_ALT_VOLUME DESIGNATED : NO
-D_DOCNR DESCRIPTION : NULL
-METRISCH ACCESS : Locked
-PRO_MP_ALT_IYY SOURCE : Alternate Mass Prop
-PROI_BRANCH ACCESS : Limited
-D_DESCRIPTION1 SOURCE : User-Defined
-PRO_MP_TRF_32 SOURCE : Mass Properties
-PRO_MP_TRF_22 DESCRIPTION : NULL
-PRO_MP_TRF_11 DESCRIPTION : NULL
-I_NAME_OLD : -
-PRO_MP_VOLUME DESCRIPTION : NULL
-MP_DENSITY SOURCE : Alternate Mass Prop
-GEWINDE_LÄNGE DESIGNATED : NO
-PRO_MP_TRF_22 ACCESS : Locked
-MC_MODE : -
-I_ADD_INFO DESCRIPTION : NULL
-PDMRL SOURCE : Alternate Mass Prop
-PDMREV DESCRIPTION : NULL
-I_ECM ACCESS : Full
-I_CUSTOMER_RELATION DESCRIPTION : NULL
-PRO_MP_ALT_IXZ SOURCE : Alternate Mass Prop
-CONTI_CLASS : RD_AUXPART
-PDMDB SOURCE : Alternate Mass Prop
-PTC_WM_CREATED_BY : von Bernuth Constantin (uidu3660) (uidu3660: Engineering)
-PTC_WM_TEAM ACCESS : Limited
-D_DOC_TYPE DESCRIPTION : NULL
-PROI_RELEASE DESIGNATED : NO
-PRO_MP_ALT_IZZ ACCESS : Full
-PTC_WM_LOCATION SOURCE : Mass Properties
-MC_MODE SOURCE : User-Defined
-PTC_WM_LOCATION DESCRIPTION : NULL
-PRO_MP_IXX DESIGNATED : NO
-PRO_MP_COGX : ->
-PRO_MP_COGY : ->
-PRO_MP_ALT_COGX DESCRIPTION : NULL
-PTC_WM_MODIFIED_BY : von Bernuth Constantin (uidu3660) (uidu3660: Engineering)
-PTC_WM_VERSION DESIGNATED : NO
-PRO_MP_COGZ : ->
-WT_EPMDOC_NUMBER DESIGNATED : NO
-MC_MODE DESIGNATED : YES
-PRO_MP_TRF_31 DESIGNATED : NO
-GDTA_STANDARD_REF_HINWEISE SOURCE : User-Defined
-PRO_MP_ALT_CSYS DESIGNATED : NO
-PDMREV ACCESS : Limited
-I_LABOR : -
-MBD DESCRIPTION : NULL
-PRO_MP_ALT_IXX DESIGNATED : NO
-I_ADD_INFO : -
-D_DOC_CLASS ACCESS : Full
-PRO_MP_ALT_IYY DESCRIPTION : NULL
-PRO_MP_ALT_IZZ DESCRIPTION : NULL
-D_LOCATION DESCRIPTION : NULL
-D_DOCNR ACCESS : Full
-GEWINDEGÄNGE_PRO_INCH : 20.320000
-D_DOC_SUBTYPE DESCRIPTION : NULL
-PROI_VERSION SOURCE : Alternate Mass Prop
-PRO_MP_ALT_COGX SOURCE : Alternate Mass Prop
-PROI_LOCATION DESCRIPTION : NULL
-MP_DENSITY DESIGNATED : NO
-PRO_MP_ALT_MASS : ->
-PRO_MP_SOURCE ACCESS : Full
-PRO_MP_AREA SOURCE : Mass Properties
-PTC_WM_REVISION DESIGNATED : NO
-PTC_WM_LIFECYCLE : CONTI_CAD_Lifecycle
-PRO_MP_ALT_INERTIA_ORIGIN SOURCE : Alternate Mass Prop
-I_USE_STATUS ACCESS : Full
-PRO_MP_ALT_CSYS SOURCE : Alternate Mass Prop
-I_RANGE : 40
-D_DOC_TYPE ACCESS : Full
-GEWINDESERIE : ISO
-D_DOC_CLASS DESCRIPTION : NULL
-I_USE_STATUS DESIGNATED : YES
-D_BASE_UNIT DESIGNATED : YES
-D_ADD_INFORMATION DESIGNATED : YES
-MC_CONFIG DESIGNATED : YES
-I_CUSTOMER_RELATION ACCESS : Full
-PRO_MP_ALT_IZZ DESIGNATED : NO
-PTC_MODIFIED ACCESS : Limited
-PRO_MP_TRF_12 SOURCE : Mass Properties
-PRO_MP_CSYS DESCRIPTION : NULL
-PRO_MP_TRF_42 SOURCE : Mass Properties
-PRO_MP_TRF_22 DESIGNATED : NO
-CUSTOMER_PROJ0 SOURCE : User-Defined
-PTC_WM_CREATED_ON SOURCE : Mass Properties
-PTC_WM_ITERATION SOURCE : Mass Properties
-GDTA_STANDARD_REF_HINWEISE DESIGNATED : NO
-PRO_MP_TRF_32 ACCESS : Locked
-D_LAST_MODIFIED : jjjj-mm-dd
-PRO_MP_TRF_13 DESCRIPTION : NULL
-PRO_MP_DENSITY ACCESS : Locked
-MBD : 1
-PRO_MP_MASS SOURCE : Mass Properties
-I_NAME_OLD SOURCE : User-Defined
-I_APP_VERSION ACCESS : Full
-PRO_MP_TRF_33 SOURCE : Mass Properties
-PROI_RELEASE : Planned
-D_DOC_PART DESCRIPTION : NULL
-PRO_MP_TRF_23 ACCESS : Locked
-D_WEIGHT_CALC DESIGNATED : YES
-PRO_MP_SOURCE DESIGNATED : NO
-SCHRAUBEN_GROESSE DESIGNATED : NO
-PTC_ORGANIZATION_ID ACCESS : Limited
-D_DOC_SUBTYPE : -
-I_ECM DESCRIPTION : NULL
-D_LOCATION SOURCE : User-Defined
-BOHRER_SPITZENWINKEL SOURCE : Mass Properties
-D_FORMAT SOURCE : User-Defined
-PROI_REVISION : AA
-PRO_MP_ALT_COGZ DESCRIPTION : NULL
-PTC_WM_VERSION DESCRIPTION : NULL
-MODEL_CHECK DESCRIPTION : NULL
-PRO_MP_IXY ACCESS : Locked
-D_MATNR ACCESS : Full
-GEWINDESERIE ACCESS : Locked
-STEIGUNG : 1.250000
-D_SURFACE_TEXT DESIGNATED : YES
-CUSTOMER DESCRIPTION : NULL
-PTC_WM_CREATED_ON DESCRIPTION : NULL
-PTC_WM_CREATED_ON : 04-Oct-16 09:41:59 AM
-BOHR_DURCHM DESCRIPTION : NULL
-D_LOGIN : -
-D_MATERIAL ACCESS : Full
-D_DOC_CLASS : -
-D_LOCATION DESIGNATED : YES
-PTC_WM_MODIFIED_ON : 04-Oct-16 09:42:00 AM
-D_WEIGHT_CALC DESCRIPTION : NULL
-PRO_MP_COGX DESCRIPTION : NULL
-D_DOC_PART DESIGNATED : YES
-I_USE_STATUS : -
-GEWINDE_TIEFE : 16.320000
-PTC_ORGANIZATION_ID DESIGNATED : NO
-PRO_MP_IZZ DESCRIPTION : NULL
-I_APP_VERSION DESIGNATED : YES
-MODEL_CHECK DESIGNATED : YES
-D_DEPARTMENT ACCESS : Full
-PRO_MP_ALT_COGY DESIGNATED : NO
-PRO_MP_TRF_12 DESCRIPTION : NULL
-GEWINDE_DURCHM ACCESS : Locked
-I_ADD_INFO ACCESS : Full
-D_MATNR : -
-PRO_MP_ALT_INERTIA_ORIGIN ACCESS : Full
-PRO_MP_ALT_COGY SOURCE : Alternate Mass Prop
-GEWINDE_TIEFE SOURCE : Mass Properties
-GEWINDE_LÄNGE SOURCE : Mass Properties
-PTC_WM_LIFECYCLE_STATE : Planned
-PRO_MP_COGX ACCESS : Locked
-PRO_MP_ALT_CSYS ACCESS : Full
-PRO_MP_ALT_AREA : ->
-D_DOCNR : -
-GEWINDEGÄNGE_PRO_INCH SOURCE : Mass Properties
-PRO_MP_IYY DESIGNATED : NO
-D_ECM_DESCRIPTION DESIGNATED : YES
-BOHR_TIEFE SOURCE : Mass Properties
-D_SURFACE_TEXT ACCESS : Full
-PTC_MODIFIED : 1
-PRO_MP_CSYS ACCESS : Locked
-PROI_LOCATION : 
-PRO_MP_AREA DESCRIPTION : NULL
-I_LABOR DESIGNATED : YES
-PRO_MP_TRF_42 DESIGNATED : NO
-MC_MODE DESCRIPTION : NULL
-MBD ACCESS : Full
-D_MATERIAL DESIGNATED : YES
-PTC_WM_VERSION SOURCE : Mass Properties
-PRO_MP_AREA : ->
-BOHRER_SPITZENWINKEL DESCRIPTION : NULL
-PRO_MP_TRF_43 SOURCE : Mass Properties
-PRO_MP_IXX SOURCE : Mass Properties
-PRO_MP_AREA DESIGNATED : NO
-XSEC_NAME : C
-PRO_MP_INERTIA_ORIGIN ACCESS : Locked
-PTC_WM_LIFECYCLE_STATE SOURCE : Mass Properties
-GEWINDE_LÄNGE DESCRIPTION : NULL
-D_BASE_UNIT SOURCE : User-Defined
-PRO_MP_ALT_IYZ DESCRIPTION : NULL
-PRO_MP_ALT_IXY DESCRIPTION : NULL
-XSEC_NAME ACCESS : Full
-PTC_ORGANIZATION_ID DESCRIPTION : NULL
-PTC_WM_MODIFIED_ON ACCESS : Limited
-GDTA_EINHEITEN_HINWEISE DESIGNATED : NO
-D_WEIGHT_WEIGHED : -
-MC_ERRORS ACCESS : Full
-PRO_MP_IYY ACCESS : Locked
-I_RANGE SOURCE : User-Defined
-D_WEIGHT_CALC : -
-PTC_WM_LIFECYCLE DESCRIPTION : NULL
-PROI_CREATED_BY SOURCE : Alternate Mass Prop
-PRO_MP_ALT_COGX : ->
-PRO_MP_ALT_COGY : ->
-D_BASE_UNIT : -
-PRO_MP_ALT_COGZ : ->
-GEWINDE_LÄNGE : 16.320000
-PRO_MP_ALT_IXY ACCESS : Full
-KLASSE SOURCE : Mass Properties
-PRO_MP_IYZ SOURCE : Mass Properties
-PTC_WM_LOCATION DESIGNATED : NO
-PTC_WM_MODIFIED_ON DESCRIPTION : NULL
-PRO_MP_DENSITY DESIGNATED : NO
-D_DOC_SUBTYPE DESIGNATED : YES
-CUSTOMER : -
-GDTA_STANDARD_REF_HINWEISE : 18
-PRO_MP_TRF_41 DESCRIPTION : NULL
-PRO_MP_IXZ ACCESS : Locked
-SCHRAUBEN_GROESSE ACCESS : Locked
-PROI_BRANCH DESIGNATED : NO
-D_ADD_INFORMATION ACCESS : Full
-PRO_MP_IXY DESIGNATED : NO
-PROI_CREATED_BY : 
-CUSTOMER_PROJ0 DESCRIPTION : NULL
-PROI_CREATED_ON ACCESS : Limited
-D_FORMAT : -
-PRO_MP_TRF_32 DESIGNATED : NO
-PROI_REVISION DESIGNATED : NO
-MP_DENSITY DESCRIPTION : NULL
-D_DOC_CLASS DESIGNATED : YES
-D_SURFACE_TEXT : -
-D_DESCRIPTION0 DESIGNATED : YES
-I_CUSTOMER_PROJ SOURCE : User-Defined
-PROI_BRANCH DESCRIPTION : NULL
-PROI_CREATED_ON DESCRIPTION : NULL
-PRO_MP_INERTIA_ORIGIN DESIGNATED : NO
-CUSTOMER ACCESS : Full
-PRO_MP_ALT_IXY DESIGNATED : NO
-PRO_MP_COGX DESIGNATED : NO
-PRO_MP_TRF_11 : ->
-PRO_MP_TRF_12 : ->
-CUSTOMER_PROJ0 DESIGNATED : YES
-PRO_MP_TRF_13 : ->
-PDMREV : AA.0+
-I_LABOR DESCRIPTION : NULL
-PRO_MP_ALT_COGZ SOURCE : Alternate Mass Prop
-I_CUSTOMER_PROJ : -
-MODEL_CHECK : -
-PRO_MP_ALT_IXX DESCRIPTION : NULL
-PRO_MP_ALT_AREA SOURCE : Alternate Mass Prop
-PRO_MP_COGY ACCESS : Locked
-PTC_WM_LIFECYCLE ACCESS : Limited
-D_LOGIN ACCESS : Full
-PRO_MP_TRF_21 : ->
-PRO_MP_VOLUME ACCESS : Locked
-PRO_MP_TRF_22 : ->
-PRO_MP_TRF_23 : ->
-D_FORMAT DESIGNATED : YES
-PROI_CREATED_ON DESIGNATED : NO
-PRO_MP_VOLUME : ->
-PRO_MP_COGZ SOURCE : Mass Properties
-D_SURFACE DESCRIPTION : NULL
-PRO_MP_TRF_31 : ->
-BOHRER_SPITZENWINKEL : 118.000000
-D_WEIGHT_WEIGHED SOURCE : User-Defined
-PRO_MP_TRF_32 : ->
-PTC_WM_MODIFIED_BY ACCESS : Limited
-PRO_MP_TRF_33 : ->
-PTC_MODIFIED DESIGNATED : NO
-PRO_MP_VOLUME DESIGNATED : NO
-PTC_WM_MODIFIED_ON DESIGNATED : NO
-BOHR_TIEFE DESCRIPTION : NULL
-STEIGUNG SOURCE : Mass Properties
-D_LAST_MODIFIED SOURCE : User-Defined
-PRO_MP_ALT_IXX SOURCE : Alternate Mass Prop
-ProductID : REV_PART_NEU_01
-PRO_MP_TRF_21 SOURCE : Mass Properties
-PRO_MP_TRF_41 : ->
-PROI_RELEASE ACCESS : Limited
-PRO_MP_TRF_42 : ->
-D_SURFACE DESIGNATED : YES
-PRO_MP_TRF_43 : ->
-PRO_MP_DENSITY DESCRIPTION : NULL
-PRO_MP_TRF_11 ACCESS : Locked
-MBD DESIGNATED : NO
-PRO_MP_TRF_41 ACCESS : Locked
-
-}

tests/metadata/step/A5

@@ -1,21 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug29633_nist_ctc_05_asme1_ap242-1.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-GDT_STANDARD : 5302
-FILESIZE : 1495040
-MaterialMultipleAssigned : FALSE
-FILESAVETIME : Tue Dec 09 03:47:24 2014
-Revision : D
-ProductID : nist_ctc_05_asme1
-CAD_SOURCE : ug
-Description : NIST PMI test model downloaded from http://go.usa.gov/mGVm
-ATTR_VERSION : 18.3.001
-FILENAME : nist_ctc_05_asme1.prt
-MTIME : 1418096844
-MaterialMissingAssignments : TRUE
-Part Number : NIST PMI CTC 05 ASME1
-ProductName : nist_ctc_05_asme1
-
-}

tests/metadata/step/A6

@@ -1,45 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug29803.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-BODY_LENGTH : 48.513999999999996
-DRILL_DEPTH : 47.625
-HELIX_START : 0
-PRIORITY : 0
-BODY_DIA : 0
-SHANK_SIZE : 16
-FLUTE_LENGTH : 42.468799999999995
-HELIX_LENGTH : 0
-OUT_SHANK_LEN : 27.2499999999926
-OUT_OAL : 78.049999999992593
-THEO_BLADE_DIA : 11.074399999999999
-OUT_MASS : 50.813477444850157
-SCREW_HOLE_SKEW : 1.1000000000000001
-SHANK_DIAMETER : 15.999999999999499
-OUT_SHANK_DIA : 15.999999999999499
-RELIEF_DIA : 21.005799999999997
-OUT_DRILL_DEPTH : 44.754799999999996
-RCA_SIZE : 0
-OUT_REF_LEN : 50.799999999999997
-SHANK_UNDER : 0
-FINISH : BLACK OXIDE
-NOTES : 
-LENGTH : STUB
-SHANK_IM : M
-ProductID : Tool1
-MODELED_BY : LSD
-STANDARD_BODY_DIA : Y
-DESCRIPTION : T-A HOLDER
-Description : NOT SPECIFIED
-SS_FLANGE : NO
-MATERIAL : STEEL
-DEEP_HOLE_NOTES : 
-ITEM_NUM : HOLDER
-SHANK : ER
-FLUTE : STRAIGHT
-SERIES : Y
-DEEP_HOLE_WEBSITE : 
-ProductName : Tool1
-
-}

tests/metadata/step/A7

@@ -1,238 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename sp7_04-do-242.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-PRO_MP_ALT_MASS DESCRIPTION : NULL
-PRO_MP_ALT_MASS SOURCE : Alternate Mass Prop
-PRO_MP_TRF_23 DESIGNATED : NO
-PRO_MP_COGY DESCRIPTION : NULL
-PRO_MP_ALT_INERTIA_ORIGIN DESIGNATED : NO
-REVISION DESCRIPTION : NULL
-PRO_MP_ALT_IYY ACCESS : Full
-PRO_MP_ALT_VOLUME : - >
-PRO_MP_IZZ SOURCE : Mass Properties
-MP_DENSITY ACCESS : Full
-PRO_MP_ALT_IYZ SOURCE : Alternate Mass Prop
-PRO_MP_ALT_IXZ ACCESS : Full
-PRO_MP_TRF_43 DESCRIPTION : NULL
-PRO_MP_ALT_VOLUME SOURCE : Alternate Mass Prop
-PRO_MP_ALT_MASS DESIGNATED : NO
-REVISION SOURCE : User-Defined
-PRO_MP_CSYS DESIGNATED : NO
-PRO_MP_TRF_13 DESIGNATED : NO
-PRO_MP_ALT_IXZ DESCRIPTION : NULL
-PRO_MP_IYY DESCRIPTION : NULL
-PRO_MP_IXX DESCRIPTION : NULL
-PRO_MP_ALT_COGZ DESIGNATED : NO
-PRO_MP_ALT_COGX ACCESS : Full
-PRO_MP_CSYS : - >
-PRO_MP_AREA ACCESS : Locked
-PRO_MP_TRF_31 SOURCE : Mass Properties
-PRO_MP_TRF_42 DESCRIPTION : NULL
-PRO_MP_TRF_31 DESCRIPTION : NULL
-PRO_MP_IYZ DESIGNATED : NO
-PRO_MP_ALT_VOLUME DESCRIPTION : NULL
-PRO_MP_DENSITY : 0.000000
-PRO_MP_TRF_22 SOURCE : Mass Properties
-PRO_MP_TRF_12 ACCESS : Locked
-PRO_MP_TRF_43 DESIGNATED : NO
-PRO_MP_TRF_42 ACCESS : Locked
-PRO_MP_TRF_13 SOURCE : Mass Properties
-PRO_MP_ALT_IZZ SOURCE : Alternate Mass Prop
-PRO_MP_MASS ACCESS : Locked
-PRO_MP_ALT_IYZ ACCESS : Full
-PRO_MP_TRF_33 ACCESS : Locked
-PRO_MP_ALT_IYY DESIGNATED : NO
-PRO_MP_TRF_11 DESIGNATED : NO
-PRO_MP_MASS DESCRIPTION : NULL
-DESCRIPTION DESIGNATED : YES
-PRO_MP_INERTIA_ORIGIN DESCRIPTION : NULL
-PART_NUMBER : NIST PMI CTC 04 ASME1
-PRO_MP_MASS DESIGNATED : NO
-PRO_MP_IXZ DESIGNATED : NO
-PRO_MP_SOURCE SOURCE : Alternate Mass Prop
-PRO_MP_TRF_33 DESIGNATED : NO
-PRO_MP_COGZ DESCRIPTION : NULL
-PRO_MP_ALT_IXZ DESIGNATED : NO
-PRO_MP_COGY DESIGNATED : NO
-PRO_MP_ALT_COGY ACCESS : Full
-PRO_MP_TRF_33 DESCRIPTION : NULL
-PRO_MP_DENSITY SOURCE : Mass Properties
-PRO_MP_INERTIA_ORIGIN : - >
-PRO_MP_TRF_23 SOURCE : Mass Properties
-PRO_MP_TRF_13 ACCESS : Locked
-PRO_MP_TRF_43 ACCESS : Locked
-PRO_MP_IXX ACCESS : Locked
-PRO_MP_ALT_INERTIA_ORIGIN : PRO_MP_ALT_CSYS
-PRO_MP_IXY SOURCE : Mass Properties
-PART_NUMBER ACCESS : Full
-PRO_MP_SOURCE DESCRIPTION : NULL
-PRO_MP_IXY DESCRIPTION : NULL
-PRO_MP_IYZ DESCRIPTION : NULL
-PRO_MP_IYZ ACCESS : Locked
-PRO_MP_TRF_32 DESCRIPTION : NULL
-PRO_MP_TRF_21 DESCRIPTION : NULL
-PRO_MP_ALT_AREA DESCRIPTION : NULL
-PRO_MP_IZZ DESIGNATED : NO
-PRO_MP_IXX : - >
-PRO_MP_IXY : - >
-PRO_MP_IXZ : - >
-PRO_MP_COGX SOURCE : Mass Properties
-PRO_MP_IYY : - >
-PRO_MP_IYZ : - >
-PRO_MP_MASS : - >
-PRO_MP_IZZ : - >
-PRO_MP_CSYS SOURCE : Mass Properties
-PRO_MP_ALT_CSYS : DEFAULT
-PRO_MP_TRF_21 DESIGNATED : NO
-PRO_MP_ALT_AREA DESIGNATED : NO
-PRO_MP_ALT_COGZ ACCESS : Full
-PRO_MP_ALT_AREA ACCESS : Full
-PRO_MP_ALT_IXX : - >
-PRO_MP_ALT_IXY : - >
-PRO_MP_INERTIA_ORIGIN SOURCE : Mass Properties
-PRO_MP_ALT_IXZ : - >
-DESCRIPTION SOURCE : User-Defined
-PRO_MP_COGZ ACCESS : Locked
-PRO_MP_ALT_IYY : - >
-PRO_MP_ALT_IYZ : - >
-PRO_MP_SOURCE : GEOMETRY
-PRO_MP_ALT_IXX ACCESS : Full
-PRO_MP_TRF_21 ACCESS : Locked
-PRO_MP_IYY SOURCE : Mass Properties
-PRO_MP_ALT_IZZ : - >
-PRO_MP_ALT_IXY SOURCE : Alternate Mass Prop
-PRO_MP_ALT_MASS ACCESS : Full
-PRO_MP_IXZ SOURCE : Mass Properties
-PRO_MP_ALT_INERTIA_ORIGIN DESCRIPTION : NULL
-PRO_MP_IZZ ACCESS : Locked
-PRO_MP_ALT_IYZ DESIGNATED : NO
-PRO_MP_TRF_12 DESIGNATED : NO
-PRO_MP_TRF_23 DESCRIPTION : NULL
-PRO_MP_ALT_COGX DESIGNATED : NO
-PART_NUMBER DESCRIPTION : NULL
-PRO_MP_ALT_VOLUME ACCESS : Full
-PRO_MP_COGY SOURCE : Mass Properties
-MP_DENSITY : - >
-PRO_MP_VOLUME SOURCE : Mass Properties
-REVISION ACCESS : Full
-PRO_MP_ALT_COGY DESCRIPTION : NULL
-PRO_MP_ALT_CSYS DESCRIPTION : NULL
-PRO_MP_TRF_41 DESIGNATED : NO
-PRO_MP_IXZ DESCRIPTION : NULL
-PRO_MP_TRF_11 SOURCE : Mass Properties
-PRO_MP_COGZ DESIGNATED : NO
-PRO_MP_TRF_41 SOURCE : Mass Properties
-PRO_MP_TRF_31 ACCESS : Locked
-PRO_MP_ALT_VOLUME DESIGNATED : NO
-PRO_MP_ALT_IYY SOURCE : Alternate Mass Prop
-PRO_MP_TRF_32 SOURCE : Mass Properties
-PRO_MP_TRF_22 DESCRIPTION : NULL
-PRO_MP_TRF_11 DESCRIPTION : NULL
-PRO_MP_VOLUME DESCRIPTION : NULL
-MP_DENSITY SOURCE : Alternate Mass Prop
-PRO_MP_TRF_22 ACCESS : Locked
-PRO_MP_ALT_IXZ SOURCE : Alternate Mass Prop
-PRO_MP_ALT_IZZ ACCESS : Full
-PRO_MP_IXX DESIGNATED : NO
-PRO_MP_COGX : - >
-PRO_MP_COGY : - >
-PRO_MP_ALT_COGX DESCRIPTION : NULL
-PRO_MP_COGZ : - >
-PRO_MP_TRF_31 DESIGNATED : NO
-PRO_MP_ALT_CSYS DESIGNATED : NO
-PRO_MP_ALT_IXX DESIGNATED : NO
-PRO_MP_ALT_IYY DESCRIPTION : NULL
-PRO_MP_ALT_IZZ DESCRIPTION : NULL
-PRO_MP_ALT_COGX SOURCE : Alternate Mass Prop
-MP_DENSITY DESIGNATED : NO
-PRO_MP_ALT_MASS : - >
-PRO_MP_SOURCE ACCESS : Full
-PRO_MP_AREA SOURCE : Mass Properties
-PRO_MP_ALT_INERTIA_ORIGIN SOURCE : Alternate Mass Prop
-PRO_MP_ALT_CSYS SOURCE : Alternate Mass Prop
-PRO_MP_ALT_IZZ DESIGNATED : NO
-PRO_MP_TRF_12 SOURCE : Mass Properties
-PRO_MP_CSYS DESCRIPTION : NULL
-REVISION : D
-PRO_MP_TRF_42 SOURCE : Mass Properties
-PRO_MP_TRF_22 DESIGNATED : NO
-PRO_MP_TRF_32 ACCESS : Locked
-PRO_MP_TRF_13 DESCRIPTION : NULL
-PRO_MP_DENSITY ACCESS : Locked
-PRO_MP_MASS SOURCE : Mass Properties
-PRO_MP_TRF_33 SOURCE : Mass Properties
-PRO_MP_TRF_23 ACCESS : Locked
-PRO_MP_SOURCE DESIGNATED : NO
-PRO_MP_ALT_COGZ DESCRIPTION : NULL
-PRO_MP_IXY ACCESS : Locked
-DESCRIPTION : NIST PMI test model downloaded from http://go.usa.gov/mGVm
-PRO_MP_COGX DESCRIPTION : NULL
-PRO_MP_IZZ DESCRIPTION : NULL
-REVISION DESIGNATED : YES
-PRO_MP_ALT_COGY DESIGNATED : NO
-PRO_MP_TRF_12 DESCRIPTION : NULL
-PRO_MP_ALT_INERTIA_ORIGIN ACCESS : Full
-PRO_MP_ALT_COGY SOURCE : Alternate Mass Prop
-PRO_MP_COGX ACCESS : Locked
-PRO_MP_ALT_CSYS ACCESS : Full
-PRO_MP_ALT_AREA : - >
-PART_NUMBER DESIGNATED : YES
-PRO_MP_IYY DESIGNATED : NO
-PRO_MP_CSYS ACCESS : Locked
-PRO_MP_AREA DESCRIPTION : NULL
-PRO_MP_TRF_42 DESIGNATED : NO
-PRO_MP_AREA : - >
-PRO_MP_TRF_43 SOURCE : Mass Properties
-PRO_MP_IXX SOURCE : Mass Properties
-PRO_MP_AREA DESIGNATED : NO
-PRO_MP_INERTIA_ORIGIN ACCESS : Locked
-DESCRIPTION ACCESS : Full
-PART_NUMBER SOURCE : User-Defined
-PRO_MP_ALT_IYZ DESCRIPTION : NULL
-PRO_MP_ALT_IXY DESCRIPTION : NULL
-PRO_MP_IYY ACCESS : Locked
-PRO_MP_ALT_COGX : - >
-PRO_MP_ALT_COGY : - >
-PRO_MP_ALT_COGZ : - >
-PRO_MP_ALT_IXY ACCESS : Full
-PRO_MP_IYZ SOURCE : Mass Properties
-PRO_MP_DENSITY DESIGNATED : NO
-PRO_MP_TRF_41 DESCRIPTION : NULL
-PRO_MP_IXZ ACCESS : Locked
-PRO_MP_IXY DESIGNATED : NO
-PRO_MP_TRF_32 DESIGNATED : NO
-MP_DENSITY DESCRIPTION : NULL
-PRO_MP_INERTIA_ORIGIN DESIGNATED : NO
-PRO_MP_ALT_IXY DESIGNATED : NO
-PRO_MP_COGX DESIGNATED : NO
-PRO_MP_TRF_11 : - >
-PRO_MP_TRF_12 : - >
-PRO_MP_TRF_13 : - >
-PRO_MP_ALT_COGZ SOURCE : Alternate Mass Prop
-DESCRIPTION DESCRIPTION : NULL
-PRO_MP_ALT_IXX DESCRIPTION : NULL
-PRO_MP_ALT_AREA SOURCE : Alternate Mass Prop
-PRO_MP_COGY ACCESS : Locked
-PRO_MP_TRF_21 : - >
-PRO_MP_VOLUME ACCESS : Locked
-PRO_MP_TRF_22 : - >
-PRO_MP_TRF_23 : - >
-PRO_MP_VOLUME : - >
-PRO_MP_COGZ SOURCE : Mass Properties
-PRO_MP_TRF_31 : - >
-PRO_MP_TRF_32 : - >
-PRO_MP_TRF_33 : - >
-PRO_MP_VOLUME DESIGNATED : NO
-PRO_MP_ALT_IXX SOURCE : Alternate Mass Prop
-ProductID : NIST_CTC_04_ASME1_RD_CR4050_RA
-PRO_MP_TRF_21 SOURCE : Mass Properties
-PRO_MP_TRF_41 : - >
-PRO_MP_TRF_42 : - >
-PRO_MP_TRF_43 : - >
-PRO_MP_DENSITY DESCRIPTION : NULL
-PRO_MP_TRF_11 ACCESS : Locked
-PRO_MP_TRF_41 ACCESS : Locked
-
-}

tests/metadata/step/A8

@@ -1,72 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug32087_part.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-SETUP_PART : 0
-MODEL_3D_REVISION : 1
-MATERIAL_DENSITY : 7850
-WEIGHT_PROTOTYPE : 0
-WEIGHT_CALCULATED : 0.0070751592515700002
-WEIGHT_FINAL : 0
-SUPPLIER_NAME : 
-EDGE_CONDITION_OUTER_EDGE : 
-MODEL_3D_REPLACES : 
-WELD_PREPARATION : 
-MODEL_3D_RELEASED_STATUS : 
-TREATMENT : 
-SURFACE_ROUGHNESS : 
-EDGE_CONDITION : 
-MODEL_3D_CREATED_BY_DEPARTMENT : 
-REFERENCE_DESIGNATION++ : 
-MODEL_3D_APPROVED_BY : 
-REFERENCE : 
-PART_NUMBER : 
-REFERENCE_DESIGNATION== : 
-LANGUAGE : 
-ProductID : Block
-TECHNICAL_SPECIFICATION : 
-MODEL_3D_APPROVED_BY_DEPARTMENT : 
-PROJECT : 
-ORDER_NUMBER : 
-MODEL_3D_REPLACED_BY : 
-WORK_ORDER_NUMBER : 
-PART_NOTE : 
-MODEL_3D_ID_NUMBER : 
-ID_NUMBER_MATERIAL : 
-OWNER : 
-REFERENCE_DESIGNATION+ : 
-REFERENCE_DESIGNATION- : 
-GENERAL_TOLERANCES_DRILL_HOLE : 
-MODEL_3D_RELEASED_DATE : 
-MODEL_3D_REVISION_LEVEL : 
-PART_SOURCE : 
-GENERAL_TOLERANCES : 
-MODEL_3D_CHECKED_BY : 
-SPARE_WEARING_PART : 
-Description : Block
-ARTICLE_NUMBER : 
-TOLERANCING_PRINCIPLE : 
-REFERENCE_DESIGNATION= : 
-MATERIAL : 
-EDGE_CONDITION_INNER_EDGE : 
-SURFACE_PROTECTION : 
-ProductDefinition :  
-SUPPLIER_NUMBER : 
-SEMI_FINISHED_PRODUCT : 
-SIMPLIFIED_DRAWING_REVISION : 
-MODEL_3D_CAD_SYSTEM : 
-PAINT_SURFACE : 
-GENERAL_TOLERANCES_FIT_DRILL_HOLE : 
-PART_REVISION_LEVEL : 
-UNIT_SYSTEM : 
-STOCK_NUMBER : 
-PART_NAME : 
-TECHNICAL_DIRECTIVE : 
-MODEL_3D_CREATED_BY : 
-MODEL_3D_RELEASED_BY : 
-COPYRIGHT : 
-MODEL_3D_DATE_OF_ISSUE : 
-WELD_TOLERANCES : 
-
-}

tests/metadata/step/A9

@@ -1,13 +0,0 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-set filename nist_ftc_08_asme1_ap242-2.stp
-
-set ref_data {
-Property for [0:1:1:1]:
-Revision : C
-ProductID : NIST PMI FTC 08 ASME1
-DescriptionRef : NIST PMI test model downloaded from http://go.usa.gov/mGVm
-PartNumber : NIST PMI FTC 08 ASME1
-ProductDefinition :  
-ProductName : NIST PMI FTC 08 ASME1
-
-}