portage V8_5_0

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

diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.cxx b/src/HYDROGUI/HYDROGUI_DigueOp.cxx
index 0d8c6073b778916acc6e38ba394587abee17b90e..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>
@@ -54,15 +50,16 @@ void HYDROGUI_DigueOp::startOperation()
 }
 
 bool HYDROGUI_DigueOp::processApply( int& theUpdateFlags,
-                                     QString& theErrorMsg )
+                                     QString& theErrorMsg,
+                                     QStringList& theBrowseObjectsEntries )
 {
-  if ( !HYDROGUI_ChannelOp::processApply( theUpdateFlags, theErrorMsg ) )
+  if ( !HYDROGUI_ChannelOp::processApply( theUpdateFlags, theErrorMsg, theBrowseObjectsEntries ) )
     return false;
 
   if ( !myIsEdit )
   {
-    myEditedObject->SetFillingColor( HYDROData_Digue::DefaultFillingColor() );
-    myEditedObject->SetBorderColor( HYDROData_Digue::DefaultBorderColor() );
+    myEditedObject->SetFillingColor( myEditedObject->DefaultFillingColor() );
+    myEditedObject->SetBorderColor( myEditedObject->DefaultBorderColor() );
   }
 
   return true;
@@ -75,8 +72,8 @@ HYDROGUI_InputPanel* HYDROGUI_DigueOp::createInputPanel() const
   return aPanel;
 }
 
-Handle(HYDROData_Channel) HYDROGUI_DigueOp::getObjectToEdit() const
+Handle(HYDROData_Channel) HYDROGUI_DigueOp::createNewObject() const
 {
-  return myIsEdit ? Handle(HYDROData_Digue)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ) :
-                    Handle(HYDROData_Digue)::DownCast( doc()->CreateObject( KIND_DIGUE ) );
+  return Handle(HYDROData_Digue)::DownCast( doc()->CreateObject( KIND_DIGUE ) );
 }
+