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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeomObjectDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
index b20216e93917042d32c58e2eee43cee88597504a..1179745d227bc5a64faf0745a680b021673e7916 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
@@
-18,7
+18,7
@@
#include "HYDROGUI_GeomObjectDlg.h"
#include "HYDROGUI_GeomObjectDlg.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool
2
.h"
#include <SUIT_FileDlg.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_FileDlg.h>
#include <SUIT_ResourceMgr.h>
@@
-179,14
+179,14
@@
void HYDROGUI_GeomObjectDlg::onBrowse()
{
SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
{
SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
- aFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+ aFileDlg->set
Name
Filter( tr("OBSTACLE_FILTER") );
if ( !lastUsedFilter.isEmpty() ) {
if ( !lastUsedFilter.isEmpty() ) {
- aFileDlg->selectFilter( lastUsedFilter );
+ aFileDlg->select
Name
Filter( lastUsedFilter );
}
if ( aFileDlg->exec() == QDialog::Accepted ) {
QString aFileName = aFileDlg->selectedFile();
}
if ( aFileDlg->exec() == QDialog::Accepted ) {
QString aFileName = aFileDlg->selectedFile();
- lastUsedFilter = aFileDlg->selectedFilter();
+ lastUsedFilter = aFileDlg->selected
Name
Filter();
if ( !aFileName.isEmpty() ) {
myFileName->setText( aFileName );
if ( !aFileName.isEmpty() ) {
myFileName->setText( aFileName );
@@
-261,4
+261,4
@@
void HYDROGUI_GeomObjectDlg::setDefaultName( const QString& theName )
QString HYDROGUI_GeomObjectDlg::getDefaultName()
{
return myDefaultName;
QString HYDROGUI_GeomObjectDlg::getDefaultName()
{
return myDefaultName;
-}
\ No newline at end of file
+}