From bedd79c4343460327a90c2c3ff2c8569c5261cd6 Mon Sep 17 00:00:00 2001
From: drazmyslovich <razmyslovich@volumegraphics.com>
Date: Tue, 19 Aug 2014 13:49:37 +0200
Subject: [PATCH] 0025167: STEP Reader - allow NextAssemblyUsageOccurance to
 accept ProductDefinitionShape as child instead of ProductDefinition

Workaround to allow NextAssemblyUsageOccurance accepting ProductDefinitionShape as child instead of ProductDefinition
---
 .../RWStepRepr_RWAssemblyComponentUsage.cxx   | 20 +++++++++++++++++++
 src/STEPControl/STEPControl_ActorRead.cxx     | 12 ++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx
index fd277bf621..7f47170d5a 100644
--- a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx
+++ b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsage.cxx
@@ -17,6 +17,8 @@
 
 #include <RWStepRepr_RWAssemblyComponentUsage.ixx>
 
+#include <StepRepr_ProductDefinitionShape.hxx>
+
 //=======================================================================
 //function : RWStepRepr_RWAssemblyComponentUsage
 //purpose  : 
@@ -58,9 +60,27 @@ void RWStepRepr_RWAssemblyComponentUsage::ReadStep (const Handle(StepData_StepRe
 
   Handle(StepBasic_ProductDefinition) aProductDefinitionRelationship_RelatingProductDefinition;
   data->ReadEntity (num, 4, "product_definition_relationship.relating_product_definition", ach, STANDARD_TYPE(StepBasic_ProductDefinition), aProductDefinitionRelationship_RelatingProductDefinition);
+  if (aProductDefinitionRelationship_RelatingProductDefinition.IsNull())
+  {
+    Handle(StepRepr_ProductDefinitionShape) aProductDefinitionShape;
+    data->ReadEntity (num, 4, "product_definition_relationship.relating_product_definition_shape", ach, STANDARD_TYPE(StepRepr_ProductDefinitionShape), aProductDefinitionShape);
+    if (!aProductDefinitionShape.IsNull())
+    {
+      aProductDefinitionRelationship_RelatingProductDefinition = aProductDefinitionShape->Definition().ProductDefinition();
+    }
+  }
 
   Handle(StepBasic_ProductDefinition) aProductDefinitionRelationship_RelatedProductDefinition;
   data->ReadEntity (num, 5, "product_definition_relationship.related_product_definition", ach, STANDARD_TYPE(StepBasic_ProductDefinition), aProductDefinitionRelationship_RelatedProductDefinition);
+  if (aProductDefinitionRelationship_RelatedProductDefinition.IsNull())
+  {
+    Handle(StepRepr_ProductDefinitionShape) aProductDefinitionShape;
+    data->ReadEntity (num, 5, "product_definition_relationship.related_product_definition_shape", ach, STANDARD_TYPE(StepRepr_ProductDefinitionShape), aProductDefinitionShape);
+    if (!aProductDefinitionShape.IsNull())
+    {
+      aProductDefinitionRelationship_RelatedProductDefinition = aProductDefinitionShape->Definition().ProductDefinition();
+    }
+  }
 
   // Own fields of AssemblyComponentUsage
 
diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx
index 3e29423682..6eaf767cbc 100644
--- a/src/STEPControl/STEPControl_ActorRead.cxx
+++ b/src/STEPControl/STEPControl_ActorRead.cxx
@@ -399,6 +399,7 @@ static void getListSDR(const Handle(StepRepr_ShapeAspect)& sa,
 
 static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
                    Handle(TColStd_HSequenceOfTransient)& listSDR,
+                   Handle(TColStd_HSequenceOfTransient)& listNAUO,
                    Handle(TColStd_HSequenceOfTransient)& listSDRAspect,
                    const Handle(Transfer_TransientProcess)& TP)
 {
@@ -448,6 +449,15 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
       getListSDR(sa,listSDRAspect,TP);
       continue;
     }
+
+    // NAUO is used to find sub-assemblies
+    Handle(StepRepr_NextAssemblyUsageOccurrence) NAUO = 
+      Handle(StepRepr_NextAssemblyUsageOccurrence)::DownCast(subs4.Value());
+    if ( ! NAUO.IsNull() ) {
+      if ( PDS->Definition().ProductDefinition() == NAUO->RelatingProductDefinition() )
+        listNAUO->Append(NAUO);
+      continue;
+    }
   }
 }
 
@@ -480,7 +490,7 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
     Handle(StepRepr_ProductDefinitionShape) PDS = 
       Handle(StepRepr_ProductDefinitionShape)::DownCast(subs3.Value());
     if ( ! PDS.IsNull() ) {
-      getSDR(PDS,listSDR,listSDRAspect,TP);
+      getSDR(PDS,listSDR,listNAUO,listSDRAspect,TP);
       continue;
     }
     // NAUO is used to find sub-assemblies