kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fixes #9306: problem importing image if path contains a single quote

Browse Source
This commit is contained in:
wmayer
2023-04-28 21:34:52 +02:00
committed by wwmayer
parent ba9c63a67a
commit 3e9b837024
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Gui/FileHandler.cpp
View File

@@ -37,6 +37,7 @@
#include "PythonEditor.h"
#include "MainWindow.h"
#include <App/Application.h>
#include <Base/Tools.h>
using namespace Gui;
@@ -162,23 +163,29 @@ bool FileHandler::openInternal()
return false;
}
void FileHandler::openInventor()
void FileHandler::openInternal(const char* type, const char* prop)
{
App::Document* doc = createDocumentIfNeeded();
QFileInfo fi;
fi.setFile(filename);
Gui::cmdAppDocumentArgs(doc, "addObject('%s', '%s')", "App::InventorObject", fi.baseName().toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.FileName = '%s'", fi.absoluteFilePath().toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.Label = '%s'", fi.baseName().toStdString());
QString encBase = Base::Tools::escapeEncodeString(fi.baseName());
QString encPath = Base::Tools::escapeEncodeString(fi.absoluteFilePath());
Gui::cmdAppDocumentArgs(doc, "addObject('%s', '%s')", type, encBase.toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.%s = '%s'", prop, encPath.toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.Label = '%s'", encBase.toStdString());
Gui::cmdAppDocument(doc, "recompute()");
}
void FileHandler::openInventor()
{
openInternal("App::InventorObject", "FileName");
}
void FileHandler::openVRML()
{
App::Document* doc = createDocumentIfNeeded();
QFileInfo fi;
fi.setFile(filename);
@@ -186,25 +193,14 @@ void FileHandler::openVRML()
QByteArray path = fi.absolutePath().toUtf8();
SoInput::addDirectoryFirst(path.constData());
Gui::cmdAppDocumentArgs(doc, "addObject('%s', '%s')", "App::VRMLObject", fi.baseName().toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.VrmlFile = '%s'", fi.absoluteFilePath().toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.Label = '%s'", fi.baseName().toStdString());
Gui::cmdAppDocument(doc, "recompute()");
openInternal("App::VRMLObject", "VrmlFile");
SoInput::removeDirectory(path.constData());
}
void FileHandler::openImage()
{
App::Document* doc = createDocumentIfNeeded();
QFileInfo fi;
fi.setFile(filename);
Gui::cmdAppDocumentArgs(doc, "addObject('%s', '%s')", "Image::ImagePlane", fi.baseName().toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.ImageFile = '%s'", fi.absoluteFilePath().toStdString());
Gui::cmdAppDocumentArgs(doc, "ActiveObject.Label = '%s'", fi.baseName().toStdString());
Gui::cmdAppDocument(doc, "recompute()");
openInternal("Image::ImagePlane", "ImageFile");
}
void FileHandler::openPython()

1
src/Gui/FileHandler.h
View File

@@ -47,6 +47,7 @@ private:
App::Document* getOrCreateDocument();
App::Document* getOrCreateDocument(const std::string& document);
bool openInternal();
void openInternal(const char* type, const char* prop);
void openInventor();
void openVRML();
void openImage();