Added progress bar to RunUntilFinished

smistad · Mar 15, 2024 · 34c1b49 · 34c1b49
1 parent db8e249
commit 34c1b49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/source/FAST/Algorithms/RunUntilFinished/RunUntilFinished.cpp b/source/FAST/Algorithms/RunUntilFinished/RunUntilFinished.cpp
@@ -5,15 +5,25 @@ namespace fast {
 RunUntilFinished::RunUntilFinished() {
     createInputPort(0);
     createOutputPort(0);
+    m_finished = false;
 }
 
 void RunUntilFinished::execute() {
-    // TODO this assumes the parent only has 1 output port
     auto parentPO = mInputConnections[0]->getProcessObject();
+    if(m_finished) {
+        return;
+    }
+    // TODO this assumes the parent only has 1 output port
     DataObject::pointer inputData;
+    Progress progress(1000);
+    progress.setText("Running ");
     do {
         inputData = parentPO->runAndGetOutputData();
+        if(inputData->hasFrameData("progress"))
+            progress.update(round(1000*inputData->getFrameData<float>("progress")));
     } while(!inputData->isLastFrame());
+    progress.update(1000);
+    m_finished = true;
     addOutputData(0, inputData);
 }
 

diff --git a/source/FAST/Algorithms/RunUntilFinished/RunUntilFinished.hpp b/source/FAST/Algorithms/RunUntilFinished/RunUntilFinished.hpp
@@ -17,6 +17,7 @@ class FAST_EXPORT RunUntilFinished : public ProcessObject {
         FAST_CONSTRUCTOR(RunUntilFinished);
     private:
         void execute() override;
+        bool m_finished = false;
 };
 
 }