X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Document.cxx;h=1bcca65adcde3b26a321434ce100e2de185ae4d5;hb=9951c43b35cc7088888afb135b0cdfcfd8d840c6;hp=7c43e53ead4cf8bd2d402453862cfa801e5f1644;hpb=3cff85424556651afcab2e7fa5081531d748b7cc;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx
index 7c43e53e..1bcca65a 100644
--- 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( ... )
   {
@@ -194,12 +194,15 @@ 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_BATHYMETRY );
-  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_ZONE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_ARTIFICIAL_OBJECT );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_NATURAL_OBJECT );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_OBSTACLE );
   aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_CALCULATION );
-
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_POLYLINE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_PROFILE );
+  aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_ALTITUDE );
   return aRes;
 }
 
@@ -250,7 +253,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;
 
@@ -352,7 +355,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);
 }