X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ImmersibleZone.cxx;h=f3b7d6758a17dda7d0fa43fce4cc9c35a206db17;hb=2f02a5b7680c10ed7fcd63f4ffb75af0932f5bb9;hp=4561fbf1b265dd17e9ef2ce76b7e8a0d574238ed;hpb=8543e637cbb4ae48998c596241fce567a729eb67;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index 4561fbf1..f3b7d675 100644
--- 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"
 
@@ -25,7 +42,6 @@
 #include <QColor>
 #include <QStringList>
 
-#define PYTHON_IMMERSIBLE_ZONE_ID "KIND_IMMERSIBLE_ZONE"
 //#define HYDRODATA_IMZONE_DEB 1
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
@@ -33,7 +49,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
 
 
 HYDROData_ImmersibleZone::HYDROData_ImmersibleZone()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_2d )
 {
 }
 
@@ -41,43 +57,24 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone()
 {
 }
 
-QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_ImmersibleZone::DumpToPython( const QString& thePyScriptPath,
+                                                    MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  
+  QString aZoneName = GetObjPyName();
 
-  QString aDocName = aDocument->GetDocPyName();
-  QString aZoneName = GetName();
+  Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aZoneName ).arg( aDocName ).arg( PYTHON_IMMERSIBLE_ZONE_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( aZoneName ).arg( aZoneName );
-  aResList << QString( "" );
+  Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
 
-  QColor aFillingColor = GetFillingColor();
-  aResList << QString( "filling_color = QColor( %1, %2, %3, %4 );" )
-              .arg( aFillingColor.red()  ).arg( aFillingColor.green() )
-              .arg( aFillingColor.blue() ).arg( aFillingColor.alpha() );
-  aResList << QString( "%1.SetFillingColor( filling_color );" ).arg( aZoneName );
   aResList << QString( "" );
 
-  QColor aBorderColor = GetBorderColor();
-  aResList << QString( "border_color = QColor( %1, %2, %3, %4 );" )
-              .arg( aBorderColor.red()  ).arg( aBorderColor.green() )
-              .arg( aBorderColor.blue() ).arg( aBorderColor.alpha() );
-  aResList << QString( "%1.SetBorderColor( border_color );" ).arg( aZoneName );
+  aResList << QString( "%1.Update();" ).arg( aZoneName );
   aResList << QString( "" );
 
-  Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
-
-  Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
-
   return aResList;
 }
 
@@ -92,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();
@@ -107,6 +99,11 @@ void HYDROData_ImmersibleZone::Update()
   createGroupObjects();
 }
 
+bool HYDROData_ImmersibleZone::IsHas2dPrs() const
+{
+  return true;
+}
+
 TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
 {
   return generateTopShape( GetPolyline() );
@@ -128,7 +125,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
         BRepBuilderAPI_MakeFace aMakeFace( aPolylineWire, Standard_True );
         aMakeFace.Build();
         if( aMakeFace.IsDone() ) {
-          return aMakeFace.Face();
+          aResultFace = aMakeFace.Face();
         }
       }
     } else {
@@ -170,6 +167,10 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
       }
     }
   }
+
+  if( aResultFace.IsNull() )
+    return aResultFace;
+
   BRepCheck_Analyzer anAnalyzer( aResultFace );
   if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE )
     return aResultFace;
@@ -231,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
@@ -269,7 +263,5 @@ Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const
 void HYDROData_ImmersibleZone::RemovePolyline()
 {
   ClearReferenceObjects( DataTag_Polyline );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
-
-