#include <HYDROData_Bathymetry.h>
#include <HYDROData_Iterator.h>
-#include <HYDROData_Polyline.h>
+#include <HYDROData_PolylineXY.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
aPanel->reset();
- QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), "Zone" );
+ QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMMERSIBLE_ZONE_NAME" ) );
- QColor aFillingColor( HYDROData_ImmersibleZone::DefaultFillingColor() );
- QColor aBorderColor( HYDROData_ImmersibleZone::DefaultBorderColor() );
QString aSelectedPolyline, aSelectedBathymetry;
QStringList aSelectedBathymetries;
{
anObjectName = myEditedObject->GetName();
- aFillingColor = myEditedObject->GetFillingColor();
- aBorderColor = myEditedObject->GetBorderColor();
-
- Handle(HYDROData_Polyline) aRefPolyline = myEditedObject->GetPolyline();
+ Handle(HYDROData_PolylineXY) aRefPolyline = myEditedObject->GetPolyline();
if ( !aRefPolyline.IsNull() )
aSelectedPolyline = aRefPolyline->GetName();
// collect information about existing closed polylines
QStringList aPolylines;
- HYDROData_Iterator anIter( doc(), KIND_POLYLINE );
+ HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
for ( ; anIter.More(); anIter.Next() )
{
- Handle(HYDROData_Polyline) aPolylineObj =
- Handle(HYDROData_Polyline)::DownCast( anIter.Current() );
- if ( aPolylineObj.IsNull() || !aPolylineObj->IsClosed() )
+ Handle(HYDROData_PolylineXY) aPolylineObj =
+ Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
+ if ( aPolylineObj.IsNull() )//TODO: || !aPolylineObj->IsClosed() )
continue;
QString aPolylineName = aPolylineObj->GetName();
}
aPanel->setObjectName( anObjectName );
-
- aPanel->setFillingColor( aFillingColor );
- aPanel->setBorderColor( aBorderColor );
aPanel->setPolylineNames( aPolylines );
aPanel->setBathymetryNames( aBathymetries );
}
}
- Handle(HYDROData_ImmersibleZone) aZoneObj = myIsEdit ? myEditedObject :
- Handle(HYDROData_ImmersibleZone)::DownCast( doc()->CreateObject( KIND_IMMERSIBLE_ZONE ) );
- if ( aZoneObj.IsNull() )
- return false;
-
- Handle(HYDROData_Polyline) aZonePolyline;
+ Handle(HYDROData_PolylineXY) aZonePolyline;
Handle(HYDROData_Bathymetry) aZoneBathymetry;
QString aPolylineName = aPanel->getPolylineName();
if ( !aPolylineName.isEmpty() )
{
- aZonePolyline = Handle(HYDROData_Polyline)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINE ) );
+ aZonePolyline = Handle(HYDROData_PolylineXY)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINEXY ) );
}
QString aBathymetryName = aPanel->getBathymetryName();
HYDROGUI_Tool::FindObjectByName( module(), aBathymetryName, KIND_BATHYMETRY ) );
}
+
+ if ( HYDROData_ImmersibleZone::generateTopShape( aZonePolyline ).IsNull() )
+ {
+ theErrorMsg = tr( "ZONE_OBJECT_CANNOT_BE_CREATED" );
+ return false;
+ }
+
+ Handle(HYDROData_ImmersibleZone) aZoneObj = myIsEdit ? myEditedObject :
+ Handle(HYDROData_ImmersibleZone)::DownCast( doc()->CreateObject( KIND_IMMERSIBLE_ZONE ) );
+
aZoneObj->SetName( anObjectName );
- aZoneObj->SetFillingColor( aPanel->getFillingColor() );
- aZoneObj->SetBorderColor( aPanel->getBorderColor() );
+ if ( !myIsEdit )
+ {
+ aZoneObj->SetFillingColor( HYDROData_ImmersibleZone::DefaultFillingColor() );
+ aZoneObj->SetBorderColor( HYDROData_ImmersibleZone::DefaultBorderColor() );
+ }
aZoneObj->SetPolyline( aZonePolyline );
aZoneObj->SetBathymetry( aZoneBathymetry );
+ aZoneObj->Update();
closePreview();
if ( !aPanel )
return;
- TopoDS_Wire aWire;
+ TopoDS_Shape aZoneShape;
- Handle(HYDROData_Polyline) aPolyline = Handle(HYDROData_Polyline)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), thePolylineName, KIND_POLYLINE ) );
+ Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), thePolylineName, KIND_POLYLINEXY ) );
if ( !aPolyline.IsNull() )
{
- aWire = TopoDS::Wire( aPolyline->GetTopShape() );
+ aZoneShape = HYDROData_ImmersibleZone::generateTopShape( aPolyline );
}
LightApp_Application* anApp = module()->getApp();
if ( !myViewManager || !myPreviewPrs )
return;
- myPreviewPrs->setFillingColor( aPanel->getFillingColor(), false, false );
- myPreviewPrs->setBorderColor( aPanel->getBorderColor(), false, false );
- myPreviewPrs->setFace( aWire );
+ QColor aFillingColor = HYDROData_ImmersibleZone::DefaultFillingColor();
+ QColor aBorderColor = HYDROData_ImmersibleZone::DefaultBorderColor();
+ if ( !myEditedObject.IsNull() ) {
+ aFillingColor = myEditedObject->GetFillingColor();
+ aBorderColor = myEditedObject->GetBorderColor();
+ }
+
+ myPreviewPrs->setFillingColor( aFillingColor, false, false );
+ myPreviewPrs->setBorderColor( aBorderColor, false, false );
+ TopoDS_Face aFace;
+ if( !aZoneShape.IsNull() )
+ aFace = TopoDS::Face( aZoneShape );
+ myPreviewPrs->setFace( aFace );
}
void HYDROGUI_ImmersibleZoneOp::closePreview()