-// 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
-//
+// Copyright (C) 2014-2015 EDF-R&D
// 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
aPanel->setObjectName( anObjectName );
aPanel->setPolylineNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_POLYLINEXY ) );
- aPanel->setBathymetryNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_BATHYMETRY ) );
+ aPanel->setAdditionalParams( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_BATHYMETRY ) );
aPanel->blockSignals( false );
aPanel->setPolylineName( aSelectedPolyline );
- aPanel->setBathymetryName( aSelectedBathymetry );
+ aPanel->setSelectedAdditionalParamName( aSelectedBathymetry );
}
void HYDROGUI_ImmersibleZoneOp::abortOperation()
HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINEXY ) );
}
- QString aBathymetryName = aPanel->getBathymetryName();
+ QString aBathymetryName = aPanel->getSelectedAdditionalParamName();
if ( !aBathymetryName.isEmpty() )
{
aZoneBathymetry = Handle(HYDROData_Bathymetry)::DownCast(
if ( !myIsEdit )
{
- aZoneObj->SetFillingColor( HYDROData_ImmersibleZone::DefaultFillingColor() );
- aZoneObj->SetBorderColor( HYDROData_ImmersibleZone::DefaultBorderColor() );
+ aZoneObj->SetFillingColor( aZoneObj->DefaultFillingColor() );
+ aZoneObj->SetBorderColor( aZoneObj->DefaultBorderColor() );
}
aZoneObj->SetPolyline( aZonePolyline );
if ( aViewManager && myPreviewPrs )
{
- QColor aFillingColor = HYDROData_ImmersibleZone::DefaultFillingColor();
- QColor aBorderColor = HYDROData_ImmersibleZone::DefaultBorderColor();
+ QColor aFillingColor = Qt::darkBlue;
+ QColor aBorderColor = Qt::transparent;
if ( !myEditedObject.IsNull() ) {
aFillingColor = myEditedObject->GetFillingColor();
aBorderColor = myEditedObject->GetBorderColor();