Add import graph functionality (#33), fix endless loop when loading a default graph at Graph constructor (#259)

Author: otto-link

Hesiod/include/hesiod/graph_editor.hpp

@@ -42,12 +42,16 @@ class GraphEditor : public QObject, public GraphNode
 
   gngui::GraphViewer *get_p_viewer() { return this->viewer.get(); }
 
-  void json_from(nlohmann::json const &json, bool override_config = true);
+  void json_from(nlohmann::json const &json,
+                 bool                  override_config = true,
+                 bool                  clear_existing_content = true,
+                 const std::string    &prefix_id = "");
 
   nlohmann::json json_to() const;
 
   void load_from_file(const std::filesystem::path &load_fname,
-                      bool                         override_config = true);
+                      bool                         override_config = true,
+                      bool                         clear_existing_content = true);
 
   void update(); // GNode::Graph
 
@@ -69,6 +73,8 @@ public Q_SLOTS:
 
   void on_graph_clear_request();
 
+  void on_graph_import_request();
+
   void on_graph_load_request();
 
   void on_graph_new_request();
@@ -115,6 +121,8 @@ public Q_SLOTS:
 
   bool update_node_on_new_link = true;
 
+  bool is_very_first_load = true;
+
   void set_fname(const std::filesystem::path &new_fname);
 
   void set_fname(const std::string &new_fname);

Hesiod/include/hesiod/model/graph_node.hpp

@@ -35,7 +35,10 @@ class GraphNode : public gnode::Graph
 
   ModelConfig *get_config_ref() { return this->config.get(); }
 
-  void json_from(nlohmann::json const &json, bool override_config = true);
+  void json_from(nlohmann::json const &json,
+                 bool                  override_config = true,
+                 bool                  clear_existing_content = true,
+                 const std::string    &prefix_id = "");
 
   nlohmann::json json_to() const;
 

Hesiod/src/graph_editor.cpp

@@ -73,6 +73,11 @@ GraphEditor::GraphEditor(const std::string           &id,
                   this,
                   &GraphEditor::on_graph_clear_request);
 
+    this->connect(this->viewer.get(),
+                  &gngui::GraphViewer::graph_import_request,
+                  this,
+                  &GraphEditor::on_graph_import_request);
+
     this->connect(this->viewer.get(),
                   &gngui::GraphViewer::graph_load_request,
                   this,
@@ -177,9 +182,15 @@ void GraphEditor::clear()
   this->graph_viewer_enable();
 }
 
-void GraphEditor::json_from(nlohmann::json const &json, bool override_config)
+void GraphEditor::json_from(nlohmann::json const &json,
+                            bool                  override_config,
+                            bool                  clear_existing_content,
+                            const std::string    &prefix_id)
 {
-  GraphNode::json_from(json["graph_node"], override_config);
+  GraphNode::json_from(json["graph_node"],
+                       override_config,
+                       clear_existing_content,
+                       prefix_id);
 
   std::string version_file = json["Hesiod version"];
   std::string version = "v" + std::to_string(HESIOD_VERSION_MAJOR) + "." +
@@ -200,7 +211,7 @@ void GraphEditor::json_from(nlohmann::json const &json, bool override_config)
     // to prevent nodes update at each link creation when the loading
     // the graph (very slooow)
     this->update_node_on_new_link = false;
-    this->viewer->json_from(json["graph_viewer"]);
+    this->viewer->json_from(json["graph_viewer"], clear_existing_content, prefix_id);
     this->update_node_on_new_link = true;
   }
 }
@@ -222,7 +233,8 @@ nlohmann::json GraphEditor::json_to() const
 }
 
 void GraphEditor::load_from_file(const std::filesystem::path &load_fname,
-                                 bool                         override_config)
+                                 bool                         override_config,
+                                 bool                         clear_existing_content)
 {
   this->graph_viewer_disable();
 
@@ -236,14 +248,35 @@ void GraphEditor::load_from_file(const std::filesystem::path &load_fname,
     file.close();
     LOG->trace("JSON successfully loaded from {}", load_fname.string());
 
-    // this->set_fname(load_fname);
+    // to avoid some endless loop when the graph is created but the
+    // main window does not exist yet
+    if (!this->is_very_first_load)
+      this->set_fname(load_fname);
 
-    this->clear();
-    if (this->viewer)
-      this->viewer->clear();
+    // not cleared when importing for instance
+    std::string prefix_id = "";
 
-    this->json_from(json, override_config);
+    if (clear_existing_content)
+    {
+      this->clear();
+      if (this->viewer)
+        this->viewer->clear();
+    }
+    else
+    {
+      // if a graph is imported, used the current node id count to
+      // prefix all the node from the imported graph to avoid any
+      // duplicate
+      uint current_id_count = this->get_id_count() + 1;
+      this->set_id_count(current_id_count);
+
+      prefix_id = std::to_string(current_id_count) + "/";
+    }
+
+    this->json_from(json, override_config, clear_existing_content, prefix_id);
     this->update();
+
+    this->is_very_first_load = false;
   }
   else
     LOG->error("Could not open file {} to load JSON", load_fname.string());
@@ -301,6 +334,28 @@ void GraphEditor::on_graph_clear_request()
   }
 }
 
+void GraphEditor::on_graph_import_request()
+{
+  LOG->trace("GraphEditor::on_graph_import_request");
+
+  std::filesystem::path path = this->fname.parent_path();
+
+  QString load_fname = QFileDialog::getOpenFileName(this->viewer.get(),
+                                                    "Import...",
+                                                    path.string().c_str(),
+                                                    "Hesiod files (*.hsd)");
+
+  if (!load_fname.isNull() && !load_fname.isEmpty())
+  {
+    bool override_config = true;
+    bool clear_existing_content = false;
+
+    this->load_from_file(load_fname.toStdString(),
+                         override_config,
+                         clear_existing_content);
+  }
+}
+
 void GraphEditor::on_graph_load_request()
 {
   LOG->trace("GraphEditor::on_graph_load_request");

Hesiod/src/model/graph_node.cpp

@@ -19,13 +19,19 @@ GraphNode::GraphNode(const std::string &id, std::shared_ptr<ModelConfig> config)
   this->config->log_debug();
 }
 
-void GraphNode::json_from(nlohmann::json const &json, bool override_config)
+void GraphNode::json_from(nlohmann::json const &json,
+                          bool                  override_config,
+                          bool                  clear_existing_content,
+                          const std::string    &prefix_id)
 {
   LOG->trace("GraphNode::json_from, graph {}", this->get_id());
 
-  this->clear();
-  this->set_id(json["id"]);
-  this->set_id_count(json["id_count"]);
+  if (clear_existing_content)
+  {
+    this->clear();
+    this->set_id(json["id"]);
+    this->set_id_count(json["id_count"]);
+  }
 
   // if set to false, the actual state of the configuration is used
   // (can for instance be used when modifying the configuration of an
@@ -43,17 +49,17 @@ void GraphNode::json_from(nlohmann::json const &json, bool override_config)
     std::string                  node_type = json_node["label"];
     std::shared_ptr<gnode::Node> node = node_factory(node_type, this->config);
 
-    this->add_node(node, json_node["id"]);
+    this->add_node(node, prefix_id + json_node["id"].get<std::string>());
 
     // set its parameters
     dynamic_cast<BaseNode *>(node.get())->json_from(json_node);
   }
 
   // links
   for (auto &json_link : json["links"])
-    this->new_link(json_link["node_id_from"].get<std::string>(),
+    this->new_link(prefix_id + json_link["node_id_from"].get<std::string>(),
                    json_link["port_id_from"].get<std::string>(),
-                   json_link["node_id_to"].get<std::string>(),
+                   prefix_id + json_link["node_id_to"].get<std::string>(),
                    json_link["port_id_to"].get<std::string>());
 }