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 20eead85ab2a6ab08dbbced470a32b015fe94632..0f6776241e7b4cf3fb4b1749f6d5d56820534db8 100644 (file)
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -25,10 +25,13 @@
 #include "HYDROData_IAltitudeObject.h"
 #include <TopoDS_Shape.hxx>
 #include <TDataStd_Integer.hxx>
+#include <TDataStd_Real.hxx>
 
 #include <QColor>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,HYDROData_Entity)
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
 
 HYDROData_Object::HYDROData_Object( Geometry theGeometry )
@@ -180,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;
@@ -309,11 +312,12 @@ void HYDROData_Object::checkAndSetAltitudeObject()
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
 
   ObjectKind anAltitudeObjectType = getAltitudeObjectType();
+  //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 );
@@ -323,6 +327,7 @@ void HYDROData_Object::checkAndSetAltitudeObject()
       HYDROData_Iterator::CreateObject( aChildLabel, anAltitudeObjectType ) );
 
   QString anAltitudePref = GetName() + "_Altitude";
+  //DEBTRACE("anAltitudePref " << anAltitudePref.toStdString());
   QString anAltitudeName = HYDROData_Tool::GenerateObjectName( aDocument, anAltitudePref );
   anAltitudeObject->SetName( anAltitudeName );