#include "HYDROData_PolylineXY.h"
#include "HYDROData_ShapesTool.h"
-#include <BRepBuilderAPI_MakeFace.hxx>
+#include <HYDROData_Tool.h>
#include <TopoDS.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Compound.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_HSequenceOfShape.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepAlgo_FaceRestrictor.hxx>
-#include <BRepCheck_Analyzer.hxx>
#include <ShapeAnalysis.hxx>
+#include <ShapeAnalysis_FreeBounds.hxx>
+
#include <QColor>
#include <QStringList>
+#define DEB_IMZ
+#include <BRepTools.hxx>
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
//#define HYDRODATA_IMZONE_DEB 1
-IMPLEMENT_STANDARD_HANDLE(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
HYDROData_ImmersibleZone::HYDROData_ImmersibleZone()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_2d )
{
}
{
}
-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" );
+
+ if (!this->IsSubmersible())
+ {
+ aResList << QString( "%1.SetIsSubmersible(False)" ).arg( aZoneName );
+ }
aResList << QString( "" );
- aResList << QString( "%1.Update();" ).arg( aZoneName );
+ aResList << QString( "%1.Update()" ).arg( aZoneName );
aResList << QString( "" );
return aResList;
{
HYDROData_NaturalObject::Update();
+ RemoveGroupObjects();
TopoDS_Shape aResShape = generateTopShape();
SetTopShape( aResShape );
TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_PolylineXY)& aPolyline )
{
- TopoDS_Face aResultFace = TopoDS_Face();
-
- if( !aPolyline.IsNull() )
- {
- TopoDS_Shape aPolylineShape = aPolyline->GetShape();
- TopTools_ListOfShape aWiresList;
-
- if ( !aPolylineShape.IsNull() &&
- aPolylineShape.ShapeType() == TopAbs_WIRE ) {
- const TopoDS_Wire& aPolylineWire = TopoDS::Wire( aPolylineShape );
- if ( !aPolylineWire.IsNull() ) {
- BRepBuilderAPI_MakeFace aMakeFace( aPolylineWire, Standard_True );
- aMakeFace.Build();
- if( aMakeFace.IsDone() ) {
- aResultFace = aMakeFace.Face();
- }
- }
- } else {
- TopExp_Explorer anExp( aPolylineShape, TopAbs_WIRE );
- for ( ; anExp.More(); anExp.Next() ) {
- if(!anExp.Current().IsNull()) {
- const TopoDS_Wire& aWire = TopoDS::Wire( anExp.Current() );
- aWiresList.Append( aWire );
- }
- }
- if(aWiresList.IsEmpty())
- return aResultFace;
-
- BRepAlgo_FaceRestrictor aFR;
- TopoDS_Face aRefFace;
- TopoDS_Shape aS = aWiresList.First();
- BRepBuilderAPI_MakeFace aMakeFace( TopoDS::Wire(aWiresList.First()), Standard_True );
- aMakeFace.Build();
- if( aMakeFace.IsDone() ) {
- aRefFace = aMakeFace.Face();
- }
- if(aRefFace.IsNull())
- return aResultFace;
-
- aFR.Init(aRefFace,Standard_False, Standard_True);
- TopTools_ListIteratorOfListOfShape anIt( aWiresList );
- for ( ; anIt.More(); anIt.Next() ) {
- TopoDS_Wire& aWire = TopoDS::Wire( anIt.Value() );
- if ( aWire.IsNull() )
- continue;
- aFR.Add(aWire);
- }
- aFR.Perform();
- if (aFR.IsDone()) {
- for (; aFR.More(); aFR.Next()) {
- aResultFace = aFR.Current();
- break;
- }
- }
- }
- }
-
- if( aResultFace.IsNull() )
- return aResultFace;
-
- BRepCheck_Analyzer anAnalyzer( aResultFace );
- if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE )
- return aResultFace;
- else
- return TopoDS_Face();
+ return HYDROData_Tool::PolyXY2Face(aPolyline);
}
void HYDROData_ImmersibleZone::createGroupObjects()
return;
SetReferenceObject( thePolyline, DataTag_Polyline );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const
void HYDROData_ImmersibleZone::RemovePolyline()
{
ClearReferenceObjects( DataTag_Polyline );
- SetToUpdate( true );
+ Changed( Geom_2d );
}