Merge pull request #1478 from mrvisscher/graph-explorer-sync

Ensuring the graph explorer updates with activity modifications

Author: mrvisscher

activity_browser/layouts/panels/right.py

@@ -83,7 +83,10 @@ def add_tab(self, key, select=True):
             log.info("adding graph tab")
             new_tab = GraphNavigatorWidget(self, key=key)
             self.tabs[key] = new_tab
-            self.addTab(new_tab, get_activity_name(bd.get_activity(key), str_length=30))
+            self.addTab(new_tab, new_tab.objectName())
+
+            new_tab.objectNameChanged.connect(lambda name: self.setTabText(self.indexOf(new_tab), name))
+
         else:
             tab = self.tabs[key]
             tab.new_graph(key)

activity_browser/ui/web/navigator.py

@@ -10,9 +10,10 @@
 from PySide2.QtCore import Slot
 
 from activity_browser import signals
-from activity_browser.mod.bw2data import Database, get_activity
+from activity_browser.mod.bw2data import Database, get_activity, databases, Edge
+from activity_browser.mod.bw2data.backends import ExchangeDataset, ActivityDataset
 
-from ...bwutils.commontasks import identify_activity_type
+from ...bwutils.commontasks import identify_activity_type, get_activity_name
 from .base import BaseGraph, BaseNavigatorWidget
 
 log = getLogger(__name__)
@@ -60,6 +61,9 @@ class GraphNavigatorWidget(BaseNavigatorWidget):
 
     def __init__(self, parent=None, key=None):
         super().__init__(parent, css_file="navigator.css")
+        self.setObjectName(get_activity_name(get_activity(key), str_length=30))
+        self.key = key
+        self.tab = parent
 
         self.graph = Graph()
 
@@ -113,6 +117,17 @@ def connect_signals(self):
             self.update_graph_settings
         )
         self.checkbox_flip_negative_edges.stateChanged.connect(self.reload_graph)
+        databases.metadata_changed.connect(self.sync_graph)
+
+    def sync_graph(self):
+        """Sync the graph with the current project."""
+        self.graph.update(delete_unstacked=False)
+        self.send_json()
+        try:
+            self.setObjectName(get_activity_name(get_activity(self.key), str_length=30))
+        except ActivityDataset.DoesNotExist:
+            log.debug("Graph activity no longer exists. Closing tab.")
+            self.tab.close_tab_by_tab_name(self.tab.get_tab_name(self))
 
     def construct_layout(self) -> None:
         """Layout of Graph Navigator"""
@@ -251,9 +266,24 @@ def __init__(self):
         self.flip_negative_edges = False  # show true flow direction of edges (e.g. for ecoinvent treatment activities, or substitutions)
 
     def update(self, delete_unstacked: bool = True) -> None:
+        self.update_datasets()
         super().update(delete_unstacked)
         self.json_data = self.get_json_data()
 
+    def update_datasets(self):
+        """Update the activities in the graph."""
+        try:
+            self.nodes = [get_activity(act.key) for act in self.nodes]
+            self.edges = [Edge(document=ExchangeDataset.get_by_id(exc._document.id)) for exc in self.edges]
+        except (ActivityDataset.DoesNotExist, ExchangeDataset.DoesNotExist):
+            try:
+                get_activity(self.central_activity.key)  # test whether the activity still exists
+                self.new_graph(self.central_activity.key)  # if so, create a new graph
+            except ActivityDataset.DoesNotExist:
+                log.warning("Graph activity no longer exists.")
+                self.nodes = []
+                self.edges = []
+
     def store_previous(self) -> None:
         self.stack.append((deepcopy(self.nodes), deepcopy(self.edges)))