Update plots when editing local YAML GRC in editor

fair-acc · Mar 15, 2024 · e518561 · e518561
1 parent 26e84d5
commit e518561
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/src/ui/dashboard.cpp b/src/ui/dashboard.cpp
@@ -535,6 +535,13 @@ void Dashboard::deletePlot(Plot *plot) {
     m_plots.erase(it);
 }
 
+void Dashboard::removeSinkFromPlots(std::string_view sinkName) {
+    for (auto &plot : m_plots) {
+        std::erase(plot.sourceNames, std::string(sinkName));
+    }
+    std::erase_if(m_plots, [](const Plot &p) { return p.sourceNames.empty(); });
+}
+
 void Dashboard::loadPlotSources() {
     for (auto &plot : m_plots) {
         plot.sources.clear();

diff --git a/src/ui/dashboard.h b/src/ui/dashboard.h
@@ -109,6 +109,7 @@ class Dashboard : public std::enable_shared_from_this<Dashboard> {
 
     void                         newPlot(int x, int y, int w, int h);
     void                         deletePlot(Plot *plot);
+    void                         removeSinkFromPlots(std::string_view sinkName);
 
     inline const auto           &sources() const { return m_sources; }
     inline auto                 &sources() { return m_sources; }

diff --git a/src/ui/imguiutils.cpp b/src/ui/imguiutils.cpp
@@ -1224,7 +1224,7 @@ void drawBlockControlsPanel(BlockControlsPanel &ctx, const ImVec2 &pos, const Im
                     });
 
                     app.dashboardPage.newPlot(app.dashboard.get());
-                    app.dashboard->plots().back().sources.push_back(&*source);
+                    app.dashboard->plots().back().sourceNames.push_back(source->name);
                 }
                 ctx.block = block.get();
 

diff --git a/src/ui/main.cpp b/src/ui/main.cpp
@@ -16,6 +16,8 @@
 #else
 #include <SDL_opengl.h>
 #endif
+
+#include <algorithm>
 #include <array>
 #include <cstdio>
 
@@ -416,7 +418,27 @@ static void main_loop(void *arg) {
                 }
                 ImGui::SameLine();
                 if (ImGui::Button("Apply")) {
+                    auto sinkNames = [](const auto &sinks) {
+                        std::vector<std::string> names;
+                        std::ranges::transform(sinks, std::back_inserter(names), [](const auto &s) { return s->name; });
+                        std::ranges::sort(names);
+                        names.erase(std::unique(names.begin(), names.end()), names.end());
+                        return names;
+                    };
+                    const auto oldNames = sinkNames(app->dashboard->localFlowGraph.sinkBlocks());
                     app->dashboard->localFlowGraph.parse(localFlowgraphGrc);
+                    const auto               newNames = sinkNames(app->dashboard->localFlowGraph.sinkBlocks());
+                    std::vector<std::string> toRemove;
+                    std::ranges::set_difference(oldNames, newNames, std::back_inserter(toRemove));
+                    std::vector<std::string> toAdd;
+                    std::ranges::set_difference(newNames, oldNames, std::back_inserter(toAdd));
+                    for (const auto &name : toRemove) {
+                        app->dashboard->removeSinkFromPlots(name);
+                    }
+                    for (const auto &newName : toAdd) {
+                        app->dashboardPage.newPlot(app->dashboard.get());
+                        app->dashboard->plots().back().sourceNames.push_back(newName);
+                    }
                 }
 
                 ImGui::InputTextMultiline("##grc", &localFlowgraphGrc, ImGui::GetContentRegionAvail());