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
Merge branch 'master' into gni/documentation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Preferences_ScalarBarDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
index 4ecb44cabf556f96e7afd618cd9337287e40a070..13564ea89fc4f1c5707115a679685f9b399bfe9a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
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
@@
-448,7
+448,7
@@
SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
connect( mySelectionMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionChanged() ) );
connect( mySMESHGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( reject() ) );
connect( mySelectionMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionChanged() ) );
connect( mySMESHGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( reject() ) );
- myHelpFileName = "
quality_page
.html";
+ myHelpFileName = "
scalar_bar
.html";
}
//=================================================================================================
}
//=================================================================================================
@@
-848,7
+848,7
@@
void SMESHGUI_Preferences_ScalarBarDlg::initScalarBarFromResources()
SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
QString name;
if (mgr){
SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
QString name;
if (mgr){
- // initialize from reso
o
urces
+ // initialize from resources
// horizontal
name = QString("scalar_bar_horizontal_%1");
// horizontal
name = QString("scalar_bar_horizontal_%1");