LADI
/
gmic-qt
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #183 from dtschump/master 

Fix typo 'Ouptut' -> 'Output'.  Allow string type for '$_persistent' variable.
This commit is contained in:
Sébastien Fourey 2023-06-19 11:30:10 +02:00 committed by GitHub
parent 111f461e75 7dacd1d308
commit 760472b7c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/FilterSyncRunner.cpp
View File

@ -41,7 +41,7 @@ FilterSyncRunner::FilterSyncRunner(QObject * parent, const QString & command, co
: QObject(parent), _command(command), _arguments(arguments), _environment(environment), //
_images(new gmic_library::gmic_list<float>), //
_imageNames(new gmic_library::gmic_list<char>), //
_persistentMemoryOuptut(new gmic_library::gmic_image<char>)
_persistentMemoryOutput(new gmic_library::gmic_image<char>)
{
#ifdef _IS_MACOS_
static bool stackSize8MB = false;
@ -59,7 +59,7 @@ FilterSyncRunner::~FilterSyncRunner()
{
delete _images;
delete _imageNames;
delete _persistentMemoryOuptut;
delete _persistentMemoryOutput;
}
void FilterSyncRunner::setArguments(const QString & str)
@ -94,7 +94,7 @@ const gmic_library::gmic_list<char> & FilterSyncRunner::imageNames() const
gmic_library::gmic_image<char> & FilterSyncRunner::persistentMemoryOutput()
{
return *_persistentMemoryOuptut;
return *_persistentMemoryOutput;
}
QStringList FilterSyncRunner::gmicStatus() const
@ -157,12 +157,15 @@ void FilterSyncRunner::run()
_gmicProgress = -1;
Logger::log(fullCommandLine, _logSuffix, true);
gmic gmicInstance(_environment.isEmpty() ? nullptr : QString("%1").arg(_environment).toLocal8Bit().constData(), GmicStdLib::Array.constData(), true, &_gmicProgress, &_gmicAbort, 0.0f);
gmicInstance.set_variable("_persistent", PersistentMemory::image());
if (PersistentMemory::image()) {
if (*PersistentMemory::image()==gmic_store) gmicInstance.set_variable("_persistent", PersistentMemory::image());
else gmicInstance.set_variable("_persistent", '=', PersistentMemory::image());
}
gmicInstance.set_variable("_host", '=', GmicQtHost::ApplicationShortname);
gmicInstance.set_variable("_tk", '=', "qt");
gmicInstance.run(fullCommandLine.toLocal8Bit().constData(), *_images, *_imageNames);
_gmicStatus = QString::fromLocal8Bit(gmicInstance.status);
gmicInstance.get_variable("_persistent").move_to(*_persistentMemoryOuptut);
gmicInstance.get_variable("_persistent").move_to(*_persistentMemoryOutput);
} catch (gmic_exception & e) {
_images->assign();
_imageNames->assign();

2
src/FilterSyncRunner.h
View File

@ -72,7 +72,7 @@ private:
QString _environment;
gmic_library::gmic_list<float> * _images;
gmic_library::gmic_list<char> * _imageNames;
gmic_library::gmic_image<char> * _persistentMemoryOuptut;
gmic_library::gmic_image<char> * _persistentMemoryOutput;
bool _gmicAbort;
bool _failed;
QString _gmicStatus;

13
src/FilterThread.cpp
View File

@ -41,7 +41,7 @@ FilterThread::FilterThread(QObject * parent, const QString & command, const QStr
: QThread(parent), _command(command), _arguments(arguments), _environment(environment), //
_images(new gmic_library::gmic_list<float>), //
_imageNames(new gmic_library::gmic_list<char>), //
_persistentMemoryOuptut(new gmic_library::gmic_image<char>)
_persistentMemoryOutput(new gmic_library::gmic_image<char>)
{
_gmicAbort = false;
_failed = false;
@ -55,7 +55,7 @@ FilterThread::~FilterThread()
{
delete _images;
delete _imageNames;
delete _persistentMemoryOuptut;
delete _persistentMemoryOutput;
}
void FilterThread::setImageNames(const gmic_library::gmic_list<char> & imageNames)
@ -85,7 +85,7 @@ const gmic_library::gmic_list<char> & FilterThread::imageNames() const
gmic_library::gmic_image<char> & FilterThread::persistentMemoryOutput()
{
return *_persistentMemoryOuptut;
return *_persistentMemoryOutput;
}
QStringList FilterThread::status2StringList(QString status)
@ -210,12 +210,15 @@ void FilterThread::run()
_gmicProgress = -1;
Logger::log(fullCommandLine, _logSuffix, true);
gmic gmicInstance(_environment.isEmpty() ? nullptr : QString("%1").arg(_environment).toLocal8Bit().constData(), GmicStdLib::Array.constData(), true, &_gmicProgress, &_gmicAbort, 0.0f);
gmicInstance.set_variable("_persistent", PersistentMemory::image());
if (PersistentMemory::image()) {
if (*PersistentMemory::image()==gmic_store) gmicInstance.set_variable("_persistent", PersistentMemory::image());
else gmicInstance.set_variable("_persistent", '=', PersistentMemory::image());
}
gmicInstance.set_variable("_host", '=', GmicQtHost::ApplicationShortname);
gmicInstance.set_variable("_tk", '=', "qt");
gmicInstance.run(fullCommandLine.toLocal8Bit().constData(), *_images, *_imageNames);
_gmicStatus = QString::fromLocal8Bit(gmicInstance.status);
gmicInstance.get_variable("_persistent").move_to(*_persistentMemoryOuptut);
gmicInstance.get_variable("_persistent").move_to(*_persistentMemoryOutput);
} catch (gmic_exception & e) {
_images->assign();
_imageNames->assign();

2
src/FilterThread.h
View File

@ -81,7 +81,7 @@ private:
QString _environment;
gmic_library::gmic_list<float> * _images;
gmic_library::gmic_list<char> * _imageNames;
gmic_library::gmic_image<char> * _persistentMemoryOuptut;
gmic_library::gmic_image<char> * _persistentMemoryOutput;
bool _gmicAbort;
bool _failed;
QString _gmicStatus;