Skip to content

Commit

Permalink
Fix for four-port bus nodes when using the find dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
aloytag committed Jun 19, 2024
1 parent 4eb5693 commit bd257e1
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "electricalsim"
version = "0.0.8.6"
version = "0.0.8.7.dev0"
author = "Dr. Ing. Ariel S. Loyarte"
authors = [
{ name="Dr. Ing. Ariel S. Loyarte", email="aloyarte@frsf.utn.edu.ar" },
Expand Down
Binary file modified src/electricalsim/__pycache__/version.cpython-311.pyc
Binary file not shown.
Binary file modified src/electricalsim/lib/__pycache__/electricalGraph.cpython-311.pyc
Binary file not shown.
22 changes: 22 additions & 0 deletions src/electricalsim/lib/electricalGraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -4555,6 +4555,25 @@ def search_node(self):
main_win_rect = self.main_window.geometry()
dialog.setParent(self.main_window)
dialog.move(main_win_rect.center() - dialog.rect().center()) # centering in the main window

# def dialog_closed(result):
# # dialog.input_search.setFocus(False)
# if result:
# node = self.get_node_by_name(dialog.selected_node)
# if node is not None:
# self.clear_selection()
# node.set_selected(True)
# self.fit_to_selection()
# self.main_window.toolBox.setCurrentIndex(0)
# simulate_ESC_key()

# if node.type_=='BusNode.BusNode':
# four_ports_on_buses(node)

# dialog.finished.connect(dialog_closed)
# dialog.open()
# dialog.input_search.setFocus()

if dialog.exec():
node = self.get_node_by_name(dialog.selected_node)
if node is not None:
Expand All @@ -4564,6 +4583,9 @@ def search_node(self):
self.main_window.toolBox.setCurrentIndex(0)
simulate_ESC_key()

if node.type_=='BusNode.BusNode':
four_ports_on_buses(node)

def update_bus_ports(self):
"""Update port positions on bus nodes."""
for node in self.all_nodes():
Expand Down
13 changes: 11 additions & 2 deletions src/electricalsim/ui/search_node_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
</item>
<item>
<widget class="QToolButton" name="btn_close">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand All @@ -56,13 +59,19 @@
</item>
<item>
<widget class="QLineEdit" name="input_search">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
Expand All @@ -71,8 +80,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>447</width>
<height>415</height>
<width>451</width>
<height>452</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down

0 comments on commit bd257e1

Please sign in to comment.