suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0001830: Gui.export() cannot handle long filenames

Browse Source
This commit is contained in:
wmayer 2014-11-17 21:11:28 +01:00
parent 3d03e208d9
commit 3904d0a8ee
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/ApplicationPy.cpp
View File

@ -242,7 +242,7 @@ PyObject* Application::sOpen(PyObject * /*self*/, PyObject *args,PyObject * /*kw
QString fileName = QString::fromUtf8(Utf8Name.c_str()); QString fileName = QString::fromUtf8(Utf8Name.c_str());
QFileInfo fi; QFileInfo fi;
fi.setFile(fileName); fi.setFile(fileName);
QString ext = fi.completeSuffix().toLower(); QString ext = fi.suffix().toLower();
QList<EditorView*> views = getMainWindow()->findChildren<EditorView*>(); QList<EditorView*> views = getMainWindow()->findChildren<EditorView*>();
for (QList<EditorView*>::Iterator it = views.begin(); it != views.end(); ++it) { for (QList<EditorView*>::Iterator it = views.begin(); it != views.end(); ++it) {
if ((*it)->fileName() == fileName) { if ((*it)->fileName() == fileName) {
@ -286,6 +286,9 @@ PyObject* Application::sOpen(PyObject * /*self*/, PyObject *args,PyObject * /*kw
edit->resize(400, 300); edit->resize(400, 300);
getMainWindow()->addWindow( edit ); getMainWindow()->addWindow( edit );
} }
else {
Base::Console().Error("File type '%s' not supported\n", ext.toLatin1().constData());
}
} PY_CATCH; } PY_CATCH;
Py_Return; Py_Return;
@ -304,7 +307,7 @@ PyObject* Application::sInsert(PyObject * /*self*/, PyObject *args,PyObject * /*
QString fileName = QString::fromUtf8(Utf8Name.c_str()); QString fileName = QString::fromUtf8(Utf8Name.c_str());
QFileInfo fi; QFileInfo fi;
fi.setFile(fileName); fi.setFile(fileName);
QString ext = fi.completeSuffix().toLower(); QString ext = fi.suffix().toLower();
if (ext == QLatin1String("iv")) { if (ext == QLatin1String("iv")) {
App::Document *doc = 0; App::Document *doc = 0;
if (DocName) if (DocName)
@ -348,6 +351,9 @@ PyObject* Application::sInsert(PyObject * /*self*/, PyObject *args,PyObject * /*
edit->resize(400, 300); edit->resize(400, 300);
getMainWindow()->addWindow( edit ); getMainWindow()->addWindow( edit );
} }
else {
Base::Console().Error("File type '%s' not supported\n", ext.toLatin1().constData());
}
} PY_CATCH; } PY_CATCH;
Py_Return; Py_Return;
@ -379,7 +385,7 @@ PyObject* Application::sExport(PyObject * /*self*/, PyObject *args,PyObject * /*
QString fileName = QString::fromUtf8(Utf8Name.c_str()); QString fileName = QString::fromUtf8(Utf8Name.c_str());
QFileInfo fi; QFileInfo fi;
fi.setFile(fileName); fi.setFile(fileName);
QString ext = fi.completeSuffix().toLower(); QString ext = fi.suffix().toLower();
if (ext == QLatin1String("iv") || ext == QLatin1String("wrl") || if (ext == QLatin1String("iv") || ext == QLatin1String("wrl") ||
ext == QLatin1String("vrml") || ext == QLatin1String("wrz") || ext == QLatin1String("vrml") || ext == QLatin1String("wrz") ||
ext == QLatin1String("svg") || ext == QLatin1String("idtf")) { ext == QLatin1String("svg") || ext == QLatin1String("idtf")) {
@ -411,6 +417,9 @@ PyObject* Application::sExport(PyObject * /*self*/, PyObject *args,PyObject * /*
} }
} }
} }
else {
Base::Console().Error("File type '%s' not supported\n", ext.toLatin1().constData());
}
} }
} PY_CATCH; } PY_CATCH;