Dump to python corrected.

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

diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx
index a92695f82fd47b95615a1ad4a9c7240badefbb11..4c2fb49f33ef636d89915bd5d66f183fd7f80325 100644 (file)
--- a/src/HYDROData/HYDROData_Document.cxx
+++ b/src/HYDROData/HYDROData_Document.cxx
@@ -38,16 +38,16 @@ Handle(HYDROData_Document) HYDROData_Document::Document(const int theStudyID)
 }
 
 Handle(HYDROData_Document) HYDROData_Document::Document(
-  const Handle(HYDROData_Object)& theObject )
+  const TDF_Label& theObjectLabel )
 {
   Handle(HYDROData_Document) aResDoc;
-  if ( theObject.IsNull() )
+  if ( theObjectLabel.IsNull() )
     return aResDoc;
 
   Handle(TDocStd_Document) anObjDoc;
   try
   {
-    anObjDoc = TDocStd_Document::Get( theObject->Label() );
+    anObjDoc = TDocStd_Document::Get( theObjectLabel );
   }
   catch( ... )
   {
@@ -158,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:
@@ -194,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;
 }
 
@@ -225,7 +232,7 @@ 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( "" );
@@ -248,7 +255,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;
 
@@ -350,7 +357,7 @@ 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);
 }