Bugfix: don't rely on nets listed in Context when checking whether ne…

…t can be origin of navigation
emsec · Oct 23, 2024 · 22e28ce · 22e28ce
1 parent 80f7b89
commit 22e28ce
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 11 deletions.
diff --git a/plugins/gui/include/gui/graph_widget/graph_widget.h b/plugins/gui/include/gui/graph_widget/graph_widget.h
@@ -158,7 +158,9 @@ namespace hal
 
         void focusRect(QRectF targetRect, bool applyCenterFix);
 
-        bool hasFocusedItem() const;
+        bool hasFocusedItem(SelectionRelay::Subfocus navigateDirection) const;
+
+        bool hasGate(const Gate* g) const;
 
         GraphGraphicsView* mView;
         GraphContext* mContext;

diff --git a/plugins/gui/src/graph_widget/graph_widget.cpp b/plugins/gui/src/graph_widget/graph_widget.cpp
@@ -541,7 +541,7 @@ namespace hal
     // ADD SOUND OR ERROR MESSAGE TO FAILED NAVIGATION ATTEMPTS
     void GraphWidget::handleNavigationLeftRequest()
     {
-        if (!hasFocusedItem()) return;
+        if (!hasFocusedItem(SelectionRelay::Subfocus::Left)) return;
         const SelectionRelay::Subfocus navigateLeft = SelectionRelay::Subfocus::Left;
         mOverlay->setWidget(mNavigationWidgetV3);
         switch (gSelectionRelay->focusType())
@@ -659,7 +659,7 @@ namespace hal
 
     void GraphWidget::handleNavigationRightRequest()
     {
-        if (!hasFocusedItem()) return;
+        if (!hasFocusedItem(SelectionRelay::Subfocus::Right)) return;
         const SelectionRelay::Subfocus navigateRight = SelectionRelay::Subfocus::Right;
         mOverlay->setWidget(mNavigationWidgetV3);
         switch (gSelectionRelay->focusType())
@@ -770,8 +770,19 @@ namespace hal
         }
     }
 
-    bool GraphWidget::hasFocusedItem() const
+    bool GraphWidget::hasFocusedItem(SelectionRelay::Subfocus navigateDirection) const
     {
+        if (gSelectionRelay->focusType() == SelectionRelay::ItemType::None && gSelectionRelay->numberSelectedItems() == 1)
+        {
+            // focus item has not been set but since only one item is selected it is obvious what the user wants
+            if (gSelectionRelay->numberSelectedModules())
+                gSelectionRelay->setFocusDirect(SelectionRelay::ItemType::Module, gSelectionRelay->selectedModulesVector().at(0));
+            else if (gSelectionRelay->numberSelectedGates())
+                gSelectionRelay->setFocusDirect(SelectionRelay::ItemType::Gate, gSelectionRelay->selectedGatesVector().at(0));
+            else if (gSelectionRelay->numberSelectedNets())
+                gSelectionRelay->setFocusDirect(SelectionRelay::ItemType::Net, gSelectionRelay->selectedNetsVector().at(0));
+        }
+
         u32 id = gSelectionRelay->focusId();
         switch (gSelectionRelay->focusType())
         {
@@ -790,22 +801,44 @@ namespace hal
             }
             break;
         case SelectionRelay::ItemType::Net:
-            if (!mContext->gates().contains(id))
-            {
-                log_warning("gui", "Cannot navigate from selected origin net ID={}, net not found on current view.", id);
-                return false;
+            switch (navigateDirection) {
+            case SelectionRelay::Subfocus::Left:
+                for (const Endpoint* ep : gNetlist->get_net_by_id(id)->get_destinations())
+                    if (hasGate(ep->get_gate())) return true;
+                break;
+            case SelectionRelay::Subfocus::Right:
+                for (const Endpoint* ep : gNetlist->get_net_by_id(id)->get_sources())
+                    if (hasGate(ep->get_gate())) return true;
+                break;
+            default:
+                return true;
             }
-            break;
+            log_warning("gui", "Cannot navigate from selected origin net ID={}, net not found on current view.", id);
+            return false;
         default:
             log_warning("gui", "Cannot navigate, no origin selected");
             return false;
         }
         return true;
     }
 
+    bool GraphWidget::hasGate(const Gate* g) const
+    {
+        if (!g) return false;
+        if (mContext->gates().contains(g->get_id())) return true;
+        const Module* parentModule = g->get_module();
+        while (parentModule)
+        {
+            if (mContext->modules().contains(parentModule->get_id()))
+                return true;
+            parentModule = parentModule->get_parent_module();
+        }
+        return false;
+    }
+
     void GraphWidget::handleNavigationUpRequest()
     {
-        if (!hasFocusedItem()) return;
+        if (!hasFocusedItem(SelectionRelay::Subfocus::None)) return;
         // FIXME this is ugly
         if ((gSelectionRelay->focusType() == SelectionRelay::ItemType::Gate && mContext->gates().contains(gSelectionRelay->focusId()))
             || (gSelectionRelay->focusType() == SelectionRelay::ItemType::Module && mContext->modules().contains(gSelectionRelay->focusId())))
@@ -814,7 +847,7 @@ namespace hal
 
     void GraphWidget::handleNavigationDownRequest()
     {
-        if (!hasFocusedItem()) return;
+        if (!hasFocusedItem(SelectionRelay::Subfocus::None)) return;
         // FIXME this is ugly
         if ((gSelectionRelay->focusType() == SelectionRelay::ItemType::Gate && mContext->gates().contains(gSelectionRelay->focusId()))
             || (gSelectionRelay->focusType() == SelectionRelay::ItemType::Module && mContext->modules().contains(gSelectionRelay->focusId())))