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 #568: use ordered list view with selection synchronized with object browser...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportImageOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index a3d2c72e040aaed1a8d230cd4604687abf75e997..d68840a8b22a5026b0a4858622e89a91a08861ca 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
@@
-350,9
+350,22
@@
bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
{
HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
{
HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
+ if( !myIsEdit )
+ {
+ QString aFilePath = aPanel->getFileName();
+ if( aFilePath.isEmpty() )
+ {
+ theErrorMsg = tr( "SELECT_IMAGE_FILE" ).arg( aFilePath );
+ return false;
+ }
+ }
+
QString anImageName = aPanel->getImageName();
if( anImageName.isEmpty() )
QString anImageName = aPanel->getImageName();
if( anImageName.isEmpty() )
+ {
+ theErrorMsg = tr( "SELECT_IMAGE_NAME" ).arg( anImageName );
return false;
return false;
+ }
if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) )
{
if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) )
{
@@
-509,14
+522,23
@@
bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
if ( isApplyAndClose() )
theUpdateFlags |= UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
if ( isApplyAndClose() )
theUpdateFlags |= UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
+ if( isApplyAndClose() )
+ {
+ commitDocOperation(); // to save the modifications in the data model
+ return true;
+ }
if( SetNextFile() )
{
theErrorMsg = "";
if( SetNextFile() )
{
theErrorMsg = "";
- commitDocOperation(); // to save the modifications in the data model
+ module()->updateObjBrowser();
return false; // and to continue the operation
}
return false; // and to continue the operation
}
+ /*if( myFiles.count() > 1 )
+ {
+ setIsApplyAndClose( true );
+ }*/
return true;
}
return true;
}