Merge branch 'Areas-and-comments-part-2'

qoala101 · Jul 6, 2023 · 0a3e439 · 0a3e439
2 parents 119a13d + 415a3b3
commit 0a3e439
Show file tree

Hide file tree

Showing 47 changed files with 824 additions and 280 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project(
   "ponc"
-  VERSION 0.5.2
+  VERSION 0.5.3
   LANGUAGES CXX
 )
 

diff --git a/include/core/core_area.h b/include/core/core_area.h
@@ -15,10 +15,13 @@
 namespace ne = ax::NodeEditor;
 
 namespace vh::ponc::core {
+///
+using AreaId = ne::NodeId;
+
 ///
 struct Area {
   ///
-  ne::NodeId id{};
+  AreaId id{};
   ///
   std::string name{};
   ///

diff --git a/include/core/core_diagram.h b/include/core/core_diagram.h
@@ -26,7 +26,7 @@ class Diagram {
   ///
   explicit Diagram(std::string name = {},
                    std::vector<std::unique_ptr<INode>> nodes = {},
-                   std::vector<Link> links = {});
+                   std::vector<Link> links = {}, std::vector<Area> areas = {});
 
   ///
   static auto GetIds(Diagram &diagram) -> std::vector<IdPtr>;
@@ -45,8 +45,9 @@ class Diagram {
   ///
   static auto HasLink(const Diagram &diagram, ne::PinId pin_id) -> bool;
   ///
-  static auto FindArea(const Diagram &diagram, ne::NodeId node_id)
-      -> const Area &;
+  static auto FindArea(const Diagram &diagram, AreaId area_id) -> const Area &;
+  ///
+  static auto FindArea(Diagram &diagram, AreaId area_id) -> Area &;
 
   ///
   auto GetName() const -> const std::string &;
@@ -71,7 +72,7 @@ class Diagram {
   ///
   auto EmplaceArea(const Area &area) -> Area &;
   ///
-  void DeleteArea(ne::NodeId node_id);
+  void DeleteArea(AreaId area_id);
 
  private:
   ///

diff --git a/include/coreui/coreui_area_creator.h b/include/coreui/coreui_area_creator.h
@@ -0,0 +1,62 @@
+/**
+ * PONC @link https://github.com/qoala101/ponc @endlink
+ * @author Volodymyr Hromakov (4y5t6r@gmail.com)
+ * @copyright Copyright (c) 2023, MIT License
+ */
+
+#ifndef VH_PONC_COREUI_AREA_CREATOR_H_
+#define VH_PONC_COREUI_AREA_CREATOR_H_
+
+#include <imgui.h>
+#include <imgui_node_editor.h>
+
+#include <optional>
+
+#include "core_area.h"
+#include "core_id_generator.h"
+#include "coreui_event.h"
+#include "cpp_safe_ptr.h"
+
+namespace vh::ponc::coreui {
+///
+class Diagram;
+
+///
+class AreaCreator {
+ public:
+  ///
+  AreaCreator(cpp::SafePtr<Diagram> parent_diagram,
+              cpp::SafePtr<core::IdGenerator> id_generator);
+
+  ///
+  auto IsCreating() const -> bool;
+  ///
+  auto StartCreateAreaAt(const ImVec2 &start_pos) -> Event &;
+  ///
+  void ResizeAreaTo(const ImVec2 &pos);
+  ///
+  void AcceptCreateArea();
+  ///
+  auto DiscardCreateArea() -> Event &;
+
+ private:
+  ///
+  struct Area {
+    ///
+    core::AreaId id{};
+    ///
+    ImVec2 start_pos{};
+  };
+
+  ///
+  cpp::SafePtr<Diagram> parent_diagram_;
+  ///
+  cpp::SafePtr<core::IdGenerator> id_generator_;
+  ///
+  cpp::SafeOwner safe_owner_{};
+  ///
+  std::optional<Area> area_{};
+};
+}  // namespace vh::ponc::coreui
+
+#endif  // VH_PONC_COREUI_AREA_CREATOR_H_
diff --git a/include/coreui/coreui_diagram.h b/include/coreui/coreui_diagram.h
@@ -11,13 +11,14 @@
 #include <imgui_node_editor.h>
 
 #include <memory>
-#include <string>
 #include <vector>
 
+#include "core_area.h"
 #include "core_diagram.h"
 #include "core_i_family.h"
 #include "core_i_node.h"
 #include "core_link.h"
+#include "coreui_area_creator.h"
 #include "coreui_event.h"
 #include "coreui_family.h"
 #include "coreui_flow_tree_node.h"
@@ -64,6 +65,8 @@ class Diagram {
   ///
   auto GetLinker() -> Linker &;
   ///
+  auto GetAreaCreator() -> AreaCreator &;
+  ///
   auto GetFamilyGroups() const -> const std::vector<FamilyGroup> &;
   ///
   auto GetNodes() const -> const std::vector<Node> &;
@@ -92,9 +95,9 @@ class Diagram {
   ///
   auto GetNodeTrees() const -> const std::vector<TreeNode> &;
   ///
-  auto CreateArea(std::string name, const ImVec2 &pos) -> Event &;
+  auto AddArea(const core::Area &area) -> Event &;
   ///
-  auto DeleteArea(ne::NodeId node_id) -> Event &;
+  auto DeleteArea(core::AreaId area_id) -> Event &;
 
  private:
   ///
@@ -151,6 +154,8 @@ class Diagram {
   ///
   Linker linker_;
   ///
+  AreaCreator area_creator_;
+  ///
   std::vector<FamilyGroup> family_groups_{};
   ///
   std::vector<Node> nodes_{};

diff --git a/include/coreui/coreui_native_facade.h b/include/coreui/coreui_native_facade.h
@@ -7,23 +7,29 @@
 #ifndef VH_PONC_COREUI_NATIVE_FACADE_H_
 #define VH_PONC_COREUI_NATIVE_FACADE_H_
 
+#include <imgui.h>
 #include <imgui_node_editor.h>
 
 #include <utility>
 #include <vector>
 
+#include "core_area.h"
 #include "cpp_static_api.h"
 
 namespace ne = ax::NodeEditor;
 
 namespace vh::ponc::coreui {
 ///
 struct NativeFacade : public cpp::StaticApi {
+  ///
+  static auto IsArea(ne::NodeId node_id) -> bool;
+  ///
+  static auto GetAreaSize(core::AreaId area_id) -> ImVec2;
   ///
   static auto GetSelectedNodes() -> std::vector<ne::NodeId>;
   ///
   static auto GetSelectedNodesAndAreas()
-      -> std::pair<std::vector<ne::NodeId>, std::vector<ne::NodeId>>;
+      -> std::pair<std::vector<ne::NodeId>, std::vector<core::AreaId>>;
   ///
   static auto GetSelectedLinks() -> std::vector<ne::LinkId>;
   ///

diff --git a/include/coreui/coreui_node_mover.h b/include/coreui/coreui_node_mover.h
@@ -16,6 +16,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include "core_area.h"
 #include "core_i_node.h"
 #include "core_id_value.h"
 #include "core_settings.h"
@@ -36,6 +37,9 @@ class NodeMover {
   ///
   void MoveNodeTo(ne::NodeId node_id, const ImVec2 &pos);
   ///
+  void MoveAreaTo(core::AreaId area_id, const ImVec2 &start_pos,
+                  const ImVec2 &end_pos);
+  ///
   void ArrangeVerticallyAt(const std::vector<ne::NodeId> &node_ids,
                            const ImVec2 &pos);
   ///
@@ -65,7 +69,7 @@ class NodeMover {
   ///
   void MarkNodeToMove(ne::NodeId node_id);
   ///
-  void MarkAreaToMove(ne::NodeId node_id);
+  void MarkAreaToMove(core::AreaId area_id);
   ///
   void MarkNewItemsToMove();
   ///
@@ -108,8 +112,9 @@ class NodeMover {
   ///
   std::unordered_set<core::IdValue<ne::NodeId>> nodes_to_move_{};
   ///
-  std::unordered_set<core::IdValue<ne::NodeId>> areas_to_move_{};
+  std::unordered_set<core::IdValue<core::AreaId>> areas_to_move_{};
   ///
+  // TODO(vh): Those are never cleared.
   std::unordered_map<core::IdValue<ne::NodeId>, ImVec2> item_sizes_{};
   ///
   std::unordered_map<core::IdValue<ne::PinId>, ImVec2> pin_poses_{};

diff --git a/include/draw/diagram/draw_area_creator.h b/include/draw/diagram/draw_area_creator.h
@@ -0,0 +1,30 @@
+/**
+ * PONC @link https://github.com/qoala101/ponc @endlink
+ * @author Volodymyr Hromakov (4y5t6r@gmail.com)
+ * @copyright Copyright (c) 2023, MIT License
+ */
+
+#ifndef VH_PONC_DRAW_AREA_CREATOR_H_
+#define VH_PONC_DRAW_AREA_CREATOR_H_
+
+#include "coreui_area_creator.h"
+
+namespace vh::ponc::draw {
+///
+class AreaCreator {
+ public:
+  ///
+  void Draw(coreui::AreaCreator &area_creator);
+
+ private:
+  ///
+  void Reset();
+
+  ///
+  bool right_mouse_clicked_{};
+  ///
+  bool right_mouse_dragged_{};
+};
+}  // namespace vh::ponc::draw
+
+#endif  // VH_PONC_DRAW_AREA_CREATOR_H_
diff --git a/include/draw/diagram/draw_diagram_editor.h b/include/draw/diagram/draw_diagram_editor.h
@@ -13,6 +13,7 @@
 
 #include "core_diagram.h"
 #include "coreui_diagram.h"
+#include "draw_area_creator.h"
 #include "draw_background_popup.h"
 #include "draw_item_deleter.h"
 #include "draw_link_popup.h"
@@ -45,6 +46,8 @@ class DiagramEditor {
   ///
   Linker linker_{};
   ///
+  AreaCreator area_creator_{};
+  ///
   BackgroundPopup background_popup_{};
   ///
   NodePopup node_popup_{};

diff --git a/include/draw/diagram/popup/draw_area_popup.h b/include/draw/diagram/popup/draw_area_popup.h
@@ -0,0 +1,37 @@
+/**
+ * PONC @link https://github.com/qoala101/ponc @endlink
+ * @author Volodymyr Hromakov (4y5t6r@gmail.com)
+ * @copyright Copyright (c) 2023, MIT License
+ */
+
+#ifndef VH_PONC_DRAW_AREA_POPUP_H_
+#define VH_PONC_DRAW_AREA_POPUP_H_
+
+#include <vector>
+
+#include "core_area.h"
+#include "coreui_diagram.h"
+#include "cpp_callbacks.h"
+#include "draw_string_buffer.h"
+
+namespace vh::ponc::draw {
+///
+class AreaPopup {
+ public:
+  ///
+  struct Callbacks {
+    ///
+    cpp::Query<bool> was_just_opened{};
+  };
+
+  ///
+  void Draw(const std::vector<core::AreaId> &selected_areas,
+            coreui::Diagram &diagram, const Callbacks &callbacks);
+
+ private:
+  ///
+  StringBuffer rename_buffer_{};
+};
+}  // namespace vh::ponc::draw
+
+#endif  // VH_PONC_DRAW_AREA_POPUP_H_
diff --git a/include/draw/diagram/popup/draw_background_popup.h b/include/draw/diagram/popup/draw_background_popup.h
@@ -11,7 +11,6 @@
 
 #include "coreui_diagram.h"
 #include "draw_i_popup.h"
-#include "draw_string_buffer.h"
 
 namespace vh::ponc::draw {
 ///
@@ -23,13 +22,8 @@ class BackgroundPopup : public IPopup {
   void SetPos(const ImVec2 &pos);
 
  private:
-  auto DrawRenamePopup();
-
   ///
   ImVec2 pos_{};
-
-  StringBuffer area_name_buffer_{};
-  bool focus_name_input_{};
 };
 }  // namespace vh::ponc::draw
 

diff --git a/include/draw/diagram/popup/draw_node_popup.h b/include/draw/diagram/popup/draw_node_popup.h
@@ -8,6 +8,7 @@
 #define VH_PONC_DRAW_NODE_POPUP_H_
 
 #include "coreui_diagram.h"
+#include "draw_area_popup.h"
 #include "draw_i_popup.h"
 
 namespace vh::ponc::draw {
@@ -16,6 +17,10 @@ class NodePopup : public IPopup {
  public:
   ///
   void Draw(coreui::Diagram &diagram);
+
+ private:
+  ///
+  AreaPopup area_popup_{};
 };
 }  // namespace vh::ponc::draw
 

diff --git a/include/draw/draw_rename_widget.h b/include/draw/draw_rename_widget.h
@@ -0,0 +1,20 @@
+/**
+ * PONC @link https://github.com/qoala101/ponc @endlink
+ * @author Volodymyr Hromakov (4y5t6r@gmail.com)
+ * @copyright Copyright (c) 2023, MIT License
+ */
+
+#ifndef VH_PONC_DRAW_RENAME_WIDGET_H_
+#define VH_PONC_DRAW_RENAME_WIDGET_H_
+
+#include <string_view>
+
+#include "draw_string_buffer.h"
+
+namespace vh::ponc::draw {
+///
+auto DrawRenameWidget(std::string_view label, StringBuffer &name_buffer)
+    -> bool;
+}  // namespace vh::ponc::draw
+
+#endif  // VH_PONC_DRAW_RENAME_WIDGET_H_