X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Document.cxx;h=7d1a12552c9a37fe957777ba17e695a4e2625949;hb=90314a195b4d4951ba61a7333cb0de16c253dea9;hp=7c43e53ead4cf8bd2d402453862cfa801e5f1644;hpb=3cff85424556651afcab2e7fa5081531d748b7cc;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx index 7c43e53e..7d1a1255 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( ... ) { @@ -197,7 +197,8 @@ bool HYDROData_Document::DumpToPython( const QString& theFileName ) const aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_IMAGE ); aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_POLYLINE ); aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_BATHYMETRY ); - aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_ZONE ); + aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_ALTITUDE ); + aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_IMMERSIBLE_ZONE ); aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_CALCULATION ); return aRes; @@ -250,7 +251,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 +353,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); }