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
Unicode support
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 832ac1c8d4bb31f0ec965a847601068307101f88..1293f3e0d37d95c12dea5f6edbc379f453f01313 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-518,7
+518,7
@@
QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
- isUnique = (aSet.count(aName.to
Latin1
().data()) == 0);
+ isUnique = (aSet.count(aName.to
Utf8
().data()) == 0);
}
return aName;
}
return aName;
@@
-534,7
+534,7
@@
void SMESHGUI_GroupDlg::setDefaultName() const
do
{
aResName = aPrefix + QString::number( i++ );
do
{
aResName = aPrefix + QString::number( i++ );
- anObj = aStudy->FindObject( aResName.to
Latin1
().data() );
+ anObj = aStudy->FindObject( aResName.to
Utf8
().data() );
}
while ( anObj );
myName->setText(aResName);
}
while ( anObj );
myName->setText(aResName);
@@
-570,7
+570,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_Mesh_ptr theMesh)
if( !aList.IsEmpty() )
{
QString aName = aList.First()->getName();
if( !aList.IsEmpty() )
{
QString aName = aList.First()->getName();
- myMeshGroupLine->setText(aName);
+ myMeshGroupLine->setText(aName);
//??????
myMeshGroupLine->home( false );
}
myMeshGroupLine->home( false );
}
@@
-593,14
+593,14
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
myNameChanged = true;
myName->blockSignals(true);
myNameChanged = true;
myName->blockSignals(true);
- myName->setText(
theGroup->GetName(
));
+ myName->setText(
QString::fromUtf8(theGroup->GetName()
));
myName->blockSignals(false);
myName->home(false);
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
myName->blockSignals(false);
myName->home(false);
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
- myMeshGroupLine->setText(
theGroup->GetName(
));
+ myMeshGroupLine->setText(
QString::fromUtf8(theGroup->GetName()
));
int aType = 0;
switch(theGroup->GetType()) {
int aType = 0;
switch(theGroup->GetType()) {
@@
-685,7
+685,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
{
myNameChanged = true;
myName->blockSignals(true);
{
myNameChanged = true;
myName->blockSignals(true);
- myName->setText(
theGroup->GetName(
));
+ myName->setText(
QString::fromUtf8(theGroup->GetName()
));
myName->blockSignals(false);
}
myName->blockSignals(false);
}
@@
-1038,7
+1038,7
@@
bool SMESHGUI_GroupDlg::onApply()
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
- myName->text().to
Latin1
().data(),
+ myName->text().to
Utf8
().data(),
myGeomObjects[0]);
}
else {
myGeomObjects[0]);
}
else {
@@
-1080,11
+1080,11
@@
bool SMESHGUI_GroupDlg::onApply()
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar,
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar,
- aNewGeomGroupName.to
Latin1
().data(), aMeshShape);
+ aNewGeomGroupName.to
Utf8
().data(), aMeshShape);
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
- myName->text().to
Latin1
().data(),
+ myName->text().to
Utf8
().data(),
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
@@
-1107,7
+1107,7
@@
bool SMESHGUI_GroupDlg::onApply()
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
- myName->text().to
Latin1
().data(),
+ myName->text().to
Utf8
().data(),
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
@@
-1148,7
+1148,7
@@
bool SMESHGUI_GroupDlg::onApply()
}
else
{
}
else
{
- resultGroup->SetName(myName->text().to
Latin1
().data());
+ resultGroup->SetName(myName->text().to
Utf8
().data());
if ( aMeshGroupSO )
{
if ( aMeshGroupSO )
{
@@
-1162,7
+1162,7
@@
bool SMESHGUI_GroupDlg::onApply()
if ( !anActor ) return false;
myActorsList.append( anActor );
}
if ( !anActor ) return false;
myActorsList.append( anActor );
}
- anActor->setName(myName->text().to
Latin1
().data());
+ anActor->setName(myName->text().to
Utf8
().data());
QColor c;
int delta;
switch ( myTypeId ) {
QColor c;
int delta;
switch ( myTypeId ) {