Bug #334: Different behavior in Edit calculation case input panel.

[modules/hydro.git] / src / HYDROData / HYDROData_Document.cxx

diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx
index a96ac998efc70fc15f7d9d9752e24a7a586245a4..c195b9d5d7150f94c93455cd49b826cfed559c20 100644 (file)
--- a/src/HYDROData/HYDROData_Document.cxx
+++ b/src/HYDROData/HYDROData_Document.cxx
@@ -15,7 +15,7 @@
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Document,MMgt_TShared)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Document,MMgt_TShared)
 
-#define PYTHON_DOC_NAME "doc"
+#define PYTHON_DOC_NAME "hydro_doc"
 
 static const int UNDO_LIMIT = 10; // number of possible undo operations in the module
 
@@ -212,9 +212,11 @@ QString HYDROData_Document::GetDocPyName() const
 {
   QString aDocName = PYTHON_DOC_NAME;
   
+  /*
   int aDocId = 1;
   if ( DocumentId( this, aDocId ) )
     aDocName += "_" + QString::number( aDocId );
+  */
   
   return aDocName;
 }
@@ -232,11 +234,12 @@ QStringList HYDROData_Document::DumpToPython( MapOfTreatedObjects& theTreatedObj
 
   QStringList aResScript;
 
-  aResScript << QString( "from HYDROpy import *" );
+  aResScript << QString( "from HYDROPy import *" );
   aResScript << QString( "from PyQt4.QtCore import *" );
   aResScript << QString( "from PyQt4.QtGui import *" );
+  aResScript << QString( "import salome" );
   aResScript << QString( "" );
-  aResScript << QString( "%1 = HYDROData_Document.Document( %2 );" ).arg( aDocName ).arg( aDocId );
+  aResScript << QString( "%1 = HYDROData_Document.Document( salome.sg.getActiveStudyId() );" ).arg( aDocName );
 
   return aResScript;
 }
@@ -357,9 +360,57 @@ void HYDROData_Document::Redo()
   myTransactionsAfterSave++;
 }
 
-Handle(HYDROData_Entity) HYDROData_Document::CreateObject(const ObjectKind theKind)
+Handle(HYDROData_Entity) HYDROData_Document::CreateObject( const ObjectKind theKind )
 {
-  return HYDROData_Iterator::CreateObject(this, theKind);
+  return HYDROData_Iterator::CreateObject( this, theKind );
+}
+
+Handle(HYDROData_Entity) HYDROData_Document::FindObjectByName( 
+  const QString&   theName,
+  const ObjectKind theObjectKind ) const
+{
+  Handle(HYDROData_Entity) anObject;
+  if ( theName.isEmpty() )
+    return anObject;
+
+  QStringList aNamesList;
+  aNamesList << theName;
+
+  HYDROData_SequenceOfObjects aSeqOfObjs = FindObjectsByNames( aNamesList, theObjectKind );
+  if( aSeqOfObjs.IsEmpty() )
+    return anObject;
+  
+  anObject = aSeqOfObjs.First();
+  return anObject;
+}
+
+HYDROData_SequenceOfObjects HYDROData_Document::FindObjectsByNames(
+  const QStringList& theNames, 
+  const ObjectKind   theObjectKind ) const
+{
+  HYDROData_SequenceOfObjects aResSeq;
+
+  QStringList aNamesList = theNames;
+
+  HYDROData_Iterator anIter( this, theObjectKind );
+  for( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Entity) anObject = anIter.Current();
+    if( anObject.IsNull() )
+      continue;
+
+    QString anObjName = anObject->GetName();
+    if ( anObjName.isEmpty() || !aNamesList.contains( anObjName ) )
+      continue;
+
+    aResSeq.Append( anObject );
+
+    aNamesList.removeAll( anObjName );
+    if ( aNamesList.isEmpty() )
+      break;
+  }
+
+  return aResSeq;
 }
 
 HYDROData_Document::HYDROData_Document()