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
quick optimization patch (bytearray for images)
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportObstacleFromFileOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index 3ad303ca5d530d8505c146d5d8a966c334f0c8ab..9c0743c0b3fcfd68c5f119daad92b4a5ca1bcdce 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
@@
-23,6
+23,7
@@
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
@@
-71,9
+72,9
@@
void HYDROGUI_ImportObstacleFromFileOp::startOperation()
} else {
myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
myFileDlg->setWindowTitle( getName() );
} else {
myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
myFileDlg->setWindowTitle( getName() );
- myFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+ myFileDlg->set
Name
Filter( tr("OBSTACLE_FILTER") );
if ( !lastUsedFilter.isEmpty() ) {
if ( !lastUsedFilter.isEmpty() ) {
- myFileDlg->selectFilter( lastUsedFilter );
+ myFileDlg->select
Name
Filter( lastUsedFilter );
}
connect( myFileDlg, SIGNAL( accepted() ), this, SLOT( onApply() ) );
}
connect( myFileDlg, SIGNAL( accepted() ), this, SLOT( onApply() ) );
@@
-117,7
+118,7
@@
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
} else if ( myFileDlg ) {
// Get file name and file filter defined by the user
aFileName = myFileDlg->selectedFile();
} else if ( myFileDlg ) {
// Get file name and file filter defined by the user
aFileName = myFileDlg->selectedFile();
- lastUsedFilter = myFileDlg->selectedFilter();
+ lastUsedFilter = myFileDlg->selected
Name
Filter();
}
// Check the file name
}
// Check the file name
@@
-194,4
+195,4
@@
HYDROGUI_InputPanel* HYDROGUI_ImportObstacleFromFileOp::createInputPanel() const
}
return aPanel;
}
return aPanel;
-}
\ No newline at end of file
+}