0028444: Data Exchange - Missed text blocks in Saved Views

Add new STEP entity to connect dimension semantic with presentation.
Fix number of GDTs in Saved View.

diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
index bf5961c6068654e8052112191dbc1f82384acb5f..b10c5c27aa8193759a7d1d042a77b4c197133aea 100644 (file)
--- a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
@@ -1356,6 +1356,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include <StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
+#include <RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
 
 static Standard_Integer catsh,catdr,catstr,catdsc,cataux;
 
@@ -5149,6 +5151,13 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN,
     RWStepVisual_RWCameraModelD3MultiClippingUnion tool;
     tool.Share(anent, iter);
   }
+  break;
+  case 719:
+  {
+    DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, anent, ent);
+    RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem tool;
+    tool.Share(anent, iter);
+  }
   break;
     default : break;
     }
@@ -7159,6 +7168,9 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid
    case 718:
      ent = new StepVisual_CameraModelD3MultiClippingUnion;
    break;
+   case 719:
+     ent = new StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem;
+   break;
 
     
   default: 
@@ -7758,6 +7770,7 @@ Standard_Integer  RWStepAP214_GeneralModule::CategoryNumber
   case 716:
   case 717:
   case 718: return cataux;
+  case 719: return catdr;
     
   default : break;
   }

diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
index e9e035470782c823fea29b64adda852b76622564..b2e3e7fa701f958df0b3df1511b548ad4c208603 100644 (file)
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
@@ -1404,6 +1404,8 @@ Handle(atype) result = Handle(atype)::DownCast (start)
 #include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include <StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
+#include <RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
 
 
 // -- General Declarations (Recognize, StepType) ---
@@ -3462,6 +3464,13 @@ Standard_Integer RWStepAP214_ReadWriteModule::CaseStep
                  types(5).IsEqual(StepType(624))))) {
         return 705;
       }
+      if ((types(1).IsEqual(StepType(4))) &&
+          (types(2).IsEqual(StepType(7))) &&
+          (types(3).IsEqual(StepType(144))) &&
+          (types(4).IsEqual(StepType(247))) &&
+          (types(5).IsEqual(StepType(270)))) {
+        return 719;
+      }
     }
     else if (NbComp == 4) {
       if ((types(1).IsEqual(StepType(161))) &&
@@ -3876,6 +3885,8 @@ Standard_Boolean RWStepAP214_ReadWriteModule::IsComplex
       return Standard_True;
     case 715:
       return Standard_True;
+    case 719:
+      return Standard_True;
     default:
       return Standard_False;
     }
@@ -4848,6 +4859,14 @@ Standard_Boolean RWStepAP214_ReadWriteModule::ComplexType(const Standard_Integer
       types.Append(StepType(714));
       types.Append(StepType(441));
       types.Append(StepType(245));
+      break;
+    case 719:
+      types.Append(StepType(4));
+      types.Append(StepType(7));
+      types.Append(StepType(144));
+      types.Append(StepType(247));
+      types.Append(StepType(270));
+      break;
     }
   return Standard_True;
 }
@@ -9419,6 +9438,14 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN,
      tool.ReadStep(data, num, ach, anent);
    }
    break;
+     case 719:
+   {
+     DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, anent, ent);
+     RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem tool;
+     tool.ReadStep(data, num, ach, anent);
+   }
+   break;
+   
 
   default: 
     ach->AddFail("Type Mismatch when reading - Entity");
@@ -14268,7 +14295,13 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN,
       tool.WriteStep(SW, anent);
     }
     break;
-
+      case 719:
+    {
+      DeclareAndCast(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, anent, ent);
+      RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem tool;
+      tool.WriteStep(SW, anent);
+    }
+      break;
 
   default: 
     return;

diff --git a/src/RWStepVisual/FILES b/src/RWStepVisual/FILES
index 83090daf371fa6c4c485034833f6bc6d6b42be7d..623a4da6a8602e906a198aed8f7b5ebdcbb599bf 100644 (file)
--- a/src/RWStepVisual/FILES
+++ b/src/RWStepVisual/FILES
@@ -1,5 +1,7 @@
 RWStepVisual_RWAnnotationCurveOccurrence.cxx
 RWStepVisual_RWAnnotationCurveOccurrence.hxx
+RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx
+RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx
 RWStepVisual_RWAnnotationFillArea.cxx
 RWStepVisual_RWAnnotationFillArea.hxx
 RWStepVisual_RWAnnotationFillAreaOccurrence.cxx

diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx
new file mode 100644 (file)
index 0000000..295a6e5
--- /dev/null
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx
@@ -0,0 +1,114 @@
+// Created on: 2017-02-06
+// Created by: Irina KRYLOVA
+// Copyright (c) 2017 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_Check.hxx>
+#include <Interface_EntityIterator.hxx>
+#include <RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
+#include <StepData_StepReaderData.hxx>
+#include <StepData_StepWriter.hxx>
+#include <StepRepr_RepresentationItem.hxx>
+#include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
+#include <StepVisual_PresentationStyleAssignment.hxx>
+#include <StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
+
+//=======================================================================
+//function : RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem
+//purpose  : 
+//=======================================================================
+RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::
+  RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem () {}
+
+//=======================================================================
+//function : ReadStep
+//purpose  : 
+//=======================================================================
+void RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::ReadStep
+(const Handle(StepData_StepReaderData)& data,
+const Standard_Integer num0,
+Handle(Interface_Check)& ach,
+const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const
+{
+  Standard_Integer num = 0;
+  data->NamedForComplex("REPRESENTATION_ITEM", "RPRITM", num0, num, ach);
+  // Inherited field : name 
+  Handle(TCollection_HAsciiString) aName;
+  data->ReadString(num, 1, "name", ach, aName);
+
+  data->NamedForComplex("STYLED_ITEM", "STYITM", num0, num, ach);
+  // Inherited field : styles
+  Handle(StepVisual_HArray1OfPresentationStyleAssignment) aStyles;
+  Handle(StepVisual_PresentationStyleAssignment) anEnt;
+  Standard_Integer nsub;
+  if (data->ReadSubList(num, 1, "styles", ach, nsub)) {
+    Standard_Integer nb = data->NbParams(nsub);
+    aStyles = new StepVisual_HArray1OfPresentationStyleAssignment(1, nb);
+    for (Standard_Integer i = 1; i <= nb; i++) {
+      if (data->ReadEntity(nsub, i, "presentation_style_assignment", ach,
+        STANDARD_TYPE(StepVisual_PresentationStyleAssignment), anEnt))
+        aStyles->SetValue(i, anEnt);
+    }
+  }
+
+  // Inherited field : item
+  Handle(MMgt_TShared) aItem;
+  data->ReadEntity(num, 2, "item", ach, STANDARD_TYPE(MMgt_TShared), aItem);
+
+  // Initialization of the read entity
+  ent->Init(aName, aStyles, aItem);
+}
+
+//=======================================================================
+//function : WriteStep
+//purpose  : 
+//=======================================================================
+void RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::WriteStep
+(StepData_StepWriter& SW,
+const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const
+{
+  SW.StartEntity("ANNOTATION_CURVE_OCCURRENCE");
+  SW.StartEntity("ANNOTATION_OCCURRENCE");
+  SW.StartEntity("GEOMETRIC_REPRESENTATION_ITEM");
+  SW.StartEntity("REPRESENTATION_ITEM");
+  //Inherited field : name
+  SW.Send(ent->Name());
+
+  SW.StartEntity("STYLED_ITEM");
+  // Inherited field : styles
+  SW.OpenSub();
+  for (Standard_Integer i = 1; i <= ent->NbStyles(); i++) {
+    SW.Send(ent->StylesValue(i));
+  }
+  SW.CloseSub();
+
+  // Inherited field : item
+  SW.Send(ent->Item());
+}
+
+//=======================================================================
+//function : Share
+//purpose  : 
+//=======================================================================
+void RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::Share(
+  const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent,
+  Interface_EntityIterator& iter) const
+{
+
+  Standard_Integer nbElem = ent->NbStyles();
+  for (Standard_Integer i = 1; i <= nbElem; i++) {
+    iter.GetOneItem(ent->StylesValue(i));
+  }
+
+  iter.GetOneItem(ent->Item());
+}

diff --git a/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx
new file mode 100644 (file)
index 0000000..8e54b28
--- /dev/null
+++ b/src/RWStepVisual/RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx
@@ -0,0 +1,45 @@
+// Created on: 2017-02-06
+// Created by: Irina KRYLOVA
+// Copyright (c) 2017 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 _RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile
+#define _RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_Integer.hxx>
+class StepData_StepReaderData;
+class Interface_Check;
+class StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem;
+class StepData_StepWriter;
+class Interface_EntityIterator;
+
+//! Read & Write Module for AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem
+class RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem 
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+  
+  Standard_EXPORT RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem();
+  
+  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const;
+  
+  Standard_EXPORT void WriteStep (StepData_StepWriter& SW, const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent) const;
+  
+  Standard_EXPORT void Share (const Handle(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem)& ent, Interface_EntityIterator& iter) const;
+};
+#endif // _RWStepVisual_RWAnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile

diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 537614b9b6f98134851077f6ff6e61f7ad9eea6a..11f9ce41e5ee3b0a9d2096cde92809485d7cc275 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -2577,6 +2577,13 @@ Standard_Boolean STEPCAFControl_Reader::setDatumToXCAF(const Handle(StepDimTol_D
     // Create object for datum
     TDF_Label aDatL = aDGTTool->AddDatum();
     myGDTMap.Bind(theDat, aDatL);
+    // bind datum label with all reference datum_feature entities
+    for (Standard_Integer i = 1; i <= aSAs.Length(); i++) {
+      Handle(StepRepr_ShapeAspect) aSA = aSAs.Value(i);
+      if (aSA.IsNull() || aSA->IsKind(STANDARD_TYPE(StepDimTol_DatumTarget)))
+        continue;
+      myGDTMap.Bind(aSA, aDatL);
+    }
     aDGTTool->Lock(aDatL);
     aDat = XCAFDoc_Datum::Set(aDatL);
     aDGTTool->SetDatum(aShapeLabels, aDatL);
@@ -4311,6 +4318,9 @@ Standard_Boolean STEPCAFControl_Reader::ReadViews(const Handle(XSControl_WorkSes
             Handle(StepAP242_DraughtingModelItemAssociation)::DownCast(aDMIAIter.Value());
           TDF_Label aGDTL;
           Standard_Boolean isFind = myGDTMap.Find(aDMIA->Definition().Value(), aGDTL);
+          if (!isFind) {
+            isFind = myGDTMap.Find(anIter.Value(), aGDTL);
+          }
           if (isFind)
             aGDTs.Append(aGDTL);
         }

diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx
index 8c87c040359683d2aa5332c0786f890248f9b336..05a997b19cdf601025f4ce45859106441475395c 100644 (file)
--- a/src/StepAP214/StepAP214_Protocol.cxx
+++ b/src/StepAP214/StepAP214_Protocol.cxx
@@ -748,6 +748,7 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepVisual_CameraModelD3MultiClipping.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
+#include <StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
 
 static int init = 0;
 static Interface_DataMapOfTransientInteger types(800);
@@ -1454,6 +1455,7 @@ StepAP214_Protocol::StepAP214_Protocol ()
   types.Bind (STANDARD_TYPE(StepVisual_CameraModelD3MultiClipping), 716);
   types.Bind (STANDARD_TYPE(StepVisual_CameraModelD3MultiClippingIntersection), 717);
   types.Bind (STANDARD_TYPE(StepVisual_CameraModelD3MultiClippingUnion), 718);
+  types.Bind (STANDARD_TYPE(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem), 719);
 }
 
 

diff --git a/src/StepVisual/FILES b/src/StepVisual/FILES
index 015bf1612c9506f55578c6b889b357d12927903b..300781c5c5d9c7bcd31eb74eaa9ee7c3bf2d3816 100644 (file)
--- a/src/StepVisual/FILES
+++ b/src/StepVisual/FILES
@@ -1,5 +1,7 @@
 StepVisual_AnnotationCurveOccurrence.cxx
 StepVisual_AnnotationCurveOccurrence.hxx
+StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx
+StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx
 StepVisual_AnnotationFillArea.cxx
 StepVisual_AnnotationFillArea.hxx
 StepVisual_AnnotationFillAreaOccurrence.cxx

diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx
new file mode 100644 (file)
index 0000000..5c79b74
--- /dev/null
+++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx
@@ -0,0 +1,24 @@
+// Created on: 2017-02-06
+// Created by: Irina KRYLOVA
+// Copyright (c) 2017 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 <StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, StepVisual_AnnotationCurveOccurrence)
+
+//=======================================================================
+//function : StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem
+//purpose  : 
+//=======================================================================
+StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem::StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem()    {  }

diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx
new file mode 100644 (file)
index 0000000..1a09ab1
--- /dev/null
+++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx
@@ -0,0 +1,38 @@
+// Created on: 2017-02-06
+// Created by: Irina KRYLOVA
+// Copyright (c) 2017 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 _StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile
+#define _StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <StepVisual_AnnotationCurveOccurrence.hxx>
+
+class StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem;
+DEFINE_STANDARD_HANDLE(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, StepVisual_AnnotationCurveOccurrence)
+//! Added for Dimensional Tolerances
+//! Complex STEP entity AnnotationCurveOccurrence & AnnotationOccurrence & GeometricRepresentationItem & RepresentationItem & StyledItem
+class StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem : public StepVisual_AnnotationCurveOccurrence
+{
+
+public:
+  
+  Standard_EXPORT StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem();
+
+  DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem, StepVisual_AnnotationCurveOccurrence)
+
+};
+#endif // _StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem_HeaderFile

diff --git a/tests/gdt/export/C1 b/tests/gdt/export/C1
new file mode 100644 (file)
index 0000000..da7e3de
--- /dev/null
+++ b/tests/gdt/export/C1
@@ -0,0 +1,19 @@
+# !!!! 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 {
+
+ NbOfDimensions          : 24
+  NbOfDimensionalSize    : 12
+  NbOfDimensionalLocation: 10
+  NbOfAngular            : 0
+  NbOfWithPath           : 0
+  NbOfCommonLabels       : 1
+ NbOfTolerances          : 27
+  NbOfGTWithModifiers    : 4
+  NbOfGTWithMaxTolerance : 0
+  NbOfGTWithDatums       : 24
+ NbOfDatumFeature        : 16
+ NbOfAttachedDatum       : 78
+ NbOfDatumTarget         : 0
+}

diff --git a/tests/gdt/presentation/B9 b/tests/gdt/presentation/B9
new file mode 100644 (file)
index 0000000..b10c435
--- /dev/null
+++ b/tests/gdt/presentation/B9
@@ -0,0 +1,8 @@
+# !!!! 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 {
+Centre of mass: 25.542750206429389 68.295957810530922 -36.016328225779375
+Mass: 32016.23194264351
+
+}

diff --git a/tests/gdt/view/A1 b/tests/gdt/view/A1
index e83eda9134f7f604b325f0cfbf2e4cc15813ee59..afb87b847ce3fde05b777ca5c2591d8f44a8700c 100644 (file)
--- a/tests/gdt/view/A1
+++ b/tests/gdt/view/A1
@@ -1,5 +1,5 @@
 set filename bug26689_nist_ctc_01_asme1_ap242.stp
 
 set ref_data {
-D_First 0:1:7:1 1 14 0 MBD_0 parallel 1230.3895263672 -1022.8276367188 1167.5091552734 0.6190726083 -0.4816746353 0.6202730458 -0.53944112655925491 0.3131943118951574 0.78160897766914172 1983.5583496094 952.4203145992 952.4203145992
+D_First 0:1:7:1 1 16 0 MBD_0 parallel 1230.3895263672 -1022.8276367188 1167.5091552734 0.6190726083 -0.4816746353 0.6202730458 -0.53944112655925491 0.3131943118951574 0.78160897766914172 1983.5583496094 952.4203145992 952.4203145992
 }

diff --git a/tests/gdt/view/A2 b/tests/gdt/view/A2
index 652ffc7a0bd712b9fbcbaf865e5f7d55ce4c7f6c..be37ac6cdbb863a1006cdffa63853970e3bf066a 100644 (file)
--- a/tests/gdt/view/A2
+++ b/tests/gdt/view/A2
@@ -1,5 +1,5 @@
 set filename bug26689_nist_ctc_04_asme1_ap242.stp
 
 set ref_data {
-D_First 0:1:7:1 2 15 0 MBD_0 parallel 782.2305297852 -719.3034667969 -926.3039550781 0.5081233954 -0.6832230654 -0.5244204973  -0.29474161432145901 0.43418265038181109 -0.85124192031091028 1593.740234375 765.2461871912 765.2461871912
+D_First 0:1:7:1 2 21 0 MBD_0 parallel 782.2305297852 -719.3034667969 -926.3039550781 0.5081233954 -0.6832230654 -0.5244204973  -0.29474161432145901 0.43418265038181109 -0.85124192031091028 1593.740234375 765.2461871912 765.2461871912
 }

diff --git a/tests/gdt/view/A3 b/tests/gdt/view/A3
index 847ad57dacf4d5769b4a662c561a1ed4bac28e64..13d1b4cf53cf4e31540c78628c9c0ccf2efddebe 100644 (file)
--- a/tests/gdt/view/A3
+++ b/tests/gdt/view/A3
@@ -1,7 +1,7 @@
 set filename bug27645_nist_ftc_06_asme1_cr3000_rd.prt.stp
 
 set ref_data {
-D_First 0:1:7:1 2 14 0 MBD_A parallel 1003.2130229675 933.1983040089 -966.2677894877 -0.5983635664 -0.5566034856 0.5763276865  -0.34864265817483364 0.82851635272424506 0.43818825882182255 20.0 40.0 40.0
-D_First 0:1:7:2 2 1 0 MBD_B parallel -1003.2130229675 933.1983040089 966.2677894877 0.5983635664 -0.5566034856 -0.5763276865  0.34864265817483364 0.82851635272424506 -0.43818825882182255 20.0 40.0 40.0
+D_First 0:1:7:1 2 18 0 MBD_A parallel 1003.2130229675 933.1983040089 -966.2677894877 -0.5983635664 -0.5566034856 0.5763276865  -0.34864265817483364 0.82851635272424506 0.43818825882182255 20.0 40.0 40.0
+D_First 0:1:7:2 2 3 0 MBD_B parallel -1003.2130229675 933.1983040089 966.2677894877 0.5983635664 -0.5566034856 -0.5763276865  0.34864265817483364 0.82851635272424506 -0.43818825882182255 20.0 40.0 40.0
 D_First 0:1:7:3 2 8 0 MBD_C parallel 0.0 1359.2608224096 -1359.2608224096 -0.0 -0.7071067812 0.7071067812  0 0.70710678118654757 0.70710678118654757 20.0 40.0 40.0
 }

diff --git a/tests/gdt/view/A4 b/tests/gdt/view/A4
index 506efaecb56e286ac12584229c8fe4b1dee69d34..7af57bb51ed4165ed3a710f47f3a1754fd73fe0a 100644 (file)
--- a/tests/gdt/view/A4
+++ b/tests/gdt/view/A4
@@ -1,7 +1,7 @@
 set filename bug27808_nist_ftc_06_asme1_ct5240_rd.stp
 
 set ref_data {
-D_First 0:1:7:1 2 23 0 MBD_A parallel 30.8084683155 26.0037688008 -25.0004637711 0.5773502692 0.5773502692 -0.5773502692 -0.40824829046386307 0.81649658092772615 0.40824829046386307 1104.2341308594 530.2063197413 530.2063197413
-D_First 0:1:7:2 2 10 0 MBD_B central -31.9257504921 33.3287805272 27.9693987989 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 1349.3127441406 647.8826584485 647.8826584485
-D_First 0:1:7:3 2 22 0 MBD_C central -0.4196386262 31.1460383858 -33.088921975 0.0 0.6979703596 -0.7161266488 0 0.71612664879940147 0.69797035959941667 1053.7369384766 505.9597131727 505.9597131727
+D_First 0:1:7:1 2 30 0 MBD_A parallel 30.8084683155 26.0037688008 -25.0004637711 0.5773502692 0.5773502692 -0.5773502692 -0.40824829046386307 0.81649658092772615 0.40824829046386307 1104.2341308594 530.2063197413 530.2063197413
+D_First 0:1:7:2 2 16 0 MBD_B central -31.9257504921 33.3287805272 27.9693987989 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 1349.3127441406 647.8826584485 647.8826584485
+D_First 0:1:7:3 2 24 0 MBD_C central -0.4196386262 31.1460383858 -33.088921975 0.0 0.6979703596 -0.7161266488 0 0.71612664879940147 0.69797035959941667 1053.7369384766 505.9597131727 505.9597131727
 }

diff --git a/tests/gdt/view/A5 b/tests/gdt/view/A5
index a9fff8fa19596e44671021056f656512135228c7..e8ae8d6a990a8dad8a99d6d92e8c32952d0dbb64 100644 (file)
--- a/tests/gdt/view/A5
+++ b/tests/gdt/view/A5
@@ -1,6 +1,6 @@
 set filename bug27645_nist_ftc_06_asme1_ct5240_rd-1.stp
 
 set ref_data {
-D_First 0:1:7:1 2 23 0 MBD_A parallel 782.5350952148 660.4957275391 -635.0117797852 0.5773502692 0.5773502692 -0.5773502692 -0.40824829046386307 0.81649658092772615 0.40824829046386307 1104.2341308594 530.2063197413 530.2063197413
-D_First 0:1:7:2 2 16 0 MBD_C central -10.658821106 791.109375 -840.4586181641 0.0 0.6979703596 -0.7161266488 0 0.71612664879940147 0.69797035959941667 1053.7369384766 505.9597131727 505.9597131727
+D_First 0:1:7:1 2 29 0 MBD_A parallel 782.5350952148 660.4957275391 -635.0117797852 0.5773502692 0.5773502692 -0.5773502692 -0.40824829046386307 0.81649658092772615 0.40824829046386307 1104.2341308594 530.2063197413 530.2063197413
+D_First 0:1:7:2 2 18 0 MBD_C central -10.658821106 791.109375 -840.4586181641 0.0 0.6979703596 -0.7161266488 0 0.71612664879940147 0.69797035959941667 1053.7369384766 505.9597131727 505.9597131727
 }

diff --git a/tests/gdt/view/A6 b/tests/gdt/view/A6
index 7dc0c5866fc8891b10c30f6031b420343004d955..05ff109248865dbeb9f33003b3646ba3eb1c7f2f 100644 (file)
--- a/tests/gdt/view/A6
+++ b/tests/gdt/view/A6
@@ -1,8 +1,8 @@
 set filename bug27645_nist_ftc_08_asme1_cr3000_rc.prt.stp
 
 set ref_data {
-D_First 0:1:7:1 3 7 0 MBD_A parallel 960.208198256 960.2081982559 -996.2072738181 -0.5701373455 -0.5701373455 0.5915123113  -0.41826236649918141 -0.41826236649918141 -0.80629596646703439 20.0 40.0 40.0
-D_First 0:1:7:2 3 2 0 MBD_B parallel 960.208198256 -960.2081982559 996.2072738181 -0.5701373455 0.5701373455 -0.5915123113 -0.41826236649918141 0.41826236649918141 0.80629596646703439 20.0 40.0 40.0
+D_First 0:1:7:1 3 8 0 MBD_A parallel 960.208198256 960.2081982559 -996.2072738181 -0.5701373455 -0.5701373455 0.5915123113  -0.41826236649918141 -0.41826236649918141 -0.80629596646703439 20.0 40.0 40.0
+D_First 0:1:7:2 3 6 0 MBD_B parallel 960.208198256 -960.2081982559 996.2072738181 -0.5701373455 0.5701373455 -0.5915123113 -0.41826236649918141 0.41826236649918141 0.80629596646703439 20.0 40.0 40.0
 D_First 0:1:7:3 3 3 0 MBD_C parallel 960.208198256 -960.2081982559 996.2072738181 -0.5701373455 0.5701373455 -0.5915123113  -0.41826236649918141 0.41826236649918141 0.80629596646703439 20.0 40.0 40.0
 D_First 0:1:7:4 3 8 0 MBD_D parallel 960.2081982559 960.2081982559 996.2072738181 -0.5701373455 -0.5701373455 -0.5915123113 -0.41826236649918141 -0.41826236649918141 0.80629596646703439 20.0 40.0 40.0
 }

diff --git a/tests/gdt/view/A7 b/tests/gdt/view/A7
index 5414be274e84e8a1ec2e5ad8b7b686ffdca0e241..4b714335de884eb8646a4285538f2b89ac73365a 100644 (file)
--- a/tests/gdt/view/A7
+++ b/tests/gdt/view/A7
@@ -1,8 +1,8 @@
 set filename bug27808_nist_ftc_08_asme1_ct5240_rc.stp
 
 set ref_data {
-D_First 0:1:7:1 3 10 0 MBD_A parallel 20.6276528666 24.7090209 -21.2968288632 0.5773502692 0.5773502692 -0.5773502692  -0.40824829046386302 -0.40824829046386302 -0.81649658092772603 1133.0983886719 544.065710136 544.065710136
-D_First 0:1:7:2 3 13 0 MBD_B parallel 21.6691096749 -22.3932077002 22.6894396684 0.5773502692 -0.5773502692 0.5773502692 -0.40824829046386302 0.40824829046386302 0.81649658092772603 972.7067871094 467.0524767961 467.0524767961
+D_First 0:1:7:1 3 15 0 MBD_A parallel 20.6276528666 24.7090209 -21.2968288632 0.5773502692 0.5773502692 -0.5773502692  -0.40824829046386302 -0.40824829046386302 -0.81649658092772603 1133.0983886719 544.065710136 544.065710136
+D_First 0:1:7:2 3 18 0 MBD_B parallel 21.6691096749 -22.3932077002 22.6894396684 0.5773502692 -0.5773502692 0.5773502692 -0.40824829046386302 0.40824829046386302 0.81649658092772603 972.7067871094 467.0524767961 467.0524767961
 D_First 0:1:7:3 3 6 0 MBD_C central 22.5691379337 -20.4109059732 21.0932597964 0.5773502692 -0.5773502692 0.5773502692 -0.40824829046386302 0.40824829046386302 0.81649658092772603 856.7503051758 411.3751002162 411.3751002162
 D_First 0:1:7:4 3 14 0 MBD_D parallel 23.6742659441 21.3498117041 22.1304297259 0.5773502692 0.5773502692 0.5773502692 -0.40824829046386302 -0.40824829046386302 0.81649658092772603 891.8790283203 428.2424207374 428.2424207374
 }

diff --git a/tests/gdt/view/A8 b/tests/gdt/view/A8
index 9a2e5949c7f8d2c0df95ab7129567e22e129523e..c578c299cf454afa6a079f2664ee15069b3dec08 100644 (file)
--- a/tests/gdt/view/A8
+++ b/tests/gdt/view/A8
@@ -1,5 +1,5 @@
 set filename bug27645_nist_ftc_08_asme1_ct5240_rc-1.stp
 
 set ref_data {
-D_First 0:1:7:1 3 13 0 MBD_B parallel 550.3953857422 -568.7874755859 576.3117675781 0.5773502692 -0.5773502692 0.5773502692 -0.40824829046386302 0.40824829046386302 0.81649658092772603 972.7067871094 467.0524767961 467.0524767961
+D_First 0:1:7:1 3 18 0 MBD_B parallel 550.3953857422 -568.7874755859 576.3117675781 0.5773502692 -0.5773502692 0.5773502692 -0.40824829046386302 0.40824829046386302 0.81649658092772603 972.7067871094 467.0524767961 467.0524767961
 }

diff --git a/tests/gdt/view/A9 b/tests/gdt/view/A9
index 81da6776f6de9675963f2360354478f439e1aad9..2d4630de8b70b13c43f7365a5fdfc514de1efd0f 100644 (file)
--- a/tests/gdt/view/A9
+++ b/tests/gdt/view/A9
@@ -1,8 +1,8 @@
 set filename bug27645_nist_ftc_09_asme1_cr3000_rd.prt.stp
 
 set ref_data {
-D_First 0:1:7:1 2 10 0 MBD_A parallel -1175.8873057482 925.9850617285 1405.1817250125 0.5727731186 -0.4510460731 -0.6844621206 0.29048014152512924 0.89249988323766694 -0.34505832231709999 20.0 40.0 40.0
-D_First 0:1:7:2 2 6 0 MBD_B parallel -1175.8873057482 925.9850617285 1405.1817250125 0.5727731186 -0.4510460731 -0.6844621206 0.29048014152512924 0.89249988323766694 -0.34505832231709999 20.0 40.0 40.0
-D_First 0:1:7:3 2 4 0 MBD_C parallel -951.665243989 749.4151823838 1137.2370486915 0.5727731186 -0.4510460731 -0.6844621206 0.29048014152512924 0.89249988323766694 -0.34505832231709999 20.0 40.0 40.0
+D_First 0:1:7:1 2 11 0 MBD_A parallel -1175.8873057482 925.9850617285 1405.1817250125 0.5727731186 -0.4510460731 -0.6844621206 0.29048014152512924 0.89249988323766694 -0.34505832231709999 20.0 40.0 40.0
+D_First 0:1:7:2 2 8 0 MBD_B parallel -1175.8873057482 925.9850617285 1405.1817250125 0.5727731186 -0.4510460731 -0.6844621206 0.29048014152512924 0.89249988323766694 -0.34505832231709999 20.0 40.0 40.0
+D_First 0:1:7:3 2 6 0 MBD_C parallel -951.665243989 749.4151823838 1137.2370486915 0.5727731186 -0.4510460731 -0.6844621206 0.29048014152512924 0.89249988323766694 -0.34505832231709999 20.0 40.0 40.0
 D_First 0:1:7:4 2 8 0 MBD_D parallel 1052.959289197 925.9850617285 1499.5077096909 -0.5128950478 -0.4510460731 -0.7304081804 -0.25811895222709652 0.89249988325203511 -0.3698899361922266 20.0 40.0 40.0
 }

diff --git a/tests/gdt/view/B1 b/tests/gdt/view/B1
index cbea367d84d649795d5c2539689824f082677868..bb99c3bfa2cd10759ba7749d5a68d605ec2f53f8 100644 (file)
--- a/tests/gdt/view/B1
+++ b/tests/gdt/view/B1
@@ -1,8 +1,8 @@
 set filename bug27808_nist_ftc_09_asme1_ct5240_rd.stp
 
 set ref_data {
-D_First 0:1:7:1 2 18 0 MBD_A central -20.8553716705 19.0487334484 16.8668443575 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 948.7595214844 455.5540171668 455.5540171668
+D_First 0:1:7:1 2 21 0 MBD_A central -20.8553716705 19.0487334484 16.8668443575 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 948.7595214844 455.5540171668 455.5540171668
 D_First 0:1:7:2 2 10 0 MBD_B parallel -16.8234421137 16.8832385446 16.8234313004 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 740.1318359375 355.3798654551 355.3798654551
-D_First 0:1:7:3 2 11 0 MBD_C central -10.8134556568 14.3968068521 12.8345579613 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 557.039855957 267.4668747527 267.4668747527
-D_First 0:1:7:4 2 15 0 MBD_D central 16.8234325018 16.8832397461 16.8234373078 0.5773502692 0.5773502692 0.5773502692 -0.40824829046386307 0.81649658092772615 -0.40824829046386307 740.1318359375 355.3798654551 355.3798654551
+D_First 0:1:7:3 2 16 0 MBD_C central -10.8134556568 14.3968068521 12.8345579613 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 557.039855957 267.4668747527 267.4668747527
+D_First 0:1:7:4 2 17 0 MBD_D central 16.8234325018 16.8832397461 16.8234373078 0.5773502692 0.5773502692 0.5773502692 -0.40824829046386307 0.81649658092772615 -0.40824829046386307 740.1318359375 355.3798654551 355.3798654551
 }

diff --git a/tests/gdt/view/B2 b/tests/gdt/view/B2
index 5db160aa91c72ddfb359c6cacbfa310ad1a995f4..1f4004e8cf5ca37586cf59bfbea098877a146023 100644 (file)
--- a/tests/gdt/view/B2
+++ b/tests/gdt/view/B2
@@ -1,8 +1,8 @@
 set filename bug27645_nist_ftc_09_asme1_ct5240_rd-1.stp
 
 set ref_data {
-D_First 0:1:7:1 2 18 0 MBD_A central -529.7264404297 483.8378295898 428.4178466797 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 948.7595214844 455.5540171668 455.5540171668
+D_First 0:1:7:1 2 21 0 MBD_A central -529.7264404297 483.8378295898 428.4178466797 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 948.7595214844 455.5540171668 455.5540171668
 D_First 0:1:7:2 2 10 0 MBD_B parallel -427.3154296875 428.8342590332 427.3151550293 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 740.1318359375 355.3798654551 355.3798654551
-D_First 0:1:7:3 2 11 0 MBD_C central -274.6617736816 365.678894043 325.9977722168 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 557.039855957 267.4668747527 267.4668747527
-D_First 0:1:7:4 2 15 0 MBD_D central 427.3151855469 428.8342895508 427.3153076172 0.5773502692 0.5773502692 0.5773502692 -0.40824829046386307 0.81649658092772615 -0.40824829046386307 740.1318359375 355.3798654551 355.3798654551
+D_First 0:1:7:3 2 16 0 MBD_C central -274.6617736816 365.678894043 325.9977722168 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 557.039855957 267.4668747527 267.4668747527
+D_First 0:1:7:4 2 17 0 MBD_D central 427.3151855469 428.8342895508 427.3153076172 0.5773502692 0.5773502692 0.5773502692 -0.40824829046386307 0.81649658092772615 -0.40824829046386307 740.1318359375 355.3798654551 355.3798654551
 }

diff --git a/tests/gdt/view/B4 b/tests/gdt/view/B4
index 6e730ad16c2f2ba8e6e65e9aa1d08689238b5806..2c3a5ab984bcbc6f16ec6b0a3ec3495f097d892f 100644 (file)
--- a/tests/gdt/view/B4
+++ b/tests/gdt/view/B4
@@ -1,5 +1,5 @@
 set filename bug28315_part_step-pmi.stp
 
 set ref_data {
-D_First 0:1:7:1 0 0 0 "Nyn\\X2\\11b\\X0\\j\\X2\\161\\X0\\S\\m pohled modelu" parallel 13.0973082 1.62908566 -570.319287 0.0 0.0 -1.0 0 1 0 0.0 342.494354 342.494354
+D_First 0:1:7:1 0 27 0 "Nyn\\X2\\11b\\X0\\j\\X2\\161\\X0\\S\\m pohled modelu" parallel 13.0973082 1.62908566 -570.319287 0.0 0.0 -1.0 0 1 0 0.0 342.494354 342.494354
 }

diff --git a/tests/gdt/view/B5 b/tests/gdt/view/B5
index 4711d69d71df93a808b0da25e92017a2124fee33..46b71290e7a0c740c64225671b2767e43a2fcb86 100644 (file)
--- a/tests/gdt/view/B5
+++ b/tests/gdt/view/B5
@@ -1,12 +1,12 @@
 set filename bug28389_CONFIDENTIAL_SHEET_METAL_F3D.stp
 
 set ref_data {
-D_First 0:1:7:1 3 13 0 "ALL ANNOTATIONS" parallel -5825.9008789063 -3248.3400878906 815.1171264648 -0.9365057375 -0.3148685702 0.1543204044 0.15697924864928148 0.017062391432409261 0.98745450036551774 6462.505859375 3103.0200919329 3103.0200919329
+D_First 0:1:7:1 3 36 0 "ALL ANNOTATIONS" parallel -5825.9008789063 -3248.3400878906 815.1171264648 -0.9365057375 -0.3148685702 0.1543204044 0.15697924864928148 0.017062391432409261 0.98745450036551774 6462.505859375 3103.0200919329 3103.0200919329
 D_First 0:1:7:2 3 0 0 "ISO VIEW" parallel -1938.3376464844 -511.2386169434 224.3153076172 -0.9365057375 -0.3148685702 0.1543204044 0.15697924645824046 0.017062398063723512 0.98745450059925199 1868.7774658203 897.3073525929 897.3073525929
-D_First 0:1:7:3 3 0 0 NOTES parallel -1892.8060302734 66.0814208984 -23.3611030579 -1.0 0.0 -0.0 0 0 1 1892.0059814453 908.4606965524 908.4606965524
-D_First 0:1:7:4 3 4 0 "FRONT VIEW" parallel -933.7789916992 176.1425476074 -141.4060668945 -1.0 0.0 -0.0 0 0 1 932.9789428711 447.9767551591 447.9767551591
-D_First 0:1:7:5 3 4 0 "RIGHT VIEW" parallel -200.9252166748 -920.0938720703 -82.4965591431 -0.0022161137 -0.9999975186 0.000227049 0.00056416539672814506 0.00022579926371258001 0.99999981536603189 920.1341552734 441.8092675779 441.8092675779
+D_First 0:1:7:3 3 1 0 NOTES parallel -1892.8060302734 66.0814208984 -23.3611030579 -1.0 0.0 -0.0 0 0 1 1892.0059814453 908.4606965524 908.4606965524
+D_First 0:1:7:4 3 9 0 "FRONT VIEW" parallel -933.7789916992 176.1425476074 -141.4060668945 -1.0 0.0 -0.0 0 0 1 932.9789428711 447.9767551591 447.9767551591
+D_First 0:1:7:5 3 8 0 "RIGHT VIEW" parallel -200.9252166748 -920.0938720703 -82.4965591431 -0.0022161137 -0.9999975186 0.000227049 0.00056416539672814506 0.00022579926371258001 0.99999981536603189 920.1341552734 441.8092675779 441.8092675779
 D_First 0:1:7:6 3 3 0 "BOTTOM VIEW" parallel -46.1214942932 25.5572605133 -1529.6362304688 0.0 0.0 -1.0 0 -1 0 1239.6362304688 595.2205685525 595.2205685525
-D_First 0:1:7:7 3 2 0 "REAR VIEW" parallel 1274.4870605469 94.8712005615 -67.2203521729 1.0 0.0 0.0 0 0 1 1274.4870605469 611.9544093021 611.9544093021
-D_First 0:1:7:8 3 2 0 TITLEBLOCK parallel -2945.3461914063 -3886.63671875 -83.6480560303 -0.9999980773 -0.0019537281 0.0001685321 0.00016672821871442924 0.00092342821712457039 0.99999955974091759 575.3185424805 276.2434627411 276.2434627411
+D_First 0:1:7:7 3 3 0 "REAR VIEW" parallel 1274.4870605469 94.8712005615 -67.2203521729 1.0 0.0 0.0 0 0 1 1274.4870605469 611.9544093021 611.9544093021
+D_First 0:1:7:8 3 16 0 TITLEBLOCK parallel -2945.3461914063 -3886.63671875 -83.6480560303 -0.9999980773 -0.0019537281 0.0001685321 0.00016672821871442924 0.00092342821712457039 0.99999955974091759 575.3185424805 276.2434627411 276.2434627411
 }

diff --git a/tests/gdt/view/B6 b/tests/gdt/view/B6
new file mode 100644 (file)
index 0000000..92f17ce
--- /dev/null
+++ b/tests/gdt/view/B6
@@ -0,0 +1,7 @@
+set filename bug28444_nist_ftc_06_asme1_ct5240_rd.stp
+
+set ref_data {
+D_First 0:1:7:1 2 31 0 "MBD_A" parallel 782.5350952148 660.4957275391 -635.0117797852 0.5773502692 0.5773502692 -0.5773502692 -0.40824829046386307 0.81649658092772615 0.40824829046386307 1104.2341308594 530.2063197413 530.2063197413
+D_First 0:1:7:2 2 18 0 "MBD_B" central -810.9140625 846.5510253906 710.4227294922 -0.5773502692 0.5773502692 0.5773502692 0.40824829046386307 0.81649658092772615 -0.40824829046386307 1349.3127441406 647.8826584485 647.8826584485
+D_First 0:1:7:3 2 24 0 "MBD_C" central -10.658821106 791.109375 -840.4586181641 0.0 0.6979703596 -0.7161266488 0 0.71612664879940147 0.69797035959941667 1053.7369384766 505.9597131727 505.9597131727
+}