ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022308: EDF 2572 SMESH: Can't import a file with a non ascii character in the path

Browse Source
This commit is contained in:
vsr 2013-09-03 10:58:47 +00:00
parent c50bee3b04
commit 82a6b20865
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/SMESHGUI/SMESHGUI.cxx
View File

@ -276,7 +276,7 @@
{ {
// UNV format // UNV format
aMeshes->length( 1 ); aMeshes->length( 1 );
aMeshes[0] = theComponentMesh->CreateMeshesFromUNV( filename.toLatin1().constData() ); aMeshes[0] = theComponentMesh->CreateMeshesFromUNV( filename.toUtf8().constData() );
if ( aMeshes[0]->_is_nil() ) if ( aMeshes[0]->_is_nil() )
errors.append( QString( "%1 :\n\t%2" ).arg( filename ). errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) ); arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) );
@ -286,7 +286,7 @@
{ {
// MED format // MED format
SMESH::DriverMED_ReadStatus res; SMESH::DriverMED_ReadStatus res;
aMeshes = theComponentMesh->CreateMeshesFromMED( filename.toLatin1().constData(), res ); aMeshes = theComponentMesh->CreateMeshesFromMED( filename.toUtf8().constData(), res );
if ( res != SMESH::DRS_OK ) { if ( res != SMESH::DRS_OK ) {
errors.append( QString( "%1 :\n\t%2" ).arg( filename ). errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) ); arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) );
@ -297,7 +297,7 @@
{ {
// STL format // STL format
aMeshes->length( 1 ); aMeshes->length( 1 );
aMeshes[0] = theComponentMesh->CreateMeshesFromSTL( filename.toLatin1().constData() ); aMeshes[0] = theComponentMesh->CreateMeshesFromSTL( filename.toUtf8().constData() );
if ( aMeshes[0]->_is_nil() ) { if ( aMeshes[0]->_is_nil() ) {
errors.append( QString( "%1 :\n\t%2" ).arg( filename ). errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) ); arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) );
@ -308,7 +308,7 @@
{ {
// CGNS format // CGNS format
SMESH::DriverMED_ReadStatus res; SMESH::DriverMED_ReadStatus res;
aMeshes = theComponentMesh->CreateMeshesFromCGNS( filename.toLatin1().constData(), res ); aMeshes = theComponentMesh->CreateMeshesFromCGNS( filename.toUtf8().constData(), res );
if ( res != SMESH::DRS_OK ) { if ( res != SMESH::DRS_OK ) {
errors.append( QString( "%1 :\n\t%2" ).arg( filename ). errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) ); arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) );
@ -319,7 +319,7 @@
{ {
// SAUV format // SAUV format
SMESH::DriverMED_ReadStatus res; SMESH::DriverMED_ReadStatus res;
aMeshes = theComponentMesh->CreateMeshesFromSAUV( filename.toLatin1().constData(), res ); aMeshes = theComponentMesh->CreateMeshesFromSAUV( filename.toUtf8().constData(), res );
if ( res != SMESH::DRS_OK ) { if ( res != SMESH::DRS_OK ) {
errors.append( QString( "%1 :\n\t%2" ).arg( filename ). errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) ); arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) );
@ -331,7 +331,7 @@
// GMF format // GMF format
SMESH::ComputeError_var res; SMESH::ComputeError_var res;
aMeshes->length( 1 ); aMeshes->length( 1 );
aMeshes[0] = theComponentMesh->CreateMeshesFromGMF( filename.toLatin1().constData(), aMeshes[0] = theComponentMesh->CreateMeshesFromGMF( filename.toUtf8().constData(),
toCreateGroups, toCreateGroups,
res.out() ); res.out() );
if ( res->code != SMESH::DRS_OK ) { if ( res->code != SMESH::DRS_OK ) {
@ -727,7 +727,7 @@
if( !toOverwrite ) { if( !toOverwrite ) {
// can't append to an existing using other format // can't append to an existing using other format
SMESH::MED_VERSION aVersion = SMESH::MED_V2_1; SMESH::MED_VERSION aVersion = SMESH::MED_V2_1;
bool isVersionOk = SMESHGUI::GetSMESHGen()->GetMEDVersion( aFilename.toLatin1().constData(), aVersion ); bool isVersionOk = SMESHGUI::GetSMESHGen()->GetMEDVersion( aFilename.toUtf8().constData(), aVersion );
if( !isVersionOk || aVersion != aFormat ) { if( !isVersionOk || aVersion != aFormat ) {
int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(), int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"), QObject::tr("SMESH_WRN_WARNING"),
@ -741,7 +741,7 @@
} }
QStringList aMeshNamesCollisionList; QStringList aMeshNamesCollisionList;
SMESH::string_array_var aMeshNames = SMESHGUI::GetSMESHGen()->GetMeshNames( aFilename.toLatin1().constData() ); SMESH::string_array_var aMeshNames = SMESHGUI::GetSMESHGen()->GetMeshNames( aFilename.toUtf8().constData() );
for( int i = 0, n = aMeshNames->length(); i < n; i++ ) { for( int i = 0, n = aMeshNames->length(); i < n; i++ ) {
QString anExistingMeshName( aMeshNames[ i ] ); QString anExistingMeshName( aMeshNames[ i ] );
for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ ) { for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ ) {
@ -807,10 +807,10 @@
SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first; SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first;
SMESH::SMESH_Mesh_var aMeshItem = aMeshOrGroup->GetMesh(); SMESH::SMESH_Mesh_var aMeshItem = aMeshOrGroup->GetMesh();
if ( aMeshOrGroup->_is_equivalent( aMeshItem )) if ( aMeshOrGroup->_is_equivalent( aMeshItem ))
aMeshItem->ExportToMEDX( aFilename.toLatin1().data(), toCreateGroups, aMeshItem->ExportToMEDX( aFilename.toUtf8().data(), toCreateGroups,
aFormat, toOverwrite && aMeshIndex == 0, toFindOutDim ); aFormat, toOverwrite && aMeshIndex == 0, toFindOutDim );
else else
aMeshItem->ExportPartToMED( aMeshOrGroup, aFilename.toLatin1().data(), toCreateGroups, aMeshItem->ExportPartToMED( aMeshOrGroup, aFilename.toUtf8().data(), toCreateGroups,
aFormat, toOverwrite && aMeshIndex == 0, toFindOutDim ); aFormat, toOverwrite && aMeshIndex == 0, toFindOutDim );
} }
} }
@ -820,29 +820,29 @@
{ {
SMESH::SMESH_Mesh_var aMeshItem = SMESH::SMESH_Mesh::_narrow( (*aMeshIter).first ); SMESH::SMESH_Mesh_var aMeshItem = SMESH::SMESH_Mesh::_narrow( (*aMeshIter).first );
if( !aMeshItem->_is_nil() ) if( !aMeshItem->_is_nil() )
aMeshItem->ExportSAUV( aFilename.toLatin1().data(), toCreateGroups ); aMeshItem->ExportSAUV( aFilename.toUtf8().data(), toCreateGroups );
} }
} }
else if ( isDAT ) else if ( isDAT )
{ {
if ( aMeshOrGroup->_is_equivalent( aMesh )) if ( aMeshOrGroup->_is_equivalent( aMesh ))
aMesh->ExportDAT( aFilename.toLatin1().data() ); aMesh->ExportDAT( aFilename.toUtf8().data() );
else else
aMesh->ExportPartToDAT( aMeshOrGroup, aFilename.toLatin1().data() ); aMesh->ExportPartToDAT( aMeshOrGroup, aFilename.toUtf8().data() );
} }
else if ( isUNV ) else if ( isUNV )
{ {
if ( aMeshOrGroup->_is_equivalent( aMesh )) if ( aMeshOrGroup->_is_equivalent( aMesh ))
aMesh->ExportUNV( aFilename.toLatin1().data() ); aMesh->ExportUNV( aFilename.toUtf8().data() );
else else
aMesh->ExportPartToUNV( aMeshOrGroup, aFilename.toLatin1().data() ); aMesh->ExportPartToUNV( aMeshOrGroup, aFilename.toUtf8().data() );
} }
else if ( isSTL ) else if ( isSTL )
{ {
if ( aMeshOrGroup->_is_equivalent( aMesh )) if ( aMeshOrGroup->_is_equivalent( aMesh ))
aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL ); aMesh->ExportSTL( aFilename.toUtf8().data(), aIsASCII_STL );
else else
aMesh->ExportPartToSTL( aMeshOrGroup, aFilename.toLatin1().data(), aIsASCII_STL ); aMesh->ExportPartToSTL( aMeshOrGroup, aFilename.toUtf8().data(), aIsASCII_STL );
} }
else if ( isCGNS ) else if ( isCGNS )
{ {
@ -852,14 +852,14 @@
SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first; SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first;
SMESH::SMESH_Mesh_var aMeshItem = aMeshOrGroup->GetMesh(); SMESH::SMESH_Mesh_var aMeshItem = aMeshOrGroup->GetMesh();
aMeshItem->ExportCGNS( aMeshOrGroup, aMeshItem->ExportCGNS( aMeshOrGroup,
aFilename.toLatin1().data(), aFilename.toUtf8().data(),
toOverwrite && aMeshIndex == 0 ); toOverwrite && aMeshIndex == 0 );
} }
} }
else if ( isGMF ) else if ( isGMF )
{ {
toCreateGroups = true; toCreateGroups = true;
aMesh->ExportGMF( aMeshOrGroup, aFilename.toLatin1().data(), toCreateGroups ); aMesh->ExportGMF( aMeshOrGroup, aFilename.toUtf8().data(), toCreateGroups );
} }
} }
catch (const SALOME::SALOME_Exception& S_ex){ catch (const SALOME::SALOME_Exception& S_ex){