Commit e4386e20 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Network: Fix item selection.

Showing with 10 additions and 10 deletions
+10 -10
...@@ -442,7 +442,7 @@ class GraphWidget(QGraphicsView): ...@@ -442,7 +442,7 @@ class GraphWidget(QGraphicsView):
Nothing Nothing
""" """
for i in self.texts: for i in self.texts:
if i is NodeItem: if type(i) is NodeItem:
self.texts[i].rename() self.texts[i].rename()
def enable_edge(self, edge, prev): def enable_edge(self, edge, prev):
...@@ -699,11 +699,11 @@ class GraphWidget(QGraphicsView): ...@@ -699,11 +699,11 @@ class GraphWidget(QGraphicsView):
self._selected_new_edge_src_node = None self._selected_new_edge_src_node = None
items = self.items(event.pos()) items = self.items(event.pos())
if items and items[0] is EdgeItem: if items and type(items[0]) is EdgeItem:
edge = items[0] edge = items[0]
if edge: if edge:
self.set_current_edge(edge) self.set_current_edge(edge)
elif items and items[0] is NodeItem: elif items and type(items[0]) is NodeItem:
self._mouse_origin_x = pos.x() self._mouse_origin_x = pos.x()
self._mouse_origin_y = pos.y() self._mouse_origin_y = pos.y()
self._current_moved_node = items[0] self._current_moved_node = items[0]
...@@ -711,7 +711,7 @@ class GraphWidget(QGraphicsView): ...@@ -711,7 +711,7 @@ class GraphWidget(QGraphicsView):
# Add nodes and edges # Add nodes and edges
elif self._state == "add": elif self._state == "add":
items = self.items(event.pos()) items = self.items(event.pos())
nodes = list(filter(lambda i: i is NodeItem, items)) nodes = list(filter(lambda i: type(i) is NodeItem, items))
if not nodes: if not nodes:
self.add_node(pos) self.add_node(pos)
else: else:
...@@ -725,15 +725,15 @@ class GraphWidget(QGraphicsView): ...@@ -725,15 +725,15 @@ class GraphWidget(QGraphicsView):
self._selected_new_edge_src_node = None self._selected_new_edge_src_node = None
items = list( items = list(
filter( filter(
lambda i: i is NodeItem or i is EdgeItem, lambda i: type(i) is NodeItem or type(i) is EdgeItem,
self.items(event.pos()) self.items(event.pos())
) )
) )
if len(items) > 0: if len(items) > 0:
item = items[0] item = items[0]
if item is NodeItem: if type(item) is NodeItem:
self.del_node(item) self.del_node(item)
elif item is EdgeItem: elif type(item) is EdgeItem:
self.del_edge(item) self.del_edge(item)
self.update() self.update()
...@@ -767,7 +767,7 @@ class GraphWidget(QGraphicsView): ...@@ -767,7 +767,7 @@ class GraphWidget(QGraphicsView):
items = self.items(event.pos()) items = self.items(event.pos())
selectable_items = list( selectable_items = list(
filter( filter(
lambda i: (i is NodeItem or i is EdgeItem), lambda i: (type(i) is NodeItem or type(i) is EdgeItem),
items items
) )
) )
...@@ -858,7 +858,7 @@ class GraphWidget(QGraphicsView): ...@@ -858,7 +858,7 @@ class GraphWidget(QGraphicsView):
menu = QMenu(self) menu = QMenu(self)
if len(items) == 0: if len(items) == 0:
self._menu_default(event, pos, items, menu) self._menu_default(event, pos, items, menu)
elif items[0] is NodeItem: elif type(items[0]) is NodeItem:
self._menu_node(event, pos, items, menu) self._menu_node(event, pos, items, menu)
elif items[0] is EdgeItem: elif type(items[0]) is EdgeItem:
self._menu_edge(event, pos, items, menu) self._menu_edge(event, pos, items, menu)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment