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() );
}
aPanel->setObjectName( anObjectName );
-
- aPanel->setFillingColor( aFillingColor );
- aPanel->setBorderColor( aBorderColor );
aPanel->setPolylineNames( aPolylines );
aPanel->setBathymetryNames( aBathymetries );
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 );
return;
TopoDS_Wire aWire;
+ TopoDS_Shape aShape;
Handle(HYDROData_Polyline) aPolyline = Handle(HYDROData_Polyline)::DownCast(
HYDROGUI_Tool::FindObjectByName( module(), thePolylineName, KIND_POLYLINE ) );
if ( !aPolyline.IsNull() )
{
- aWire = TopoDS::Wire( aPolyline->GetTopShape() );
+ aShape = aPolyline->GetTopShape();
+ if ( aShape.ShapeType() == TopAbs_WIRE ) {
+ aWire = TopoDS::Wire( aShape );
+ }
}
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 );
+ if ( !aWire.IsNull() ) {
+ myPreviewPrs->setFace( aWire );
+ } else if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_COMPOUND ) {
+ TopoDS_Compound aCompound = TopoDS::Compound( aShape );
+ if ( !aCompound.IsNull() ) {
+ myPreviewPrs->setFaces( aCompound );
+ }
+ }
}
void HYDROGUI_ImmersibleZoneOp::closePreview()