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_TwoImagesDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesDlg.h
b/src/HYDROGUI/HYDROGUI_TwoImagesDlg.h
index 5f9522664c3e884009ee329203c5681691e4d76b..b29d18841e4b52e309fda34b80982079e93095a8 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_TwoImagesDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_TwoImagesDlg.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
@@
-29,6
+25,7
@@
class QCheckBox;
class QLabel;
class QLineEdit;
class QRadioButton;
class QLabel;
class QLineEdit;
class QRadioButton;
+class QFrame;
class HYDROGUI_ColorWidget;
class HYDROGUI_ObjSelector;
class HYDROGUI_ColorWidget;
class HYDROGUI_ObjSelector;
@@
-38,7
+35,7
@@
class HYDROGUI_TwoImagesDlg : public HYDROGUI_InputPanel
Q_OBJECT
public:
Q_OBJECT
public:
- enum Mode { Two
Images = 0
, ImageAndPolyline };
+ enum Mode { Two
FuseImage = 0, TwoCutImage
, ImageAndPolyline };
public:
HYDROGUI_TwoImagesDlg( HYDROGUI_Module* theModule, const QString& theTitle );
public:
HYDROGUI_TwoImagesDlg( HYDROGUI_Module* theModule, const QString& theTitle );
@@
-63,9
+60,22
@@
public:
void setColor( const QColor& theColor );
QColor getColor() const;
void setColor( const QColor& theColor );
QColor getColor() const;
+signals:
+ /** Signal is emitted if the name has already been selected
+ * in other selector of the same parent widget.
+ * @param theName the selected object name
+ */
+ void alreadySelected( const QString& theName );
+
protected slots:
void onModifySelectedImage( bool theState );
protected slots:
void onModifySelectedImage( bool theState );
+private:
+ /**
+ * Returns whether the mode is to select two images, that corresponds to cut or fuse mode
+ */
+ bool isTwoImagesMode() const;
+
private:
int myMode;
bool myIsEdit;
private:
int myMode;
bool myIsEdit;
@@
-82,6
+92,7
@@
private:
QLabel* myPolylineLabel;
HYDROGUI_ObjSelector* myPolyline;
QLabel* myPolylineLabel;
HYDROGUI_ObjSelector* myPolyline;
+ QFrame* myBackgroundFrame;
QRadioButton* myTransparent;
QRadioButton* myColor;
HYDROGUI_ColorWidget* myColorBox;
QRadioButton* myTransparent;
QRadioButton* myColor;
HYDROGUI_ColorWidget* myColorBox;