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
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:
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_ALTITUDE );
+ 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;
}
{
QString aDocName = PYTHON_DOC_NAME;
+ /*
int aDocId = 1;
if ( DocumentId( this, aDocId ) )
aDocName += "_" + QString::number( aDocId );
+ */
return aDocName;
}
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;
}
myTransactionsAfterSave++;
}
-Handle(HYDROData_Entity) HYDROData_Document::CreateObject(const ObjectKind theKind)
+Handle(HYDROData_Entity) HYDROData_Document::CreateObject( const ObjectKind theKind )
+{
+ return HYDROData_Iterator::CreateObject( this, theKind );
+}
+
+Handle(HYDROData_Entity) HYDROData_Document::FindObjectByName(
+ const QString& theName,
+ const ObjectKind theObjectKind ) const
{
- return HYDROData_Iterator::CreateObject(this, theKind);
+ 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()