0029068: Data Exchange - Invalid rotation of result shape after import attached STEP...

Changes for using Axis Placement(not used during creation of assembly) as transformation for root Shape Representation.
Test for bug 29068 and auxilary command are added.

diff --git a/src/DrawResources/CheckCommands.tcl b/src/DrawResources/CheckCommands.tcl
index 7c3c3041cc7077f0c5179b9fac50713000172177..923d77a0155543d77c2e23bd782fae99c7d45b9d 100644 (file)
--- a/src/DrawResources/CheckCommands.tcl
+++ b/src/DrawResources/CheckCommands.tcl
@@ -1104,3 +1104,33 @@ proc checkplatform {args} {
     # current platform is not equal to given as argument platform, return false
     return 0
 }
+
+help checkgravitycenter {
+  Compare Center Of Gravity with given reference data
+
+  Use: checkgravitycenter shape prop_type x y z tol
+}
+proc checkgravitycenter {shape prop_type x y z tol} {
+  puts "checkgravitycenter ${shape} $prop_type $x $y $z $tol"
+  upvar ${shape} ${shape}
+
+  if { $prop_type == "-l" } {
+    set outstr [lprops $shape]
+  } elseif { $prop_type == "-s" } {
+    set outstr [sprops $shape]
+  } elseif { $prop_type == "-v" } {
+    set outstr [vprops $shape]
+  } else {
+    error "Error : invalid prop_type"
+  }
+
+  if { ![regexp {\nX = +([-0-9.+eE]+).*\nY = +([-0-9.+eE]+).*\nZ = +([-0-9.+eE]+)} ${outstr} full comp_x comp_y comp_z] } {
+    error "Error : cannot evaluate properties"
+  }
+
+  if { [expr abs($comp_x-$x)] < $tol && [expr abs($comp_y-$y)] < $tol && [expr abs($comp_z-$z)] < $tol } {
+    puts "Check of center of gravity is OK: value = ($comp_x, $comp_y, $comp_z), expected = ($x, $y, $z)"
+  } else {
+    puts "Error: center of gravity ($comp_x, $comp_y, $comp_z) is not equal to expected ($x, $y, $z)"
+  }
+}
\ No newline at end of file

diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx
index 37463e7e1de8ccdf3511a7428f9b51224f5138c0..f00951787672c53dfe9b666931bb83d98b090371 100644 (file)
--- a/src/STEPControl/STEPControl_ActorRead.cxx
+++ b/src/STEPControl/STEPControl_ActorRead.cxx
@@ -296,7 +296,7 @@ Handle(Transfer_Binder)  STEPControl_ActorRead::Transfer
     }
   }
   // [END] Get version of preprocessor (to detect I-Deas case) (ssv; 23.11.2010)
-  return TransferShape (start,TP);  
+  return TransferShape (start, TP, Standard_True, Standard_True);
 }
 
 
@@ -462,9 +462,10 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
 //function : TransferEntity
 //purpose  : 
 //=======================================================================
- Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Handle(StepBasic_ProductDefinition)& PD,
-                                                                        const Handle(Transfer_TransientProcess)& TP) 
-
+ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(
+     const Handle(StepBasic_ProductDefinition)& PD,
+     const Handle(Transfer_TransientProcess)& TP,
+     const Standard_Boolean theUseTrsf)
 {
   Handle(Message_Messenger) sout = TP->Messenger();
   Handle(TransferBRep_ShapeBinder) shbinder;
@@ -578,9 +579,13 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
 
     // translate SDR representation
     Standard_Boolean isBound = Standard_True;
+    // SKL for bug 29068: transformation need to applied only for "main" ShapeDefinitionRepresentation.
+    // Part of listSDR given by ShapeAspect must be ignored because all needed transformations will be
+    // applied during its transfer. Therefore flag for using Trsf must be updated.
+    Standard_Boolean useTrsf = theUseTrsf && (i <= nbNotAspect);
     Handle(Transfer_Binder) binder = TP->Find(rep);
     if (binder.IsNull())
-      binder = TransferEntity(rep,TP,isBound);
+      binder = TransferEntity(rep, TP, isBound, useTrsf);
 
     // if SDR is obtained from ShapeAspect and representation items have already been tramnslated,
     // this means that that ShapeAspect is used to refer to sub-shape of the main shape
@@ -624,7 +629,10 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
         Handle(StepRepr_ShapeRepresentationRelationship) SRR =
           Handle(StepRepr_ShapeRepresentationRelationship)::DownCast(anitem);
         Standard_Integer nbrep = ( rep == SRR->Rep1() ? 2 : 1 );
-        binder = TransferEntity(SRR, TP, nbrep);
+        // SKL for bug 29068: parameter useTrsf is used because if root entity has connection with other
+        // by ShapeRepresentationRelationship then result after such transferring need to transform also.
+        // This case is from test "bugs modalg_7 bug30196"
+        binder = TransferEntity(SRR, TP, nbrep, useTrsf);
         if ( ! binder.IsNull() ) {
           theResult = TransferBRep::ShapeResult (binder);
           Result1 = theResult;
@@ -747,9 +755,11 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
 //purpose  : 
 //=======================================================================
 
-Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Handle(StepShape_ShapeRepresentation)& sr,
-                                                                       const Handle(Transfer_TransientProcess)& TP,
-                                                                       Standard_Boolean& isBound)
+Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(
+    const Handle(StepShape_ShapeRepresentation)& sr,
+    const Handle(Transfer_TransientProcess)& TP,
+    Standard_Boolean& isBound,
+    const Standard_Boolean theUseTrsf)
 {
   NM_DETECTED = Standard_False;
   Handle(TransferBRep_ShapeBinder) shbinder;
@@ -807,6 +817,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
   myNMTool.SetActive(!isManifold && isNMMode);
   // [END] Proceed with non-manifold topology (ssv; 12.11.2010)
 
+  gp_Trsf aTrsf;
   for (Standard_Integer i = 1; i <= nb && PS.More(); i ++,PS.Next()) {
   //for (i = 1; i <= nb ; i ++) {
     #ifdef TRANSLOG
@@ -814,6 +825,43 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
       sout<<" -- Actor, shape_representation.item n0. "<<i<<Message_EndLine;
     #endif
     Handle(StepRepr_RepresentationItem) anitem = sr->ItemsValue(i);
+    if(anitem.IsNull())
+      continue;
+    if (theUseTrsf)
+    {
+      if (anitem->IsKind(STANDARD_TYPE(StepGeom_Axis2Placement3d)))
+      {
+        const Interface_Graph& graph = TP->Graph();
+        Interface_EntityIterator subs3 = graph.Sharings(anitem);
+        for (subs3.Start(); subs3.More(); subs3.Next()) {
+          Handle(StepRepr_ItemDefinedTransformation) IDT =
+            Handle(StepRepr_ItemDefinedTransformation)::DownCast(subs3.Value());
+          if (!IDT.IsNull())
+          {
+            // current Axis2Placement is used for related ShapeRepresentation => ignore it
+            break;
+          }
+        }
+        if (!subs3.More())
+        {
+          Handle(StepGeom_Axis2Placement3d) aCS = Handle(StepGeom_Axis2Placement3d)::DownCast(anitem);
+          Handle(Geom_Axis2Placement) aTargAP = StepToGeom::MakeAxis2Placement(aCS);
+          if (!aTargAP.IsNull())
+          {
+            const gp_Ax3 ax3Orig(gp_Pnt(0., 0., 0), gp_Vec(0., 0., 1.), gp_Vec(1., 0., 0.));
+            const gp_Ax3 ax3Targ(aTargAP->Ax2());
+            if (ax3Targ.Location().SquareDistance(ax3Orig.Location()) < Precision::SquareConfusion() &&
+                ax3Targ.Direction().IsEqual(ax3Orig.Direction(), Precision::Angular()) &&
+                ax3Targ.XDirection().IsEqual(ax3Orig.XDirection(), Precision::Angular()))
+            {
+              continue;
+            }
+            aTrsf.SetTransformation(ax3Targ, ax3Orig);
+          }
+          continue;
+        }
+      }
+    }
     Handle(Transfer_Binder) binder;
     if (!TP->IsBound(anitem)) {
       binder = TransferShape(anitem, TP, isManifold);
@@ -910,9 +958,28 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
   }
 
   // Bind the resulting shape
-  if      (nsh == 0) shbinder.Nullify();
-  else if (nsh == 1) shbinder = new TransferBRep_ShapeBinder (OneResult);
-  else               shbinder = new TransferBRep_ShapeBinder (comp);
+  //if      (nsh == 0) shbinder.Nullify();
+  //else if (nsh == 1) shbinder = new TransferBRep_ShapeBinder (OneResult);
+  //else               shbinder = new TransferBRep_ShapeBinder (comp);
+  if (nsh == 0) shbinder.Nullify();
+  else if (nsh == 1)
+  {
+    if (aTrsf.Form() != gp_Identity)
+    {
+      TopLoc_Location aLoc(aTrsf);
+      OneResult.Move(aLoc);
+    }
+    shbinder = new TransferBRep_ShapeBinder(OneResult);
+  }
+  else
+  {
+    if (aTrsf.Form() != gp_Identity)
+    {
+      TopLoc_Location aLoc(aTrsf);
+      comp.Move(aLoc);
+    }
+    shbinder = new TransferBRep_ShapeBinder(comp);
+  }
 
   PrepareUnits ( oldSRContext, TP ); //:S4136
   TP->Bind(sr, shbinder);
@@ -973,9 +1040,11 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
 //purpose  : 
 //=======================================================================
 
-Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Handle(StepRepr_ShapeRepresentationRelationship)& und,
-                                                                       const Handle(Transfer_TransientProcess)& TP,
-                                                                       const Standard_Integer nbrep)
+Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(
+    const Handle(StepRepr_ShapeRepresentationRelationship)& und,
+    const Handle(Transfer_TransientProcess)& TP,
+    const Standard_Integer nbrep,
+    const Standard_Boolean theUseTrsf)
 {
   //  REPRESENTATION_RELATIONSHIP et la famille
   Handle(TransferBRep_ShapeBinder) shbinder;
@@ -1005,7 +1074,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
     Handle(StepShape_ShapeRepresentation) anitem = Handle(StepShape_ShapeRepresentation)::DownCast(anitemt);
     Handle(Transfer_Binder) binder;
     Standard_Boolean isBound = Standard_False;
-    if (!TP->IsBound(anitem)) binder = TransferEntity(anitem,TP,isBound);
+    if (!TP->IsBound(anitem)) binder = TransferEntity(anitem, TP, isBound, theUseTrsf);
     else                       binder = TP->Find(anitem);
     TopoDS_Shape theResult = TransferBRep::ShapeResult (binder);
     if (!theResult.IsNull()) {
@@ -1408,9 +1477,11 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
 //purpose  : 
 //=======================================================================
 
-Handle(Transfer_Binder) STEPControl_ActorRead::TransferShape(const Handle(Standard_Transient)& start,
-                                                             const Handle(Transfer_TransientProcess)& TP,
-                                                             const Standard_Boolean isManifold)
+Handle(Transfer_Binder) STEPControl_ActorRead::TransferShape(
+    const Handle(Standard_Transient)& start,
+    const Handle(Transfer_TransientProcess)& TP,
+    const Standard_Boolean isManifold,
+    const Standard_Boolean theUseTrsf)
 {
   if (start.IsNull()) return NullResult();
   XSAlgo::AlgoContainer()->PrepareForTransfer();
@@ -1437,7 +1508,7 @@ Handle(Transfer_Binder) STEPControl_ActorRead::TransferShape(const Handle(Standa
   else if (start->IsKind(STANDARD_TYPE(StepBasic_ProductDefinition))) {
     Handle(StepBasic_ProductDefinition) PD =
       Handle(StepBasic_ProductDefinition)::DownCast(start);
-    shbinder = TransferEntity(PD, TP);
+    shbinder = TransferEntity(PD, TP, theUseTrsf);
   }
   
   // NextAssemblyUsageOccurrence

diff --git a/src/STEPControl/STEPControl_ActorRead.hxx b/src/STEPControl/STEPControl_ActorRead.hxx
index 1ea04b90494564eb9fff8b41daac0b89a457335d..e235410b569b1a5539b3b15ae25b7b86ba2e6556 100644 (file)
--- a/src/STEPControl/STEPControl_ActorRead.hxx
+++ b/src/STEPControl/STEPControl_ActorRead.hxx
@@ -67,7 +67,12 @@ public:
   
   Standard_EXPORT virtual Handle(Transfer_Binder) Transfer (const Handle(Standard_Transient)& start, const Handle(Transfer_TransientProcess)& TP) Standard_OVERRIDE;
   
-  Standard_EXPORT Handle(Transfer_Binder) TransferShape (const Handle(Standard_Transient)& start, const Handle(Transfer_TransientProcess)& TP, const Standard_Boolean isManifold = Standard_True);
+  //! theUseTrsf - special flag for using Axis2Placement from ShapeRepresentation for transform root shape
+  Standard_EXPORT Handle(Transfer_Binder) TransferShape (
+      const Handle(Standard_Transient)& start,
+      const Handle(Transfer_TransientProcess)& TP,
+      const Standard_Boolean isManifold = Standard_True,
+      const Standard_Boolean theUseTrsf = Standard_False);
   
   //! set units and tolerances context by given ShapeRepresentation
   Standard_EXPORT void PrepareUnits (const Handle(StepRepr_Representation)& rep, const Handle(Transfer_TransientProcess)& TP);
@@ -95,19 +100,33 @@ protected:
 
   
   //! Transfers product definition entity
-  Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (const Handle(StepBasic_ProductDefinition)& PD, const Handle(Transfer_TransientProcess)& TP);
+  //! theUseTrsf - special flag for using Axis2Placement from ShapeRepresentation for transform root shape
+    Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (
+      const Handle(StepBasic_ProductDefinition)& PD,
+      const Handle(Transfer_TransientProcess)& TP,
+      const Standard_Boolean theUseTrsf = Standard_False);
   
   //! Transfers next assembly usage occurence entity
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (const Handle(StepRepr_NextAssemblyUsageOccurrence)& NAUO, const Handle(Transfer_TransientProcess)& TP);
   
   //! Transfers shape representation entity
-  Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (const Handle(StepShape_ShapeRepresentation)& sr, const Handle(Transfer_TransientProcess)& TP, Standard_Boolean& isBound);
+  //! theUseTrsf - special flag for using Axis2Placement from ShapeRepresentation for transform root shape
+  Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (
+      const Handle(StepShape_ShapeRepresentation)& sr,
+      const Handle(Transfer_TransientProcess)& TP,
+      Standard_Boolean& isBound,
+      const Standard_Boolean theUseTrsf = Standard_False);
   
   //! Transfers context dependent shape representation entity
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (const Handle(StepShape_ContextDependentShapeRepresentation)& CDSR, const Handle(Transfer_TransientProcess)& TP);
   
   //! Transfers  shape representation relationship entity
-  Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (const Handle(StepRepr_ShapeRepresentationRelationship)& und, const Handle(Transfer_TransientProcess)& TP, const Standard_Integer nbrep = 0);
+  //! theUseTrsf - special flag for using Axis2Placement from ShapeRepresentation for transform root shape
+  Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (
+      const Handle(StepRepr_ShapeRepresentationRelationship)& und,
+      const Handle(Transfer_TransientProcess)& TP,
+      const Standard_Integer nbrep = 0,
+      const Standard_Boolean theUseTrsf = Standard_False);
   
   //! Transfers  geometric representation item entity such as ManifoldSolidBRep ,...etc
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (const Handle(StepGeom_GeometricRepresentationItem)& git, const Handle(Transfer_TransientProcess)& TP, const Standard_Boolean isManifold);

diff --git a/tests/bugs/step/bug29068 b/tests/bugs/step/bug29068
new file mode 100644 (file)
index 0000000..a6bd900
--- /dev/null
+++ b/tests/bugs/step/bug29068
@@ -0,0 +1,30 @@
+puts "========"
+puts "OCC29068"
+puts "========"
+puts ""
+##########################################################################
+# Invalid rotation of shape after import STEP file
+##########################################################################
+
+stepread [locate_data_file bug29068.stp] a *
+#stepread bug29068.stp a *
+
+checkshape a_1
+
+set nbshapes_expected "
+Number of shapes in shape
+ VERTEX    : 2955
+ EDGE      : 4576
+ WIRE      : 1970
+ FACE      : 1793
+ SHELL     : 54
+ SOLID     : 0
+ COMPSOLID : 0
+ COMPOUND  : 1
+ SHAPE     : 11349
+"
+checknbshapes a_1 -ref ${nbshapes_expected} -t -m "importing file"
+
+checkgravitycenter a_1 -v 36.7307 -14.513 0.0157913 0.001
+
+