X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesOp.cxx;h=990673a64a649ebcf7070fc41513c59d85d7f571;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=885fff83946e677c3a371990824e165b701c1c49;hpb=58dcd27e75266f5734ce96619682d2a41fb520ad;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx index 885fff83..990673a6 100644 --- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx +++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx @@ -26,6 +26,7 @@ #include "HYDROGUI_Tool.h" #include "HYDROGUI_TwoImagesDlg.h" #include "HYDROGUI_UpdateFlags.h" +#include #include #include @@ -75,10 +76,14 @@ void HYDROGUI_TwoImagesOp::startOperation() HYDROGUI_TwoImagesDlg* aPanel = (HYDROGUI_TwoImagesDlg*)inputPanel(); aPanel->reset(); - if( myType == Fuse || myType == Cut ) - aPanel->setMode( HYDROGUI_TwoImagesDlg::TwoImages, myIsEdit ); + int aMode; + if( myType == Fuse ) + aMode = HYDROGUI_TwoImagesDlg::TwoFuseImage; + if ( myType == Cut ) + aMode = HYDROGUI_TwoImagesDlg::TwoCutImage; else if( myType == Split ) - aPanel->setMode( HYDROGUI_TwoImagesDlg::ImageAndPolyline, myIsEdit ); + aMode = HYDROGUI_TwoImagesDlg::ImageAndPolyline; + aPanel->setMode( aMode, myIsEdit ); QString anImageName; if( myIsEdit ) @@ -147,7 +152,8 @@ void HYDROGUI_TwoImagesOp::onAlreadySelected( const QString& theName ) } bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast( inputPanel() ); @@ -204,6 +210,8 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, anOperator = aFactory->Operator( anOperatorName ); aResult = aFactory->CreateImage( doc(), anOperator ); + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult ); + theBrowseObjectsEntries.append( anEntry ); } if( aResult.IsNull() || !anOperator )