ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-28 18:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

BUG 18584 - Import doesn't work

Browse Source 
BUG 19215 - Exception if file is not selected
This commit is contained in:
nkv 2008-03-12 08:37:35 +00:00
parent b9b1bc96aa
commit 96a900317d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -98,12 +98,13 @@ static QString getFileName( QWidget* parent,
fd->selectFilter( aBrepFilter ); fd->selectFilter( aBrepFilter );
} }
fd->setFilters( filters ); QString filename;
if ( fd->exec() == QDialog::Accepted ) {
filename = fd->selectedFile();
format = filterMap[fd->selectedFilter()];
lastUsedFilter = fd->selectedFilter();
}
fd->exec();
QString filename = fd->selectedFile();
format = filterMap[fd->selectedFilter()];
lastUsedFilter = fd->selectedFilter();
delete fd; delete fd;
qApp->processEvents(); qApp->processEvents();
return filename; return filename;
@ -501,6 +502,9 @@ bool GEOMToolsGUI::Import()
QString fileName = getFileName(app->desktop(), "", aMap, filters, QString fileName = getFileName(app->desktop(), "", aMap, filters,
tr("GEOM_MEN_IMPORT"), true, fileType); tr("GEOM_MEN_IMPORT"), true, fileType);
if (fileName.isEmpty())
return false;
if (fileType.isEmpty() ) if (fileType.isEmpty() )
{ {
// Trying to detect file type // Trying to detect file type
@ -511,7 +515,7 @@ bool GEOMToolsGUI::Import()
fileType = aPossibleType; fileType = aPossibleType;
} }
if (fileName.isEmpty() || fileType.isEmpty()) if (fileType.isEmpty())
return false; return false;
GEOM_Operation* anOp = new GEOM_Operation (app, aInsOp.in()); GEOM_Operation* anOp = new GEOM_Operation (app, aInsOp.in());
@ -522,8 +526,8 @@ bool GEOMToolsGUI::Import()
anOp->start(); anOp->start();
CORBA::String_var fileN = fileName.toLatin1().data(); CORBA::String_var fileN = CORBA::string_dup(fileName.toLatin1().data());
CORBA::String_var fileT = fileType.toLatin1().data(); CORBA::String_var fileT = CORBA::string_dup(fileType.toLatin1().data());
anObj = aInsOp->Import(fileN, fileT); anObj = aInsOp->Import(fileN, fileT);
if ( !anObj->_is_nil() && aInsOp->IsDone() ) { if ( !anObj->_is_nil() && aInsOp->IsDone() ) {