X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Profile.cxx;h=217c49c9981db2e5471b2412470258b21bfb8ca8;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=9c4eda1d8288de01ba5a2b436f6acaa4b6e9bca2;hpb=d3d7ea6412ef12cf3ecdda87c52881fa03accfee;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx index 9c4eda1d..217c49c9 100755 --- a/src/HYDROData/HYDROData_Profile.cxx +++ b/src/HYDROData/HYDROData_Profile.cxx @@ -163,7 +163,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const TopoDS_Shape HYDROData_Profile::GetShape3D() const { - TopoDS_Shape aShape = getShape3D(); + TopoDS_Shape aShape = HYDROData_Object::GetShape3D(); if( aShape.IsNull() ) aShape = CreateProfileWire( true ); return aShape; @@ -191,26 +191,16 @@ void HYDROData_Profile::Update() SetShape3D( aShape ); } -QColor HYDROData_Profile::DefaultFillingColor() +QColor HYDROData_Profile::DefaultFillingColor() const { return QColor( Qt::transparent ); } -QColor HYDROData_Profile::DefaultBorderColor() +QColor HYDROData_Profile::DefaultBorderColor() const { return QColor( Qt::black ); } -QColor HYDROData_Profile::getDefaultFillingColor() const -{ - return DefaultFillingColor(); -} - -QColor HYDROData_Profile::getDefaultBorderColor() const -{ - return DefaultBorderColor(); -} - bool HYDROData_Profile::IsValid() const { gp_XY aFirstPoint, aLastPoint; @@ -537,7 +527,7 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc, aProfile->SetFilePath( theFileName ); - aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() ); + aProfile->SetBorderColor( aProfile->DefaultBorderColor() ); } return aCreatedProfiles.Length();