From: rnv <rnv@opencascade.com>
Date: Tue, 1 Mar 2011 14:06:35 +0000 (+0000)
Subject: Fix names of the python variables for not published GEOM objects.
X-Git-Tag: Start_BR_19998_21191~56
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43f4ad9b7df34cb14974e92435b2baade52bd0e6;p=modules%2Fgeom.git

Fix names of the python variables for not published GEOM objects.
---

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 9fffbf977..6f830e15e 100644
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -1305,27 +1305,28 @@ void ReplaceEntriesByNames (TCollection_AsciiString&                  theScript,
     theObjListToPublish.Append( anEntry );
     
     TObjectData& data = aEntry2ObjData[ anEntry ];
-    if ( !data._name.IsEmpty() ) { // published object
-      if ( data._pyName.IsEmpty() ) { // encounted for the 1st time
+    if ( data._pyName.IsEmpty() ) { // encounted for the 1st time
+      if ( !data._name.IsEmpty() ) { // published object
         data._pyName = data._name;
         healPyName( data._pyName, anEntry, aNameToEntry);
       }
+      else {
+	do {
+	  data._pyName = aBaseName + TCollection_AsciiString(++objectCounter);
+	} while(aNameToEntry.IsBound(data._pyName));
+      }
     }
-    else {
-      do {
-        data._pyName = aBaseName + TCollection_AsciiString(++objectCounter);
-      } while(aNameToEntry.IsBound(data._pyName));
-    }
+    
     aNameToEntry.Bind(data._pyName, anEntry); // to detect same name of diff objects
-
+    
     anUpdatedScript += data._pyName;
     aStart = aSeq->Value(i+1) + 1;
   }
-
+  
   //Add final part of the script
   if (aLen && aSeq->Value(aLen) < aScriptLength)
     anUpdatedScript += theScript.SubString(aSeq->Value(aLen)+1, aScriptLength); // mkr : IPAL11865
-
+  
   theScript = anUpdatedScript;
 }