X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_GroupOpDlg.cxx;h=c63879413fc1de112763cd07c2d13ec2a9af6adb;hp=69077f967f5ef8ec291f55ad8706943d2ef6b401;hb=560f8b2d0c2a7fdb4047f981cfac56ed3629bc1a;hpb=5c19bc1e1684ec6a466423361949ed7b60556968

diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 69077f967..c63879413 100644
--- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -31,6 +31,7 @@
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_VTKUtils.h"
 #include "SMESH_TypeFilter.hxx"
+#include <SMESH_ActorUtils.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));
+
+  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 ) )
-      continue; // nonsence
+      continue; // nonsense
 
     SMESH::SMESH_Mesh_var aMesh = aGrp->GetMesh();
     if ( CORBA::is_nil( aMesh ) )
@@ -447,6 +450,14 @@ SALOMEDS::Color SMESHGUI_GroupOpDlg::getColor() const
   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 
@@ -471,7 +482,7 @@ void SMESHGUI_GroupOpDlg::setVisible( bool visible )
 }
 
 /*!
-  \brief SLOT called when dialog must be deativated
+  \brief SLOT called when dialog must be deactivated
 */
 void SMESHGUI_GroupOpDlg::onDeactivate()
 {
@@ -499,12 +510,13 @@ void SMESHGUI_GroupOpDlg::enterEvent(QEvent*)
 /*!
   \brief Resets state of the dialog, initializes its fields with default value, etc. 
   Usually called by onApply() slot to reinitialize dialog  fields. This virtual method 
-  should be redefined in derived class to update its own fileds
+  should be redefined in derived class to update its own fields
 */
 void SMESHGUI_GroupOpDlg::reset()
 {
   myNameEdit->setText("");
   myNameEdit->setFocus();
+  setDefaultGroupColor();
 }
 
 /*!
@@ -584,7 +596,7 @@ SMESHGUI_UnionGroupsDlg::SMESHGUI_UnionGroupsDlg( SMESHGUI* theModule )
 : SMESHGUI_GroupOpDlg( theModule )
 {
   setWindowTitle(tr("UNION_OF_GROUPS"));
-  setHelpFileName( "using_operations_on_groups_page.html#union_anchor" );
+  setHelpFileName( "using_operations_on_groups.html#union-anchor" );
 
   QGroupBox* anArgGrp = getArgGrp();
   myListWg = new QListWidget( anArgGrp );
@@ -617,7 +629,7 @@ void SMESHGUI_UnionGroupsDlg::reset()
 */
 bool SMESHGUI_UnionGroupsDlg::onApply()
 {
-  if ( getSMESHGUI()->isActiveStudyLocked())
+  if ( SMESHGUI::isStudyLocked())
     return false;
 
   // Verify validity of group name
@@ -640,7 +652,7 @@ bool SMESHGUI_UnionGroupsDlg::onApply()
   {
     SMESH::ListOfGroups_var aList = convert( myGroups );
     SMESH::SMESH_Group_var aNewGrp = 
-      aMesh->UnionListOfGroups( aList, aName.toLatin1().constData() );
+      aMesh->UnionListOfGroups( aList, aName.toUtf8().constData() );
     if ( !CORBA::is_nil( aNewGrp ) )
     {
       aNewGrp->SetColor(  getColor() );
@@ -693,7 +705,7 @@ SMESHGUI_IntersectGroupsDlg::SMESHGUI_IntersectGroupsDlg( SMESHGUI* theModule )
 : SMESHGUI_GroupOpDlg( theModule )
 {
   setWindowTitle(tr("INTERSECTION_OF_GROUPS"));
-  setHelpFileName( "using_operations_on_groups_page.html#intersection_anchor" );
+  setHelpFileName( "using_operations_on_groups.html#intersection-anchor" );
 
   QGroupBox* anArgGrp = getArgGrp();
   myListWg = new QListWidget( anArgGrp );
@@ -726,7 +738,7 @@ void SMESHGUI_IntersectGroupsDlg::reset()
 */
 bool SMESHGUI_IntersectGroupsDlg::onApply()
 {
-  if ( getSMESHGUI()->isActiveStudyLocked())
+  if ( SMESHGUI::isStudyLocked())
     return false;
 
   // Verify validity of group name
@@ -749,7 +761,7 @@ bool SMESHGUI_IntersectGroupsDlg::onApply()
   {
     SMESH::ListOfGroups_var aList = convert( myGroups );
     SMESH::SMESH_Group_var aNewGrp = 
-      aMesh->IntersectListOfGroups( aList, aName.toLatin1().constData() );
+      aMesh->IntersectListOfGroups( aList, aName.toUtf8().constData() );
     if ( !CORBA::is_nil( aNewGrp ) )
     {
       aNewGrp->SetColor(  getColor() );
@@ -802,7 +814,7 @@ SMESHGUI_CutGroupsDlg::SMESHGUI_CutGroupsDlg( SMESHGUI* theModule )
 : SMESHGUI_GroupOpDlg( theModule )
 {
   setWindowTitle(tr("CUT_OF_GROUPS"));
-  setHelpFileName( "using_operations_on_groups_page.html#cut_anchor" );
+  setHelpFileName( "using_operations_on_groups.html#cut-anchor" );
 
   QGroupBox* anArgGrp = getArgGrp();
 
@@ -886,7 +898,7 @@ void SMESHGUI_CutGroupsDlg::reset()
 */
 bool SMESHGUI_CutGroupsDlg::onApply()
 {
-  if ( getSMESHGUI()->isActiveStudyLocked())
+  if ( SMESHGUI::isStudyLocked())
     return false;
 
   // Verify validity of group name
@@ -922,7 +934,7 @@ bool SMESHGUI_CutGroupsDlg::onApply()
     SMESH::ListOfGroups_var aList1 = convert( myGroups1 );
     SMESH::ListOfGroups_var aList2 = convert( myGroups2 );
     SMESH::SMESH_Group_var aNewGrp = 
-      aMesh->CutListOfGroups( aList1, aList2, aName.toLatin1().constData() );
+      aMesh->CutListOfGroups( aList1, aList2, aName.toUtf8().constData() );
     if ( !CORBA::is_nil( aNewGrp ) )
     {
       aNewGrp->SetColor(  getColor() );
@@ -984,7 +996,7 @@ SMESHGUI_DimGroupDlg::SMESHGUI_DimGroupDlg( SMESHGUI* theModule )
   : SMESHGUI_GroupOpDlg( theModule )
 {
   setWindowTitle( tr( "CREATE_GROUP_OF_UNDERLYING_ELEMS" ) );
-  setHelpFileName( "group_of_underlying_elements_page.html" );
+  setHelpFileName( "group_of_underlying_elements.html" );
 
   QGroupBox* anArgGrp = getArgGrp();
 
@@ -1076,7 +1088,7 @@ void SMESHGUI_DimGroupDlg::setElementType( const SMESH::ElementType& theElemType
 */
 bool SMESHGUI_DimGroupDlg::onApply()
 {
-  if ( getSMESHGUI()->isActiveStudyLocked())
+  if ( SMESHGUI::isStudyLocked())
     return false;
 
   // Verify validity of group name
@@ -1108,7 +1120,7 @@ bool SMESHGUI_DimGroupDlg::onApply()
       (SMESH::NB_COMMON_NODES_ENUM) myNbNoCombo->currentIndex();
 
     SMESH::SMESH_Group_var aNewGrp =
-      aMesh->CreateDimGroup( aList, anElemType, aName.toLatin1().constData(),
+      aMesh->CreateDimGroup( aList, anElemType, aName.toUtf8().constData(),
                              aNbCoNodes, myUnderlOnlyChk->isChecked() );
     if ( !CORBA::is_nil( aNewGrp ) )
     {