Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

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

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index 800d27536607133cd1effa4c09bee36ba1383533..f5716c17e548e247794e5b0402abdc82b9a3cf64 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -1,3 +1,20 @@
+// 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_ImmersibleZone.h"
 
@@ -32,7 +49,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
 
 
 HYDROData_ImmersibleZone::HYDROData_ImmersibleZone()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_2d )
 {
 }
 
@@ -40,21 +57,22 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone()
 {
 }
 
-QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_ImmersibleZone::DumpToPython( const QString& thePyScriptPath,
+                                                    MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   
   QString aZoneName = GetObjPyName();
 
   Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
 
   Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
 
   aResList << QString( "" );
 
-  aResList << QString( "%1.Update();" ).arg( aZoneName );
+  aResList << QString( "%1.Update()" ).arg( aZoneName );
   aResList << QString( "" );
 
   return aResList;
@@ -71,11 +89,6 @@ HYDROData_SequenceOfObjects HYDROData_ImmersibleZone::GetAllReferenceObjects() c
   return aResSeq;
 }
 
-TopoDS_Shape HYDROData_ImmersibleZone::GetTopShape() const
-{
-  return getTopShape();
-}
-
 void HYDROData_ImmersibleZone::Update()
 {
   HYDROData_NaturalObject::Update();
@@ -219,33 +232,26 @@ void HYDROData_ImmersibleZone::createGroupObjects()
 
 TopoDS_Shape HYDROData_ImmersibleZone::GetShape3D() const
 {
-  return getTopShape();
+  return GetTopShape();
 }
 
-QColor HYDROData_ImmersibleZone::DefaultFillingColor()
+QColor HYDROData_ImmersibleZone::DefaultFillingColor() const
 {
   return QColor( Qt::darkBlue );
 }
 
-QColor HYDROData_ImmersibleZone::DefaultBorderColor()
+QColor HYDROData_ImmersibleZone::DefaultBorderColor() const
 {
   return QColor( Qt::transparent );
 }
 
-QColor HYDROData_ImmersibleZone::getDefaultFillingColor() const
-{
-  return DefaultFillingColor();
-}
-
-QColor HYDROData_ImmersibleZone::getDefaultBorderColor() const
-{
-  return DefaultBorderColor();
-}
-
 void HYDROData_ImmersibleZone::SetPolyline( const Handle(HYDROData_PolylineXY)& thePolyline )
 {
+  if( IsEqual( GetPolyline(), thePolyline ) )
+    return;
+
   SetReferenceObject( thePolyline, DataTag_Polyline );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const
@@ -257,7 +263,5 @@ Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const
 void HYDROData_ImmersibleZone::RemovePolyline()
 {
   ClearReferenceObjects( DataTag_Polyline );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
-
-