unified access to default colors

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ChannelOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
index f00d5804c1d847b70661f8ba8f19570b55bd2550..958d9b8a3b77bcc502f24fa8eb056dd82e617256 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
@@ -175,8 +175,8 @@ bool HYDROGUI_ChannelOp::processApply( int& theUpdateFlags,
 
   if ( !myIsEdit )
   {
-    myEditedObject->SetFillingColor( getDefaultFillingColor() );
-    myEditedObject->SetBorderColor( getDefaultBorderColor() );
+    myEditedObject->SetFillingColor( myEditedObject->DefaultFillingColor() );
+    myEditedObject->SetBorderColor( myEditedObject->DefaultBorderColor() );
   }
 
   QString aGuideLineName = aPanel->getGuideLineName();
@@ -235,16 +235,6 @@ Handle(HYDROData_Channel) HYDROGUI_ChannelOp::createNewObject() const
   return Handle(HYDROData_Channel)::DownCast( doc()->CreateObject( KIND_CHANNEL ) );
 }
 
-QColor HYDROGUI_ChannelOp::getDefaultFillingColor() const
-{
-  return HYDROData_Channel::DefaultFillingColor();
-}
-
-QColor HYDROGUI_ChannelOp::getDefaultBorderColor() const
-{
-  return HYDROData_Channel::DefaultBorderColor();
-}
-
 void HYDROGUI_ChannelOp::onCreatePreview()
 {
   HYDROGUI_ChannelDlg* aPanel = ::qobject_cast<HYDROGUI_ChannelDlg*>( inputPanel() );
@@ -277,8 +267,8 @@ void HYDROGUI_ChannelOp::onCreatePreview()
       {
         myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
 
-        QColor aFillingColor = getDefaultFillingColor();
-        QColor aBorderColor = getDefaultBorderColor();
+        QColor aFillingColor = myEditedObject->DefaultFillingColor();
+        QColor aBorderColor = myEditedObject->DefaultBorderColor();
         if ( !myEditedObject.IsNull() )
         {
           aFillingColor = myEditedObject->GetFillingColor();