Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ménage avant intégration
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Preferences_ScalarBarDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
index 804b4aa6aa742a97a9fa4480f28d0724eb7643d7..1ff42cfb13e4d8eab201a7ffbc72d76d714e5323 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-23,7
+23,7
@@
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_Preferences_ScalarBarDlg.h
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_Preferences_ScalarBarDlg.h
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
-//
+
#ifndef SMESHGUI_PREFERENCES_SCALARBARDLG_H
#define SMESHGUI_PREFERENCES_SCALARBARDLG_H
#ifndef SMESHGUI_PREFERENCES_SCALARBARDLG_H
#define SMESHGUI_PREFERENCES_SCALARBARDLG_H
@@
-64,20
+64,22
@@
public:
static void ScalarBarProperties( SMESHGUI* );
static void ScalarBarProperties( SMESHGUI* );
- void closeEvent( QCloseEvent* );
void setOriginAndSize( const double,
const double,
const double,
const double );
void initScalarBarFromResources();
void setOriginAndSize( const double,
const double,
const double,
const double );
void initScalarBarFromResources();
+protected slots:
+ virtual void reject();
+
protected slots:
void onOk();
bool onApply();
protected slots:
void onOk();
bool onApply();
- void onCancel();
void onHelp();
void onSelectionChanged();
void onXYChanged();
void onHelp();
void onSelectionChanged();
void onXYChanged();
+ void onMinMaxChanged();
void onOrientationChanged();
void onDistributionChanged( int );
void onDistributionActivated( bool );
void onOrientationChanged();
void onDistributionChanged( int );
void onDistributionActivated( bool );
@@
-94,6
+96,7
@@
private:
QGroupBox* myRangeGrp;
QLineEdit* myMinEdit;
QLineEdit* myMaxEdit;
QGroupBox* myRangeGrp;
QLineEdit* myMinEdit;
QLineEdit* myMaxEdit;
+ QCheckBox* myLogarithmicCheck;
QGroupBox* myFontGrp;
QtxColorButton* myTitleColorBtn;
QGroupBox* myFontGrp;
QtxColorButton* myTitleColorBtn;