Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

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

diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.cxx b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
index 60c8119fd8b96855aa78a28110e3d17655899942..a65db9cd67e1dd58402c6ad290594571b8176b20 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DigueOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,7 +19,7 @@
 #include "HYDROGUI_DigueOp.h"
 
 #include "HYDROGUI_DigueDlg.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_Shape.h"
 
 #include <HYDROData_Document.h>
@@ -62,8 +58,8 @@ bool HYDROGUI_DigueOp::processApply( int& theUpdateFlags,
 
   if ( !myIsEdit )
   {
-    myEditedObject->SetFillingColor( HYDROData_Digue::DefaultFillingColor() );
-    myEditedObject->SetBorderColor( HYDROData_Digue::DefaultBorderColor() );
+    myEditedObject->SetFillingColor( myEditedObject->DefaultFillingColor() );
+    myEditedObject->SetBorderColor( myEditedObject->DefaultBorderColor() );
   }
 
   return true;
@@ -81,12 +77,3 @@ Handle(HYDROData_Channel) HYDROGUI_DigueOp::createNewObject() const
   return Handle(HYDROData_Digue)::DownCast( doc()->CreateObject( KIND_DIGUE ) );
 }
 
-QColor HYDROGUI_DigueOp::getDefaultFillingColor() const
-{
-  return HYDROData_Digue::DefaultFillingColor();
-}
-
-QColor HYDROGUI_DigueOp::getDefaultBorderColor() const
-{
-  return HYDROData_Digue::DefaultBorderColor();
-}