ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Unicode support

Browse Source
This commit is contained in:
vsr 2014-06-18 12:36:56 +04:00
parent 20feda8e84
commit 8f57b2cfd3
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHGUI/SMESHGUI.cxx
View File

@ -4755,7 +4755,7 @@ void SMESHGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& ti
_PTR(Study) study = appStudy->studyDS(); _PTR(Study) study = appStudy->studyDS();
_PTR(SObject) obj = study->FindObjectID( io->getEntry() ); _PTR(SObject) obj = study->FindObjectID( io->getEntry() );
if ( obj ) { if ( obj ) {
QString aName = QString( obj->GetName().c_str() ); QString aName = QString( QString::fromUtf8(obj->GetName().c_str()) );
while ( aName.at( aName.length() - 1 ) == ' ' ) // Remove extraspaces in Name of Popup while ( aName.at( aName.length() - 1 ) == ' ' ) // Remove extraspaces in Name of Popup
aName.remove( (aName.length() - 1), 1 ); aName.remove( (aName.length() - 1), 1 );
title = aName; title = aName;
@ -6735,7 +6735,7 @@ void SMESHGUI::message( const QString& msg )
_PTR(SObject) obj = study->FindObjectID( entry.toLatin1().constData() ); _PTR(SObject) obj = study->FindObjectID( entry.toLatin1().constData() );
QString name; QString name;
if ( obj ) if ( obj )
name = obj->GetName().c_str(); name = QString::fromUtf8(obj->GetName().c_str());
if ( name.isEmpty() ) if ( name.isEmpty() )
return; return;

24
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -518,7 +518,7 @@ QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
bool isUnique = false; bool isUnique = false;
while (!isUnique) { while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber); aName = theOperation + "_" + QString::number(++aNumber);
isUnique = (aSet.count(aName.toLatin1().data()) == 0); isUnique = (aSet.count(aName.toUtf8().data()) == 0);
} }
return aName; return aName;
@ -534,7 +534,7 @@ void SMESHGUI_GroupDlg::setDefaultName() const
do do
{ {
aResName = aPrefix + QString::number( i++ ); aResName = aPrefix + QString::number( i++ );
anObj = aStudy->FindObject( aResName.toLatin1().data() ); anObj = aStudy->FindObject( aResName.toUtf8().data() );
} }
while ( anObj ); while ( anObj );
myName->setText(aResName); myName->setText(aResName);
@ -570,7 +570,7 @@ void SMESHGUI_GroupDlg::init (SMESH::SMESH_Mesh_ptr theMesh)
if( !aList.IsEmpty() ) if( !aList.IsEmpty() )
{ {
QString aName = aList.First()->getName(); 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; myNameChanged = true;
myName->blockSignals(true); myName->blockSignals(true);
myName->setText(theGroup->GetName()); myName->setText(QString::fromUtf8(theGroup->GetName()));
myName->blockSignals(false); myName->blockSignals(false);
myName->home(false); myName->home(false);
SALOMEDS::Color aColor = theGroup->GetColor(); SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor ); setGroupColor( aColor );
myMeshGroupLine->setText(theGroup->GetName()); myMeshGroupLine->setText(QString::fromUtf8(theGroup->GetName()));
int aType = 0; int aType = 0;
switch(theGroup->GetType()) { switch(theGroup->GetType()) {
@ -685,7 +685,7 @@ void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
{ {
myNameChanged = true; myNameChanged = true;
myName->blockSignals(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) { if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType, myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
myName->text().toLatin1().data(), myName->text().toUtf8().data(),
myGeomObjects[0]); myGeomObjects[0]);
} }
else { else {
@ -1080,11 +1080,11 @@ bool SMESHGUI_GroupDlg::onApply()
aNewGeomGroupName += myName->text(); aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO = SALOMEDS::SObject_var aNewGroupSO =
geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar, geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar,
aNewGeomGroupName.toLatin1().data(), aMeshShape); aNewGeomGroupName.toUtf8().data(), aMeshShape);
} }
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType, myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
myName->text().toLatin1().data(), myName->text().toUtf8().data(),
aGroupVar); aGroupVar);
} }
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom ); resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
@ -1107,7 +1107,7 @@ bool SMESHGUI_GroupDlg::onApply()
return false; return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType, myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
myName->text().toLatin1().data(), myName->text().toUtf8().data(),
myFilter); myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter ); resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
@ -1148,7 +1148,7 @@ bool SMESHGUI_GroupDlg::onApply()
} }
else else
{ {
resultGroup->SetName(myName->text().toLatin1().data()); resultGroup->SetName(myName->text().toUtf8().data());
if ( aMeshGroupSO ) if ( aMeshGroupSO )
{ {
@ -1162,7 +1162,7 @@ bool SMESHGUI_GroupDlg::onApply()
if ( !anActor ) return false; if ( !anActor ) return false;
myActorsList.append( anActor ); myActorsList.append( anActor );
} }
anActor->setName(myName->text().toLatin1().data()); anActor->setName(myName->text().toUtf8().data());
QColor c; QColor c;
int delta; int delta;
switch ( myTypeId ) { switch ( myTypeId ) {

2
src/SMESHGUI/SMESHGUI_GroupUtils.cxx
View File

@ -42,7 +42,7 @@ namespace SMESH
SMESH::SMESH_Group_var aGroup; SMESH::SMESH_Group_var aGroup;
try { try {
if ( !theMesh->_is_nil() ) if ( !theMesh->_is_nil() )
aGroup = theMesh->CreateGroup( theType, theGroupName.toLatin1().data() ); aGroup = theMesh->CreateGroup( theType, theGroupName.toUtf8().data() );
} }
catch( const SALOME::SALOME_Exception& S_ex ) { catch( const SALOME::SALOME_Exception& S_ex ) {
SalomeApp_Tools::QtCatchCorbaException( S_ex ); SalomeApp_Tools::QtCatchCorbaException( S_ex );