Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #430: incorrect coordinates in dump polyline
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TwoImagesOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
index 885fff83946e677c3a371990824e165b701c1c49..990673a64a649ebcf7070fc41513c59d85d7f571 100644
(file)
--- 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 "HYDROGUI_Tool.h"
#include "HYDROGUI_TwoImagesDlg.h"
#include "HYDROGUI_UpdateFlags.h"
+#include <HYDROGUI_DataObject.h>
#include <HYDROData_Document.h>
#include <HYDROData_Image.h>
#include <HYDROData_Document.h>
#include <HYDROData_Image.h>
@@
-75,10
+76,14
@@
void HYDROGUI_TwoImagesOp::startOperation()
HYDROGUI_TwoImagesDlg* aPanel = (HYDROGUI_TwoImagesDlg*)inputPanel();
aPanel->reset();
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 )
else if( myType == Split )
- aPanel->setMode( HYDROGUI_TwoImagesDlg::ImageAndPolyline, myIsEdit );
+ aMode = HYDROGUI_TwoImagesDlg::ImageAndPolyline;
+ aPanel->setMode( aMode, myIsEdit );
QString anImageName;
if( myIsEdit )
QString anImageName;
if( myIsEdit )
@@
-147,7
+152,8
@@
void HYDROGUI_TwoImagesOp::onAlreadySelected( const QString& theName )
}
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast<HYDROGUI_TwoImagesDlg*>( inputPanel() );
{
HYDROGUI_TwoImagesDlg* aPanel = dynamic_cast<HYDROGUI_TwoImagesDlg*>( inputPanel() );
@@
-204,6
+210,8
@@
bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags,
anOperator = aFactory->Operator( anOperatorName );
aResult = aFactory->CreateImage( doc(), anOperator );
anOperator = aFactory->Operator( anOperatorName );
aResult = aFactory->CreateImage( doc(), anOperator );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+ theBrowseObjectsEntries.append( anEntry );
}
if( aResult.IsNull() || !anOperator )
}
if( aResult.IsNull() || !anOperator )