Move ABTreeView to be main solution

mrvisscher · mrvisscher · commit dc75fc67d6c0 · 2025-11-18T13:15:03.000+01:00
diff --git a/activity_browser/app/pages/activity_details/consumers_tab.py b/activity_browser/app/pages/activity_details/consumers_tab.py
@@ -97,7 +97,7 @@ def build_df(self, exchanges: list[bd.Edge]) -> pd.DataFrame:
         return df[cols]
 
 
-class ConsumersView(widgets.ABNewTreeView):
+class ConsumersView(widgets.ABTreeView):
     """
     A view that displays the consumers in a tree structure.
     """
diff --git a/activity_browser/app/pages/activity_details/data_tab.py b/activity_browser/app/pages/activity_details/data_tab.py
@@ -90,7 +90,7 @@ def build_df(self) -> pd.DataFrame:
         return df[cols]
 
 
-class DataView(widgets.ABNewTreeView):
+class DataView(widgets.ABTreeView):
     """
     A view that displays the data in a tree structure.
 
diff --git a/activity_browser/app/pages/activity_details/exchanges_tab.py b/activity_browser/app/pages/activity_details/exchanges_tab.py
@@ -305,7 +305,7 @@ def setModelData(self, editor: QtWidgets.QComboBox, model, index):
         )
 
 
-class ExchangesView(widgets.ABNewTreeView):
+class ExchangesView(widgets.ABTreeView):
     """
     A view that displays the exchanges in a tree structure.
 
diff --git a/activity_browser/app/pages/activity_details/parameters_tab.py b/activity_browser/app/pages/activity_details/parameters_tab.py
@@ -100,7 +100,7 @@ def build_df(self) -> pd.DataFrame:
         return pd.DataFrame(translated, columns=columns)
 
 
-class ParametersView(widgets.ABNewTreeView):
+class ParametersView(widgets.ABTreeView):
     """
     A view that displays the parameters in a tree structure.
 
diff --git a/activity_browser/app/pages/calculation_setup/functional_unit_section.py b/activity_browser/app/pages/calculation_setup/functional_unit_section.py
@@ -84,7 +84,7 @@ def build_df(self):
         return act_df[cols].reset_index(drop=True)
 
 
-class FunctionalUnitView(widgets.ABNewTreeView):
+class FunctionalUnitView(widgets.ABTreeView):
     defaultColumnDelegates = {
         "amount": delegates.AmountDelegate
     }
diff --git a/activity_browser/app/pages/calculation_setup/impact_category_section.py b/activity_browser/app/pages/calculation_setup/impact_category_section.py
@@ -48,7 +48,7 @@ def build_df(self):
         return df[cols]
 
 
-class ImpactCategoryView(widgets.ABNewTreeView):
+class ImpactCategoryView(widgets.ABTreeView):
     defaultColumnDelegates = {
         "name": delegates.StringDelegate
     }
diff --git a/activity_browser/app/pages/impact_category_details/impact_category_details.py b/activity_browser/app/pages/impact_category_details/impact_category_details.py
@@ -92,7 +92,7 @@ def uncertainty_from_cf(self, cf):
         return 0
 
 
-class CharacterizationFactorsView(widgets.ABNewTreeView):
+class CharacterizationFactorsView(widgets.ABTreeView):
     defaultColumnDelegates = {
         "amount": delegates.FloatDelegate,
         "categories": delegates.ListDelegate,
diff --git a/activity_browser/app/pages/metadatastore.py b/activity_browser/app/pages/metadatastore.py
@@ -1,6 +1,6 @@
 from qtpy import QtWidgets
 
-from activity_browser.ui import widgets, delegates
+from activity_browser.ui import widgets, delegates, core
 from activity_browser.app import metadata, signals
 
 
@@ -9,7 +9,7 @@ def __init__(self, parent=None):
         super().__init__(parent)
         self.setObjectName("MetaDataStorePage")
 
-        self.model = MDSModel(self, metadata.dataframe)
+        self.model = core.ABTreeModel(metadata.dataframe, self)
         self.view = MDSView(self)
         self.view.setModel(self.model)
 
@@ -20,7 +20,7 @@ def connect_signals(self):
         signals.metadata.synced.connect(self.sync)
 
     def sync(self):
-        self.model.setDataFrame(metadata.dataframe)
+        self.model.set_dataframe(metadata.dataframe)
 
     def build_layout(self):
         layout = QtWidgets.QVBoxLayout()
@@ -32,9 +32,3 @@ class MDSView(widgets.ABTreeView):
     def __init__(self, parent=None):
         super().__init__(parent)
         self.setItemDelegate(delegates.StringDelegate(self))
-
-class MDSItem(widgets.ABDataItem):
-    pass
-
-class MDSModel(widgets.ABItemModel):
-    pass
diff --git a/activity_browser/app/pages/parameters/parameters_new.py b/activity_browser/app/pages/parameters/parameters_new.py
@@ -278,7 +278,7 @@ def build_exchanges_df(self) -> pd.DataFrame:
         return pd.DataFrame(translated, columns=columns)
 
 
-class ProjectParametersView(widgets.ABNewTreeView):
+class ProjectParametersView(widgets.ABTreeView):
     """
     A view that displays the project parameters in a tree structure.
 
@@ -470,7 +470,7 @@ def scoped_parameters(self, index: QtCore.QModelIndex) -> dict[str, Parameter]:
         return parameters_in_scope(parameter=parameter)
 
 
-class ParameterizedExchangesView(widgets.ABNewTreeView):
+class ParameterizedExchangesView(widgets.ABTreeView):
     """
     A view that displays parameterized exchanges in a tree structure.
 
diff --git a/activity_browser/app/pages/settings/project_manager.py b/activity_browser/app/pages/settings/project_manager.py
@@ -117,7 +117,7 @@ def build_template_df(self) -> pd.DataFrame:
         return pd.DataFrame(data, columns=cols)
 
 
-class ProjectView(widgets.ABNewTreeView):
+class ProjectView(widgets.ABTreeView):
 
     class ContextMenu(widgets.ABMenu):
         menuSetup = [
@@ -202,7 +202,7 @@ def decorationData(self, index):
         return None
 
 
-class TemplateView(widgets.ABNewTreeView):
+class TemplateView(widgets.ABTreeView):
 
     class ContextMenu(widgets.ABMenu):
         menuSetup = []
diff --git a/activity_browser/app/panes/__init__.py b/activity_browser/app/panes/__init__.py
@@ -1,4 +1,3 @@
-from .database_explorer import DatabaseExplorerPane
 from .database_products import DatabaseProductsPane
 from .databases import DatabasesPane
 from .impact_categories import ImpactCategoriesPane
diff --git a/activity_browser/app/panes/calculation_setups.py b/activity_browser/app/panes/calculation_setups.py
@@ -79,7 +79,7 @@ def build_df(self) -> pd.DataFrame:
         return pd.DataFrame(data, columns=cols)
 
 
-class CalculationSetupsView(widgets.ABNewTreeView):
+class CalculationSetupsView(widgets.ABTreeView):
     """
     A view that displays the calculation setups in a tree structure.
 
diff --git a/activity_browser/app/panes/database_explorer.py b/activity_browser/app/panes/database_explorer.py
diff --git a/activity_browser/app/panes/database_products.py b/activity_browser/app/panes/database_products.py
@@ -203,7 +203,7 @@ def search_error(self, reset=False):
         self.search.setPalette(palette)
 
 
-class ProductView(ui.widgets.ABNewTreeView):
+class ProductView(ui.widgets.ABTreeView):
     """
     A view that displays the products in a tree structure.
 
diff --git a/activity_browser/app/panes/databases.py b/activity_browser/app/panes/databases.py
@@ -100,7 +100,7 @@ def build_df(self) -> pd.DataFrame:
         return pd.DataFrame(data, columns=cols)
 
 
-class DatabasesView(widgets.ABNewTreeView):
+class DatabasesView(widgets.ABTreeView):
     """
     A view that displays the databases in a tree structure.
 
diff --git a/activity_browser/app/panes/impact_categories.py b/activity_browser/app/panes/impact_categories.py
@@ -74,7 +74,7 @@ def build_df(self):
         return df[cols]
 
 
-class ImpactCategoriesView(widgets.ABNewTreeView):
+class ImpactCategoriesView(widgets.ABTreeView):
     defaultColumnDelegates = {
         "groups": delegates.ListDelegate,
     }
diff --git a/activity_browser/ui/widgets/__init__.py b/activity_browser/ui/widgets/__init__.py
@@ -4,9 +4,6 @@
 from .cutoff_menu import CutoffMenu
 from .line_edit import (ABLineEdit, SignalledComboEdit, SignalledLineEdit,
                         SignalledPlainTextEdit)
-from .treeview import ABTreeView
-from .item_model import ABItemModel
-from .item import ABAbstractItem, ABBranchItem, ABDataItem
 from .line import ABHLine, ABVLine
 from .formula_edit import ABFormulaEdit
 
@@ -21,6 +18,6 @@
 from .central import CentralTabWidget
 from .menu import ABMenu
 from .drop_overlay import ABDropOverlay
-from .tree_view import ABNewTreeView
+from .tree_view import ABTreeView
 from .buttons import ABCloseButton, ABMinimizeButton
 from .tab_widget import ABTabWidget
diff --git a/activity_browser/ui/widgets/item.py b/activity_browser/ui/widgets/item.py
diff --git a/activity_browser/ui/widgets/item_model.py b/activity_browser/ui/widgets/item_model.py
diff --git a/activity_browser/ui/widgets/tree_view.py b/activity_browser/ui/widgets/tree_view.py
diff --git a/activity_browser/ui/widgets/treeview.py b/activity_browser/ui/widgets/treeview.py

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ def setModelData(self, editor: QtWidgets.QComboBox, model, index):`
`305`	`305`	`)`
`306`	`306`
`307`	`307`
`308`		`-class ExchangesView(widgets.ABNewTreeView):`
	`308`	`+class ExchangesView(widgets.ABTreeView):`
`309`	`309`	`"""`
`310`	`310`	`A view that displays the exchanges in a tree structure.`
`311`	`311`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ def build_df(self):`
`84`	`84`	`return act_df[cols].reset_index(drop=True)`
`85`	`85`
`86`	`86`
`87`		`-class FunctionalUnitView(widgets.ABNewTreeView):`
	`87`	`+class FunctionalUnitView(widgets.ABTreeView):`
`88`	`88`	`defaultColumnDelegates = {`
`89`	`89`	`"amount": delegates.AmountDelegate`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def build_df(self):`
`48`	`48`	`return df[cols]`
`49`	`49`
`50`	`50`
`51`		`-class ImpactCategoryView(widgets.ABNewTreeView):`
	`51`	`+class ImpactCategoryView(widgets.ABTreeView):`
`52`	`52`	`defaultColumnDelegates = {`
`53`	`53`	`"name": delegates.StringDelegate`
`54`	`54`	`}`