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 #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportBathymetryDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.cxx
b/src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.cxx
index 447a8132a6edf5eff211b05b96579b76595797fe..76ab3075e8a35c64961f987bddd71e177d01e097 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,16
+20,17
@@
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Tool.h"
+#include <SUIT_FileDlg.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
-#include <QFileDialog>
#include <QGroupBox>
#include <QLabel>
#include <QLayout>
#include <QLineEdit>
#include <QPicture>
#include <QToolButton>
#include <QGroupBox>
#include <QLabel>
#include <QLayout>
#include <QLineEdit>
#include <QPicture>
#include <QToolButton>
+#include <QCheckBox>
HYDROGUI_ImportBathymetryDlg::HYDROGUI_ImportBathymetryDlg( HYDROGUI_Module* theModule, const QString& theTitle )
: HYDROGUI_InputPanel( theModule, theTitle )
HYDROGUI_ImportBathymetryDlg::HYDROGUI_ImportBathymetryDlg( HYDROGUI_Module* theModule, const QString& theTitle )
: HYDROGUI_InputPanel( theModule, theTitle )
@@
-70,9
+67,13
@@
HYDROGUI_ImportBathymetryDlg::HYDROGUI_ImportBathymetryDlg( HYDROGUI_Module* the
aBathymetryNameLayout->addWidget( aBathymetryNameLabel );
aBathymetryNameLayout->addWidget( myObjectName );
aBathymetryNameLayout->addWidget( aBathymetryNameLabel );
aBathymetryNameLayout->addWidget( myObjectName );
+ myInvertAltitudes = new QCheckBox( tr( "INVERT_BATHYMETRY_ALTITUDES" ), this );
+
// Common
addWidget( myFileNameGroup );
addWidget( myObjectNameGroup );
// Common
addWidget( myFileNameGroup );
addWidget( myObjectNameGroup );
+ addWidget( myInvertAltitudes );
+
addStretch();
connect( aBrowseBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) );
addStretch();
connect( aBrowseBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) );
@@
-113,10
+114,20
@@
QString HYDROGUI_ImportBathymetryDlg::getFileName() const
return myFileName->text();
}
return myFileName->text();
}
+void HYDROGUI_ImportBathymetryDlg::setInvertAltitudes( const bool theIsInvert )
+{
+ myInvertAltitudes->setChecked( theIsInvert );
+}
+
+bool HYDROGUI_ImportBathymetryDlg::isInvertAltitudes() const
+{
+ return myInvertAltitudes->isChecked();
+}
+
void HYDROGUI_ImportBathymetryDlg::onBrowse()
{
QString aFilter( tr( "BATHYMETRY_FILTER" ) );
void HYDROGUI_ImportBathymetryDlg::onBrowse()
{
QString aFilter( tr( "BATHYMETRY_FILTER" ) );
- QString aFileName =
QFileDialog::getOpenFileName( this, tr( "IMPORT_BATHYMETRY_FROM_FILE" ), "", aFilter
);
+ QString aFileName =
SUIT_FileDlg::getFileName( this, "", aFilter, tr( "IMPORT_BATHYMETRY_FROM_FILE" ), true
);
if( !aFileName.isEmpty() )
{
if( !aFileName.isEmpty() )
{