From cc83a1e535727ba7b8ae2993ca866a285d326446 Mon Sep 17 00:00:00 2001
From: Martin Hanzik <martin@hanzik.com>
Date: Fri, 11 May 2018 21:07:40 +0200
Subject: [PATCH] Fixes
---
agui2/src/Graphics/Connection/InputConnectionBox.cpp | 2 +-
agui2/src/MainWindow.cpp | 2 +-
agui2/src/Models/OutputModelBox.cpp | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/agui2/src/Graphics/Connection/InputConnectionBox.cpp b/agui2/src/Graphics/Connection/InputConnectionBox.cpp
index d6a07caccc..8484d8b4f4 100644
--- a/agui2/src/Graphics/Connection/InputConnectionBox.cpp
+++ b/agui2/src/Graphics/Connection/InputConnectionBox.cpp
@@ -6,7 +6,7 @@ InputConnectionBox::InputConnectionBox(GraphicsBox* parent, size_t slot)
{}
void InputConnectionBox::setConnection(Connection* connection) {
- Q_ASSERT(!this->connection);
+ Q_ASSERT((this->connection == nullptr) != (connection == nullptr));
this->connection = connection;
}
diff --git a/agui2/src/MainWindow.cpp b/agui2/src/MainWindow.cpp
index 3897d6c69c..723d9239a9 100644
--- a/agui2/src/MainWindow.cpp
+++ b/agui2/src/MainWindow.cpp
@@ -59,7 +59,7 @@ void MainWindow::on_RunBtn_clicked()
try {
#if 0
ModelBox::clearCachedResults();
- result = this->outputBox->getModelBox()->run();
+ result = this->outputBox->getModelBox()->evaluate();
#else
result = ParallelExecutor::execute(dynamic_cast<OutputModelBox*>(this->outputBox->getModelBox()));
#endif
diff --git a/agui2/src/Models/OutputModelBox.cpp b/agui2/src/Models/OutputModelBox.cpp
index 13c2e21fc9..2181fe2c92 100644
--- a/agui2/src/Models/OutputModelBox.cpp
+++ b/agui2/src/Models/OutputModelBox.cpp
@@ -10,7 +10,8 @@ std::shared_ptr<abstraction::OperationAbstraction> OutputModelBox::evaluate() {
assert(this->inputs.size() == 1);
if (!this->inputs[0])
return nullptr;
- return inputs[0]->getCachedResultOrEvaluate();
+ this->result = inputs[0]->getCachedResultOrEvaluate();
+ return this->result;
}
std::string OutputModelBox::getName() const {
--
GitLab