Negative values in calculation setup

Author: mrvisscher

activity_browser/actions/calculation_setup/cs_add_functional_unit.py

@@ -16,7 +16,7 @@ def run(cs_name: str, activities: list[tuple | int | bd.Node]):
         activities = [bwutils.refresh_node(node) for node in activities]
         calculation_setup = bd.calculation_setups[cs_name]
 
-        fus = [{act.key: 1.0} for act in activities]
+        fus = [{act.key: -1.0 if act.get("type") == "waste" else 1.0} for act in activities]
         calculation_setup['inv'] += fus
 
         bd.calculation_setups[cs_name] = calculation_setup

activity_browser/layouts/pages/activity_details/exchanges_tab.py

@@ -289,7 +289,7 @@ class ExchangesView(widgets.ABTreeView):
         hovered_item (ExchangesItem): The item currently being hovered over.
     """
     defaultColumnDelegates = {
-        "amount": delegates.AmountDelegate,
+        "amount": delegates.AbsoluteAmountDelegate,
         "allocation_factor": delegates.FloatDelegate,
         "substitution_factor": delegates.FloatDelegate,
         "unit": delegates.StringDelegate,

activity_browser/layouts/pages/calculation_setup/functional_unit_section.py

@@ -37,7 +37,7 @@ def sync(self):
 
     def build_df(self):
         keys, amounts = [], []
-        cols = ["unit", "name", "product", "location", "database", "processor"]
+        cols = ["unit", "name", "product", "location", "database", "processor", "type"]
 
         for fu in self.calculation_setup.get("inv", []):
             for key, amount in fu.items():
@@ -75,7 +75,9 @@ def build_df(self):
         act_df.update(act_df["product"].rename("name"))
         act_df["product"] = act_df["name"]
 
-        cols = ["amount", "unit", "product", "process", "database", "location", "_processor_key", "_activity_key", "_cs_name"]
+        act_df.rename({"type": "_type"}, axis="columns", inplace=True)
+
+        cols = ["amount", "unit", "product", "process", "database", "location", "_processor_key", "_activity_key", "_cs_name", "_type"]
 
         return act_df[cols].reset_index(drop=True)
 
@@ -163,7 +165,11 @@ def dropEvent(self, event) -> None:
 
 class FunctionalUnitItem(widgets.ABDataItem):
     def decorationData(self, col: int, key: str):
-        if key == "product":
+        if key == "product" and self["_type"] == "waste":
+            return icons.qicons.waste
+        elif key == "product" and self["type"] == "processwithreferenceproduct":
+            return icons.qicons.processproduct
+        elif key == "product":
             return icons.qicons.product
         if key == "process":
             return icons.qicons.process

activity_browser/ui/delegates/__init__.py

@@ -14,10 +14,11 @@
 from .new_formula import NewFormulaDelegate
 from .date_time import DateTimeDelegate
 from .property import PropertyDelegate
-from .amount import AmountDelegate
+from .amount import AmountDelegate, AbsoluteAmountDelegate
 
 __all__ = [
     "AmountDelegate",
+    "AbsoluteAmountDelegate",
     "CheckboxDelegate",
     "ComboBoxDelegate",
     "DatabaseDelegate",

activity_browser/ui/delegates/amount.py

@@ -10,7 +10,7 @@ def displayText(self, value, locale):
 
         if math.isnan(value):
             return ""
-        return str(abs(value))
+        return str(value)
 
     def createEditor(self, parent, option, index):
         editor = QtWidgets.QLineEdit(parent)
@@ -23,6 +23,37 @@ def createEditor(self, parent, option, index):
         editor.setValidator(validator)
         return editor
 
+    def setEditorData(self, editor: QtWidgets.QLineEdit, index: QtCore.QModelIndex):
+        """Populate the editor with data if editing an existing field."""
+        import math
+
+        data = index.data(QtCore.Qt.DisplayRole)
+
+        try:
+            value = float(data)
+        except ValueError:
+            value = math.nan
+
+        editor.setText(format(value, '.10f').rstrip('0').rstrip('.'))
+
+    def setModelData(
+            self,
+            editor: QtWidgets.QLineEdit,
+            model: QtCore.QAbstractItemModel,
+            index: QtCore.QModelIndex,
+    ):
+        """Take the editor, read the given value and set it in the model"""
+        try:
+            value = float(editor.text())
+            model.setData(index, value, QtCore.Qt.EditRole)
+        except ValueError:
+            pass
+
+
+class AbsoluteAmountDelegate(AmountDelegate):
+    def displayText(self, value, locale):
+        return str(abs(float(super().displayText(value, locale))))
+
     def setEditorData(self, editor: QtWidgets.QLineEdit, index: QtCore.QModelIndex):
         """Populate the editor with data if editing an existing field."""
         import math
@@ -52,4 +83,4 @@ def setModelData(
 
             model.setData(index, value, QtCore.Qt.EditRole)
         except ValueError:
-            pass
+            pass