Merge branch 'major' into major-database-deletion

Author: mrvisscher

activity_browser/layouts/pages/activity_details/exchanges_tab.py

@@ -195,7 +195,7 @@ def dragEnterEvent(self, event):
             return
 
         if event.mimeData().hasFormat("application/bw-nodekeylist"):
-            self.overlay = DropOverlay(self)
+            self.overlay = widgets.ABDropOverlay(self)
             self.overlay.show()
             event.accept()
 
@@ -239,28 +239,6 @@ def get_exchange_type(activity_key: tuple) -> str | None:
     return None
 
 
-class DropOverlay(QtWidgets.QWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.setAttribute(Qt.WA_TransparentForMouseEvents)
-        self.setAttribute(Qt.WA_NoSystemBackground)
-        self.setAttribute(Qt.WA_TranslucentBackground)
-        self.setAutoFillBackground(False)
-        self.resize(parent.size())
-
-    def paintEvent(self, event):
-        painter = QtGui.QPainter(self)
-        painter.setRenderHint(QtGui.QPainter.Antialiasing)
-        painter.fillRect(self.rect(), QtGui.QColor(0, 100, 255, 200))  # Semi-transparent blue
-        painter.setPen(Qt.white)
-
-        font = self.font()
-        font.setBold(True)
-
-        painter.setFont(font)
-        painter.drawText(self.rect(), Qt.AlignCenter, "Drop here to create new exchanges")
-
-
 class RelinkDelegate(delegates.StringDelegate):
     matched: pd.DataFrame
     column: str

activity_browser/layouts/pages/activity_details/graph_tab.py

@@ -9,7 +9,8 @@
 import bw_functional as bf
 
 from activity_browser import static, bwutils, actions
-from .exchanges_tab import DropOverlay, get_exchange_type
+from activity_browser.ui import widgets
+from .exchanges_tab import get_exchange_type
 
 log = getLogger(__name__)
 
@@ -208,7 +209,7 @@ def dragEnterEvent(self, event):
             return
 
         if event.mimeData().hasFormat("application/bw-nodekeylist"):
-            self.overlay = DropOverlay(self)
+            self.overlay = widgets.ABDropOverlay(self)
             self.overlay.show()
             event.accept()
 

activity_browser/layouts/pages/impact_category_details/impact_category_details.py

@@ -6,7 +6,7 @@
 
 from activity_browser import actions, signals
 from activity_browser.ui import widgets, icons, delegates
-from activity_browser.bwutils import AB_metadata
+from activity_browser.bwutils import AB_metadata, is_node_biosphere
 
 from .impact_category_header import ImpactCategoryHeader
 
@@ -16,6 +16,7 @@ def __init__(self, name: tuple, parent=None):
         super().__init__(parent)
         self.name = name
         self.impact_category = bd.Method(name)
+        self.is_editable = False
 
         self.setObjectName(" | ".join(name))
 
@@ -74,8 +75,9 @@ def build_df(self):
 
         df = df.merge(other, left_on="id", right_on="id").rename(columns={"id": "_id", "data": "_cf"})
         df["_impact_category_name"] = [self.name for i in range(len(df))]
+        df["_editable"] = self.is_editable
 
-        cols = ["name", "categories", "database", "amount", "unit", "uncertainty", "_id", "_impact_category_name", "_cf"]
+        cols = ["name", "categories", "database", "amount", "unit", "uncertainty", "_id", "_impact_category_name", "_cf", "_editable"]
         return df[cols]
 
 
@@ -86,7 +88,91 @@ class CharacterizationFactorsView(widgets.ABTreeView):
         "uncertainty": delegates.UncertaintyDelegate,
     }
 
+    class ContextMenu(widgets.ABMenu):
+        menuSetup = [
+            lambda m: m.add(actions.CFRemove, m.impact_category_name, m.char_factors,
+                            enable=bool(m.char_factors) and m.is_editable,
+                            text="Remove characterization factor(s)"),
+        ]
 
+        @property
+        def is_editable(self):
+            return self.parent().parent().is_editable
+
+        @property
+        def impact_category_name(self):
+            return self.parent().parent().name
+
+        @property
+        def char_factors(self):
+            indexes = self.parent().selectedIndexes()
+            return [(idx.internalPointer()["_id"], idx.internalPointer()["_cf"]) 
+                    for idx in indexes if idx.isValid() and idx.column() == 0]
+
+    def __init__(self, parent):
+        super().__init__(parent)
+        self.setAcceptDrops(True)
+        self.setSortingEnabled(True)
+        self.overlay = None
+
+    def dragEnterEvent(self, event):
+        """
+        Handles the drag enter event.
+
+        Args:
+            event: The drag enter event.
+        """
+        if not self.parent().is_editable:
+            event.ignore()
+            return
+
+        if event.mimeData().hasFormat("application/bw-nodekeylist"):
+            self.overlay = widgets.ABDropOverlay(self)
+            self.overlay.show()
+            event.accept()
+        else:
+            event.ignore()
+    
+    def dragMoveEvent(self, event):
+        """Handles the drag move event - required for proper drop indicator."""
+        if not self.parent().is_editable:
+            event.ignore()
+            return
+
+        if event.mimeData().hasFormat("application/bw-nodekeylist"):
+            event.accept()
+        else:
+            event.ignore()
+
+    def dragLeaveEvent(self, event):
+        """
+        Handles the drag leave event.
+
+        Args:
+            event: The drag leave event.
+        """
+        if not self.overlay is None:
+            # Reset the palette on drag leave
+            self.overlay.deleteLater()
+            self.overlay = None
+
+    def dropEvent(self, event):
+        """
+        Handles the drop event.
+
+        Args:
+            event: The drop event.
+        """
+        self.overlay.deleteLater()
+        self.overlay = None
+
+        keys: list = event.mimeData().retrievePickleData("application/bw-nodekeylist")
+
+        # Filter to only biosphere flows
+        biosphere_keys = [key for key in keys if is_node_biosphere(key)]
+
+        if biosphere_keys:
+            actions.CFNew.run(self.parent().name, biosphere_keys)
 
 
 class ExchangesItem(widgets.ABDataItem):
@@ -102,7 +188,8 @@ def flags(self, col: int, key: str):
             QtCore.Qt.ItemFlags: The item flags.
         """
         flags = super().flags(col, key)
-        if key in ["amount", "uncertainty"]:
+
+        if key in ["amount", "uncertainty"] and self["_editable"]:
             return flags | Qt.ItemFlag.ItemIsEditable
         return flags