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 da06a2c8ba819b0fb09bcdf9daa06b6cd771fe55..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
 
@@ -37,6 +37,41 @@ Handle(HYDROData_Document) HYDROData_Document::Document(const int theStudyID)
   return aResult;
 }
 
+Handle(HYDROData_Document) HYDROData_Document::Document(
+  const TDF_Label& theObjectLabel )
+{
+  Handle(HYDROData_Document) aResDoc;
+  if ( theObjectLabel.IsNull() )
+    return aResDoc;
+
+  Handle(TDocStd_Document) anObjDoc;
+  try
+  {
+    anObjDoc = TDocStd_Document::Get( theObjectLabel );
+  }
+  catch( ... )
+  {
+  }
+
+  if ( anObjDoc.IsNull() )
+    return aResDoc;
+
+  HYDROData_Application* anApp = HYDROData_Application::GetApplication();
+
+  DataMapOfStudyIDDocument::Iterator aMapIt( anApp->myDocuments );
+  for ( ; aMapIt.More(); aMapIt.Next() )
+  {
+    Handle(HYDROData_Document) anAppDoc = aMapIt.Value();
+    if ( anAppDoc.IsNull() || anAppDoc->myDoc != anObjDoc )
+      continue;
+
+    aResDoc = anAppDoc;
+    break;
+  }
+
+  return aResDoc;
+}
+
 bool HYDROData_Document::HasDocument(const int theStudyID)
 {
   Handle(HYDROData_Document) aResult = 
@@ -123,8 +158,8 @@ Data_DocError HYDROData_Document::Save(const char* theFileName)
     anError = DocError_ResourcesProblem;
     break;
   case PCDM_SS_WriteFailure:
-  case PCDM_SS_DiskWritingFailure:
-  case PCDM_SS_UserRightsFailure:
+  //case PCDM_SS_DiskWritingFailure:
+  //case PCDM_SS_UserRightsFailure:
     anError = DocError_CanNotOpen;
     break;
   default:
@@ -159,10 +194,17 @@ bool HYDROData_Document::DumpToPython( const QString& theFileName ) const
   bool aRes = true;
 
   // Dump all model objects to Python script
-  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_IMAGE      );
-  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_POLYLINE   );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_IMAGE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_POLYLINEXY );
   aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_BATHYMETRY );
-
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_PROFILE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_POLYLINE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_IMMERSIBLE_ZONE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_STREAM );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_CHANNEL );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_DIGUE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_OBSTACLE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_CALCULATION );
   return aRes;
 }
 
@@ -170,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;
 }
@@ -190,9 +234,12 @@ QStringList HYDROData_Document::DumpToPython( MapOfTreatedObjects& theTreatedObj
 
   QStringList aResScript;
 
-  aResScript << QString( "from HYDROData 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;
 }
@@ -211,7 +258,7 @@ bool HYDROData_Document::dumpPartitionToPython( QFile&               theFile,
   HYDROData_Iterator anIterator( this, theObjectKind );
   for( ; anIterator.More(); anIterator.Next() )
   {
-    Handle(HYDROData_Object) anObject = anIterator.Current();
+    Handle(HYDROData_Entity) anObject = anIterator.Current();
     if ( anObject.IsNull() )
       continue;
 
@@ -313,9 +360,57 @@ void HYDROData_Document::Redo()
   myTransactionsAfterSave++;
 }
 
-Handle_HYDROData_Object 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()