Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions examples/nested_graphs.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ def MyNode(file):
# o file<> | +--->o file<> | +--->o file<> |
# | file o-----+ | file o-----+ | file o
# +----------------+ +----------------------------+ +----------------+
udpate_db_from_file = Graph(name="udpate_db_from_file")
find_file = MyNode(name="Find File", graph=udpate_db_from_file)
update_db_from_file = Graph(name="update_db_from_file")
find_file = MyNode(name="Find File", graph=update_db_from_file)

values_from_file = MyNode(
name="Read Values from File", graph=udpate_db_from_file
name="Read Values from File", graph=update_db_from_file
)
update_db = MyNode(name="Update DB", graph=udpate_db_from_file)
update_db = MyNode(name="Update DB", graph=update_db_from_file)
find_file.outputs["file"].connect(values_from_file.inputs["file"])
values_from_file.outputs["file"].connect(update_db.inputs["file"])

Expand All @@ -61,7 +62,7 @@ def MyNode(file):
# Now the update_db graph can connect nodes to the fix_file graph
find_file.outputs["file"].connect(fix_file.inputs["file_to_clean"])
fix_file.outputs["clean_file"].connect(
udpate_db_from_file["Read Values from File"].inputs["file"]
update_db_from_file["Read Values from File"].inputs["file"]
)

# Display the graph
Expand All @@ -73,7 +74,7 @@ def MyNode(file):
)

window = QtWidgets.QWidget()
window.setWindowTitle("Flowpipe-Editor Nestd Graphs Example")
window.setWindowTitle("Flowpipe-Editor Nested Graphs Example")
window.resize(1100, 800)

flowpipe_editor_widget = FlowpipeEditorWidget(parent=window)
Expand Down
10 changes: 5 additions & 5 deletions flowpipe_editor/flowpipe_editor_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,13 @@ def load_graph(self, graph: Graph):
self.clear()
self.flowpipe_graph = graph
x_pos = 0
nodes_dict = {}
for row in graph.evaluation_matrix:
y_pos = 0
x_diff = 250
for fp_node in row:
self._add_node(fp_node, QtCore.QPoint(int(x_pos), int(y_pos)))
qt_node =self._add_node(fp_node, QtCore.QPoint(int(x_pos), int(y_pos)))
nodes_dict[fp_node.identifier] = qt_node
y_pos += 150
x_pos += x_diff
for fp_node in graph.all_nodes:
Expand All @@ -179,11 +181,9 @@ def load_graph(self, graph: Graph):
in_index = list(
connection.node.all_inputs().values()
).index(connection)
self.graph.get_node_by_name(fp_node.name).set_output(
nodes_dict[fp_node.identifier].set_output(
i,
self.graph.get_node_by_name(
connection.node.name
).input(in_index),
nodes_dict[connection.node.identifier].input(in_index),
)

nodes = self.graph.all_nodes()
Expand Down
3 changes: 2 additions & 1 deletion flowpipe_editor/widgets/properties_bin/attribute_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ def __init__(self, label: str, parent: QtWidgets.QWidget = None):
super().__init__(parent)
self.label = label

def mouseDoubleClickEvent(self, event: QtGui.QMouseEvent):
def mouseDoubleClickEvent(self, event: QtGui.QMouseEvent): # pylint: disable=invalid-name
"""Open a popup dialog to edit the line edit contents on double-click."""
# Open popup dialog on double-click
dialog = PopupDialog(self.label, self.text(), self)
dialog.exec_()
Expand Down