Lot 2: change bathy associated to natural object propagated to all cases without...

[modules/hydro.git] / src / HYDROData / HYDROData_Object.cxx

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 240db460801d73ff059a86480fb879f8ec4a80ab..0fcae54fdd9f89c088be247acff920d1815ce46d 100644 (file)
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -32,7 +32,6 @@
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
 
 HYDROData_Object::HYDROData_Object( Geometry theGeometry )
@@ -46,6 +45,7 @@ HYDROData_Object::~HYDROData_Object()
 
 void HYDROData_Object::SetName( const QString& theName )
 {
+  //DEBTRACE("SetName");
   QString anOldObjName = GetName();
   if ( anOldObjName != theName )
   {
@@ -75,6 +75,7 @@ void HYDROData_Object::SetName( const QString& theName )
 
 void HYDROData_Object::Update()
 {
+  DEBTRACE("Update");
   if( IsMustBeUpdated( Geom_2d ) )
   {
     RemoveTopShape();
@@ -89,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();
@@ -100,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();
@@ -109,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();
@@ -126,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 );
@@ -149,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;
@@ -159,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();
@@ -177,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();
@@ -184,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;
@@ -197,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;
 
@@ -215,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,
@@ -234,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
@@ -292,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 );
@@ -310,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);
   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 );
@@ -337,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 =
@@ -348,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();
@@ -355,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
@@ -378,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<TopoDS_Shape>& theBoundShapes,
                                       QStringList& theBoundNames ) const
 {
+  DEBTRACE("GetBoundaries");
   HYDROData_SequenceOfObjects aGroups = GetGroups();
     HYDROData_SequenceOfObjects::Iterator anIter( aGroups );
     for ( ; anIter.More(); anIter.Next() )