From: dbv Date: Fri, 10 Mar 2017 13:36:37 +0000 (+0300) Subject: Removed fix as it is integrated into OCCT. X-Git-Tag: V_2.7.0~235 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5abce71500c7250c8f5922b1f7f5efa65341960b;p=modules%2Fshaper.git Removed fix as it is integrated into OCCT. --- diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp index d54b83130..59a3fcf4a 100755 --- a/src/Model/Model_Document.cpp +++ b/src/Model/Model_Document.cpp @@ -198,50 +198,6 @@ bool Model_Document::load(const char* theDirName, const char* theFileName, Docum 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 > aShapePairs; // to store old and new shapes - for(TNaming_Iterator anIter(aNamedShape); anIter.More(); anIter.Next()) { - aShapePairs.push_back( - std::pair(anIter.OldShape(), anIter.NewShape())); - } - - // Add in reverse order. - TDF_Label aLabel = aNamedShape->Label(); - TNaming_Builder aBuilder(aLabel); - for(std::list >::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);