Bug #490: batch mode error.

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

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index 4561fbf1b265dd17e9ef2ce76b7e8a0d574238ed..800d27536607133cd1effa4c09bee36ba1383533 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -25,7 +25,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)
@@ -43,34 +42,9 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone()
 
 QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-
-  QString aDocName = aDocument->GetDocPyName();
-  QString aZoneName = GetName();
-
-  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( "" );
-
-  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( "" );
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  
+  QString aZoneName = GetObjPyName();
 
   Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
@@ -78,6 +52,11 @@ QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTrea
   Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
 
+  aResList << QString( "" );
+
+  aResList << QString( "%1.Update();" ).arg( aZoneName );
+  aResList << QString( "" );
+
   return aResList;
 }
 
@@ -107,6 +86,11 @@ void HYDROData_ImmersibleZone::Update()
   createGroupObjects();
 }
 
+bool HYDROData_ImmersibleZone::IsHas2dPrs() const
+{
+  return true;
+}
+
 TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
 {
   return generateTopShape( GetPolyline() );
@@ -128,7 +112,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 +154,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;