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
Ménage avant intégration
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index d5cc3cc5ea7dda1addf59a55e8c63377a39b8b5f..2c3893bcbb1212d4a1a4ce0b2d24615cc1154f2b 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
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
@@
-258,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 ) )
@@
-482,7
+482,7
@@
void SMESHGUI_GroupOpDlg::setVisible( bool visible )
}
/*!
}
/*!
- \brief SLOT called when dialog must be deativated
+ \brief SLOT called when dialog must be dea
c
tivated
*/
void SMESHGUI_GroupOpDlg::onDeactivate()
{
*/
void SMESHGUI_GroupOpDlg::onDeactivate()
{
@@
-510,7
+510,7
@@
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
/*!
\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 fi
le
ds
+ should be redefined in derived class to update its own fi
el
ds
*/
void SMESHGUI_GroupOpDlg::reset()
{
*/
void SMESHGUI_GroupOpDlg::reset()
{
@@
-596,7
+596,7
@@
SMESHGUI_UnionGroupsDlg::SMESHGUI_UnionGroupsDlg( SMESHGUI* theModule )
: SMESHGUI_GroupOpDlg( theModule )
{
setWindowTitle(tr("UNION_OF_GROUPS"));
: 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 );
QGroupBox* anArgGrp = getArgGrp();
myListWg = new QListWidget( anArgGrp );
@@
-629,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
@@
-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() );
@@
-705,7
+705,7
@@
SMESHGUI_IntersectGroupsDlg::SMESHGUI_IntersectGroupsDlg( SMESHGUI* theModule )
: SMESHGUI_GroupOpDlg( theModule )
{
setWindowTitle(tr("INTERSECTION_OF_GROUPS"));
: 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 );
QGroupBox* anArgGrp = getArgGrp();
myListWg = new QListWidget( anArgGrp );
@@
-738,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
@@
-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() );
@@
-814,7
+814,7
@@
SMESHGUI_CutGroupsDlg::SMESHGUI_CutGroupsDlg( SMESHGUI* theModule )
: SMESHGUI_GroupOpDlg( theModule )
{
setWindowTitle(tr("CUT_OF_GROUPS"));
: 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();
QGroupBox* anArgGrp = getArgGrp();
@@
-898,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
@@
-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() );
@@
-996,7
+996,7
@@
SMESHGUI_DimGroupDlg::SMESHGUI_DimGroupDlg( SMESHGUI* theModule )
: SMESHGUI_GroupOpDlg( theModule )
{
setWindowTitle( tr( "CREATE_GROUP_OF_UNDERLYING_ELEMS" ) );
: 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();
QGroupBox* anArgGrp = getArgGrp();
@@
-1088,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
@@
-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 ) )
{