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

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

diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.cxx b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
index d62b163006282d2a7ae90130bbc6dc6e07efecc3..0f5cb65a84674e2adbf4c935f4940c2d8a4b2201 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DigueOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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 +24,7 @@
 
 #include "HYDROGUI_DigueDlg.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Shape.h"
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Digue.h>
@@ -52,6 +53,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 +76,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();
 }