#include "HYDROData_ImmersibleZone.h"
-#include "HYDROData_Bathymetry.h"
+#include "HYDROData_IAltitudeObject.h"
#include "HYDROData_Document.h"
#include "HYDROData_ShapesGroup.h"
#include "HYDROData_PolylineXY.h"
#include <QColor>
#include <QStringList>
-#define PYTHON_IMMERSIBLE_ZONE_ID "KIND_IMMERSIBLE_ZONE"
//#define HYDRODATA_IMZONE_DEB 1
IMPLEMENT_STANDARD_HANDLE(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
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();
+ QStringList aResList = dumpObjectCreation( theTreatedObjects );
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() )
aResList << QString( "%1.SetBorderColor( border_color );" ).arg( aZoneName );
aResList << QString( "" );
- Handle(HYDROData_Bathymetry) aRefBathymetry = GetBathymetry();
- setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetBathymetry" );
+ Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
+ setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
}
}
}
+
+ if( aResultFace.IsNull() )
+ return aResultFace;
+
BRepCheck_Analyzer anAnalyzer( aResultFace );
if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE )
return aResultFace;
TopoDS_Wire aZoneOuterWire = ShapeAnalysis::OuterWire( aZoneFace );
- TopTools_SequenceOfShape anInnerEdges;
+ // Create outer edges group
+ QString anOutWiresGroupName = GetName() + "_Outer";
+
+ Handle(HYDROData_ShapesGroup) anOutWiresGroup = createGroupObject();
+ anOutWiresGroup->SetName( anOutWiresGroupName );
+
+ TopTools_SequenceOfShape anOuterEdges;
+ HYDROData_ShapesTool::ExploreShapeToShapes( aZoneOuterWire, TopAbs_EDGE, anOuterEdges );
+ anOutWiresGroup->SetShapes( anOuterEdges );
+ int anInnerCounter = 1;
TopExp_Explorer aZoneFaceExp( aZoneFace, TopAbs_WIRE );
for ( ; aZoneFaceExp.More(); aZoneFaceExp.Next() )
{
if ( aZoneWire.IsEqual( aZoneOuterWire ) )
continue; // Skip the outer wire
- TopTools_SequenceOfShape anEdges;
- HYDROData_ShapesTool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anEdges );
- anInnerEdges.Append( anEdges );
- }
-
- // Create outer edges group
- QString anOutWiresGroupName = GetName() + "_Outer";
+ TopTools_SequenceOfShape anInnerEdges;
+ HYDROData_ShapesTool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anInnerEdges );
+ if ( anInnerEdges.IsEmpty() )
+ continue;
- Handle(HYDROData_ShapesGroup) anOutWiresGroup = createGroupObject();
- anOutWiresGroup->SetName( anOutWiresGroupName );
-
- TopTools_SequenceOfShape anEdges;
- HYDROData_ShapesTool::ExploreShapeToShapes( aZoneOuterWire, TopAbs_EDGE, anEdges );
- anOutWiresGroup->SetShapes( anEdges );
-
- // Create group for inner edges only if edges is not empty
- if ( !anInnerEdges.IsEmpty() )
- {
- QString anInWiresGroupName = GetName() + "_Inner";
+ QString anInWiresGroupName = GetName() + "_Inner_" + QString::number( anInnerCounter++ );
Handle(HYDROData_ShapesGroup) anInWiresGroup = createGroupObject();
anInWiresGroup->SetName( anInWiresGroupName );