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
Merge branch 'BR_MULTI_BATHS' into HEAD
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportBathymetryDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.h
b/src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.h
index f39042bb0c2431618d944499c1b976f476b57f54..438bddb461d7039717fad29c49b8cbfa0854e5e0 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_ImportBathymetryDlg.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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
@@
-30,6
+26,8
@@
class QGroupBox;
class QLineEdit;
class QCheckBox;
class QGroupBox;
class QLineEdit;
class QCheckBox;
+class QListWidget;
+class QStringList;
class HYDROGUI_ImportBathymetryDlg : public HYDROGUI_InputPanel
{
class HYDROGUI_ImportBathymetryDlg : public HYDROGUI_InputPanel
{
@@
-44,24
+42,33
@@
public:
void setObjectName( const QString& theName );
QString getObjectName() const;
void setObjectName( const QString& theName );
QString getObjectName() const;
- void setFileName
( const QString
& theFileName );
- QString
getFileName
() const;
+ void setFileName
s( const QStringList
& theFileName );
+ QString
List getFileNames
() const;
void setInvertAltitudes( const bool theIsInvert );
bool isInvertAltitudes() const;
void setInvertAltitudes( const bool theIsInvert );
bool isInvertAltitudes() const;
+ void setFuseIntoOneOptionChecked( bool isFIO );
+ bool isFuseIntoOneOptionChecked() const;
+ void setFuseIntoOneOptionEnabled(bool enabled);
+ bool isFuseIntoOneOptionEnabled() const;
+
+
signals:
signals:
- void FileSelected( const QString& theFileName );
+ void FileSelected( const QString
List
& theFileName );
protected slots:
void onBrowse();
protected slots:
void onBrowse();
+ void onStateChanged (int state);
private:
QGroupBox* myFileNameGroup;
private:
QGroupBox* myFileNameGroup;
- QLi
neEdit* myFileName
;
+ QLi
stWidget* myFileNames
;
QCheckBox* myInvertAltitudes;
QCheckBox* myInvertAltitudes;
+ QCheckBox* myFuseIntoOne;
+
QGroupBox* myObjectNameGroup;
QLineEdit* myObjectName;
};
QGroupBox* myObjectNameGroup;
QLineEdit* myObjectName;
};