X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DigueOp.cxx;h=6131334d0047365b4c2c7725b413ab754a2e7df5;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=0d8c6073b778916acc6e38ba394587abee17b90e;hpb=2d99821157e770385d7af917b2d22d6aa3cacb7e;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.cxx b/src/HYDROGUI/HYDROGUI_DigueOp.cxx index 0d8c6073..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 @@ -54,9 +50,10 @@ 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 ) @@ -75,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(); }