From e9a13cf1234fa07afbceeca7e4ce5dd482792ffd Mon Sep 17 00:00:00 2001
From: snn <snn@opencascade.com>
Date: Wed, 20 Apr 2022 14:56:21 +0300
Subject: [PATCH] 0032914: Data Exchange - Some parts of compound are lost
 while writing STEP in nonmanifold mode

Code related to supporting of single SDR for a non-manifold group, which prevents writing all translation results except the first one, is removed.
SDRs with null used representation object are excluded from writing.
---
 src/STEPControl/STEPControl_ActorWrite.cxx | 19 ++++++++-----------
 tests/bugs/step/bug32914                   | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 tests/bugs/step/bug32914

diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx
index e83fd17279..97fa556e28 100644
--- a/src/STEPControl/STEPControl_ActorWrite.cxx
+++ b/src/STEPControl/STEPControl_ActorWrite.cxx
@@ -1243,8 +1243,8 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferShape
       Handle(StepRepr_HArray1OfRepresentationItem) newItems = 
         new StepRepr_HArray1OfRepresentationItem(1, oldItems->Length() + 1);
       Standard_Integer el = 1;
-      for (Standard_Integer i = 1; i <= oldItems->Length(); i++)
-        newItems->SetValue( el++, oldItems->Value(i) );
+        for (Standard_Integer i = 1; i <= oldItems->Length(); i++)
+          newItems->SetValue(el++, oldItems->Value(i));
       newItems->SetValue( el, items->Value( items->Length() ) );
       shapeRep->SetItems(newItems);
     }
@@ -1278,7 +1278,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferShape
     return resbind;
   } else return FP->Find(start);
 
-}
+  }
 
 //=======================================================================
 //function : TransferCompound
@@ -1383,11 +1383,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferCompound
       Handle(Transfer_SimpleBinderOfTransient) bx = 
         Handle(Transfer_SimpleBinderOfTransient)::DownCast(bnd);
       if ( !bx.IsNull() ) {
-        // Single SDR is created for a non-manifold group (ssv: 12.11.2010)
-        if (!isManifold && i > 1)
-          break;
-        else
-          binder->AddResult( TransientResult( bx->Result() ) );
+        binder->AddResult( TransientResult( bx->Result() ) );
       }
       bnd = bnd->NextResult();
     }
@@ -1468,9 +1464,10 @@ Handle(Transfer_Binder)  STEPControl_ActorWrite::TransferSubShape
   Handle(Transfer_Binder) resprod = TransientResult(sdr);  //KA - OCC7141(skl 10.11.2004)
   bool isJustTransferred = false;
   if ( ! iasdr || resbind.IsNull() ) {
-    resbind = TransferShape(mapper, sdr, FP, shapeGroup, isManifold, theProgress);
-    if (resbind.IsNull())
-      return resbind;
+    Handle(Transfer_Binder) resbind1 = TransferShape(mapper, sdr, FP, shapeGroup, isManifold, theProgress);
+    if (resbind1.IsNull() || sdr->UsedRepresentation().IsNull())
+      return Handle(Transfer_Binder)();
+    resbind = resbind1;
     Handle(Transfer_Binder) oldbind = FP->Find ( mapper );
     if ( ! oldbind.IsNull() && !resbind.IsNull()) resbind->AddResult ( oldbind );
     isJustTransferred = true;
diff --git a/tests/bugs/step/bug32914 b/tests/bugs/step/bug32914
new file mode 100644
index 0000000000..cfa6536e26
--- /dev/null
+++ b/tests/bugs/step/bug32914
@@ -0,0 +1,19 @@
+puts "==================================================="
+puts " 0032914: Data Exchange - Some parts of compound are lost while writing STEP in nonmanifold mode "
+puts "==================================================="
+puts ""
+
+set BugNumber OCC32914
+
+set filepath [locate_data_file ${BugNumber}.brep]
+
+restore ${filepath} s
+
+param write.step.nonmanifold 1
+stepwrite 0 s ${imagedir}/${BugNumber}.step
+
+testreadstep ${imagedir}/${BugNumber}.step result
+
+checknbshapes result -vertex 16 -edge 17 -wire 7 -face 7 -shell 2 -solid 0 -compsolid 0 -compound 4 -shape 53
+
+checkview -display result -2d -path ${imagedir}/${test_image}.png