imp schematic: use part browser for assiging parts

changelog: Enhancements/Schematic Editor: use part browser for assigning parts

Author: carrotIndustries

Makefile

@@ -306,6 +306,7 @@ SRC_IMP = \
 	src/core/tools/tool_place_pad.cpp\
 	src/core/tools/tool_paste.cpp\
 	src/core/tools/tool_assign_part.cpp\
+	src/core/tools/tool_clear_part.cpp\
 	src/core/tools/tool_map_package.cpp\
 	src/core/tools/tool_draw_track.cpp\
 	src/core/tools/tool_place_via.cpp\

src/core/create_tool.cpp

@@ -3,6 +3,7 @@
 #include "tools/tool_add_part.hpp"
 #include "tools/tool_add_vertex.hpp"
 #include "tools/tool_assign_part.hpp"
+#include "tools/tool_clear_part.hpp"
 #include "tools/tool_bend_line_net.hpp"
 #include "tools/tool_delete.hpp"
 #include "tools/tool_disconnect.hpp"
@@ -214,6 +215,9 @@ std::unique_ptr<ToolBase> Core::create_tool(ToolID tool_id)
     case ToolID::ASSIGN_PART:
         return std::make_unique<ToolAssignPart>(this, tool_id);
 
+    case ToolID::CLEAR_PART:
+        return std::make_unique<ToolClearPart>(this, tool_id);
+
     case ToolID::MAP_PACKAGE:
         return std::make_unique<ToolMapPackage>(this, tool_id);
 

src/core/tool_id.hpp

@@ -169,5 +169,6 @@ enum class ToolID {
     DRAW_NET_TIE,
     MOVE_TRACK_CONNECTION,
     MOVE_TRACK_CENTER,
+    CLEAR_PART,
 };
 } // namespace horizon

src/core/tools/tool_clear_part.cpp

@@ -0,0 +1,36 @@
+#include "tool_clear_part.hpp"
+#include "document/idocument_schematic.hpp"
+#include "schematic/schematic.hpp"
+#include "imp/imp_interface.hpp"
+
+namespace horizon {
+
+bool ToolClearPart::can_begin()
+{
+    for (const auto &it : selection) {
+        if (it.type == ObjectType::SCHEMATIC_SYMBOL) {
+            auto &sym = doc.c->get_sheet()->symbols.at(it.uuid);
+            if (sym.component->part)
+                return true;
+        }
+    }
+    return false;
+}
+
+ToolResponse ToolClearPart::begin(const ToolArgs &args)
+{
+    for (const auto &it : args.selection) {
+        if (it.type == ObjectType::SCHEMATIC_SYMBOL) {
+            auto &sym = doc.c->get_sheet()->symbols.at(it.uuid);
+            sym.component->part = nullptr;
+        }
+    }
+    return ToolResponse::commit();
+}
+
+ToolResponse ToolClearPart::update(const ToolArgs &args)
+{
+    return ToolResponse();
+}
+
+} // namespace horizon

src/core/tools/tool_clear_part.hpp

@@ -0,0 +1,19 @@
+#pragma once
+#include "core/tool.hpp"
+
+namespace horizon {
+
+class ToolClearPart : public ToolBase {
+public:
+    using ToolBase::ToolBase;
+    ToolResponse begin(const ToolArgs &args) override;
+    ToolResponse update(const ToolArgs &args) override;
+    bool can_begin() override;
+    bool is_specific() override
+    {
+        return true;
+    }
+
+private:
+};
+} // namespace horizon

src/imp/action_catalog.cpp

@@ -444,6 +444,11 @@ const std::map<ActionToolID, ActionCatalogItem> action_catalog = {
 
         {{ActionID::TOOL, ToolID::ASSIGN_PART},
          {"Assign part", ActionGroup::SCHEMATIC, ActionCatalogItem::AVAILABLE_IN_SCHEMATIC,
+          ActionCatalogItem::FLAGS_NO_POPOVER | ActionCatalogItem::FLAGS_NO_MENU
+                  | ActionCatalogItem::FLAGS_NO_PREFERENCES}},
+
+        {{ActionID::TOOL, ToolID::CLEAR_PART},
+         {"Clear part", ActionGroup::SCHEMATIC, ActionCatalogItem::AVAILABLE_IN_SCHEMATIC,
           ActionCatalogItem::FLAGS_DEFAULT}},
 
         {{ActionID::TOOL, ToolID::EDIT_SCHEMATIC_PROPERTIES},
@@ -1092,6 +1097,10 @@ const std::map<ActionToolID, ActionCatalogItem> action_catalog = {
         {{ActionID::CONVERT_TO_PAD, ToolID::NONE},
          {"Convert to pad", ActionGroup::PACKAGE, ActionCatalogItem::AVAILABLE_IN_PACKAGE,
           ActionCatalogItem::FLAGS_SPECIFIC}},
+
+        {{ActionID::ASSIGN_PART, ToolID::NONE},
+         {"Assign part", ActionGroup::SCHEMATIC, ActionCatalogItem::AVAILABLE_IN_SCHEMATIC,
+          ActionCatalogItem::FLAGS_SPECIFIC}},
 };
 
 const std::vector<std::pair<ActionGroup, std::string>> action_group_catalog = {
@@ -1247,6 +1256,7 @@ const LutEnumStr<ActionID> action_lut = {
         ACTION_LUT_ITEM(CYCLE_LAYER_DISPLAY_MODE),
         ACTION_LUT_ITEM(OPEN_PROJECT),
         ACTION_LUT_ITEM(CONVERT_TO_PAD),
+        ACTION_LUT_ITEM(ASSIGN_PART),
 };
 
 #define TOOL_LUT_ITEM(x)                                                                                               \
@@ -1291,6 +1301,7 @@ const LutEnumStr<ToolID> tool_lut = {
         TOOL_LUT_ITEM(PLACE_PAD),
         TOOL_LUT_ITEM(PASTE),
         TOOL_LUT_ITEM(ASSIGN_PART),
+        TOOL_LUT_ITEM(CLEAR_PART),
         TOOL_LUT_ITEM(MAP_PACKAGE),
         TOOL_LUT_ITEM(DRAW_TRACK),
         TOOL_LUT_ITEM(PLACE_VIA),

src/imp/actions.hpp

@@ -126,5 +126,6 @@ enum class ActionID {
     CYCLE_LAYER_DISPLAY_MODE,
     OPEN_PROJECT,
     CONVERT_TO_PAD,
+    ASSIGN_PART,
 };
 }

src/imp/imp_schematic.cpp

@@ -611,6 +611,41 @@ void ImpSchematic::construct()
             this->send_json(j);
         }
     });
+    connect_action(ActionID::ASSIGN_PART, [this](const auto &a) {
+        const auto sel = canvas->get_selection();
+
+        if (!sockets_connected) {
+            this->tool_begin(ToolID::ASSIGN_PART);
+        }
+        else if (auto entity = entity_from_selection(sel)) {
+            canvas->set_selection_mode(CanvasGL::SelectionMode::NORMAL);
+            handle_selection_cross_probe();
+            std::set<const Component *> components;
+            const auto &sheet = *core_schematic.get_sheet();
+            for (const auto &it : sel) {
+                if (it.type == ObjectType::SCHEMATIC_SYMBOL) {
+                    if (sheet.symbols.count(it.uuid))
+                        components.insert(sheet.symbols.at(it.uuid).component);
+                }
+            }
+            std::string hint;
+            for (const auto comp : components) {
+                if (hint.size())
+                    hint += ", ";
+                hint += core_schematic.get_top_block()
+                                ->get_component_info(*comp, core_schematic.get_instance_path())
+                                .refdes;
+            }
+            hint = "Assigning to " + hint;
+            json j;
+            j["op"] = "show-browser-assign";
+            j["time"] = gtk_get_current_event_time();
+            j["entity"] = (std::string)entity->uuid;
+            j["hint"] = hint;
+            allow_set_foreground_window(mgr_pid);
+            this->send_json(j);
+        }
+    });
 
     connect_action(ActionID::PREV_SHEET, sigc::mem_fun(*this, &ImpSchematic::handle_next_prev_sheet));
     connect_action(ActionID::NEXT_SHEET, sigc::mem_fun(*this, &ImpSchematic::handle_next_prev_sheet));
@@ -900,9 +935,33 @@ ActionButton &ImpSchematic::add_action_button_schematic(ActionToolID id)
     return b;
 }
 
+const Entity *ImpSchematic::entity_from_selection(const std::set<SelectableRef> &sel)
+{
+    if (core_schematic.get_block_symbol_mode())
+        return nullptr;
+    const Entity *entity = nullptr;
+    const auto &sheet = *core_schematic.get_sheet();
+    for (const auto &it : sel) {
+        if (it.type == ObjectType::SCHEMATIC_SYMBOL) {
+            if (!sheet.symbols.count(it.uuid))
+                continue;
+            const auto &sym = sheet.symbols.at(it.uuid);
+            if (entity) {
+                if (entity != sym.component->entity) {
+                    return nullptr;
+                }
+            }
+            else {
+                entity = sym.component->entity;
+            }
+        }
+    }
+    return entity;
+}
+
 void ImpSchematic::update_action_sensitivity()
 {
-    auto sel = canvas->get_selection();
+    const auto sel = canvas->get_selection();
     const auto n_block_sym = sel_count_type(sel, ObjectType::SCHEMATIC_BLOCK_SYMBOL);
     if (sockets_connected) {
         json req;
@@ -977,6 +1036,9 @@ void ImpSchematic::update_action_sensitivity()
     set_action_sensitive(ActionID::EDIT_BLOCK_SYMBOL, have_block_sym);
     set_action_sensitive(ActionID::POP_OUT_OF_BLOCK, core_schematic.get_instance_path().size());
     set_action_sensitive(ActionID::GO_TO_BLOCK_SYMBOL, !core_schematic.current_block_is_top());
+
+    set_action_sensitive(ActionID::ASSIGN_PART, entity_from_selection(sel));
+
     ImpBase::update_action_sensitivity();
 }
 

src/imp/imp_schematic.hpp

@@ -53,6 +53,7 @@ class ImpSchematic : public ImpBase {
     void handle_move_to_other_sheet(const ActionConnection &conn);
     void handle_highlight_group_tag(const ActionConnection &conn);
     void handle_next_prev_sheet(const ActionConnection &conn);
+    const Entity *entity_from_selection(const std::set<SelectableRef> &sel);
 
     struct ViewInfo {
         float scale;

src/pool-prj-mgr/pool-prj-mgr-app_win.cpp

@@ -463,6 +463,13 @@ json PoolProjectManagerAppWindow::handle_req(const json &j)
         part_browser_window->placed_part(part);
     }
     else if (op == "show-browser") {
+        part_browser_window->set_entity({}, "");
+        part_browser_window->present(timestamp);
+        part_browser_window->focus_search();
+    }
+    else if (op == "show-browser-assign") {
+        const UUID entity_uuid = j.at("entity").get<std::string>();
+        part_browser_window->set_entity(entity_uuid, j.at("hint").get<std::string>());
         part_browser_window->present(timestamp);
         part_browser_window->focus_search();
     }