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 remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_DuplicateNodesDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
index 9e3c4487c6efe0aaae996dc8d874f60ebc94002b..ae86d977c09a65a31459f2942f74ea06b35102d2 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
@@
-402,7
+402,7
@@
void SMESHGUI_DuplicateNodesDlg::onConstructorsClicked (int constructorId)
*/
bool SMESHGUI_DuplicateNodesDlg::onApply()
{
*/
bool SMESHGUI_DuplicateNodesDlg::onApply()
{
- if (
mySMESHGUI->isActive
StudyLocked() || !isValid() )
+ if (
SMESHGUI::is
StudyLocked() || !isValid() )
return false;
BusyLocker lock( myBusy );
return false;
BusyLocker lock( myBusy );
@@
-477,7
+477,7
@@
bool SMESHGUI_DuplicateNodesDlg::onApply()
for ( int i = 0; i < myGroups1.count(); i++ )
{
SMESH::SMESH_Group_var group =
for ( int i = 0; i < myGroups1.count(); i++ )
{
SMESH::SMESH_Group_var group =
- aMeshEditor->DoubleElements( myGroups1[i], groupName.to
Latin1
().data() );
+ aMeshEditor->DoubleElements( myGroups1[i], groupName.to
Utf8
().data() );
if ( group->_is_nil() )
{
if ( toCreateElemGroup )
if ( group->_is_nil() )
{
if ( toCreateElemGroup )
@@
-705,7
+705,7
@@
void SMESHGUI_DuplicateNodesDlg::onDeactivate()
*/
void SMESHGUI_DuplicateNodesDlg::onGenerate()
{
*/
void SMESHGUI_DuplicateNodesDlg::onGenerate()
{
- if (
mySMESHGUI->isActive
StudyLocked() )
+ if (
SMESHGUI::is
StudyLocked() )
return;
SUIT_OverrideCursor aWaitCursor;
return;
SUIT_OverrideCursor aWaitCursor;