Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-07-03 16:09:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MOving forward with the TaskConcept and TaskModel, all working

Browse source
This commit is contained in:
Sam Cake 2017-04-10 02:51:19 -07:00
parent a458828590
commit e7fb18bd2f
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/render/src/render/Task.h
View file

@ -416,6 +416,8 @@ signals:
class TaskConfig : public JobConfig { class TaskConfig : public JobConfig {
Q_OBJECT Q_OBJECT
public: public:
using QConfigPointer = std::shared_ptr<QObject>;
using Persistent = PersistentConfig<TaskConfig>; using Persistent = PersistentConfig<TaskConfig>;
TaskConfig() = default ; TaskConfig() = default ;
@ -429,10 +431,28 @@ public:
return findChild<typename T::Config*>(name); return findChild<typename T::Config*>(name);
} }
void connectSubJobConfig(QConfigPointer jobConfig, const std::string& name) {
// QConfigPointer config = _jobs.back().getConfiguration();
jobConfig->setParent(this);
jobConfig->setObjectName(name.c_str());
// Connect loaded->refresh
// QObject::connect(config.get(), SIGNAL(loaded()), getConfiguration().get(), SLOT(refresh()));
QObject::connect(jobConfig.get(), SIGNAL(loaded()), this, SLOT(refresh()));
static const char* DIRTY_SIGNAL = "dirty()";
// if (config->metaObject()->indexOfSignal(DIRTY_SIGNAL) != -1) {
if (jobConfig->metaObject()->indexOfSignal(DIRTY_SIGNAL) != -1) {
// Connect dirty->refresh if defined
// QObject::connect(config.get(), SIGNAL(dirty()), getConfiguration().get(), SLOT(refresh()));
QObject::connect(jobConfig.get(), SIGNAL(dirty()), this, SLOT(refresh()));
}
}
public slots: public slots:
void refresh(); void refresh();
private: private:
friend Task;
JobConcept* _task; JobConcept* _task;
}; };
@ -595,7 +615,7 @@ public:
// Create a new job in the container's queue; returns the job's output // Create a new job in the container's queue; returns the job's output
template <class NT, class... NA> const Varying addJob(std::string name, const Varying& input, NA&&... args) { template <class NT, class... NA> const Varying addJob(std::string name, const Varying& input, NA&&... args) {
_jobs.emplace_back(name, (NT::JobModel::factoryModel(input, std::forward<NA>(args)...))); _jobs.emplace_back(name, (NT::JobModel::factoryModel(input, std::forward<NA>(args)...)));
QConfigPointer config = _jobs.back().getConfiguration(); /* QConfigPointer config = _jobs.back().getConfiguration();
config->setParent(getConfiguration().get()); config->setParent(getConfiguration().get());
config->setObjectName(name.c_str()); config->setObjectName(name.c_str());
@ -605,7 +625,9 @@ public:
if (config->metaObject()->indexOfSignal(DIRTY_SIGNAL) != -1) { if (config->metaObject()->indexOfSignal(DIRTY_SIGNAL) != -1) {
// Connect dirty->refresh if defined // Connect dirty->refresh if defined
QObject::connect(config.get(), SIGNAL(dirty()), getConfiguration().get(), SLOT(refresh())); QObject::connect(config.get(), SIGNAL(dirty()), getConfiguration().get(), SLOT(refresh()));
} }*/
std::static_pointer_cast<TaskConfig>(getConfiguration())->connectSubJobConfig(_jobs.back().getConfiguration(), name);
return _jobs.back().getOutput(); return _jobs.back().getOutput();
} }