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

support of unicode strings in saveImage function

Browse Source
This commit is contained in:
wmayer 2016-11-05 18:04:22 +01:00
parent 6f4f92019a
commit ae8db048b6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/View3DPy.cpp
View File

@ -731,10 +731,13 @@ Py::Object View3DInventorPy::saveImage(const Py::Tuple& args)
char *cFileName,*cColor="Current",*cComment="$MIBA"; char *cFileName,*cColor="Current",*cComment="$MIBA";
int w=-1,h=-1; int w=-1,h=-1;
if (!PyArg_ParseTuple(args.ptr(), "s|iiss",&cFileName,&w,&h,&cColor,&cComment)) if (!PyArg_ParseTuple(args.ptr(), "et|iiss","utf-8",&cFileName,&w,&h,&cColor,&cComment))
throw Py::Exception(); throw Py::Exception();
QFileInfo fi(QString::fromUtf8(cFileName)); std::string encodedName = std::string(cFileName);
PyMem_Free(cFileName);
QFileInfo fi(QString::fromUtf8(encodedName.c_str()));
if (!fi.absoluteDir().exists()) if (!fi.absoluteDir().exists())
throw Py::RuntimeError("Directory where to save image doesn't exist"); throw Py::RuntimeError("Directory where to save image doesn't exist");
@ -762,7 +765,7 @@ Py::Object View3DInventorPy::saveImage(const Py::Tuple& args)
SoFCOffscreenRenderer& renderer = SoFCOffscreenRenderer::instance(); SoFCOffscreenRenderer& renderer = SoFCOffscreenRenderer::instance();
SoCamera* cam = _view->getViewer()->getSoRenderManager()->getCamera(); SoCamera* cam = _view->getViewer()->getSoRenderManager()->getCamera();
renderer.writeToImageFile(cFileName, cComment, cam->getViewVolume().getMatrix(), img); renderer.writeToImageFile(encodedName.c_str(), cComment, cam->getViewVolume().getMatrix(), img);
return Py::None(); return Py::None();
} }