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 #727, #736: fix for the first bug and for the second part (Bug2) of the last...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportImageDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_ImportImageDlg.h
b/src/HYDROGUI/HYDROGUI_ImportImageDlg.h
index f1f2a6478f77ffd038e4435d9061f841d457427e..2adcb89592d532a9bb874e9e6b2da8494969c923 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportImageDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_ImportImageDlg.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
@@
-42,6
+38,8
@@
class QCheckBox;
class QtxDoubleSpinBox;
class QtxIntSpinBox;
class QtxDoubleSpinBox;
class QtxIntSpinBox;
+class QAbstractSpinBox;
+class QToolButton;
class HYDROGUI_ImportImageDlg : public HYDROGUI_InputPanel
{
class HYDROGUI_ImportImageDlg : public HYDROGUI_InputPanel
{
@@
-86,6
+84,7
@@
public:
QString getRefImageName() const;
QString getFileName() const;
QString getRefImageName() const;
QString getFileName() const;
+ void setFileName( const QString& theName );
QString getGeoreferencementFileName() const;
void setImageSize( const QSize& theSize,
QString getGeoreferencementFileName() const;
void setImageSize( const QSize& theSize,
@@
-107,6
+106,8
@@
public:
void initializePointSelection();
void initializePointSelection();
+ void ActivateFile( const QString& theFileName, bool isEnableFilesChoice );
+
public:
static TransformationData ComputeTrsfData( const int theMode,
public:
static TransformationData ComputeTrsfData( const int theMode,
@@
-129,8
+130,10
@@
protected slots:
void onCartesianCoordChanged( const int thePointType );
private:
void onCartesianCoordChanged( const int thePointType );
private:
- void blockSignalsGeodesic( const bool theState );
- void blockSignalsCartesian( const bool theState );
+ void clearSpins( QAbstractSpinBox* theSpin );
+ bool blockSignalsPoints( const bool theState );
+ bool blockSignalsGeodesic( const bool theState );
+ bool blockSignalsCartesian( const bool theState );
signals:
void createPreview( QImage );
signals:
void createPreview( QImage );
@@
-142,10
+145,12
@@
signals:
void modeActivated( int );
void refImageActivated( const QString& );
void setCIsUsed( bool theIsByTwoPoints );
void modeActivated( int );
void refImageActivated( const QString& );
void setCIsUsed( bool theIsByTwoPoints );
+ void filesSelected( const QStringList& );
private:
QGroupBox* myFileNameGroup; //!< The group for the source image file selection
QLineEdit* myFileName; //!< Source image file name input field
private:
QGroupBox* myFileNameGroup; //!< The group for the source image file selection
QLineEdit* myFileName; //!< Source image file name input field
+ QToolButton* myBrowseBtn;
QGroupBox* myImageNameGroup; //!< The group for the image name input field
QLineEdit* myImageName; //!< The image name input field
QGroupBox* myImageNameGroup; //!< The group for the image name input field
QLineEdit* myImageName; //!< The image name input field