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 V9_3_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 408546d464ba7321ad81d6752c01c445406aa343..37419baa5f91e94c76cfa1673439cef0ba4908b7 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-652,7
+652,7
@@
bool SMESHGUI_UnionGroupsDlg::onApply()
{
SMESH::ListOfGroups_var aList = convert( myGroups );
SMESH::SMESH_Group_var aNewGrp =
{
SMESH::ListOfGroups_var aList = convert( myGroups );
SMESH::SMESH_Group_var aNewGrp =
- aMesh->UnionListOfGroups( aList, aName.to
Latin1
().constData() );
+ aMesh->UnionListOfGroups( aList, aName.to
Utf8
().constData() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNewGrp->SetColor( getColor() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNewGrp->SetColor( getColor() );
@@
-761,7
+761,7
@@
bool SMESHGUI_IntersectGroupsDlg::onApply()
{
SMESH::ListOfGroups_var aList = convert( myGroups );
SMESH::SMESH_Group_var aNewGrp =
{
SMESH::ListOfGroups_var aList = convert( myGroups );
SMESH::SMESH_Group_var aNewGrp =
- aMesh->IntersectListOfGroups( aList, aName.to
Latin1
().constData() );
+ aMesh->IntersectListOfGroups( aList, aName.to
Utf8
().constData() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNewGrp->SetColor( getColor() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNewGrp->SetColor( getColor() );
@@
-934,7
+934,7
@@
bool SMESHGUI_CutGroupsDlg::onApply()
SMESH::ListOfGroups_var aList1 = convert( myGroups1 );
SMESH::ListOfGroups_var aList2 = convert( myGroups2 );
SMESH::SMESH_Group_var aNewGrp =
SMESH::ListOfGroups_var aList1 = convert( myGroups1 );
SMESH::ListOfGroups_var aList2 = convert( myGroups2 );
SMESH::SMESH_Group_var aNewGrp =
- aMesh->CutListOfGroups( aList1, aList2, aName.to
Latin1
().constData() );
+ aMesh->CutListOfGroups( aList1, aList2, aName.to
Utf8
().constData() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNewGrp->SetColor( getColor() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNewGrp->SetColor( getColor() );
@@
-1120,7
+1120,7
@@
bool SMESHGUI_DimGroupDlg::onApply()
(SMESH::NB_COMMON_NODES_ENUM) myNbNoCombo->currentIndex();
SMESH::SMESH_Group_var aNewGrp =
(SMESH::NB_COMMON_NODES_ENUM) myNbNoCombo->currentIndex();
SMESH::SMESH_Group_var aNewGrp =
- aMesh->CreateDimGroup( aList, anElemType, aName.to
Latin1
().constData(),
+ aMesh->CreateDimGroup( aList, anElemType, aName.to
Utf8
().constData(),
aNbCoNodes, myUnderlOnlyChk->isChecked() );
if ( !CORBA::is_nil( aNewGrp ) )
{
aNbCoNodes, myUnderlOnlyChk->isChecked() );
if ( !CORBA::is_nil( aNewGrp ) )
{