Merge branch 'geopandas_district_layer'

Author: couteau

LICENSE

@@ -1,6 +1,6 @@
 QGIS Redistricting Plugin
 
-Copyright (C) 2022 Stuart C. Naifeh
+Copyright (C) 2022-2024 Stuart C. Naifeh
 [email protected]
 
 This program is free software; you can redistribute it and/or modify it under the terms

pylintrc

@@ -441,10 +441,10 @@ exclude-too-few-public-methods=
 ignored-parents=
 
 # Maximum number of arguments for function / method.
-max-args=5
+max-args=10
 
 # Maximum number of attributes for a class (see R0902).
-max-attributes=7
+max-attributes=15
 
 # Maximum number of boolean expressions in an if statement (see R0916).
 max-bool-expr=5

pyproject.toml

@@ -4,3 +4,4 @@ max_line_length = 120
 [tool.pytest.ini_options]
 filterwarnings = "ignore:distutils:DeprecationWarning"
 qt_api = "pyqt5"
+# addopts = "-nauto"

redistricting/core/BasePlanBuilder.py

@@ -183,7 +183,7 @@ def setPopLayer(self, value: QgsVectorLayer):
 
         return self
 
-    def setJoinField(self, value: str):
+    def setPopJoinField(self, value: str):
         if value is not None and not isinstance(value, str):
             raise ValueError(tr('Population join field must be a string'))
 
@@ -305,7 +305,14 @@ def setDataFields(self, dataFields: Union[List[DataField], FieldList]):
         return self
 
     @overload
-    def appendDataField(self, field: str, isExpression: bool = False, caption: str = None, sumfield=None, pctbase=None) -> Self:
+    def appendDataField(
+        self,
+        field: str,
+        isExpression: bool = False,
+        caption: str = None,
+        sumfield=None,
+        pctbase=None
+    ) -> Self:
         ...
 
     @overload

redistricting/core/DeltaList.py

@@ -164,10 +164,6 @@ def setAssignLayer(self, value: QgsVectorLayer):
             self._undoStack = self._assignLayer.undoStack()
             self._undoStack.indexChanged.connect(self.update)
 
-    def detachSignals(self):
-        self._undoStack.indexChanged.disconnect(self.update)
-        self._undoStack = None
-
     def isUpdatingPending(self):
         return self._pendingTask is not None and self._pendingTask.status() < self._pendingTask.TaskStatus.Complete
 
@@ -192,9 +188,8 @@ def taskTerminated():
         if self._pendingTask and self._pendingTask.status() < self._pendingTask.TaskStatus.Complete:
             return self._pendingTask
 
-        if not self._assignLayer or not self._assignLayer.editBuffer() or \
-                len(self._assignLayer.editBuffer().changedAttributeValues()) == 0:
-            # self.clear()
+        if not self._assignLayer or not self._assignLayer.editBuffer() or self._undoStack.index() == 0:
+            self.clear()
             return None
 
         self.updateStarted.emit(self._plan)

redistricting/core/DeltaListModel.py

@@ -137,8 +137,10 @@ def updateFields(self):
                     'format': '{:.2%}'
                 })
 
-    def planChanged(self, plan, field, new, old):  # pylint: disable=unused-argument
-        if field in {'pop-field', 'pop-fields', 'data-fields'}:
+    def planChanged(self, plan, fields):
+        assert plan == self._plan
+
+        if fields & {'pop-field', 'pop-fields', 'data-fields'}:
             self.beginResetModel()
             self.updateFields()
             self.endResetModel()

redistricting/core/District.py

@@ -44,11 +44,11 @@
 
 
 class District:
-    def __init__(self, district: int, owner: DistrictList):
+    def __init__(self, district: int, lst: DistrictList):
         self._district = district
-        self._data = owner._data
+        self._data = lst._data
         self._index = self._data.index.get_loc(district)
-        self._list = owner
+        self._list = lst
 
     @overload
     def __getitem__(self, index: str | int) -> Any:
@@ -153,13 +153,19 @@ def isValid(self):
         lower, upper = self._list.idealRange(self["members"])
         return lower <= self.population <= upper
 
+    @property
+    def assignments(self):
+        return self._list.getAssignments(self._district)
+
     @property
     def color(self):
         renderer = self._list.layer.renderer()
         if isinstance(renderer, QgsCategorizedSymbolRenderer):
             idx = renderer.categoryIndexForValue(self._district)
-            if idx != -1:
-                cat = renderer.categories()[idx]
-                return QColor(cat.symbol().color())
+            if idx == -1:
+                idx = 0
+
+            cat = renderer.categories()[idx]
+            return QColor(cat.symbol().color())
 
         return QColor(QPalette().color(QPalette.Normal, QPalette.Window))

redistricting/core/DistrictDataModel.py

@@ -22,7 +22,10 @@
  *                                                                         *
  ***************************************************************************/
 """
-from typing import Any
+from typing import (
+    Any,
+    Union
+)
 
 import numpy as np
 import pandas as pd
@@ -63,29 +66,27 @@ def plan(self, value: RedistrictingPlan):
         self.beginResetModel()
 
         if self._districts is not None:
-            self._districts.updating.disconnect(self.beginResetModel)
-            self._districts.updateComplete.disconnect(self.endResetModel)
-            self._districts.updateTerminated.disconnect(self.endResetModel)
             self._districts.districtChanged.disconnect(self.districtChanged)
+            self._plan.districtsUpdated.disconnect(self.districtsUpdated)
             self._plan.planChanged.disconnect(self.planChanged)
 
         self._plan = value
         self._districts = self._plan.districts if self._plan else None
 
         if self._districts is not None:
-            self._districts.updating.connect(self.beginResetModel)
-            self._districts.updateComplete.connect(self.endResetModel)
-            self._districts.updateTerminated.connect(self.endResetModel)
             self._districts.districtChanged.connect(self.districtChanged)
+            self._plan.districtsUpdated.connect(self.districtsUpdated)
             self._plan.planChanged.connect(self.planChanged)
 
         self.endResetModel()
 
-    def planChanged(self, plan, prop, value, oldValue):  # pylint: disable=unused-argument
-        if prop in ('districts', 'data-fields', 'pop-field', 'pop-fields'):
+    def planChanged(self, plan, props):
+        assert plan == self.plan
+
+        if props & {'districts', 'data-fields', 'pop-field', 'pop-fields'}:
             self.beginResetModel()
             self.endResetModel()
-        elif prop == 'deviation':
+        elif 'deviation' in props:
             self.dataChanged.emit(self.createIndex(1, 1), self.createIndex(self.rowCount() - 1, 4), [Qt.BackgroundRole])
 
     def districtChanged(self, district: District):
@@ -184,3 +185,16 @@ def flags(self, index):
             f |= Qt.ItemIsEditable
 
         return f
+
+    def districtsUpdated(self, districts: Union[list[int], None]):
+        if districts:
+            for d in districts:
+                self.dataChanged.emit(
+                    self.createIndex(d, 3),
+                    self.createIndex(d, self.columnCount()),
+                    [Qt.DisplayRole, Qt.EditRole]
+                )
+                self.dataChanged.emit(self.createIndex(d, 4), self.createIndex(d, 5), [Qt.FontRole])
+        else:
+            self.beginResetModel()
+            self.endResetModel()