X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=0fcae54fdd9f89c088be247acff920d1815ce46d;hb=e7e76450be3fadf6ad263f78e10ceb8cd1f70deb;hp=bf73726b33343069ef44c36692ad7db956540d2f;hpb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx index bf73726b..0fcae54f 100644 --- a/src/HYDROData/HYDROData_Object.cxx +++ b/src/HYDROData/HYDROData_Object.cxx @@ -45,6 +45,7 @@ HYDROData_Object::~HYDROData_Object() void HYDROData_Object::SetName( const QString& theName ) { + //DEBTRACE("SetName"); QString anOldObjName = GetName(); if ( anOldObjName != theName ) { @@ -74,6 +75,7 @@ void HYDROData_Object::SetName( const QString& theName ) void HYDROData_Object::Update() { + DEBTRACE("Update"); if( IsMustBeUpdated( Geom_2d ) ) { RemoveTopShape(); @@ -88,6 +90,7 @@ void HYDROData_Object::Update() HYDROData_SequenceOfObjects HYDROData_Object::GetAllReferenceObjects() const { + //DEBTRACE("GetAllReferenceObjects"); HYDROData_SequenceOfObjects aResSeq = HYDROData_Entity::GetAllReferenceObjects(); Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject(); @@ -99,6 +102,7 @@ HYDROData_SequenceOfObjects HYDROData_Object::GetAllReferenceObjects() const void HYDROData_Object::Changed( Geometry theChangedGeometry ) { + DEBTRACE("Changed"); HYDROData_Entity::Changed( theChangedGeometry ); Handle(HYDROData_DummyObject3D) anObject3D = GetObject3D(); @@ -108,16 +112,19 @@ void HYDROData_Object::Changed( Geometry theChangedGeometry ) void HYDROData_Object::SetTopShape( const TopoDS_Shape& theShape ) { + DEBTRACE("SetTopShape"); HYDROData_Entity::SetShape( DataTag_TopShape, theShape ); } TopoDS_Shape HYDROData_Object::GetTopShape() const { + //DEBTRACE("GetTopShape"); return HYDROData_Entity::GetShape( DataTag_TopShape ); } void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape ) { + DEBTRACE("SetShape3D"); HYDROData_Entity::SetShape( DataTag_Shape3D, theShape ); // Check the object 3D existance checkAndSetObject3D(); @@ -125,11 +132,13 @@ void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape ) TopoDS_Shape HYDROData_Object::GetShape3D() const { + //DEBTRACE("GetShape3D"); return HYDROData_Entity::GetShape( DataTag_Shape3D ); } Handle(HYDROData_DummyObject3D) HYDROData_Object::GetObject3D() const { + //DEBTRACE("GetObject3D"); Handle(HYDROData_DummyObject3D) anObject; TDF_Label aLabel = myLab.FindChild( DataTag_Object3D, false ); @@ -148,6 +157,7 @@ Handle(HYDROData_DummyObject3D) HYDROData_Object::GetObject3D() const void HYDROData_Object::checkAndSetObject3D() { + DEBTRACE("checkAndSetObject3D"); TDF_Label aLabel = myLab.FindChild( DataTag_Object3D, false ); if ( !aLabel.IsNull() ) return; @@ -158,11 +168,13 @@ void HYDROData_Object::checkAndSetObject3D() HYDROData_SequenceOfObjects HYDROData_Object::GetGroups() const { + //DEBTRACE("GetGroups"); return GetReferenceObjects( DataTag_EdgesGroup ); } Handle(HYDROData_ShapesGroup) HYDROData_Object::GetGroup( const int theGroupId ) const { + //DEBTRACE("GetGroup"); Handle(HYDROData_ShapesGroup) aResGroup; HYDROData_SequenceOfObjects aGroups = GetGroups(); @@ -176,6 +188,7 @@ Handle(HYDROData_ShapesGroup) HYDROData_Object::GetGroup( const int theGroupId ) int HYDROData_Object::GetGroupId( const Handle(HYDROData_ShapesGroup)& theGroup ) const { + //DEBTRACE("GetGroupId"); int aRes = -1; HYDROData_SequenceOfObjects aGroups = GetGroups(); @@ -183,7 +196,7 @@ int HYDROData_Object::GetGroupId( const Handle(HYDROData_ShapesGroup)& theGroup { Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( i ) ); - if ( IsEqual( theGroup, aGroup ) ) + if ( theGroup->CompareLabels ( aGroup ) ) { aRes = i - 1; break; @@ -196,10 +209,14 @@ int HYDROData_Object::GetGroupId( const Handle(HYDROData_ShapesGroup)& theGroup bool HYDROData_Object::SetAltitudeObject( const Handle(HYDROData_IAltitudeObject)& theAltitude ) { + DEBTRACE("SetAltitudeObject"); if ( theAltitude.IsNull() ) return false; Handle(HYDROData_IAltitudeObject) aPrevAltitude = GetAltitudeObject(); + if (!aPrevAltitude.IsNull()) + DEBTRACE("aPrevAltitude: " << aPrevAltitude->GetName()) + DEBTRACE("theAltitude: " << theAltitude->GetName()) if ( IsEqual( aPrevAltitude, theAltitude ) ) return true; @@ -214,16 +231,18 @@ bool HYDROData_Object::SetAltitudeObject( Handle(HYDROData_IAltitudeObject) HYDROData_Object::GetAltitudeObject() const { + //DEBTRACE("GetAltitudeObject"); return Handle(HYDROData_IAltitudeObject)::DownCast( GetReferenceObject( DataTag_AltitudeObject ) ); } void HYDROData_Object::RemoveAltitudeObject() { + DEBTRACE("RemoveAltitudeObject"); Handle(HYDROData_IAltitudeObject) aPrevAltitude = GetAltitudeObject(); if ( aPrevAltitude.IsNull() ) return; - + DEBTRACE("aPrevAltitude: " << aPrevAltitude->GetName()) ClearReferenceObjects( DataTag_AltitudeObject ); // #636: In the case of the altitude object change the geometry of the main object is not changed, @@ -233,36 +252,43 @@ void HYDROData_Object::RemoveAltitudeObject() void HYDROData_Object::SetFillingColor( const QColor& theColor ) { + //DEBTRACE("SetFillingColor"); SetColor( theColor, DataTag_FillingColor ); } QColor HYDROData_Object::GetFillingColor() const { + //DEBTRACE("GetFillingColor"); return GetColor( DefaultFillingColor(), DataTag_FillingColor ); } void HYDROData_Object::SetBorderColor( const QColor& theColor ) { + //DEBTRACE("SetBorderColor"); SetColor( theColor, DataTag_BorderColor ); } QColor HYDROData_Object::GetBorderColor() const { + //DEBTRACE("GetBorderColor"); return GetColor( DefaultBorderColor(), DataTag_BorderColor ); } QColor HYDROData_Object::DefaultFillingColor() const { + //DEBTRACE("DefaultFillingColor"); return QColor( Qt::yellow ); } QColor HYDROData_Object::DefaultBorderColor() const { + //DEBTRACE("DefaultBorderColor"); return QColor( Qt::transparent ); } QStringList HYDROData_Object::dumpObjectCreation( MapOfTreatedObjects& theTreatedObjects ) const { + DEBTRACE("dumpObjectCreation"); QStringList aResList = HYDROData_Entity::dumpObjectCreation( theTreatedObjects ); if ( aResList.isEmpty() ) return aResList; //Object was not created @@ -291,6 +317,7 @@ ObjectKind HYDROData_Object::getAltitudeObjectType() const Handle(HYDROData_IAltitudeObject) HYDROData_Object::getChildAltitudeObject() const { + //DEBTRACE("getChildAltitudeObject"); Handle(HYDROData_IAltitudeObject) anObject; TDF_Label aLabel = myLab.FindChild( DataTag_ChildAltitudeObject, false ); @@ -309,15 +336,21 @@ Handle(HYDROData_IAltitudeObject) HYDROData_Object::getChildAltitudeObject() con void HYDROData_Object::checkAndSetAltitudeObject() { - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + DEBTRACE("checkAndSetAltitudeObject"); + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document(); ObjectKind anAltitudeObjectType = getAltitudeObjectType(); - //DEBTRACE("HYDROData_Object::checkAndSetAltitudeObject anAltitudeObjectType="<< anAltitudeObjectType); + DEBTRACE("HYDROData_Object::checkAndSetAltitudeObject anAltitudeObjectType="<< anAltitudeObjectType); if ( anAltitudeObjectType == KIND_UNKNOWN ) + { + DEBTRACE("anAltitudeObjectType == KIND_UNKNOWN"); return; // No need to create altitude object + } - TDF_Label aLabel = myLab.FindChild( DataTag_ChildAltitudeObject, false ); - if ( !aLabel.IsNull() ) + Handle(HYDROData_IAltitudeObject) altObject = GetAltitudeObject(); + if( !altObject.IsNull() ) + DEBTRACE(altObject->GetName()); + if( !altObject.IsNull() && altObject->GetKind()==anAltitudeObjectType ) return; TDF_Label aChildLabel = myLab.FindChild( DataTag_ChildAltitudeObject ).FindChild( 0 ); @@ -327,7 +360,7 @@ void HYDROData_Object::checkAndSetAltitudeObject() HYDROData_Iterator::CreateObject( aChildLabel, anAltitudeObjectType ) ); QString anAltitudePref = GetName() + "_Altitude"; - //DEBTRACE("anAltitudePref " << anAltitudePref.toStdString()); + DEBTRACE("anAltitudePref " << anAltitudePref.toStdString()); QString anAltitudeName = HYDROData_Tool::GenerateObjectName( aDocument, anAltitudePref ); anAltitudeObject->SetName( anAltitudeName ); @@ -336,6 +369,7 @@ void HYDROData_Object::checkAndSetAltitudeObject() Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject() { + DEBTRACE("createGroupObject"); TDF_Label aNewLab = myLab.FindChild( DataTag_EdgesGroup ).NewChild(); Handle(HYDROData_ShapesGroup) aNewGroup = @@ -347,6 +381,7 @@ Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject() void HYDROData_Object::RemoveGroupObjects() { + DEBTRACE("RemoveGroupObjects"); TDF_Label aLabel = myLab.FindChild( DataTag_EdgesGroup, false ); if ( !aLabel.IsNull() ) aLabel.ForgetAllAttributes(); @@ -354,16 +389,19 @@ void HYDROData_Object::RemoveGroupObjects() void HYDROData_Object::RemoveTopShape() { + DEBTRACE("RemoveTopShape"); HYDROData_Entity::SetShape( DataTag_TopShape, TopoDS_Shape() ); } void HYDROData_Object::RemoveShape3D() { + DEBTRACE("RemoveShape3D"); HYDROData_Entity::SetShape( DataTag_Shape3D, TopoDS_Shape() ); } bool HYDROData_Object::IsSubmersible() const { + //DEBTRACE("IsSubmersible"); Handle(TDataStd_Integer) aSubMersibleAttr; bool isSubmersible = true; //default @@ -377,12 +415,15 @@ bool HYDROData_Object::IsSubmersible() const void HYDROData_Object::SetIsSubmersible( bool isSubmersible ) const { - TDataStd_Integer::Set( myLab, isSubmersible ? 1 : 0 ); + DEBTRACE("SetIsSubmersible"); + Handle(TDataStd_Integer) anAttr = TDataStd_Integer::Set( myLab, isSubmersible ? 1 : 0 ); + anAttr->SetID(TDataStd_Integer::GetID()); } void HYDROData_Object::GetBoundaries( QList& theBoundShapes, QStringList& theBoundNames ) const { + DEBTRACE("GetBoundaries"); HYDROData_SequenceOfObjects aGroups = GetGroups(); HYDROData_SequenceOfObjects::Iterator anIter( aGroups ); for ( ; anIter.More(); anIter.Next() )