X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=7204f97fde1bf06c1bcdec4e5cf52457713122ba;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=970b62d7eaef94cfa290b89b6dcad2e04bf04c66;hpb=8543e637cbb4ae48998c596241fce567a729eb67;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 970b62d7..7204f97f 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -3,6 +3,7 @@
 
 #include "HYDROData_DummyObject3D.h"
 #include "HYDROData_ShapesGroup.h"
+#include "HYDROData_Tool.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_IAltitudeObject.h"
 
@@ -39,16 +40,16 @@ void HYDROData_Object::SetName( const QString& theName )
       if ( aGroup.IsNull() )
         continue;
 
-      QString aGroupName = aGroup->GetName();
-      if ( anOldObjName.isEmpty() )
-        aGroupName.prepend( theName + "_" );
-      else if ( aGroupName.startsWith( anOldObjName ) )
-        aGroupName.replace( anOldObjName, theName );
-      else
-        continue;
-
-      aGroup->SetName( aGroupName );
+      HYDROData_Tool::UpdateChildObjectName( anOldObjName, theName, aGroup );
     }
+
+    Handle(HYDROData_DummyObject3D) anObject3D = GetObject3D();
+    if ( !anObject3D.IsNull() )
+      HYDROData_Tool::UpdateChildObjectName( anOldObjName, theName, anObject3D );
+
+    Handle(HYDROData_IAltitudeObject) anAltitudeObj = getChildAltitudeObject();
+    if ( !anAltitudeObj.IsNull() )
+      HYDROData_Tool::UpdateChildObjectName( anOldObjName, theName, anAltitudeObj );
   }
 
   HYDROData_Entity::SetName( theName );
@@ -56,10 +57,11 @@ void HYDROData_Object::SetName( const QString& theName )
 
 void HYDROData_Object::Update()
 {
-  HYDROData_Entity::Update();
   removeTopShape();
   removeShape3D();
   removeGroupObjects();
+  checkAndSetAltitudeObject();
+  HYDROData_Entity::Update();
 }
 
 HYDROData_SequenceOfObjects HYDROData_Object::GetAllReferenceObjects() const
@@ -130,6 +132,38 @@ HYDROData_SequenceOfObjects HYDROData_Object::GetGroups() const
   return GetReferenceObjects( DataTag_EdgesGroup );
 }
 
+Handle(HYDROData_ShapesGroup) HYDROData_Object::GetGroup( const int theGroupId ) const
+{
+  Handle(HYDROData_ShapesGroup) aResGroup;
+
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  if ( theGroupId < 0 || theGroupId >= aGroups.Length() )
+    return aResGroup;
+
+  aResGroup = Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( theGroupId + 1 ) );
+
+  return aResGroup;
+}
+
+int HYDROData_Object::GetGroupId( const Handle(HYDROData_ShapesGroup)& theGroup ) const
+{
+  int aRes = -1;
+
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  for ( int i = 1, n = aGroups.Length(); i <= n; ++i )
+  {
+    Handle(HYDROData_ShapesGroup) aGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( i ) );
+    if ( IsEqual( theGroup, aGroup ) )
+    {
+      aRes = i - 1;
+      break;
+    }
+  }
+
+  return aRes;
+}
+
 bool HYDROData_Object::SetAltitudeObject( 
   const Handle(HYDROData_IAltitudeObject)& theAltitude )
 {
@@ -186,24 +220,85 @@ QColor HYDROData_Object::GetBorderColor() const
   return GetColor( getDefaultBorderColor(), DataTag_BorderColor );
 }
 
-QColor HYDROData_Object::DefaultFillingColor()
+QColor HYDROData_Object::getDefaultFillingColor() const
 {
   return QColor( Qt::yellow );
 }
 
-QColor HYDROData_Object::DefaultBorderColor()
+QColor HYDROData_Object::getDefaultBorderColor() const
 {
   return QColor( Qt::transparent );
 }
 
-QColor HYDROData_Object::getDefaultFillingColor() const
+QStringList HYDROData_Object::dumpObjectCreation( MapOfTreatedObjects& theTreatedObjects ) const
+{
+  QStringList aResList = HYDROData_Entity::dumpObjectCreation( theTreatedObjects );
+  if ( aResList.isEmpty() )
+    return aResList; //Object was not created
+
+  QStringList aColorsDef;
+
+  QColor aFillingColor = GetFillingColor();
+  setPythonObjectColor( aColorsDef, aFillingColor, getDefaultFillingColor(), "SetFillingColor" );
+
+  QColor aBorderColor = GetBorderColor();
+  setPythonObjectColor( aColorsDef, aBorderColor, getDefaultBorderColor(), "SetBorderColor" );
+
+  if ( !aColorsDef.isEmpty() )
+  {
+    aResList << aColorsDef;
+    aResList << QString( "" );
+  }
+
+  return aResList;
+}
+
+ObjectKind HYDROData_Object::getAltitudeObjectType() const
 {
-  return DefaultFillingColor();
+  return KIND_UNKNOWN;
 }
 
-QColor HYDROData_Object::getDefaultBorderColor() const
+Handle(HYDROData_IAltitudeObject) HYDROData_Object::getChildAltitudeObject() const
+{
+  Handle(HYDROData_IAltitudeObject) anObject;
+  
+  TDF_Label aLabel = myLab.FindChild( DataTag_ChildAltitudeObject, false );
+  if ( !aLabel.IsNull() )
+  {
+    TDF_Label aChildLabel = aLabel.FindChild( 0, false );
+    if ( !aChildLabel.IsNull() )
+    {
+      anObject = Handle(HYDROData_IAltitudeObject)::DownCast(
+        HYDROData_Iterator::Object( aChildLabel ) );
+    }
+  }
+
+  return anObject;
+}
+
+void HYDROData_Object::checkAndSetAltitudeObject()
 {
-  return DefaultBorderColor();
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+
+  ObjectKind anAltitudeObjectType = getAltitudeObjectType();
+  if ( anAltitudeObjectType == KIND_UNKNOWN )
+    return; // No need to create altitude object
+
+  TDF_Label aLabel = myLab.FindChild( DataTag_ChildAltitudeObject, false );
+  if ( !aLabel.IsNull() )
+    return;
+
+  TDF_Label aChildLabel = myLab.FindChild( DataTag_ChildAltitudeObject ).FindChild( 0 );
+
+  Handle(HYDROData_IAltitudeObject) anAltitudeObject =
+    Handle(HYDROData_IAltitudeObject)::DownCast(
+      HYDROData_Iterator::CreateObject( aChildLabel, anAltitudeObjectType ) );
+
+  QString anAltitudePref = GetName() + "_Altitude";
+  QString anAltitudeName = HYDROData_Tool::GenerateObjectName( aDocument, anAltitudePref );
+  anAltitudeObject->SetName( anAltitudeName );
+
+  SetAltitudeObject( anAltitudeObject );
 }
 
 Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject()
@@ -217,10 +312,6 @@ Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject()
   return aNewGroup;
 }
 
-void HYDROData_Object::createGroupObjects()
-{
-}
-
 void HYDROData_Object::removeGroupObjects()
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_EdgesGroup, false );