X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=f2570cfe08970263164b2e063f6b1d50a308c686;hb=a95289fabbb6fbf6f32c06207422c65aafd5bd65;hp=81cbe38ac4198022ae9a658d7cd9e76c4ca44184;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 81cbe38a..f2570cfe 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
@@ -27,19 +23,20 @@
 #include "HYDROData_Tool.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_IAltitudeObject.h"
-
-#include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
-
 #include <TopoDS_Shape.hxx>
+#include <TDataStd_Integer.hxx>
+#include <TDataStd_Real.hxx>
 
 #include <QColor>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
 
-HYDROData_Object::HYDROData_Object()
-: HYDROData_Entity()
+HYDROData_Object::HYDROData_Object( Geometry theGeometry )
+  : HYDROData_Entity( theGeometry )
 {
 }
 
@@ -78,9 +75,14 @@ void HYDROData_Object::SetName( const QString& theName )
 
 void HYDROData_Object::Update()
 {
-  removeTopShape();
-  removeShape3D();
-  removeGroupObjects();
+  if( IsMustBeUpdated( Geom_2d ) )
+  {
+    RemoveTopShape();
+    RemoveGroupObjects();
+  }
+  if( IsMustBeUpdated( Geom_3d ) )
+    RemoveShape3D();
+
   checkAndSetAltitudeObject();
   HYDROData_Entity::Update();
 }
@@ -96,30 +98,37 @@ HYDROData_SequenceOfObjects HYDROData_Object::GetAllReferenceObjects() const
   return aResSeq;
 }
 
-void HYDROData_Object::SetToUpdate( bool theFlag )
+void HYDROData_Object::Changed( Geometry theChangedGeometry )
 {
-  HYDROData_Entity::SetToUpdate( theFlag );
+  HYDROData_Entity::Changed( theChangedGeometry );
 
   Handle(HYDROData_DummyObject3D) anObject3D = GetObject3D();
   if ( !anObject3D.IsNull() )
-    anObject3D->SetToUpdate( theFlag );
+    anObject3D->Changed( theChangedGeometry );
 }
 
 void HYDROData_Object::SetTopShape( const TopoDS_Shape& theShape )
 {
-  TNaming_Builder aBuilder( myLab.FindChild( DataTag_TopShape ) );
-  aBuilder.Generated( theShape );
+  HYDROData_Entity::SetShape( DataTag_TopShape, theShape );
+}
+
+TopoDS_Shape HYDROData_Object::GetTopShape() const
+{
+  return HYDROData_Entity::GetShape( DataTag_TopShape );
 }
 
 void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape )
 {
-  TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape3D ) );
-  aBuilder.Generated( theShape );
-  
+  HYDROData_Entity::SetShape( DataTag_Shape3D, theShape );
   // Check the object 3D existance
   checkAndSetObject3D();
 }
 
+TopoDS_Shape HYDROData_Object::GetShape3D() const
+{
+  return HYDROData_Entity::GetShape( DataTag_Shape3D );
+}
+
 Handle(HYDROData_DummyObject3D) HYDROData_Object::GetObject3D() const
 {
   Handle(HYDROData_DummyObject3D) anObject;
@@ -197,8 +206,9 @@ bool HYDROData_Object::SetAltitudeObject(
 
   SetReferenceObject( theAltitude, DataTag_AltitudeObject );
 
-  // Indicate model of the need to update object
-  SetToUpdate( true );
+  // #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 );
 
   return true;
 }
@@ -217,8 +227,9 @@ void HYDROData_Object::RemoveAltitudeObject()
 
   ClearReferenceObjects( DataTag_AltitudeObject );
 
-  // Indicate model of the need to update object
-  SetToUpdate( true );
+  // #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 );
 }
 
 void HYDROData_Object::SetFillingColor( const QColor& theColor )
@@ -228,7 +239,7 @@ void HYDROData_Object::SetFillingColor( const QColor& theColor )
 
 QColor HYDROData_Object::GetFillingColor() const
 {
-  return GetColor( getDefaultFillingColor(), DataTag_FillingColor );
+  return GetColor( DefaultFillingColor(), DataTag_FillingColor );
 }
 
 void HYDROData_Object::SetBorderColor( const QColor& theColor )
@@ -238,15 +249,15 @@ void HYDROData_Object::SetBorderColor( const QColor& theColor )
 
 QColor HYDROData_Object::GetBorderColor() const
 {
-  return GetColor( getDefaultBorderColor(), DataTag_BorderColor );
+  return GetColor( DefaultBorderColor(), DataTag_BorderColor );
 }
 
-QColor HYDROData_Object::getDefaultFillingColor() const
+QColor HYDROData_Object::DefaultFillingColor() const
 {
   return QColor( Qt::yellow );
 }
 
-QColor HYDROData_Object::getDefaultBorderColor() const
+QColor HYDROData_Object::DefaultBorderColor() const
 {
   return QColor( Qt::transparent );
 }
@@ -260,10 +271,10 @@ QStringList HYDROData_Object::dumpObjectCreation( MapOfTreatedObjects& theTreate
   QStringList aColorsDef;
 
   QColor aFillingColor = GetFillingColor();
-  setPythonObjectColor( aColorsDef, aFillingColor, getDefaultFillingColor(), "SetFillingColor" );
+  setPythonObjectColor( aColorsDef, aFillingColor, DefaultFillingColor(), "SetFillingColor" );
 
   QColor aBorderColor = GetBorderColor();
-  setPythonObjectColor( aColorsDef, aBorderColor, getDefaultBorderColor(), "SetBorderColor" );
+  setPythonObjectColor( aColorsDef, aBorderColor, DefaultBorderColor(), "SetBorderColor" );
 
   if ( !aColorsDef.isEmpty() )
   {
@@ -302,6 +313,7 @@ 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
 
@@ -316,6 +328,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 );
 
@@ -333,50 +346,60 @@ Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject()
   return aNewGroup;
 }
 
-void HYDROData_Object::removeGroupObjects()
+void HYDROData_Object::RemoveGroupObjects()
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_EdgesGroup, false );
   if ( !aLabel.IsNull() )
     aLabel.ForgetAllAttributes();
 }
 
-TopoDS_Shape HYDROData_Object::getTopShape() const
+void HYDROData_Object::RemoveTopShape()
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_TopShape, false );
-  if ( !aLabel.IsNull() )
-  {
-    Handle(TNaming_NamedShape) aNamedShape;
-    if( aLabel.FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
-      return aNamedShape->Get();
-  }
-
-  return TopoDS_Shape();
+  HYDROData_Entity::SetShape( DataTag_TopShape, TopoDS_Shape() );
 }
 
-void HYDROData_Object::removeTopShape()
+void HYDROData_Object::RemoveShape3D()
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_TopShape, false );
-  if ( !aLabel.IsNull() )
-    aLabel.ForgetAllAttributes();
+  HYDROData_Entity::SetShape( DataTag_Shape3D, TopoDS_Shape() );
 }
 
-TopoDS_Shape HYDROData_Object::getShape3D() const
+bool HYDROData_Object::IsSubmersible() const
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_Shape3D, false );
-  if ( !aLabel.IsNull() )
+  Handle(TDataStd_Integer) aSubMersibleAttr;
+
+  bool isSubmersible = true; //default
+  if( myLab.FindAttribute(TDataStd_Integer::GetID(), aSubMersibleAttr ) )
   {
-    Handle(TNaming_NamedShape) aNamedShape;
-    if( aLabel.FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
-      return aNamedShape->Get();
+    int aValue = aSubMersibleAttr->Get();
+    isSubmersible = ( aValue != 0 );
   }
-
-  return TopoDS_Shape();
+  return isSubmersible;
 }
 
-void HYDROData_Object::removeShape3D()
+void HYDROData_Object::SetIsSubmersible( bool isSubmersible ) const
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_Shape3D, false );
-  if ( !aLabel.IsNull() )
-    aLabel.ForgetAllAttributes();
+  TDataStd_Integer::Set( myLab, isSubmersible ? 1 : 0 );
 }
 
+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() )
+    {
+      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 );
+      }
+    }
+}