Issue #1940: error when Load python script.

Fixed order of named shapes when loading study.

diff --git a/src/Model/Model_BodyBuilder.cpp b/src/Model/Model_BodyBuilder.cpp
index 38b1543485ada04f857505b35b742b7109ee447d..2136750ba1dd6d235c3b928bad970039fcdd434f 100755 (executable)
--- a/src/Model/Model_BodyBuilder.cpp
+++ b/src/Model/Model_BodyBuilder.cpp
@@ -72,24 +72,25 @@ static void evolutionToSelectionRec(TDF_Label theLab, const bool theFlag) {
       aShapePairs.push_front(std::pair<TopoDS_Shape, TopoDS_Shape>
         (anIter.OldShape(), anIter.NewShape()));
     }
-  }
-  // create new
-  TNaming_Builder aBuilder(theLab);
-  TNaming_Evolution anEvol = (TNaming_Evolution)(anEvolution);
-  std::list<std::pair<TopoDS_Shape, TopoDS_Shape> >::iterator aPairsIter = aShapePairs.begin();
-  for(; aPairsIter != aShapePairs.end(); aPairsIter++) {
-    if (theFlag) { // disabled => make selection
-      aBuilder.Select(aPairsIter->second, aPairsIter->first);
-    } else if (anEvol == TNaming_GENERATED) {
-      aBuilder.Generated(aPairsIter->first, aPairsIter->second);
-    } else if (anEvol == TNaming_MODIFY) {
-      aBuilder.Modify(aPairsIter->first, aPairsIter->second);
-    } else if (anEvol == TNaming_DELETE) {
-      aBuilder.Delete(aPairsIter->first);
-    } else if (anEvol == TNaming_PRIMITIVE) {
-      aBuilder.Generated(aPairsIter->second);
-    } else if (anEvol == TNaming_SELECTED) {
-      aBuilder.Select(aPairsIter->second, aPairsIter->first);
+
+    // create new
+    TNaming_Builder aBuilder(theLab);
+    TNaming_Evolution anEvol = (TNaming_Evolution)(anEvolution);
+    std::list<std::pair<TopoDS_Shape, TopoDS_Shape> >::iterator aPairsIter = aShapePairs.begin();
+    for(; aPairsIter != aShapePairs.end(); aPairsIter++) {
+      if (theFlag) { // disabled => make selection
+        aBuilder.Select(aPairsIter->second, aPairsIter->first);
+      } else if (anEvol == TNaming_GENERATED) {
+        aBuilder.Generated(aPairsIter->first, aPairsIter->second);
+      } else if (anEvol == TNaming_MODIFY) {
+        aBuilder.Modify(aPairsIter->first, aPairsIter->second);
+      } else if (anEvol == TNaming_DELETE) {
+        aBuilder.Delete(aPairsIter->first);
+      } else if (anEvol == TNaming_PRIMITIVE) {
+        aBuilder.Generated(aPairsIter->second);
+      } else if (anEvol == TNaming_SELECTED) {
+        aBuilder.Select(aPairsIter->second, aPairsIter->first);
+      }
     }
   }
   // recursive call for all sub-labels

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 4311f40f6580f05393d19b6690c9a7711bc75af0..2afecb39cd95f5bf52190e1406dbd35a83f3c6ce 100755 (executable)
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -38,6 +38,7 @@
 #include <TDF_ListIteratorOfLabelList.hxx>
 #include <TDF_LabelMap.hxx>
 #include <TDF_DeltaOnAddition.hxx>
+#include <TNaming_Builder.hxx>
 #include <TNaming_SameShapeIterator.hxx>
 #include <TNaming_Iterator.hxx>
 #include <TNaming_NamedShape.hxx>
@@ -196,6 +197,51 @@ bool Model_Document::load(const char* theDirName, const char* theFileName, Docum
   if (!isError) {
     myDoc = aLoaded;
     myDoc->SetUndoLimit(UNDO_LIMIT);
+
+    // TODO: remove after fix in OCCT.
+    // All named shapes are stored in reversed order, so to fix this we reverse them back.
+    for(TDF_ChildIDIterator aChildIter(myDoc->Main(), TNaming_NamedShape::GetID(), true);
+        aChildIter.More();
+        aChildIter.Next()) {
+      Handle(TNaming_NamedShape) aNamedShape =
+        Handle(TNaming_NamedShape)::DownCast(aChildIter.Value());
+      if (aNamedShape.IsNull()) {
+        continue;
+      }
+
+      TopoDS_Shape aShape = aNamedShape->Get();
+      if(aShape.IsNull() || aShape.ShapeType() != TopAbs_COMPOUND) {
+        continue;
+      }
+
+      TNaming_Evolution anEvol = aNamedShape->Evolution();
+      std::list<std::pair<TopoDS_Shape, TopoDS_Shape> > aShapePairs; // to store old and new shapes
+      for(TNaming_Iterator anIter(aNamedShape); anIter.More(); anIter.Next()) {
+        aShapePairs.push_back(
+          std::pair<TopoDS_Shape, TopoDS_Shape>(anIter.OldShape(), anIter.NewShape()));
+      }
+
+      // Add in reverse order.
+      TDF_Label aLabel = aNamedShape->Label();
+      TNaming_Builder aBuilder(aLabel);
+      for(std::list<std::pair<TopoDS_Shape, TopoDS_Shape> >::iterator aPairsIter =
+            aShapePairs.begin();
+          aPairsIter != aShapePairs.end();
+          aPairsIter++) {
+        if (anEvol == TNaming_GENERATED) {
+          aBuilder.Generated(aPairsIter->first, aPairsIter->second);
+        } else if (anEvol == TNaming_MODIFY) {
+          aBuilder.Modify(aPairsIter->first, aPairsIter->second);
+        } else if (anEvol == TNaming_DELETE) {
+          aBuilder.Delete(aPairsIter->first);
+        } else if (anEvol == TNaming_PRIMITIVE) {
+          aBuilder.Generated(aPairsIter->second);
+        } else if (anEvol == TNaming_SELECTED) {
+          aBuilder.Select(aPairsIter->second, aPairsIter->first);
+        }
+      }
+    }
+
     // to avoid the problem that feature is created in the current, not this, document
     aSession->setActiveDocument(anApp->document(myID), false);
     aSession->setCheckTransactions(false);