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_2_2_BR'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ShapeByMeshDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index b17fed16fd0713ebb412cca2a8daf608201d8229..6647f4cdc00b76ec4dfb83dfb833f68829ec158a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.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
@@
-314,7
+314,7
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
// GEOM_Object is published -> no need to UnRegister()
myGeomObj = GEOM::GEOM_Object::_duplicate
(SMESHGUI::GetSMESHGen()->GetGeometryByMeshElement
// GEOM_Object is published -> no need to UnRegister()
myGeomObj = GEOM::GEOM_Object::_duplicate
(SMESHGUI::GetSMESHGen()->GetGeometryByMeshElement
- ( myMesh.in(), elemID, myDlg->myGeomName->text().to
Latin1
().constData()) );
+ ( myMesh.in(), elemID, myDlg->myGeomName->text().to
Utf8
().constData()) );
}
else
{
}
else
{
@@
-387,7
+387,7
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
QString aNewGeomGroupName ( myDlg->myGeomName->text() );
SALOMEDS::SObject_wrap aNewGroupSO =
geomGen->AddInStudy( aGeomObject,
QString aNewGeomGroupName ( myDlg->myGeomName->text() );
SALOMEDS::SObject_wrap aNewGroupSO =
geomGen->AddInStudy( aGeomObject,
- aNewGeomGroupName.to
Latin1
().data(), aMeshShape);
+ aNewGeomGroupName.to
Utf8
().data(), aMeshShape);
// get a GEOM_Object already published, which doesn't need UnRegister()
CORBA::Object_var obj = aNewGroupSO->GetObject();
// get a GEOM_Object already published, which doesn't need UnRegister()
CORBA::Object_var obj = aNewGroupSO->GetObject();