Skip to content

Commit 47deef3

Browse files
[ui] Edge: Remove edge visiblity because not used right now
1 parent 5246397 commit 47deef3

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

meshroom/core/graph.py

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ def GraphModification(graph):
6161

6262
class Edge(BaseObject):
6363

64-
def __init__(self, src, dst, parent=None, visible=True):
64+
def __init__(self, src, dst, parent=None):
6565
super().__init__(parent)
6666
self._src = weakref.ref(src)
6767
self._dst = weakref.ref(dst)
6868
self._repr = f"<Edge> {self._src()} -> {self._dst()}"
69-
self._visible = visible
7069

7170
@property
7271
def src(self):
@@ -75,17 +74,9 @@ def src(self):
7574
@property
7675
def dst(self):
7776
return self._dst()
78-
79-
def setVisible(self, visible: bool):
80-
self._visible = visible
81-
82-
def getVisible(self) -> bool:
83-
return self._visible
8477

8578
src = Property(Attribute, src.fget, constant=True)
8679
dst = Property(Attribute, dst.fget, constant=True)
87-
isVisibleChanged = Signal()
88-
isVisible = Property(bool, getVisible, setVisible, notify=isVisibleChanged)
8980

9081

9182
WHITE = 0
@@ -218,7 +209,6 @@ def __init__(self, name: str = "", parent: BaseObject = None):
218209
self._nodes = DictModel(keyAttrName='name', parent=self)
219210
# Edges: use dst attribute as unique key since it can only have one input connection
220211
self._edges = DictModel(keyAttrName='dst', parent=self)
221-
self._visiblEdges = DictModel(keyAttrName="dstAttr", parent=self)
222212
self._compatibilityNodes = DictModel(keyAttrName='name', parent=self)
223213
self._cacheDir: str = ''
224214
self._filepath: str = ''
@@ -902,7 +892,7 @@ def getRootNodes(self, dependenciesOnly):
902892
return set(self._nodes) - nodesWithInputLink
903893

904894
@changeTopology
905-
def addEdge(self, srcAttr, dstAttr, visible=True):
895+
def addEdge(self, srcAttr, dstAttr):
906896

907897
assert isinstance(srcAttr, Attribute)
908898
assert isinstance(dstAttr, Attribute)
@@ -914,7 +904,7 @@ def addEdge(self, srcAttr, dstAttr, visible=True):
914904
if not dstAttr.isCompatibleWith(srcAttr):
915905
raise AttributeCompatibilityError(f'Attribute: "{srcAttr.name}" can not be connected to "{dstAttr.name}" because they are not compatible')
916906

917-
edge = Edge(srcAttr, dstAttr, visible=visible)
907+
edge = Edge(srcAttr, dstAttr)
918908
self.edges.add(edge)
919909
self.markNodesDirty(dstAttr.node)
920910
dstAttr.valueChanged.emit()
@@ -1597,13 +1587,6 @@ def setVerbose(self, v):
15971587
except Exception:
15981588
pass
15991589

1600-
def getVisibleEdges(self):
1601-
self._visiblEdges.clear()
1602-
for e in self.edges:
1603-
if e.getVisible():
1604-
self._visiblEdges.add(e)
1605-
return self._visiblEdges
1606-
16071590
nodes = Property(BaseObject, nodes.fget, constant=True)
16081591
edges = Property(BaseObject, edges.fget, constant=True)
16091592
filepathChanged = Signal()
@@ -1617,8 +1600,6 @@ def getVisibleEdges(self):
16171600
updated = Signal()
16181601
canComputeLeavesChanged = Signal()
16191602
canComputeLeaves = Property(bool, lambda self: self._canComputeLeaves, notify=canComputeLeavesChanged)
1620-
visibleEdges = Property(BaseObject, getVisibleEdges, notify=updated)
1621-
16221603

16231604
def loadGraph(filepath, strictCompatibility: bool = False) -> Graph:
16241605
"""

meshroom/ui/qml/GraphEditor/GraphEditor.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,13 +476,13 @@ Item {
476476
id: edgesRepeater
477477

478478
// Delay edges loading after nodes (edges needs attribute pins to be created)
479-
model: nodeRepeater.loaded && root.graph ? root.graph.visibleEdges : undefined
479+
model: nodeRepeater.loaded && root.graph ? root.graph.edges : undefined
480480

481481
delegate: Edge {
482482
property var src: recursivelyRetrieveAttributePin(edge.src)
483483
property var dst: recursivelyRetrieveAttributePin(edge.dst)
484484
property bool isValidEdge: src !== undefined && dst !== undefined
485-
visible: isValidEdge && src && dst && src.visible && dst.visible
485+
visible: isValidEdge && src && dst
486486

487487
property bool forLoop: src.attribute.type === "ListAttribute" && dst.attribute.type != "ListAttribute"
488488

0 commit comments

Comments
 (0)