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
copyrights in HYDRO files are updated
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Zone.h
diff --git
a/src/HYDROGUI/HYDROGUI_Zone.h
b/src/HYDROGUI/HYDROGUI_Zone.h
index e960de24508215749b4743f4ec5e2038690951e2..4676d40a2076d846efcddd39c33cc4ca1394ad30 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Zone.h
+++ b/
src/HYDROGUI/HYDROGUI_Zone.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
@@
-76,23
+76,23
@@
public:
bool isMergingNeed() const;
/**
bool isMergingNeed() const;
/**
- * Returns the list of
bathymetries
names.
+ * Returns the list of
altidude object
names.
*/
*/
- QStringList get
Bathymetri
es() const;
+ QStringList get
Altitud
es() const;
/**
/**
- * Returns the merging type for conflict
bathymetri
es.
+ * Returns the merging type for conflict
altidud
es.
*/
*/
- HYDROData_Zone::Merge
Bathymetri
esType getMergeType() const;
+ HYDROData_Zone::Merge
Altitud
esType getMergeType() const;
/**
/**
- * Set the merging type for conflict
bathymetri
es.
+ * Set the merging type for conflict
altidud
es.
* If the type is Merge_Object then use the second parameter to set the merge bathymetry.
*/
* If the type is Merge_Object then use the second parameter to set the merge bathymetry.
*/
- void setMergeType( int theMergeType, QString the
Bathymetry
Name = QString() );
+ void setMergeType( int theMergeType, QString the
Altitude
Name = QString() );
private:
QString getRefObjectNames() const;
private:
QString getRefObjectNames() const;
- QString get
Bathimetry
Name() const;
+ QString get
Altitude
Name() const;
};
#endif
};
#endif