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_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeoreferencementDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
index 52879a486bb7784b8954af3a0dbc302013f5fa75..6c993ec3fce01743b59f495960f194262af1436c 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
@@
-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
@@
-20,6
+16,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#ifndef HYDROGUI_GEOREFERENCEMENT_H
#define HYDROGUI_GEOREFERENCEMENT_H
#ifndef HYDROGUI_GEOREFERENCEMENT_H
#define HYDROGUI_GEOREFERENCEMENT_H
@@
-36,8
+33,6
@@
class HYDROGUI_GeoreferencementDlg : public HYDROGUI_InputPanel
{
Q_OBJECT
{
Q_OBJECT
- class Delegate;
-
public:
enum ProfilesMode { AllProfiles, SelectedProfiles };
public:
enum ProfilesMode { AllProfiles, SelectedProfiles };
@@
-52,8
+47,8
@@
public:
QString Name;
QString Name;
- ProfileGeoData() :
- isEmpty( true ), isIncomplete( false ) {}
+ ProfileGeoData(
const QString& theName
) :
+
Name( theName ),
isEmpty( true ), isIncomplete( false ) {}
ProfileGeoData( const QString& theName,
const QString& theXg, const QString& theYg,
ProfileGeoData( const QString& theName,
const QString& theXg, const QString& theYg,
@@
-62,7
+57,7
@@
public:
ProfileGeoData( const QString& theName,
double theXg, double theYg,
double theXd, double theYd )
ProfileGeoData( const QString& theName,
double theXg, double theYg,
double theXd, double theYd )
- : Name( theName), Xg( theXg ), Yg( theYg ), Xd( theXd ), Yd( theYd ),
+ : Name( theName
), Xg( theXg ), Yg( theYg ), Xd( theXd ), Yd( theYd ),
isIncomplete(false), isEmpty(false) {}
};
typedef QList<ProfileGeoData> ProfilesGeoDataList;
isIncomplete(false), isEmpty(false) {}
};
typedef QList<ProfileGeoData> ProfilesGeoDataList;