X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DigueOp.cxx;h=6131334d0047365b4c2c7725b413ab754a2e7df5;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=d62b163006282d2a7ae90130bbc6dc6e07efecc3;hpb=3f67da828864f8d27b0aea2828bc8f5c5aaa9808;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.cxx b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
index d62b1630..6131334d 100644
--- 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
@@ -24,6 +20,7 @@
 
 #include "HYDROGUI_DigueDlg.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Shape.h"
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Digue.h>
@@ -52,6 +49,22 @@ void HYDROGUI_DigueOp::startOperation()
   }
 }
 
+bool HYDROGUI_DigueOp::processApply( int& theUpdateFlags,
+                                     QString& theErrorMsg,
+                                     QStringList& theBrowseObjectsEntries )
+{
+  if ( !HYDROGUI_ChannelOp::processApply( theUpdateFlags, theErrorMsg, theBrowseObjectsEntries ) )
+    return false;
+
+  if ( !myIsEdit )
+  {
+    myEditedObject->SetFillingColor( HYDROData_Digue::DefaultFillingColor() );
+    myEditedObject->SetBorderColor( HYDROData_Digue::DefaultBorderColor() );
+  }
+
+  return true;
+}
+
 HYDROGUI_InputPanel* HYDROGUI_DigueOp::createInputPanel() const
 {
   HYDROGUI_DigueDlg* aPanel = new HYDROGUI_DigueDlg( module(), getName() );
@@ -59,8 +72,17 @@ HYDROGUI_InputPanel* HYDROGUI_DigueOp::createInputPanel() const
   return aPanel;
 }
 
-Handle(HYDROData_Channel) HYDROGUI_DigueOp::getObjectToEdit() const
+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 myIsEdit ? Handle(HYDROData_Digue)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ) :
-                    Handle(HYDROData_Digue)::DownCast( doc()->CreateObject( KIND_DIGUE ) );
+  return HYDROData_Digue::DefaultBorderColor();
 }