X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DigueOp.cxx;h=60c8119fd8b96855aa78a28110e3d17655899942;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=d62b163006282d2a7ae90130bbc6dc6e07efecc3;hpb=3f67da828864f8d27b0aea2828bc8f5c5aaa9808;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.cxx b/src/HYDROGUI/HYDROGUI_DigueOp.cxx index d62b1630..60c8119f 100644 --- a/src/HYDROGUI/HYDROGUI_DigueOp.cxx +++ b/src/HYDROGUI/HYDROGUI_DigueOp.cxx @@ -24,6 +24,7 @@ #include "HYDROGUI_DigueDlg.h" #include "HYDROGUI_Tool.h" +#include "HYDROGUI_Shape.h" #include #include @@ -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(); }