X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Entity.cxx;h=4b8a76ede2252fff6b4f2700f68fba7273368190;hb=a95289fabbb6fbf6f32c06207422c65aafd5bd65;hp=ceea46b60ff4305b7d9f45f61f3c90c129411b89;hpb=f709724a7a412254db7ee6ca094b01b6dc75e82b;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx index ceea46b6..4b8a76ed 100644 --- a/src/HYDROData/HYDROData_Entity.cxx +++ b/src/HYDROData/HYDROData_Entity.cxx @@ -24,9 +24,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -37,6 +39,9 @@ #include #include +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects() : NCollection_Sequence() { @@ -52,7 +57,6 @@ HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const NCollection_Sequ { } - IMPLEMENT_STANDARD_HANDLE(HYDROData_Entity,MMgt_TShared) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Entity,MMgt_TShared) @@ -82,12 +86,44 @@ QString HYDROData_Entity::GetObjPyName() const return aName; } -void HYDROData_Entity::SetName(const QString& theName) +QString HYDROData_Entity::GetDefaultName() const +{ + QString aName; + + TDF_Label aLabel = myLab.FindChild(DataTag_DefaultName, false); + if (!aLabel.IsNull()) + { + Handle(TDataStd_AsciiString) anAsciiStr; + if (aLabel.FindAttribute(TDataStd_AsciiString::GetID(), anAsciiStr)) + aName = QString(anAsciiStr->Get().ToCString()); + } + else + aName = GetName(); + + return aName; + +} + +void HYDROData_Entity::SetName(const QString& theName, bool isDefault) { TDataStd_Name::Set(myLab, TCollection_ExtendedString(theName.toLatin1().constData())); + if (isDefault) + { + TDF_Label aDefaultNameLabel = myLab.FindChild( DataTag_DefaultName, true ); + if ( aDefaultNameLabel.IsNull() ) + return; + Handle(TDataStd_AsciiString) theDefaultName; + + if ( !aDefaultNameLabel.FindAttribute( TDataStd_AsciiString::GetID(), theDefaultName )) + { + TCollection_AsciiString aName = theName.toStdString().c_str(); + theDefaultName = TDataStd_AsciiString::Set(myLab.FindChild( DataTag_DefaultName), aName ); + } + } } -QStringList HYDROData_Entity::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_Entity::DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const { QStringList anEmptyList; return anEmptyList; @@ -165,6 +201,8 @@ void HYDROData_Entity::Changed( Geometry theChangedGeometry ) for ( ; anIter.More(); anIter.Next() ) { Handle(HYDROData_Entity) anObject = anIter.Current(); + if( anObject.IsNull() ) + continue; HYDROData_SequenceOfObjects aRefSeq = anObject->GetAllReferenceObjects(); for ( int i = 1, n = aRefSeq.Length(); i <= n; ++i ) { @@ -595,9 +633,9 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate QString aDocName = aDocument->GetDocPyName(); QString aName = GetObjPyName(); - aResList << QString( "%1 = %2.CreateObject( %3 );" ) + aResList << QString( "%1 = %2.CreateObject( %3 )" ) .arg( aName ).arg( aDocName ).arg( getPyTypeID() ); - aResList << QString( "%1.SetName( \"%2\" );" ) + aResList << QString( "%1.SetName( \"%2\" )" ) .arg( aName ).arg( GetName() ); aResList << QString( "" ); @@ -607,7 +645,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate Standard_Integer anObjZLevel = -1; if ( GetZLevel( anObjZLevel ) ) { - aResList << QString( "%1.SetZLevel( %2 );" ) + aResList << QString( "%1.SetZLevel( %2 )" ) .arg( aName ).arg( anObjZLevel ); aResList << QString( "" ); } @@ -618,6 +656,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate QString HYDROData_Entity::getPyTypeID() const { + DEBTRACE("HYDROData_Entity::getPyTypeID " << GetKind()); switch( GetKind() ) { case KIND_IMAGE: return "KIND_IMAGE"; @@ -642,32 +681,35 @@ QString HYDROData_Entity::getPyTypeID() const case KIND_NATURAL_OBJECT: return "KIND_NATURAL_OBJECT"; case KIND_DUMMY_3D: return "KIND_DUMMY_3D"; case KIND_SHAPES_GROUP: return "KIND_SHAPES_GROUP"; - case KIND_SPLITTED_GROUP: return "KIND_SPLITTED_GROUP"; + case KIND_SPLIT_GROUP: return "KIND_SPLIT_GROUP"; case KIND_STREAM_ALTITUDE: return "KIND_STREAM_ALTITUDE"; case KIND_OBSTACLE_ALTITUDE: return "KIND_OBSTACLE_ALTITUDE"; case KIND_STRICKLER_TABLE: return "KIND_STRICKLER_TABLE"; - case KIND_LAND_COVER: return "KIND_LAND_COVER"; + case KIND_LAND_COVER_OBSOLETE: return ""; + case KIND_CHANNEL_ALTITUDE: return "KIND_CHANNEL_ALTITUDE"; case KIND_LAND_COVER_MAP: return "KIND_LAND_COVER_MAP"; default: return "KIND_UNKNOWN"; ///! Unrecognized object } } -void HYDROData_Entity::setPythonReferenceObject( MapOfTreatedObjects& theTreatedObjects, +void HYDROData_Entity::setPythonReferenceObject( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects, QStringList& theScript, const Handle(HYDROData_Entity)& theRefObject, const QString& theMethod ) const { - if ( !checkObjectPythonDefinition( theTreatedObjects, theScript, theRefObject ) ) + if ( !checkObjectPythonDefinition( thePyScriptPath, theTreatedObjects, theScript, theRefObject ) ) return; QString aRefObjName = theRefObject->GetObjPyName(); QString anObjName = GetObjPyName(); - theScript << QString( "%1.%2( %3 );" ) + theScript << QString( "%1.%2( %3 )" ) .arg( anObjName ).arg( theMethod ).arg( aRefObjName ); } -bool HYDROData_Entity::checkObjectPythonDefinition( MapOfTreatedObjects& theTreatedObjects, +bool HYDROData_Entity::checkObjectPythonDefinition( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects, QStringList& theScript, const Handle(HYDROData_Entity)& theRefObject ) const { @@ -682,7 +724,7 @@ bool HYDROData_Entity::checkObjectPythonDefinition( MapOfTreatedObjects& return true; // The definition of reference object must be dumped before this - QStringList aRefObjDump = theRefObject->DumpToPython( theTreatedObjects ); + QStringList aRefObjDump = theRefObject->DumpToPython( thePyScriptPath, theTreatedObjects ); if ( aRefObjDump.isEmpty() ) return false; @@ -706,22 +748,42 @@ void HYDROData_Entity::setPythonObjectColor( QStringList& theScript, return; //Do not set the color for object if it like default QString anObjName = GetObjPyName(); - theScript << QString( "%1.%2( QColor( %3, %4, %5, %6 ) );" ) + theScript << QString( "%1.%2( QColor( %3, %4, %5, %6 ) )" ) .arg( anObjName ).arg( theMethod ) .arg( theColor.red() ).arg( theColor.green() ) .arg( theColor.blue() ).arg( theColor.alpha() ); } -void HYDROData_Entity::findPythonReferenceObject( MapOfTreatedObjects& theTreatedObjects, - QStringList& theScript ) const +void HYDROData_Entity::findPythonReferenceObject( QStringList& theScript, + QString defName) const +{ + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + if ( aDocument.IsNull() ) + return; + + if (defName.isEmpty()) + theScript << QString( "%1 = %2.FindObjectByName( \"%3\" )" ).arg( GetObjPyName() ) + .arg( aDocument->GetDocPyName() ) + .arg( GetDefaultName() ); + else + theScript << QString( "%1 = %2.FindObjectByName( \"%3\" )" ).arg( GetObjPyName() ) + .arg( aDocument->GetDocPyName() ) + .arg( defName ); +} + +void HYDROData_Entity::SetNameInDumpPython(QStringList& theScript, + QString theName) const { Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); if ( aDocument.IsNull() ) return; - - theScript << QString( "%1 = %2.FindObjectByName( \"%3\" );" ).arg( GetObjPyName() ) - .arg( aDocument->GetDocPyName() ) - .arg( GetName() ); + + if (theName.isEmpty()) + theScript << QString( "%1.SetName( \"%2\" )" ).arg( GetObjPyName() ) + .arg( GetName() ); + else + theScript << QString( "%1.SetName( \"%2\" )" ).arg( GetObjPyName() ) + .arg( theName ); } void HYDROData_Entity::SetShape( int theTag, const TopoDS_Shape& theShape ) @@ -741,3 +803,22 @@ TopoDS_Shape HYDROData_Entity::GetShape( int theTag ) const } return TopoDS_Shape(); } + +void HYDROData_Entity::SetDouble( int theTag, double theValue ) +{ + Handle(TDataStd_Real) anAttr; + TDF_Label aLabel = myLab.FindChild( theTag ); + if( !aLabel.FindAttribute( TDataStd_Real::GetID(), anAttr ) ) + aLabel.AddAttribute( anAttr = new TDataStd_Real() ); + anAttr->Set( theValue ); +} + +double HYDROData_Entity::GetDouble( int theTag, double theDefValue ) const +{ + Handle(TDataStd_Real) anAttr; + TDF_Label aLabel = myLab.FindChild( theTag ); + if( !aLabel.FindAttribute( TDataStd_Real::GetID(), anAttr ) ) + return theDefValue; + + return anAttr->Get(); +}