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 'V9_7_BR'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshUtils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index b6036d4de0a2527fa93899410bdef242b9a61bbe..89af29b1a67fc9bcf344c62349b267c4977fe705 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-64,9
+64,9
@@
namespace SMESH
{
QString baseName = thePostfix.isEmpty() ?
theBaseName : theBaseName + "_" + thePostfix;
{
QString baseName = thePostfix.isEmpty() ?
theBaseName : theBaseName + "_" + thePostfix;
- if ( _PTR(Study) aStudy =
GetActiveStudyDocument
() ) {
+ if ( _PTR(Study) aStudy =
getStudy
() ) {
QString name = baseName;
QString name = baseName;
- while ( !aStudy->FindObjectByName( name.to
Latin1
().data(), "SMESH" ).empty() ) {
+ while ( !aStudy->FindObjectByName( name.to
Utf8
().data(), "SMESH" ).empty() ) {
int nb = 0;
QStringList names = name.split("_", QString::KeepEmptyParts);
if ( names.count() > 0 ) {
int nb = 0;
QStringList names = name.split("_", QString::KeepEmptyParts);
if ( names.count() > 0 ) {
@@
-90,7
+90,7
@@
namespace SMESH
QString baseName = thePostfix.isEmpty() ?
theBaseName : theBaseName + "_" + thePostfix;
QString name = baseName;
QString baseName = thePostfix.isEmpty() ?
theBaseName : theBaseName + "_" + thePostfix;
QString name = baseName;
- if ( _PTR(Study) aStudy =
GetActiveStudyDocument
() ) {
+ if ( _PTR(Study) aStudy =
getStudy
() ) {
_PTR(SObject) p = theParent;
if ( !p ) p = aStudy->FindComponent( "SMESH" );
if ( p ) {
_PTR(SObject) p = theParent;
if ( !p ) p = aStudy->FindComponent( "SMESH" );
if ( p ) {