From 6c588d710b400618048ea2978f41d6f3cd242668 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 3 Sep 2012 14:26:02 +0000 Subject: [PATCH] 0021833: [CEA] problem with naming when exploding a step file Correct regression caused by fix for issue 0021805 --- src/GEOM_I/GEOM_Gen_i.cc | 5 ----- src/GEOM_SWIG/geompyDC.py | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index d98bec0e1..fe877f791 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -748,11 +748,6 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy (SALOMEDS::Study_ptr theStudy, aResultSO = PublishInStudy(theStudy, aResultSO, theObject, theName); if(aResultSO->_is_nil()) return aResultSO._retn(); - // ignore internal name (for example, read from STEP file) - // in case of publishing from script - if (strlen(theName) > 0) - aResultSO->SetAttrString("AttributeName", theName); - GEOM::ListOfGO_var aList = theObject->GetDependency(); Standard_Integer aLength = aList->length(); if(aLength < 1) return aResultSO._retn(); diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 465f57eb6..acfd7a361 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -486,6 +486,7 @@ class geompyDC(GEOM._objref_GEOM_Gen): # Example: see GEOM_TestAll.py try: aSObject = self.AddInStudy(self.myStudy, aShape, aName, None) + if aSObject and aName: aSObject.SetAttrString("AttributeName", aName) if doRestoreSubShapes: self.RestoreSubShapesSO(self.myStudy, aSObject, theArgs, theFindMethod, theInheritFirstArg, True ) @@ -516,6 +517,7 @@ class geompyDC(GEOM._objref_GEOM_Gen): # Example: see GEOM_TestAll.py try: aSObject = self.AddInStudy(self.myStudy, aShape, aName, aFather) + if aSObject and aName: aSObject.SetAttrString("AttributeName", aName) except: print "addToStudyInFather() failed" return "" -- 2.39.2