X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ImmersibleZone.cxx;h=346251e7a6db001f65b25431a49a34141cbda1c1;hb=cd6ea20d9a76665a24a533d0340385a335961f05;hp=3232ae96eeb2f7afcf9f6498fa044378d980336e;hpb=63cfcd8fde33b237c06377b628b4e9e8027a425f;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx index 3232ae96..346251e7 100644 --- a/src/HYDROData/HYDROData_ImmersibleZone.cxx +++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx @@ -1,3 +1,24 @@ +// 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 +// +// 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" @@ -43,22 +64,9 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone() QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { QStringList aResList = dumpObjectCreation( theTreatedObjects ); + QString aZoneName = GetObjPyName(); - 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( "" ); - Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject(); setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" ); @@ -66,6 +74,7 @@ QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTrea setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" ); aResList << QString( "" ); + aResList << QString( "%1.Update();" ).arg( aZoneName ); aResList << QString( "" ); @@ -98,6 +107,11 @@ void HYDROData_ImmersibleZone::Update() createGroupObjects(); } +bool HYDROData_ImmersibleZone::IsHas2dPrs() const +{ + return true; +} + TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const { return generateTopShape( GetPolyline() ); @@ -119,7 +133,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 {