X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Document.cxx;h=43ce2a1fecf84593123eb7aca3b570a8aa62996d;hb=0d9decc8762a829f1bdc69048fab08122e441ec0;hp=665748a66b1863ebf8d52b2039cd71f4b7f37b93;hpb=c5410d3d46ff6a4aad5bd6d4ec7673bf796e5f97;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx index 665748a6..43ce2a1f 100644 --- a/src/HYDROData/HYDROData_Document.cxx +++ b/src/HYDROData/HYDROData_Document.cxx @@ -38,7 +38,7 @@ Handle(HYDROData_Document) HYDROData_Document::Document(const int theStudyID) } Handle(HYDROData_Document) HYDROData_Document::Document( - const Handle(HYDROData_Object)& theObject ) + const Handle(HYDROData_Entity)& theObject ) { Handle(HYDROData_Document) aResDoc; if ( theObject.IsNull() ) @@ -197,6 +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_IMMERSIBLE_ZONE ); + aRes = aRes && dumpPartitionToPython( aFile, aTreatedObjects, KIND_CALCULATION ); return aRes; } @@ -226,6 +228,8 @@ QStringList HYDROData_Document::DumpToPython( MapOfTreatedObjects& theTreatedObj QStringList aResScript; aResScript << QString( "from HYDROData import *" ); + aResScript << QString( "from PyQt4.QtCore import *" ); + aResScript << QString( "from PyQt4.QtGui import *" ); aResScript << QString( "" ); aResScript << QString( "%1 = HYDROData_Document.Document( %2 );" ).arg( aDocName ).arg( aDocId ); @@ -246,7 +250,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; @@ -348,7 +352,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); }