refs #1330: basic implementation of the not zoomable polyline arrows

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

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 240db460801d73ff059a86480fb879f8ec4a80ab..0f6776241e7b4cf3fb4b1749f6d5d56820534db8 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 )
@@ -184,7 +183,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;
@@ -313,12 +312,12 @@ void HYDROData_Object::checkAndSetAltitudeObject()
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
 
   ObjectKind anAltitudeObjectType = getAltitudeObjectType();
-  DEBTRACE("HYDROData_Object::checkAndSetAltitudeObject anAltitudeObjectType="<< anAltitudeObjectType);
+  //DEBTRACE("HYDROData_Object::checkAndSetAltitudeObject anAltitudeObjectType="<< anAltitudeObjectType);
   if ( 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() && altObject->GetKind()==anAltitudeObjectType )
     return;
 
   TDF_Label aChildLabel = myLab.FindChild( DataTag_ChildAltitudeObject ).FindChild( 0 );
@@ -328,7 +327,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 );