repeat

zdenyhraz · Jun 5, 2024 · 814f574 · 814f574
1 parent 65808f8
commit 814f574
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/src/Gui/Windows/MicroserviceEditorWindow.cpp b/src/Gui/Windows/MicroserviceEditorWindow.cpp
@@ -21,6 +21,9 @@ void MicroserviceEditorWindow::Render()
     if (ImGui::Button("Run"))
       LaunchAsync([&]() { Run(); });
     ImGui::SameLine();
+    if (ImGui::Button("Run repeat"))
+      LaunchAsync([&]() { RunRepeat(); });
+    ImGui::SameLine();
     if (ImGui::Button("Show flow"))
       editor.ShowFlow();
 
@@ -36,6 +39,16 @@ void MicroserviceEditorWindow::Run()
   LOG_SUCCESS("Workflow run completed");
 }
 
+void MicroserviceEditorWindow::RunRepeat()
+{
+  for (int i = 0; i < 5; ++i)
+  {
+    Plot::Clear();
+    editor.workflow.Run();
+  }
+  LOG_SUCCESS("Workflow run completed");
+}
+
 void MicroserviceEditorWindow::TestInitialize()
 {
   editor.workflow.AddMicroservice<LoadImageMicroservice>();

diff --git a/src/Gui/Windows/MicroserviceEditorWindow.hpp b/src/Gui/Windows/MicroserviceEditorWindow.hpp
@@ -7,6 +7,7 @@ class MicroserviceEditorWindow : public Window
   void TestInitialize();
   void ShowFlow();
   void Run();
+  void RunRepeat();
 
   MicroserviceEditor editor;
 

diff --git a/src/Microservice/Microservice.hpp b/src/Microservice/Microservice.hpp
@@ -38,7 +38,6 @@ class Microservice
 
     uintptr_t GetId() const { return reinterpret_cast<uintptr_t>(this); }
     const std::string& GetName() const { return name; }
-    void Reset() { value = nullptr; }
   };
 
   struct OutputParameter
@@ -282,11 +281,9 @@ class Microservice
     param.value = value;
   }
 
-  void Reset() // call this on repeated workflows
+  void Reset()
   {
-    for (auto& [name, param] : inputParameters)
-      param.Reset();
-
+    // call this on repeated workflows to recompute output parameters
     for (auto& [name, param] : outputParameters)
       param.Reset();
   }

diff --git a/src/Microservice/TODO.md b/src/Microservice/TODO.md
@@ -8,7 +8,9 @@
 - [x] add strongly-typed UserParameters (manual params) and a way to edit them
 - [ ] workflow save to / load from file - json
 - [ ] derive more specific classes from Microservice for control flow - not all microservices have start / completed, e.g. plot / start
-- [ ] repeated workflows - reset? / remove .has_value condition
+- [ ] repeated workflows - reset / remove .has_value condition
+- [ ] tracy profile
+- [ ] simple workflow type - just follow output connections
 
 # GUI
 - [ ] gui layout save? - json

diff --git a/src/Microservice/Workflow.hpp b/src/Microservice/Workflow.hpp
@@ -95,12 +95,19 @@ class Workflow
       return LOG_WARNING("Workflow '{}' does not contain any microservices", GetName());
 
     ExecuteMicroservice(*microservices.front());
+    Reset();
   }
   catch (const std::exception& e)
   {
     LOG_ERROR("Workflow '{}' error: {}", GetName(), e.what());
   }
 
+  void Reset()
+  {
+    for (auto& microservice : microservices)
+      microservice->Reset();
+  }
+
   void Connect(Microservice::Connection&& connection)
   {
     if (not connection.outputMicroservice or not connection.inputMicroservice or not connection.outputParameter or not connection.inputParameter)