From 3acac1e9624ad3bce7a3f30064dcb7b5e83b3f1d Mon Sep 17 00:00:00 2001
From: ouv <ouv@opencascade.com>
Date: Wed, 27 Apr 2011 09:22:16 +0000
Subject: [PATCH] Definition of getSObjectByFatherPathAndName() function moved
 to visu.py

---
 src/VISU_I/VISU_DumpPython.cc | 27 ++++-----------------------
 src/VISU_SWIG/visu.py         | 10 ++++++++++
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index 38b1318d..7254fe56 100644
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -2115,7 +2115,8 @@ namespace VISU
           value = refObj->GetName();
           QString path(theStudy->GetObjectPath(father));
           //The following code requierd as a field name can contain '/' character
-          theStr<<thePrefix<<"aBuilder.Addreference(fieldSO,getSObjectByFatherPathAndName(theStudy, '"<<path.toLatin1().data()<<"', '"<<value.toLatin1().data()<<"'))"<<endl;
+          theStr<<thePrefix<<"aBuilder.Addreference(fieldSO,visu.getSObjectByFatherPathAndName(theStudy, '"<<
+            path.toLatin1().data()<<"', '"<<value.toLatin1().data()<<"'))"<<endl;
         }
         value = anObj->GetName();
         if(!value.isEmpty()) theStr<<thePrefix<<"aBuilder.SetName(fieldSO, '"<<value.toLatin1().data()<<"')"<< endl;
@@ -2204,7 +2205,8 @@ namespace VISU
 	  value = refObj->GetName();
 	  QString path(theStudy->GetObjectPath(father));
 	  //The following code requierd as a field name can contain '/' character
-	  theStr<<thePrefix<<"aBuilder.Addreference(fieldSO,getSObjectByFatherPathAndName(theStudy, '"<<path.toLatin1().data()<<"', '"<<value.toLatin1().data()<<"'))"<<endl;
+	  theStr<<thePrefix<<"aBuilder.Addreference(fieldSO,visu.getSObjectByFatherPathAndName(theStudy, '"<<
+            path.toLatin1().data()<<"', '"<<value.toLatin1().data()<<"'))"<<endl;
 	}
 	value = anObj->GetName();
 	if(!value.isEmpty()) theStr<<thePrefix<<"aBuilder.SetName(fieldSO, '"<<value.toLatin1().data()<<"')"<< endl;
@@ -2410,27 +2412,6 @@ namespace VISU
     if( theIsMultiFile )
       aStr<<aPrefix<<"pass"<<endl;
 
-    if(theIsPublished) { //SRN: define function for Animation
-
-      aPrefix = PREFIX;
-
-      //Define a function that find a SObject by its father's path and its name
-      aStr<<endl;
-      aStr<<endl;
-
-      aStr<<"def getSObjectByFatherPathAndName(theStudy, thePath, theName):"<<endl;
-      aStr<<aPrefix<<"father = theStudy.FindObjectByPath(thePath)"<<endl;
-      aStr<<aPrefix<<"itr = theStudy.NewChildIterator(father)"<<endl;
-      aStr<<aPrefix<<"while itr.More():"<<endl;
-      aStr<<aPrefix<<aPrefix<<"so = itr.Value()"<<endl;
-      aStr<<aPrefix<<aPrefix<<"if so.GetName()==theName: return so"<<endl;
-      aStr<<aPrefix<<aPrefix<<"itr.Next()"<<endl;
-      aStr<<aPrefix<<aPrefix<<"pass"<<endl;
-      aStr<<aPrefix<<"return None"<<endl;
-
-      aStr<<endl;
-    }
-
     // theIsValidScript currently is not used by internal dump methods (DumpChildrenToPython(), etc.)
     // If the situation changes, then the following line should be removed, and theIsValidScript
     // should be set properly by those internal methods
diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py
index d1d65e67..d51dea92 100644
--- a/src/VISU_SWIG/visu.py
+++ b/src/VISU_SWIG/visu.py
@@ -195,6 +195,16 @@ def getFieldObjectFromStudy(number, subnumber, theStudy = myLocalStudy):
         print "ERROR: No Field Object stored in this Study"
         return None
 
+def getSObjectByFatherPathAndName(theStudy, thePath, theName):
+    father = theStudy.FindObjectByPath(thePath)
+    itr = theStudy.NewChildIterator(father)
+    while itr.More():
+        so = itr.Value()
+        if so.GetName()==theName: return so
+        itr.Next()
+        pass
+    return None
+
 def SObjectToObject(theSObject) :
      #    global myORB
     if theSObject is None :
-- 
2.39.2