X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=f2570cfe08970263164b2e063f6b1d50a308c686;hb=110c68a935c71ebdb6f305fa992f1e6c989ab859;hp=2ee9bd7ec4788fab611f7367eaebf3bf9173df72;hpb=3cff85424556651afcab2e7fa5081531d748b7cc;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 2ee9bd7e..f2570cfe 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -1,346 +1,405 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "HYDROData_Object.h"
 
+#include "HYDROData_DummyObject3D.h"
+#include "HYDROData_ShapesGroup.h"
+#include "HYDROData_Tool.h"
 #include "HYDROData_Iterator.h"
-
-#include <TDataStd_Name.hxx>
-#include <TDataStd_ByteArray.hxx>
-#include <TDataStd_UAttribute.hxx>
-#include <TDataStd_IntegerArray.hxx>
-#include <TDataStd_BooleanArray.hxx>
-#include <TDataStd_RealArray.hxx>
-#include <TDataStd_ReferenceList.hxx>
-
-#include <TDF_CopyLabel.hxx>
-#include <TDF_ListIteratorOfLabelList.hxx>
+#include "HYDROData_IAltitudeObject.h"
+#include <TopoDS_Shape.hxx>
+#include <TDataStd_Integer.hxx>
+#include <TDataStd_Real.hxx>
 
 #include <QColor>
-#include <QString>
-#include <QStringList>
-#include <QVariant>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,MMgt_TShared)
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
 
-// is equal function for unique object mapping
-bool IsEqual(const Handle_HYDROData_Object& theObj1, const Handle_HYDROData_Object& theObj2)
-{
-  return (theObj1->ID() == theObj2->ID());
-}
+IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,HYDROData_Entity)
+IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
 
-QString HYDROData_Object::GetName() const
+HYDROData_Object::HYDROData_Object( Geometry theGeometry )
+  : HYDROData_Entity( theGeometry )
 {
-  Handle(TDataStd_Name) aName;
-  if (myLab.FindAttribute(TDataStd_Name::GetID(), aName)) {
-    TCollection_AsciiString aStr(aName->Get());
-    return QString(aStr.ToCString());
-  }
-  return QString();
 }
 
-void HYDROData_Object::SetName(const QString& theName)
+HYDROData_Object::~HYDROData_Object()
 {
-  TDataStd_Name::Set(myLab, TCollection_ExtendedString(theName.toLatin1().constData()));
 }
 
-QStringList HYDROData_Object::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+void HYDROData_Object::SetName( const QString& theName )
 {
-  QStringList anEmptyList;
-  return anEmptyList;
-}
+  QString anOldObjName = GetName();
+  if ( anOldObjName != theName )
+  {
+    HYDROData_SequenceOfObjects aGroups = GetGroups();
+    HYDROData_SequenceOfObjects::Iterator anIter( aGroups );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_ShapesGroup) aGroup =
+        Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+      if ( aGroup.IsNull() )
+        continue;
 
-void HYDROData_Object::Update( const bool theIsForce )
-{
+      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 );
 }
 
-QVariant HYDROData_Object::GetDataVariant()
+void HYDROData_Object::Update()
 {
-  return QVariant();
+  if( IsMustBeUpdated( Geom_2d ) )
+  {
+    RemoveTopShape();
+    RemoveGroupObjects();
+  }
+  if( IsMustBeUpdated( Geom_3d ) )
+    RemoveShape3D();
+
+  checkAndSetAltitudeObject();
+  HYDROData_Entity::Update();
 }
 
-bool HYDROData_Object::IsRemoved() const
+HYDROData_SequenceOfObjects HYDROData_Object::GetAllReferenceObjects() const
 {
-  return !myLab.HasAttribute();
+  HYDROData_SequenceOfObjects aResSeq = HYDROData_Entity::GetAllReferenceObjects();
+
+  Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
+  if ( !aRefAltitude.IsNull() )
+    aResSeq.Append( aRefAltitude );
+
+  return aResSeq;
 }
 
-void HYDROData_Object::Remove()
+void HYDROData_Object::Changed( Geometry theChangedGeometry )
 {
-  return myLab.ForgetAllAttributes(Standard_True);
+  HYDROData_Entity::Changed( theChangedGeometry );
+
+  Handle(HYDROData_DummyObject3D) anObject3D = GetObject3D();
+  if ( !anObject3D.IsNull() )
+    anObject3D->Changed( theChangedGeometry );
 }
 
-HYDROData_Object::HYDROData_Object()
+void HYDROData_Object::SetTopShape( const TopoDS_Shape& theShape )
 {
+  HYDROData_Entity::SetShape( DataTag_TopShape, theShape );
 }
 
-HYDROData_Object::~HYDROData_Object()
+TopoDS_Shape HYDROData_Object::GetTopShape() const
 {
+  return HYDROData_Entity::GetShape( DataTag_TopShape );
 }
 
-void HYDROData_Object::CopyTo(Handle_HYDROData_Object theDestination) const
+void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape )
 {
-  TDF_CopyLabel aCopy(myLab, theDestination->Label());
-  aCopy.Perform();
+  HYDROData_Entity::SetShape( DataTag_Shape3D, theShape );
+  // Check the object 3D existance
+  checkAndSetObject3D();
 }
 
-void HYDROData_Object::SetLabel(TDF_Label theLabel)
+TopoDS_Shape HYDROData_Object::GetShape3D() const
 {
-  myLab = theLabel;
+  return HYDROData_Entity::GetShape( DataTag_Shape3D );
 }
 
-void HYDROData_Object::SaveByteArray(const int theTag, 
-  const char* theData, const int theLen)
+Handle(HYDROData_DummyObject3D) HYDROData_Object::GetObject3D() const
 {
-  TDF_Label aLab = theTag == 0 ? myLab : myLab.FindChild(theTag);
-  // array is empty, remove the attribute
-  if (theLen <= 0) {
-    aLab.ForgetAttribute(TDataStd_ByteArray::GetID());
-    return;
-  }
-  // store data of image in byte array
-  Handle(TDataStd_ByteArray) aData;
-  if (!aLab.FindAttribute(TDataStd_ByteArray::GetID(), aData)) {
-    aData = TDataStd_ByteArray::Set(aLab, 1, theLen);
-  }
-  // copy bytes one by one
-  if (aData->Length() != theLen) {
-    Handle(TColStd_HArray1OfByte) aNewData = new TColStd_HArray1OfByte(1, theLen);
-    for(int a = 0; a < theLen; a++)
-      aNewData->SetValue(a + 1, theData[a]);
-    aData->ChangeArray(aNewData);
-  } else {
-    for(int a = 0; a < theLen; a++)
-      aData->SetValue(a + 1, theData[a]);
+  Handle(HYDROData_DummyObject3D) anObject;
+  
+  TDF_Label aLabel = myLab.FindChild( DataTag_Object3D, false );
+  if ( !aLabel.IsNull() )
+  {
+    TDF_Label aChildLabel = aLabel.FindChild( 0, false );
+    if ( !aChildLabel.IsNull() )
+    {
+      anObject = Handle(HYDROData_DummyObject3D)::DownCast(
+        HYDROData_Iterator::Object( aChildLabel ) );
+    }
   }
+
+  return anObject;
 }
 
-const char* HYDROData_Object::ByteArray(const int theTag, int& theLen) const
+void HYDROData_Object::checkAndSetObject3D()
 {
-  TDF_Label aLab = theTag == 0 ? myLab : myLab.FindChild(theTag);
-  Handle(TDataStd_ByteArray) aData;
-  if (!aLab.FindAttribute(TDataStd_ByteArray::GetID(), aData))
-    return NULL; // return empty image if there is no array
-  theLen = aData->Length();
-  if (theLen)
-    return (const char*)(&(aData->InternalArray()->ChangeArray1().ChangeValue(1)));
-  return NULL;
+  TDF_Label aLabel = myLab.FindChild( DataTag_Object3D, false );
+  if ( !aLabel.IsNull() )
+    return;
+
+  TDF_Label aChildLabel = myLab.FindChild( DataTag_Object3D ).FindChild( 0 );
+  HYDROData_Iterator::CreateObject( aChildLabel, KIND_DUMMY_3D );
 }
 
-int HYDROData_Object::NbReferenceObjects( const int theTag ) const
+HYDROData_SequenceOfObjects HYDROData_Object::GetGroups() const
 {
-  Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, false );
-  return aRefs.IsNull() ? 0 : aRefs->Extent();
+  return GetReferenceObjects( DataTag_EdgesGroup );
 }
 
-void HYDROData_Object::AddReferenceObject( const Handle_HYDROData_Object& theObj,
-                                           const int                      theTag )
+Handle(HYDROData_ShapesGroup) HYDROData_Object::GetGroup( const int theGroupId ) const
 {
-  if ( theObj.IsNull() )
-    return;
+  Handle(HYDROData_ShapesGroup) aResGroup;
+
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  if ( theGroupId < 0 || theGroupId >= aGroups.Length() )
+    return aResGroup;
 
-  Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, true );
-  aRefs->Append( theObj->Label() );
+  aResGroup = Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( theGroupId + 1 ) );
+
+  return aResGroup;
 }
 
-void HYDROData_Object::SetReferenceObject( const Handle_HYDROData_Object& theObj,
-                                           const int                      theTag,
-                                           const int                      theIndex )
+int HYDROData_Object::GetGroupId( const Handle(HYDROData_ShapesGroup)& theGroup ) const
 {
-  if ( theObj.IsNull() )
+  int aRes = -1;
+
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+  for ( int i = 1, n = aGroups.Length(); i <= n; ++i )
   {
-    RemoveReferenceObject( theTag, theIndex );
-    return;
+    Handle(HYDROData_ShapesGroup) aGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( i ) );
+    if ( IsEqual( theGroup, aGroup ) )
+    {
+      aRes = i - 1;
+      break;
+    }
   }
 
-  Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, true );
+  return aRes;
+}
+
+bool HYDROData_Object::SetAltitudeObject( 
+  const Handle(HYDROData_IAltitudeObject)& theAltitude )
+{
+  if ( theAltitude.IsNull() )
+    return false;
+  
+  Handle(HYDROData_IAltitudeObject) aPrevAltitude = GetAltitudeObject();
+  if ( IsEqual( aPrevAltitude, theAltitude ) )
+    return true;
 
-  if ( theIndex >= aRefs->Extent() )
-  {
-    aRefs->Append( theObj->Label() );
-  }
-  else if ( theIndex < 0 )
-  {
-    aRefs->Prepend( theObj->Label() );
-  }
-  else
-  {
-    RemoveReferenceObject( theTag, theIndex );
+  SetReferenceObject( theAltitude, DataTag_AltitudeObject );
 
-    Handle(HYDROData_Object) aBeforeObj = GetReferenceObject( theTag, theIndex );
+  // #636: In the case of the altitude object change the geometry of the main object is not changed,
+  // to the object should not be marked as updated
+  //SetToUpdate( true );
 
-    aRefs = getReferenceList( theTag, true ); // because reference list can be removed
-    if ( !aBeforeObj.IsNull() )
-      aRefs->InsertBefore( theObj->Label(), aBeforeObj->Label() );
-    else 
-      aRefs->Append( theObj->Label() );
-  }
+  return true;
+}
+
+Handle(HYDROData_IAltitudeObject) HYDROData_Object::GetAltitudeObject() const
+{
+  return Handle(HYDROData_IAltitudeObject)::DownCast( 
+           GetReferenceObject( DataTag_AltitudeObject ) );
 }
 
-void HYDROData_Object::SetReferenceObjects( const HYDROData_SequenceOfObjects& theObjects,
-                                            const int                          theTag )
+void HYDROData_Object::RemoveAltitudeObject()
 {
-  ClearReferenceObjects( theTag );
-  if ( theObjects.IsEmpty() )
+  Handle(HYDROData_IAltitudeObject) aPrevAltitude = GetAltitudeObject();
+  if ( aPrevAltitude.IsNull() )
     return;
 
-  HYDROData_SequenceOfObjects::Iterator anIter( theObjects );
-  for ( ; anIter.More(); anIter.Next() )
-    AddReferenceObject( anIter.Value(), theTag );
+  ClearReferenceObjects( DataTag_AltitudeObject );
+
+  // #636: In the case of the altitude object change the geometry of the main object is not changed,
+  // to the object should not be marked as updated
+  //SetToUpdate( true );
 }
 
-Handle(HYDROData_Object) HYDROData_Object::GetReferenceObject( const int theTag,
-                                                               const int theIndex ) const
+void HYDROData_Object::SetFillingColor( const QColor& theColor )
 {
-  Handle(HYDROData_Object) aRes;
+  SetColor( theColor, DataTag_FillingColor );
+}
 
-  Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, false );
-  if ( aRefs.IsNull() || theIndex < 0 || theIndex >= aRefs->Extent() )
-    return aRes;
+QColor HYDROData_Object::GetFillingColor() const
+{
+  return GetColor( DefaultFillingColor(), DataTag_FillingColor );
+}
 
-  TDF_ListIteratorOfLabelList anIter( aRefs->List() );
-  for ( int anIndex = 0; anIndex != theIndex && anIter.More(); anIter.Next(), ++anIndex );
+void HYDROData_Object::SetBorderColor( const QColor& theColor )
+{
+  SetColor( theColor, DataTag_BorderColor );
+}
 
-  const TDF_Label& aRefLabel = anIter.Value();
-  aRes = HYDROData_Iterator::Object( aRefLabel );
+QColor HYDROData_Object::GetBorderColor() const
+{
+  return GetColor( DefaultBorderColor(), DataTag_BorderColor );
+}
 
-  return aRes;
+QColor HYDROData_Object::DefaultFillingColor() const
+{
+  return QColor( Qt::yellow );
+}
+
+QColor HYDROData_Object::DefaultBorderColor() const
+{
+  return QColor( Qt::transparent );
 }
 
-HYDROData_SequenceOfObjects HYDROData_Object::GetReferenceObjects( const int theTag ) const
+QStringList HYDROData_Object::dumpObjectCreation( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  HYDROData_SequenceOfObjects aRes;
+  QStringList aResList = HYDROData_Entity::dumpObjectCreation( theTreatedObjects );
+  if ( aResList.isEmpty() )
+    return aResList; //Object was not created
 
-  Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, false );
-  if ( aRefs.IsNull() )
-    return aRes;
+  QStringList aColorsDef;
 
-  TDF_ListIteratorOfLabelList anIter( aRefs->List() );
-  for ( ; anIter.More(); anIter.Next() )
-  {
-    const TDF_Label& aRefLabel = anIter.Value();
+  QColor aFillingColor = GetFillingColor();
+  setPythonObjectColor( aColorsDef, aFillingColor, DefaultFillingColor(), "SetFillingColor" );
 
-    Handle(HYDROData_Object) aRefObject = HYDROData_Iterator::Object( aRefLabel );
-    if ( aRefObject.IsNull() )
-      continue;
+  QColor aBorderColor = GetBorderColor();
+  setPythonObjectColor( aColorsDef, aBorderColor, DefaultBorderColor(), "SetBorderColor" );
 
-    aRes.Append( aRefObject );
+  if ( !aColorsDef.isEmpty() )
+  {
+    aResList << aColorsDef;
+    aResList << QString( "" );
   }
 
-  return aRes;
+  return aResList;
 }
 
-void HYDROData_Object::RemoveReferenceObject( const int theTag,
-                                              const int theIndex )
+ObjectKind HYDROData_Object::getAltitudeObjectType() const
 {
-  Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, false );
-  if ( aRefs.IsNull() )
-    return;
+  return KIND_UNKNOWN;
+}
 
-  if ( aRefs->Extent() == 1 && theIndex == 0 )
-  { 
-    // remove all if only one
-    ClearReferenceObjects( theTag );
-    return;
+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 ) );
+    }
   }
 
-  int anIndex = 0;
-  TDF_ListIteratorOfLabelList anIter( aRefs->List() );
-  for ( ; anIndex != theIndex && anIter.More(); anIter.Next(), ++anIndex );
+  return anObject;
+}
+
+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
 
-  if ( anIndex != theIndex )
+  TDF_Label aLabel = myLab.FindChild( DataTag_ChildAltitudeObject, false );
+  if ( !aLabel.IsNull() )
     return;
 
-  const TDF_Label& aRefLabel = anIter.Value();
-  aRefs->Remove( aRefLabel );
-}
+  TDF_Label aChildLabel = myLab.FindChild( DataTag_ChildAltitudeObject ).FindChild( 0 );
 
-void HYDROData_Object::ClearReferenceObjects( const int theTag )
-{
-  TDF_Label aSetLabel = theTag == 0 ? myLab : myLab.FindChild( theTag );
-  aSetLabel.ForgetAttribute( TDataStd_ReferenceList::GetID() );
+  Handle(HYDROData_IAltitudeObject) anAltitudeObject =
+    Handle(HYDROData_IAltitudeObject)::DownCast(
+      HYDROData_Iterator::CreateObject( aChildLabel, anAltitudeObjectType ) );
+
+  QString anAltitudePref = GetName() + "_Altitude";
+  DEBTRACE("anAltitudePref " << anAltitudePref.toStdString());
+  QString anAltitudeName = HYDROData_Tool::GenerateObjectName( aDocument, anAltitudePref );
+  anAltitudeObject->SetName( anAltitudeName );
+
+  SetAltitudeObject( anAltitudeObject );
 }
 
-Handle(TDataStd_ReferenceList) HYDROData_Object::getReferenceList( const int theTag,
-                                                                   const bool theIsCreate ) const
+Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject()
 {
-  TDF_Label aLabel = theTag == 0 ? myLab : myLab.FindChild( theTag );
+  TDF_Label aNewLab = myLab.FindChild( DataTag_EdgesGroup ).NewChild();
 
-  Handle(TDataStd_ReferenceList) aRefs;
-  if ( !aLabel.FindAttribute( TDataStd_ReferenceList::GetID(), aRefs ) && theIsCreate )
-    aRefs = TDataStd_ReferenceList::Set( aLabel );
+  Handle(HYDROData_ShapesGroup) aNewGroup =
+    Handle(HYDROData_ShapesGroup)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_SHAPES_GROUP ) );
+  AddReferenceObject( aNewGroup, DataTag_EdgesGroup );
 
-  return aRefs;
+  return aNewGroup;
 }
 
-void HYDROData_Object::SetColor( const QColor& theColor,
-                                 const int     theTag )
+void HYDROData_Object::RemoveGroupObjects()
 {
-  TDF_Label aLabel = theTag == 0 ? myLab : myLab.FindChild( theTag );
-
-  Handle(TDataStd_IntegerArray) aColorArray;
-  if ( !aLabel.FindAttribute( TDataStd_IntegerArray::GetID(), aColorArray ) )
-    aColorArray = TDataStd_IntegerArray::Set( aLabel, 1, 4 );
+  TDF_Label aLabel = myLab.FindChild( DataTag_EdgesGroup, false );
+  if ( !aLabel.IsNull() )
+    aLabel.ForgetAllAttributes();
+}
 
-  aColorArray->SetValue( 1, theColor.red()   );
-  aColorArray->SetValue( 2, theColor.green() );
-  aColorArray->SetValue( 3, theColor.blue()  );
-  aColorArray->SetValue( 4, theColor.alpha() );
+void HYDROData_Object::RemoveTopShape()
+{
+  HYDROData_Entity::SetShape( DataTag_TopShape, TopoDS_Shape() );
 }
 
-QColor HYDROData_Object::GetColor( const QColor& theDefColor,
-                                   const int     theTag ) const
+void HYDROData_Object::RemoveShape3D()
 {
-  QColor aResColor = theDefColor;
+  HYDROData_Entity::SetShape( DataTag_Shape3D, TopoDS_Shape() );
+}
 
-  TDF_Label aLabel = theTag == 0 ? myLab : myLab.FindChild( theTag );
+bool HYDROData_Object::IsSubmersible() const
+{
+  Handle(TDataStd_Integer) aSubMersibleAttr;
 
-  Handle(TDataStd_IntegerArray) aColorArray;
-  if ( aLabel.FindAttribute( TDataStd_IntegerArray::GetID(), aColorArray ) )
+  bool isSubmersible = true; //default
+  if( myLab.FindAttribute(TDataStd_Integer::GetID(), aSubMersibleAttr ) )
   {
-    aResColor.setRed(   aColorArray->Value( 1 ) );
-    aResColor.setGreen( aColorArray->Value( 2 ) );
-    aResColor.setBlue(  aColorArray->Value( 3 ) );
-    aResColor.setAlpha( aColorArray->Value( 4 ) );
+    int aValue = aSubMersibleAttr->Get();
+    isSubmersible = ( aValue != 0 );
   }
-
-  return aResColor;
+  return isSubmersible;
 }
 
-void HYDROData_Object::setPythonReferenceObject( MapOfTreatedObjects&            theTreatedObjects,
-                                                 QStringList&                    theScript,
-                                                 const Handle(HYDROData_Object)& theRefObject,
-                                                 const QString&                  theMethod ) const
+void HYDROData_Object::SetIsSubmersible( bool isSubmersible ) const
 {
-  if ( theRefObject.IsNull() )
-    return;
-
-  QString aRefObjName = theRefObject->GetName();
-  if ( aRefObjName.isEmpty() )
-    return;
-
-  bool anIsToSetObject = true;
+  TDataStd_Integer::Set( myLab, isSubmersible ? 1 : 0 );
+}
 
-  // The definition of reference polyline must be dumped before this
-  if ( !theTreatedObjects.contains( aRefObjName ) )
-  {
-    // Write definition of reference polyline
-    QStringList aRefObjDump = theRefObject->DumpToPython( theTreatedObjects );
-    if ( ( anIsToSetObject = !aRefObjDump.isEmpty() ) )
+void HYDROData_Object::GetBoundaries( QList<TopoDS_Shape>& theBoundShapes,
+                                      QStringList& theBoundNames ) const
+{
+  HYDROData_SequenceOfObjects aGroups = GetGroups();
+    HYDROData_SequenceOfObjects::Iterator anIter( aGroups );
+    for ( ; anIter.More(); anIter.Next() )
     {
-      QStringList aTmpList = theScript;
-      theScript = aRefObjDump;
-
-      theScript << QString( "" );
-      theScript << aTmpList;
-
-      theTreatedObjects.insert( aRefObjName, theRefObject );
+      Handle(HYDROData_ShapesGroup) aGroup =
+        Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+      if( aGroup.IsNull() )
+        continue;
+
+      QString aName = aGroup->GetName();
+      TopTools_SequenceOfShape aShapes;
+      aGroup->GetShapes( aShapes );
+      for( int i=1, n=aShapes.Length(); i<=n; i++ )
+      {
+        theBoundShapes.append( aShapes( i ) );
+        theBoundNames.append( aName );
+      }
     }
-  }
-
-  if ( anIsToSetObject )
-  {
-    theScript << QString( "%1.%2( %3 );" )
-                 .arg( GetName() ).arg( theMethod ).arg( aRefObjName );
-  }
 }
-
-