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 multi-study removal branch.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 69077f967f5ef8ec291f55ad8706943d2ef6b401..b4084b6655b391f4cf23e1a6d91dbff3b7e09e78 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-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();
}
/*!
}
/*!
@@
-255,7
+258,7
@@
bool SMESHGUI_GroupOpDlg::isValid( const QList<SMESH::SMESH_GroupBase_var>& theL
{
SMESH::SMESH_GroupBase_var aGrp = *anIter;
if ( CORBA::is_nil( aGrp ) )
{
SMESH::SMESH_GroupBase_var aGrp = *anIter;
if ( CORBA::is_nil( aGrp ) )
- continue; // nonsen
c
e
+ continue; // nonsen
s
e
SMESH::SMESH_Mesh_var aMesh = aGrp->GetMesh();
if ( CORBA::is_nil( aMesh ) )
SMESH::SMESH_Mesh_var aMesh = aGrp->GetMesh();
if ( CORBA::is_nil( aMesh ) )
@@
-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();
}
/*!
}
/*!
@@
-617,7
+629,7
@@
void SMESHGUI_UnionGroupsDlg::reset()
*/
bool SMESHGUI_UnionGroupsDlg::onApply()
{
*/
bool SMESHGUI_UnionGroupsDlg::onApply()
{
- if (
getSMESHGUI()->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
// Verify validity of group name
return false;
// Verify validity of group name
@@
-726,7
+738,7
@@
void SMESHGUI_IntersectGroupsDlg::reset()
*/
bool SMESHGUI_IntersectGroupsDlg::onApply()
{
*/
bool SMESHGUI_IntersectGroupsDlg::onApply()
{
- if (
getSMESHGUI()->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
// Verify validity of group name
return false;
// Verify validity of group name
@@
-886,7
+898,7
@@
void SMESHGUI_CutGroupsDlg::reset()
*/
bool SMESHGUI_CutGroupsDlg::onApply()
{
*/
bool SMESHGUI_CutGroupsDlg::onApply()
{
- if (
getSMESHGUI()->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
// Verify validity of group name
return false;
// Verify validity of group name
@@
-1076,7
+1088,7
@@
void SMESHGUI_DimGroupDlg::setElementType( const SMESH::ElementType& theElemType
*/
bool SMESHGUI_DimGroupDlg::onApply()
{
*/
bool SMESHGUI_DimGroupDlg::onApply()
{
- if (
getSMESHGUI()->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
// Verify validity of group name
return false;
// Verify validity of group name