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 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeoreferencementDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
index 8ac5f6d9cd13757bd312f23cd3586788a1172343..b623c44bf584548539940bcf6cb1520262f89977 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_GeoreferencementDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_GeoreferencementDlg.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
@@
-20,6
+20,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
@@
-50,18
+51,22
@@
public:
bool isIncomplete, isEmpty;
bool isIncomplete, isEmpty;
- ProfileGeoData() :
- isEmpty( true ), isIncomplete( false ) {}
+ QString Name;
+
+ ProfileGeoData( const QString& theName ) :
+ Name( theName ), isEmpty( true ), isIncomplete( false ) {}
- ProfileGeoData( const QString& theXg, const QString& theYg,
+ ProfileGeoData( const QString& theName,
+ const QString& theXg, const QString& theYg,
const QString& theXd, const QString& theYd );
const QString& theXd, const QString& theYd );
- ProfileGeoData( double theXg, double theYg,
+ ProfileGeoData( const QString& theName,
+ double theXg, double theYg,
double theXd, double theYd )
double theXd, double theYd )
- : Xg( theXg ), Yg( theYg ), Xd( theXd ), Yd( theYd ),
+ :
Name( theName ),
Xg( theXg ), Yg( theYg ), Xd( theXd ), Yd( theYd ),
isIncomplete(false), isEmpty(false) {}
};
isIncomplete(false), isEmpty(false) {}
};
- typedef Q
Map< QString, ProfileGeoData > ProfilesGeoDataMap
;
+ typedef Q
List<ProfileGeoData> ProfilesGeoDataList
;
public:
HYDROGUI_GeoreferencementDlg( HYDROGUI_Module* theModule, const QString& theTitle );
public:
HYDROGUI_GeoreferencementDlg( HYDROGUI_Module* theModule, const QString& theTitle );
@@
-71,8
+76,8
@@
public:
void setMode( const int theMode );
void setMode( const int theMode );
- void setData( const ProfilesGeoData
Map& theMap
);
- void getData( ProfilesGeoData
Map& theMap )
;
+ void setData( const ProfilesGeoData
List& theData
);
+ void getData( ProfilesGeoData
List& theData ) const
;
bool isModified() const;
bool isModified() const;
@@
-87,9
+92,6
@@
signals:
void modeActivated( int );
void updateSelection();
void modeActivated( int );
void updateSelection();
-private:
- QString getString( const double theNumber ) const;
-
private:
QButtonGroup* myModeButtons;
QPushButton* myUpdateSelBtn;
private:
QButtonGroup* myModeButtons;
QPushButton* myUpdateSelBtn;