ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-31 03:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021130: EDF 1746 SMESH: Issue with export in STL format

Browse Source 
Import of STL file via GUI has been enabled
This commit is contained in:
eap 2011-01-28 11:19:54 +00:00
parent 33aaca7a21
commit 8b075049f9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/SMESHGUI/SMESHGUI.cxx
View File

@ -198,6 +198,9 @@
else if ( theCommandID == 111 ) { else if ( theCommandID == 111 ) {
filter.append( QObject::tr( "DAT_FILES_FILTER" ) + " (*.dat)" ); filter.append( QObject::tr( "DAT_FILES_FILTER" ) + " (*.dat)" );
} }
else if ( theCommandID == 140 ) {
filter.append( QObject::tr( "STL_ASCII_FILES_FILTER" ) + " (*.stl)" );
}
QString anInitialPath = ""; QString anInitialPath = "";
if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() ) if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
@ -246,6 +249,17 @@
} }
break; break;
} }
case 140:
{
// STL format
aMeshes->length( 1 );
aMeshes[0] = theComponentMesh->CreateMeshesFromSTL( filename.toLatin1().constData() );
if ( aMeshes[0]->_is_nil() ) {
errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) );
}
break;
}
} }
} }
catch ( const SALOME::SALOME_Exception& S_ex ) { catch ( const SALOME::SALOME_Exception& S_ex ) {
@ -396,7 +410,6 @@
aFilter = QObject::tr( "IDEAS_FILES_FILTER" ) + " (*.unv)"; aFilter = QObject::tr( "IDEAS_FILES_FILTER" ) + " (*.unv)";
} }
break; break;
case 140:
case 141: case 141:
{ {
// export STL // export STL
@ -443,12 +456,12 @@
if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() ) if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
anInitialPath = QDir::currentPath(); anInitialPath = QDir::currentPath();
if ( theCommandID != 122 && theCommandID != 125 && theCommandID != 140 && theCommandID != 141) { if ( theCommandID != 122 && theCommandID != 125 && theCommandID != 141) {
if ( anInitialPath.isEmpty() ) anInitialPath = SUIT_FileDlg::getLastVisitedPath(); if ( anInitialPath.isEmpty() ) anInitialPath = SUIT_FileDlg::getLastVisitedPath();
aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), anInitialPath + QString("/") + aMeshName, aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), anInitialPath + QString("/") + aMeshName,
aFilter, aTitle, false); aFilter, aTitle, false);
} }
else if(theCommandID == 140 || theCommandID == 141) { // Export to STL else if(theCommandID == 141) { // Export to STL
QStringList filters; QStringList filters;
QMap<QString, int>::const_iterator it = aFilterMapSTL.begin(); QMap<QString, int>::const_iterator it = aFilterMapSTL.begin();
for ( ; it != aFilterMapSTL.end(); ++it ) for ( ; it != aFilterMapSTL.end(); ++it )
@ -607,7 +620,6 @@
case 123: case 123:
aMesh->ExportUNV( aFilename.toLatin1().data() ); aMesh->ExportUNV( aFilename.toLatin1().data() );
break; break;
case 140:
case 141: case 141:
aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL ); aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL );
break; break;
@ -1862,6 +1874,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
case 113: // IMPORT case 113: // IMPORT
case 112: case 112:
case 111: case 111:
case 140:
{ {
if(checkLock(aStudy)) break; if(checkLock(aStudy)) break;
::ImportMeshesFromFile(GetSMESHGen(),theCommandID); ::ImportMeshesFromFile(GetSMESHGen(),theCommandID);
@ -1893,7 +1906,6 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
case 124: case 124:
case 125: case 125:
case 126: case 126:
case 140:
case 141: case 141:
{ {
::ExportMeshToFile(theCommandID); ::ExportMeshToFile(theCommandID);
@ -3469,11 +3481,12 @@ void SMESHGUI::initialize( CAM_Application* app )
createMenu( 111, importId, -1 ); createMenu( 111, importId, -1 );
createMenu( 112, importId, -1 ); createMenu( 112, importId, -1 );
createMenu( 113, importId, -1 ); createMenu( 113, importId, -1 );
createMenu( 140, importId, -1 );
createMenu( 121, exportId, -1 ); createMenu( 121, exportId, -1 );
createMenu( 122, exportId, -1 ); createMenu( 122, exportId, -1 );
createMenu( 123, exportId, -1 ); createMenu( 123, exportId, -1 );
createMenu( 140, exportId, -1 ); // export to stl STL createMenu( 141, exportId, -1 ); // export to stl STL
createMenu( separator(), fileId, 10 ); createMenu( separator(), fileId, 10 );