Merge pull request #1315 from marc-vdm/db_tree_view_patch

resolve tree-view not able to open activity correctly

Author: mrvisscher

activity_browser/ui/tables/activity.py

@@ -131,8 +131,8 @@ def dragEnterEvent(self, event):
         """
         source = event.source()
         if (
-            getattr(source, "table_name", "") == "technosphere"
-            or getattr(source, "technosphere", False) is True
+                getattr(source, "table_name", "") == "technosphere"
+                or getattr(source, "technosphere", False) is True
         ):
             event.accept()
 
@@ -186,8 +186,9 @@ def dragEnterEvent(self, event):
         downstream exchanges table.
         """
         source = event.source()
-        if getattr(source, "table_name", "") == "downstream" or hasattr(
-            source, "technosphere"
+        if (getattr(source, "table_name", "") == "downstream"
+                or hasattr(source, "technosphere")
+                or getattr(source, "table_name", "") == "technosphere"
         ):
             event.accept()
 

activity_browser/ui/tables/inventory.py

@@ -430,7 +430,7 @@ def selected_keys(self) -> Iterable:
         tree_level = self.tree_level()
         if tree_level[0] == "leaf":
             # select key of the leaf
-            return [tree_level[1][-1]]
+            return [eval(tree_level[1][-1])]
         if tree_level[0] == "root":
             # filter on the root + ', '
             # (this needs to be added in case one root level starts with a shorter name of another one

activity_browser/ui/tables/models/inventory.py

@@ -11,6 +11,7 @@
 from PySide2.QtCore import QModelIndex, Qt, Slot
 from PySide2.QtWidgets import QApplication
 
+import activity_browser
 from activity_browser import log, project_settings
 from activity_browser.bwutils import AB_metadata
 from activity_browser.bwutils import commontasks as bc
@@ -251,12 +252,12 @@ def get_isic_tree(self) -> Tuple[dict, dict, dict]:
             tree_numeric_order: keys are classification number, values are the row number in file
         """
         path = os.path.join(
-            os.getcwd(),
-            "activity_browser",
+            os.path.dirname(os.path.abspath(activity_browser.__file__)),
             "static",
             "database_classifications",
             "ISIC_Rev_4_english_structure.txt",
         )
+
         df = pd.read_csv(path)
 
         tree_data = {}