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
INT PAL 0052968: 'Mesh Information' dialog shows incorrect color of group built from...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 69077f967f5ef8ec291f55ad8706943d2ef6b401..6f32383c0706c598664c1c558f07d83c18bb057c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@
-31,6
+31,7
@@
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_VTKUtils.h"
#include "SMESH_TypeFilter.hxx"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_VTKUtils.h"
#include "SMESH_TypeFilter.hxx"
+#include <SMESH_ActorUtils.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
@@
-232,6
+233,8
@@
void SMESHGUI_GroupOpDlg::Init()
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));
+
+ setDefaultGroupColor();
}
/*!
}
/*!
@@
-447,6
+450,14
@@
SALOMEDS::Color SMESHGUI_GroupOpDlg::getColor() const
return aColor;
}
return aColor;
}
+/*!
+ \brief Set default color for group
+*/
+void SMESHGUI_GroupOpDlg::setDefaultGroupColor()
+{
+ myColorBtn->setColor( SMESH::GetColor( "SMESH", "default_grp_color", QColor( 255, 170, 0 ) ) );
+}
+
/*!
\brief SLOT, called when selection is changed. Current implementation does
nothing. The method should be redefined in derived classes to update
/*!
\brief SLOT, called when selection is changed. Current implementation does
nothing. The method should be redefined in derived classes to update
@@
-505,6
+516,7
@@
void SMESHGUI_GroupOpDlg::reset()
{
myNameEdit->setText("");
myNameEdit->setFocus();
{
myNameEdit->setText("");
myNameEdit->setFocus();
+ setDefaultGroupColor();
}
/*!
}
/*!