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 #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImmersibleZoneDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_ImmersibleZoneDlg.h
b/src/HYDROGUI/HYDROGUI_ImmersibleZoneDlg.h
index 1de986ced506fbcbc2b8a760f16758bcb6444430..ea64b763c291883e2630346937119e5078365a99 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImmersibleZoneDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_ImmersibleZoneDlg.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
@@
-25,12
+21,9
@@
#include "HYDROGUI_InputPanel.h"
#include "HYDROGUI_InputPanel.h"
-class HYDROGUI_ColorWidget;
class QComboBox;
class QGroupBox;
class QLineEdit;
class QComboBox;
class QGroupBox;
class QLineEdit;
-class QListWidget;
-class QRadioButton;
class HYDROGUI_ImmersibleZoneDlg : public HYDROGUI_InputPanel
{
class HYDROGUI_ImmersibleZoneDlg : public HYDROGUI_InputPanel
{
@@
-53,19
+46,11
@@
public:
void setBathymetryName( const QString& theBathymetry );
QString getBathymetryName() const;
void setBathymetryName( const QString& theBathymetry );
QString getBathymetryName() const;
- void setFillingColor( const QColor& theColor );
- QColor getFillingColor() const;
-
- void setBorderColor( const QColor& theColor );
- QColor getBorderColor() const;
-
signals:
void CreatePreview( const QString& thePolylineName );
private slots:
void onZoneDefChanged();
signals:
void CreatePreview( const QString& thePolylineName );
private slots:
void onZoneDefChanged();
- void onFillingColorChanged();
- void onFillingColorChanged( const bool theIsChecked );
private:
private:
@@
-74,13
+59,6
@@
private:
QComboBox* myPolylines;
QComboBox* myBathymetries;
QComboBox* myPolylines;
QComboBox* myBathymetries;
-
- QRadioButton* myFillingTransparent;
- QRadioButton* myFillingColor;
- HYDROGUI_ColorWidget* myFillingColorBox;
-
- QGroupBox* myBorderColorGroup;
- HYDROGUI_ColorWidget* myBorderColorBox;
};
#endif
};
#endif