diff --git a/geest/core/algorithms/__init__.py b/geest/core/algorithms/__init__.py
index fcbe9fa..9b34713 100644
--- a/geest/core/algorithms/__init__.py
+++ b/geest/core/algorithms/__init__.py
@@ -1,2 +1,3 @@
from .area_iterator import AreaIterator
from .population_processor import PopulationRasterProcessingTask
+from .wee_score_processor import WEEScoreProcessingTask
diff --git a/geest/core/algorithms/population_processor.py b/geest/core/algorithms/population_processor.py
index 3e0db12..476ac1b 100644
--- a/geest/core/algorithms/population_processor.py
+++ b/geest/core/algorithms/population_processor.py
@@ -1,7 +1,12 @@
import os
import traceback
+import shutil
from typing import Optional, Tuple
+import subprocess
+import platform
+
from qgis.core import (
+ QgsApplication,
QgsTask,
QgsProcessingContext,
QgsFeedback,
@@ -12,7 +17,7 @@
QgsFeature,
)
import processing
-from geest.utilities import log_message
+from geest.utilities import log_message, resources_path
from geest.core.algorithms import AreaIterator
@@ -25,11 +30,11 @@ class PopulationRasterProcessingTask(QgsTask):
three classes based on population values.
Args:
- name (str): Name of the task.
population_raster_path (str): Path to the population raster layer.
study_area_gpkg_path (str): Path to the GeoPackage containing study area masks.
output_dir (str): Directory to save the output rasters.
- crs (Optional[QgsCoordinateReferenceSystem]): CRS for the output rasters.
+ cell_size_m (float): Cell size for the output rasters.
+ crs (Optional[QgsCoordinateReferenceSystem]): CRS for the output rasters. Will use the CRS of the clip layer if not provided.
context (Optional[QgsProcessingContext]): QGIS processing context.
feedback (Optional[QgsFeedback]): QGIS feedback object.
force_clear (bool): Flag to force clearing of all outputs before processing.
@@ -37,39 +42,60 @@ class PopulationRasterProcessingTask(QgsTask):
def __init__(
self,
- name: str,
population_raster_path: str,
study_area_gpkg_path: str,
- output_dir: str,
- crs: Optional[QgsCoordinateReferenceSystem] = None,
+ working_directory: str,
+ cell_size_m: float,
+ target_crs: Optional[QgsCoordinateReferenceSystem] = None,
context: Optional[QgsProcessingContext] = None,
feedback: Optional[QgsFeedback] = None,
force_clear: bool = False,
):
- super().__init__(name, QgsTask.CanCancel)
+ super().__init__("Population Processor", QgsTask.CanCancel)
self.population_raster_path = population_raster_path
self.study_area_gpkg_path = study_area_gpkg_path
- self.output_dir = os.path.join(output_dir, "population")
+ self.output_dir = os.path.join(working_directory, "population")
self.force_clear = force_clear
if self.force_clear and os.path.exists(self.output_dir):
for file in os.listdir(self.output_dir):
os.remove(os.path.join(self.output_dir, file))
+ self.cell_size_m = cell_size_m
os.makedirs(self.output_dir, exist_ok=True)
- self.crs = crs
+ self.target_crs = target_crs
+ if not self.target_crs:
+ layer: QgsVectorLayer = QgsVectorLayer(
+ f"{self.study_area_gpkg_path}|layername=study_area_clip_polygons",
+ "study_area_clip_polygons",
+ "ogr",
+ )
+ self.target_crs = layer.crs()
+ del layer
self.context = context
self.feedback = feedback
self.global_min = float("inf")
self.global_max = float("-inf")
self.clipped_rasters = []
self.reclassified_rasters = []
+ self.resampled_rasters = []
+ log_message(f"---------------------------------------------")
+ log_message(f"Population raster processing task initialized")
+ log_message(f"---------------------------------------------")
+ log_message(f"Population raster path: {self.population_raster_path}")
+ log_message(f"Study area GeoPackage path: {self.study_area_gpkg_path}")
+ log_message(f"Output directory: {self.output_dir}")
+ log_message(f"Cell size: {self.cell_size_m}")
+ log_message(f"CRS: {self.target_crs.authid() if self.target_crs else 'None'}")
+ log_message(f"Force clear: {self.force_clear}")
+ log_message(f"---------------------------------------------")
def run(self) -> bool:
"""
Executes the task to process population rasters.
"""
try:
- self.process_population_rasters()
- self.reclassify_population_rasters()
+ self.clip_population_rasters()
+ self.resample_population_rasters()
+ self.reclassify_resampled_rasters()
self.generate_vrts()
return True
except Exception as e:
@@ -86,7 +112,7 @@ def finished(self, result: bool) -> None:
else:
log_message("Population raster processing failed.")
- def process_population_rasters(self) -> None:
+ def clip_population_rasters(self) -> None:
"""
Clips the population raster using study area masks and records min and max values.
"""
@@ -98,7 +124,7 @@ def process_population_rasters(self) -> None:
return
# create a temporary layer using the clip geometry
clip_layer = QgsVectorLayer("Polygon", "clip", "memory")
- clip_layer.setCrs(self.crs)
+ clip_layer.setCrs(self.target_crs)
clip_layer.startEditing()
feature = QgsFeature()
feature.setGeometry(clip_area)
@@ -141,19 +167,128 @@ def process_population_rasters(self) -> None:
self.clipped_rasters.append(output_path)
- # Calculate min and max values for the clipped raster
- provider: QgsRasterDataProvider = clipped_layer.dataProvider()
+ log_message(f"Processed mask {layer_name}")
+
+ def find_gdalwarp(self) -> str:
+ """
+ Finds the gdalwarp executable using 'which' command on Unix-based systems
+ and QGIS installation path on Windows.
+ """
+ if platform.system() == "Windows":
+ gdal_path = os.path.join(QgsApplication.prefixPath(), "bin", "gdalwarp.exe")
+ if os.path.exists(gdal_path):
+ return gdal_path
+ else:
+ raise FileNotFoundError(
+ "gdalwarp.exe not found in QGIS installation path."
+ )
+ else:
+ result = subprocess.run(
+ ["which", "gdalwarp"], capture_output=True, text=True
+ )
+ if result.returncode == 0 and result.stdout.strip():
+ return result.stdout.strip()
+ else:
+ raise FileNotFoundError("gdalwarp not found in system path.")
+
+ def resample_population_rasters(self) -> None:
+ """
+ Resamples the reclassified rasters to the target CRS and resolution.
+
+ Uses the sum method to aggregate values when resampling via gdalwarp.
+
+ From gdalwarp docs: sum: compute the weighted sum of all non-NODATA contributing pixels (since GDAL 3.1)
+
+ Note: gdal:warpreproject does not expose the -r sum option, so this method
+ uses a direct gdalwarp shell call instead.
+ """
+ try:
+ gdal_path = self.find_gdalwarp()
+ except FileNotFoundError as e:
+ log_message(f"Error: {str(e)}")
+ return
+
+ area_iterator = AreaIterator(self.study_area_gpkg_path)
+
+ for index, (current_area, clip_area, current_bbox, progress) in enumerate(
+ area_iterator
+ ):
+ if self.feedback and self.feedback.isCanceled():
+ return
+
+ layer_name = f"{index}.tif"
+ input_path = os.path.join(self.output_dir, f"clipped_{layer_name}")
+ output_path = os.path.join(self.output_dir, f"resampled_{layer_name}")
+
+ log_message(f"Resampling {output_path} from {input_path}")
+
+ if not self.force_clear and os.path.exists(output_path):
+ log_message(f"Reusing existing resampled raster: {output_path}")
+ self.resampled_rasters.append(output_path)
+ continue
+
+ bbox = current_bbox.boundingBox()
+
+ # Define gdalwarp command arguments
+ gdalwarp_cmd = [
+ gdal_path,
+ "-t_srs",
+ self.target_crs.authid(),
+ "-tr",
+ str(self.cell_size_m),
+ str(self.cell_size_m),
+ "-te",
+ str(bbox.xMinimum()),
+ str(bbox.yMinimum()),
+ str(bbox.xMaximum()),
+ str(bbox.yMaximum()),
+ "-r",
+ "sum",
+ "-of",
+ "GTiff",
+ input_path,
+ output_path,
+ ]
+
+ try:
+ # Run the gdalwarp command
+ log_message(f"Running gdalwarp with command: {' '.join(gdalwarp_cmd)}")
+ subprocess.run(
+ gdalwarp_cmd,
+ check=True,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ )
+
+ except subprocess.CalledProcessError as e:
+ log_message(
+ f"Failed to resample raster: {output_path}\nError: {e.stderr.decode()}"
+ )
+ continue
+
+ # Load the resampled raster
+ resampled_layer = QgsRasterLayer(output_path, f"Resampled {layer_name}")
+
+ if not resampled_layer.isValid():
+ log_message(f"Invalid resampled raster layer for: {layer_name}")
+ continue
+
+ self.resampled_rasters.append(output_path)
+
+ # Calculate min and max values for the resampled raster
+ provider: QgsRasterDataProvider = resampled_layer.dataProvider()
stats = provider.bandStatistics(1)
self.global_min = min(self.global_min, stats.minimumValue)
self.global_max = max(self.global_max, stats.maximumValue)
log_message(
- f"Processed mask {layer_name}: Min={stats.minimumValue}, Max={stats.maximumValue}"
+ f"Processed resample {layer_name}: Min={stats.minimumValue}, Max={stats.maximumValue}"
)
+ log_message(f"Resampled raster: {output_path}")
- def reclassify_population_rasters(self) -> None:
+ def reclassify_resampled_rasters(self) -> None:
"""
- Reclassifies clipped rasters into three classes based on population values.
+ Reclassifies the resampled rasters into three classes based on population values.
"""
area_iterator = AreaIterator(self.study_area_gpkg_path)
range_third = (self.global_max - self.global_min) / 3
@@ -165,9 +300,9 @@ def reclassify_population_rasters(self) -> None:
return
layer_name = f"{index}.tif"
+ input_path = os.path.join(self.output_dir, f"resampled_{layer_name}")
output_path = os.path.join(self.output_dir, f"reclassified_{layer_name}")
- input_path = os.path.join(self.output_dir, f"clipped_{layer_name}")
log_message(f"Reclassifying {output_path} from {input_path}")
if not self.force_clear and os.path.exists(output_path):
@@ -178,7 +313,7 @@ def reclassify_population_rasters(self) -> None:
params = {
"INPUT_RASTER": input_path,
"RASTER_BAND": 1,
- "TABLE": [
+ "TABLE": [ # ['0','52','1','52','95','2','95','140','3'],
self.global_min,
self.global_min + range_third,
1,
@@ -189,12 +324,16 @@ def reclassify_population_rasters(self) -> None:
self.global_max,
3,
],
+ "RANGE_BOUNDARIES": 0,
+ "NODATA_FOR_MISSING": True,
"NO_DATA": 0,
- "DATA_TYPE": 5, # Float32
- # "DATA_TYPE": 1, # Byte
+ # "DATA_TYPE": 5, # Float32
+ "DATA_TYPE": 1, # Byte
"OUTPUT": output_path,
}
+
log_message(f"Reclassifying raster: {input_path}")
+ log_message(f"Reclassification table:\n {params['TABLE']}\n")
result = processing.run("native:reclassifybytable", params)
if not result["OUTPUT"]:
@@ -210,9 +349,15 @@ def generate_vrts(self) -> None:
Generates VRT files combining all clipped and reclassified rasters.
"""
clipped_vrt_path = os.path.join(self.output_dir, "clipped_population.vrt")
+
+ resampled_vrt_path = os.path.join(self.output_dir, "resampled_population.vrt")
+
reclassified_vrt_path = os.path.join(
self.output_dir, "reclassified_population.vrt"
)
+ reclassified_qml_path = os.path.join(
+ self.output_dir, "reclassified_population.qml"
+ )
# Generate VRT for clipped rasters
if self.clipped_rasters:
@@ -225,6 +370,17 @@ def generate_vrts(self) -> None:
processing.run("gdal:buildvirtualraster", params)
log_message(f"Generated VRT for clipped rasters: {clipped_vrt_path}")
+ # Generate VRT for resampled rasters
+ if self.resampled_rasters:
+ params = {
+ "INPUT": self.resampled_rasters,
+ "RESOLUTION": 0, # Use highest resolution among input files
+ "SEPARATE": False, # Combine into a single band
+ "OUTPUT": resampled_vrt_path,
+ }
+ processing.run("gdal:buildvirtualraster", params)
+ log_message(f"Generated VRT for resampled rasters: {resampled_vrt_path}")
+
# Generate VRT for reclassified rasters
if self.reclassified_rasters:
params = {
@@ -237,3 +393,7 @@ def generate_vrts(self) -> None:
log_message(
f"Generated VRT for reclassified rasters: {reclassified_vrt_path}"
)
+ source_qml = resources_path("resources", "qml", f"population_3_classes.qml")
+
+ log_message(f"Copying QML from {source_qml} to {reclassified_qml_path}")
+ shutil.copyfile(source_qml, reclassified_qml_path)
diff --git a/geest/core/algorithms/wee_score_processor.py b/geest/core/algorithms/wee_score_processor.py
new file mode 100644
index 0000000..d82819c
--- /dev/null
+++ b/geest/core/algorithms/wee_score_processor.py
@@ -0,0 +1,201 @@
+import os
+import traceback
+from typing import Optional, List
+import shutil
+
+from qgis.core import (
+ QgsTask,
+ QgsProcessingContext,
+ QgsFeedback,
+ QgsRasterLayer,
+ QgsVectorLayer,
+ QgsCoordinateReferenceSystem,
+)
+import processing
+from geest.utilities import log_message, resources_path
+from geest.core.algorithms import AreaIterator
+
+
+class WEEScoreProcessingTask(QgsTask):
+ """
+ A QgsTask subclass for calculating WEE SCORE using raster algebra.
+
+ It iterates over study areas, calculates the WEE SCORE using aligned input rasters
+ (GEEST and POP), combines the resulting rasters into a VRT, and applies a QML style.
+
+ Args:
+ study_area_gpkg_path (str): Path to the GeoPackage containing study area masks.
+ working_directory (str): Directory to save the output rasters.
+ target_crs (Optional[QgsCoordinateReferenceSystem]): CRS for the output rasters.
+ force_clear (bool): Flag to force clearing of all outputs before processing.
+ """
+
+ def __init__(
+ self,
+ study_area_gpkg_path: str,
+ working_directory: str,
+ target_crs: Optional[QgsCoordinateReferenceSystem] = None,
+ force_clear: bool = False,
+ ):
+ super().__init__("WEE Score Processor", QgsTask.CanCancel)
+ self.study_area_gpkg_path = study_area_gpkg_path
+
+ self.output_dir = os.path.join(working_directory, "wee_score")
+ os.makedirs(self.output_dir, exist_ok=True)
+
+ # These folders should already exist from the aggregation analysis and population raster processing
+ self.population_folder = os.path.join(working_directory, "population")
+ self.wee_folder = working_directory
+
+ self.force_clear = force_clear
+ if self.force_clear and os.path.exists(self.output_dir):
+ for file in os.listdir(self.output_dir):
+ os.remove(os.path.join(self.output_dir, file))
+
+ self.target_crs = target_crs
+ if not self.target_crs:
+ layer: QgsVectorLayer = QgsVectorLayer(
+ f"{self.study_area_gpkg_path}|layername=study_area_clip_polygons",
+ "study_area_clip_polygons",
+ "ogr",
+ )
+ self.target_crs = layer.crs()
+ del layer
+ self.output_rasters: List[str] = []
+
+ log_message("Initialized WEE SCORE Processing Task")
+
+ def run(self) -> bool:
+ """
+ Executes the WEE SCORE calculation task.
+ """
+ try:
+ self.calculate_wee_score()
+ self.generate_vrt()
+ return True
+ except Exception as e:
+ log_message(f"Task failed: {e}")
+ log_message(traceback.format_exc())
+ return False
+
+ def validate_rasters(
+ self,
+ geest_raster: QgsRasterLayer,
+ pop_raster: QgsRasterLayer,
+ dimension_check=False,
+ ) -> None:
+ """
+ Checks if GEEST and POP rasters have the same origin, dimensions, and pixel sizes.
+
+ Raises an exception if the check fails.
+
+ Args:
+ geest_raster_path (QgsRasterLayer): Path to the GEEST raster.
+ pop_raster_path (QgsRasterLayer): Path to the POP raster.
+ dimension_check (bool): Flag to check if the rasters have the same dimensions.
+ returns:
+ None
+ """
+ log_message("Validating input rasters")
+ log_message(f"GEEST Raster: {geest_raster.source()}")
+ log_message(f"POP Raster : {pop_raster.source()}")
+
+ if not geest_raster.isValid() or not pop_raster.isValid():
+ raise ValueError("One or both input rasters are invalid.")
+
+ if not dimension_check:
+ return
+
+ geest_provider = geest_raster.dataProvider()
+ pop_provider = pop_raster.dataProvider()
+
+ geest_extent = geest_provider.extent()
+ pop_extent = pop_provider.extent()
+ if geest_extent != pop_extent:
+ raise ValueError("Input rasters do not share the same extent.")
+
+ geest_size = geest_provider.xSize(), geest_provider.ySize()
+ pop_size = pop_provider.xSize(), pop_provider.ySize()
+ if geest_size != pop_size:
+ raise ValueError("Input rasters do not share the same dimensions.")
+
+ log_message("Validation successful: rasters are aligned.")
+
+ def calculate_wee_score(self) -> None:
+ """
+ Calculates WEE SCORE using raster algebra and saves the result for each area.
+ """
+ area_iterator = AreaIterator(self.study_area_gpkg_path)
+ for index, (_, _, _, _) in enumerate(area_iterator):
+ if self.isCanceled():
+ return
+
+ wee_path = os.path.join(self.wee_folder, f"wee_masked_{index}.tif")
+ population_path = os.path.join(
+ self.population_folder, f"reclassified_{index}.tif"
+ )
+ wee_layer = QgsRasterLayer(wee_path, "WEE")
+ pop_layer = QgsRasterLayer(population_path, "POP")
+ self.validate_rasters(wee_layer, pop_layer)
+
+ output_path = os.path.join(self.output_dir, f"wee_score_{index}.tif")
+ if not self.force_clear and os.path.exists(output_path):
+ log_message(f"Reusing existing raster: {output_path}")
+ self.output_rasters.append(output_path)
+ continue
+
+ log_message(f"Calculating WEE SCORE for area {index}")
+
+ params = {
+ "INPUT_A": wee_layer,
+ "BAND_A": 1,
+ "INPUT_B": pop_layer,
+ "BAND_B": 1,
+ "FORMULA": "((A - 1) * 3) + B",
+ "NO_DATA": None,
+ "EXTENT_OPT": 3,
+ "PROJWIN": None,
+ "RTYPE": 0,
+ "OPTIONS": "",
+ "EXTRA": "",
+ "OUTPUT": output_path,
+ }
+
+ processing.run("gdal:rastercalculator", params)
+ self.output_rasters.append(output_path)
+
+ log_message(f"WEE SCORE raster saved to {output_path}")
+
+ def generate_vrt(self) -> None:
+ """
+ Combines all WEE SCORE rasters into a single VRT and applies a QML style.
+ """
+ vrt_path = os.path.join(self.output_dir, "wee_score.vrt")
+ qml_path = os.path.join(self.output_dir, "wee_score.qml")
+ source_qml = resources_path("resources", "qml", "wee_score_style.qml")
+
+ params = {
+ "INPUT": self.output_rasters,
+ "RESOLUTION": 0, # Use highest resolution
+ "SEPARATE": False, # Combine into a single band
+ "OUTPUT": vrt_path,
+ }
+
+ processing.run("gdal:buildvirtualraster", params)
+ log_message(f"Generated VRT at {vrt_path}")
+
+ # Apply QML Style
+ if os.path.exists(source_qml):
+ shutil.copy(source_qml, qml_path)
+ log_message(f"Copied QML style from {source_qml} to {qml_path}")
+ else:
+ log_message("QML style file not found. Skipping QML copy.")
+
+ def finished(self, result: bool) -> None:
+ """
+ Called when the task completes.
+ """
+ if result:
+ log_message("WEE SCORE calculation completed successfully.")
+ else:
+ log_message("WEE SCORE calculation failed.")
diff --git a/geest/core/tasks/study_area.py b/geest/core/tasks/study_area.py
index 1aa8d02..aa45717 100644
--- a/geest/core/tasks/study_area.py
+++ b/geest/core/tasks/study_area.py
@@ -50,7 +50,6 @@ class StudyAreaProcessingTask(QgsTask):
def __init__(
self,
- name: str,
layer: QgsVectorLayer,
field_name: str,
cell_size_m: float,
@@ -63,7 +62,6 @@ def __init__(
"""
Initializes the StudyAreaProcessingTask.
- :param name: The name of the task.
:param layer: The vector layer containing study area features.
:param field_name: The name of the field containing area names.
:param cell_size: The size of the grid cells in meters.
@@ -74,7 +72,7 @@ def __init__(
:param context: QgsProcessingContext for the task. Default is None.
:param feedback: QgsFeedback object for task cancelling. Default is None.
"""
- super().__init__(name, QgsTask.CanCancel)
+ super().__init__("Study Area Preparation", QgsTask.CanCancel)
self.feedback = feedback
self.layer: QgsVectorLayer = layer
self.field_name: str = field_name
@@ -149,8 +147,6 @@ def run(self) -> bool:
with open(os.path.join(self.working_dir, "error.txt"), "w") as f:
# first the date and time
f.write(f"{datetime.datetime.now()}\n")
- # then the name of the task
- f.write(f"{self.name}\n")
# then the traceback
f.write(traceback.format_exc())
return False
diff --git a/geest/core/workflow_factory.py b/geest/core/workflow_factory.py
index 5d8d696..f92f8f2 100644
--- a/geest/core/workflow_factory.py
+++ b/geest/core/workflow_factory.py
@@ -59,8 +59,7 @@ def create_workflow(
attributes = item.attributes()
log_message(f"Workflow Factory Called")
log_message(f"-----------------------")
- for key, value in attributes.items():
- log_message(f"{key}: {value}")
+ log_message(f"{item.attributesAsMarkdown()}")
log_message(f"-----------------------")
analysis_mode = attributes.get("analysis_mode", "")
diff --git a/geest/core/workflow_job.py b/geest/core/workflow_job.py
index 8bc0c53..6705e9f 100644
--- a/geest/core/workflow_job.py
+++ b/geest/core/workflow_job.py
@@ -90,7 +90,7 @@ def run(self) -> bool:
level=Qgis.Info,
)
attributes = self._item.attributes()
- log_message(f"{attributes}")
+ log_message(f"{self._item.attributesAsMarkdown()}")
if result:
log_message(
f"Workflow {self.description()} completed.",
diff --git a/geest/core/workflows/analysis_aggregation_workflow.py b/geest/core/workflows/analysis_aggregation_workflow.py
index 57c27d7..c4698e4 100644
--- a/geest/core/workflows/analysis_aggregation_workflow.py
+++ b/geest/core/workflows/analysis_aggregation_workflow.py
@@ -2,6 +2,7 @@
from qgis.core import QgsFeedback, QgsProcessingContext
from qgis.analysis import QgsRasterCalculator, QgsRasterCalculatorEntry
from .aggregation_workflow_base import AggregationWorkflowBase
+from geest.core.algorithms import PopulationRasterProcessingTask, WEEScoreProcessingTask
from geest.utilities import resources_path
from geest.core import JsonTreeItem
@@ -43,3 +44,20 @@ def __init__(
self.layer_id = "wee"
self.weight_key = "dimension_weighting"
self.workflow_name = "analysis_aggregation"
+ # Prepare the population data if provided
+ self.population_data = self.item.attribute("population_layer_source", None)
+ population_processor = PopulationRasterProcessingTask(
+ population_raster_path=self.population_data,
+ working_directory=self.working_directory,
+ study_area_gpkg_path=self.gpkg_path,
+ cell_size_m=self.cell_size_m,
+ target_crs=self.target_crs,
+ feedback=self.feedback,
+ )
+ population_processor.run()
+ wee_processor = WEEScoreProcessingTask(
+ study_area_gpkg_path=self.gpkg_path,
+ working_directory=self.working_directory,
+ force_clear=False,
+ )
+ wee_processor.run()
diff --git a/geest/gui/panels/create_project_panel.py b/geest/gui/panels/create_project_panel.py
index 97e1c9e..6e590cc 100644
--- a/geest/gui/panels/create_project_panel.py
+++ b/geest/gui/panels/create_project_panel.py
@@ -178,7 +178,6 @@ def create_project(self):
try:
processor = StudyAreaProcessingTask(
- name="Study Area Processing",
layer=layer,
field_name=field_name,
cell_size_m=self.cell_size_spinbox.value(),
diff --git a/geest/gui/panels/setup_panel.py b/geest/gui/panels/setup_panel.py
index bbceb22..ba2bbb2 100644
--- a/geest/gui/panels/setup_panel.py
+++ b/geest/gui/panels/setup_panel.py
@@ -1,14 +1,8 @@
from PyQt5.QtWidgets import (
QWidget,
)
-from qgis.core import (
- Qgis,
-)
from qgis.PyQt.QtCore import pyqtSignal
-from qgis.PyQt.QtGui import QPixmap
-from geest.core.tasks import StudyAreaProcessingTask, OrsCheckerTask
from geest.utilities import get_ui_class, resources_path, log_message
-from geest.core import WorkflowQueueManager
from geest.gui.widgets import CustomBannerLabel
FORM_CLASS = get_ui_class("setup_panel_base.ui")
diff --git a/geest/gui/panels/tree_panel.py b/geest/gui/panels/tree_panel.py
index 328c8d2..2f5fd02 100644
--- a/geest/gui/panels/tree_panel.py
+++ b/geest/gui/panels/tree_panel.py
@@ -215,6 +215,13 @@ def on_previous_button_clicked(self):
def on_next_button_clicked(self):
self.switch_to_next_tab.emit()
+ def clear_item(self):
+ """Clear the outputs for a single item."""
+ index = self.treeView.currentIndex()
+ item = index.internalPointer()
+ item.clear(recursive=False)
+ self.save_json_to_working_directory()
+
def clear_workflows(self):
"""
Recursively mark workflows as not done, delete their working directories and their file_paths.
@@ -300,7 +307,7 @@ def working_directory_changed(self, new_directory):
# If this is a first time use of the analysis project lets set some things up
analysis_item = self.model.rootItem.child(0)
analysis_data = analysis_item.attributes()
- log_message(str(analysis_data))
+ log_message(analysis_item.attributesAsMarkdown())
if analysis_data.get("working_folder", "Not Set"):
analysis_data["working_folder"] = self.working_directory
else:
@@ -441,7 +448,8 @@ def update_action_text():
# Update initially
update_action_text()
-
+ clear_item_action = QAction("Clear Item", self)
+ clear_item_action.triggered.connect(self.clear_item)
clear_results_action = QAction("Clear Results", self)
clear_results_action.triggered.connect(self.clear_workflows)
@@ -464,6 +472,7 @@ def update_action_text():
) # Connect to method
menu.addAction(edit_analysis_action)
menu.addAction(show_json_attributes_action)
+ menu.addAction(clear_item_action)
menu.addAction(clear_results_action)
menu.addAction(run_item_action)
menu.addAction(add_to_map_action)
@@ -501,6 +510,7 @@ def update_action_text():
menu = QMenu(self)
menu.addAction(edit_aggregation_action)
menu.addAction(show_json_attributes_action)
+ menu.addAction(clear_item_action)
menu.addAction(add_to_map_action)
menu.addAction(run_item_action)
menu.addAction(disable_action)
@@ -526,6 +536,7 @@ def update_action_text():
menu = QMenu(self)
menu.addAction(edit_aggregation_action)
menu.addAction(show_json_attributes_action)
+ menu.addAction(clear_item_action)
menu.addAction(add_to_map_action)
menu.addAction(run_item_action)
menu.addAction(disable_action)
@@ -549,6 +560,7 @@ def update_action_text():
menu = QMenu(self)
menu.addAction(show_properties_action)
menu.addAction(show_json_attributes_action)
+ menu.addAction(clear_item_action)
menu.addAction(add_to_map_action)
menu.addAction(run_item_action)
menu.addAction(disable_action)
@@ -812,24 +824,30 @@ def add_study_area_to_map(self):
) # Insert at the top of the layers panel
layers = [
- "study_area_bbox",
- "study_area_bboxes",
"study_area_polygons",
+ "study_area_clip_polygons",
"study_area_grid",
+ "study_area_bboxes",
+ "study_area_bbox",
]
for layer_name in layers:
gpkg_layer_path = f"{gpkg_path}|layername={layer_name}"
layer = QgsVectorLayer(gpkg_layer_path, layer_name, "ogr")
- if layer.isValid():
- QgsProject.instance().addMapLayer(layer)
- log_message(f"Added '{layer_name}' layer to the map.")
- else:
+ if not layer.isValid():
log_message(
f"Failed to add '{layer_name}' layer to the map.",
tag="Geest",
level=Qgis.Critical,
)
+ continue
+
+ source_qml = resources_path("resources", "qml", f"{layer_name}.qml")
+ result = layer.loadNamedStyle(source_qml)
+ if result[0]: # loadNamedStyle returns (success, error_message)
+ print(f"Successfully applied QML style to layer '{layer_name}'")
+ else:
+ print(f"Failed to apply QML style: {result[1]}")
# Check if a layer with the same data source exists in the correct group
existing_layer = None
diff --git a/geest/resources/qml/population_3_classes.qml b/geest/resources/qml/population_3_classes.qml
new file mode 100644
index 0000000..562f528
--- /dev/null
+++ b/geest/resources/qml/population_3_classes.qml
@@ -0,0 +1,156 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ None
+ WholeRaster
+ Estimated
+ 0.02
+ 0.98
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ resamplingFilter
+
+ 0
+
diff --git a/geest/resources/qml/study_area_bbox.qml b/geest/resources/qml/study_area_bbox.qml
new file mode 100644
index 0000000..03f009c
--- /dev/null
+++ b/geest/resources/qml/study_area_bbox.qml
@@ -0,0 +1,424 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "area_name"
+
+ 2
+
diff --git a/geest/resources/qml/study_area_bboxes.qml b/geest/resources/qml/study_area_bboxes.qml
new file mode 100644
index 0000000..159f610
--- /dev/null
+++ b/geest/resources/qml/study_area_bboxes.qml
@@ -0,0 +1,424 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "area_name"
+
+ 2
+
diff --git a/geest/resources/qml/study_area_clip_polygons.qml b/geest/resources/qml/study_area_clip_polygons.qml
new file mode 100644
index 0000000..06987f8
--- /dev/null
+++ b/geest/resources/qml/study_area_clip_polygons.qml
@@ -0,0 +1,424 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "area_name"
+
+ 2
+
diff --git a/geest/resources/qml/study_area_grid.qml b/geest/resources/qml/study_area_grid.qml
new file mode 100644
index 0000000..e8cdb52
--- /dev/null
+++ b/geest/resources/qml/study_area_grid.qml
@@ -0,0 +1,424 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "area_name"
+
+ 2
+
diff --git a/geest/resources/qml/study_area_polygons.qml b/geest/resources/qml/study_area_polygons.qml
new file mode 100644
index 0000000..38802d9
--- /dev/null
+++ b/geest/resources/qml/study_area_polygons.qml
@@ -0,0 +1,548 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "area_name"
+
+ 2
+
diff --git a/geest/ui/create_project_panel_base.ui b/geest/ui/create_project_panel_base.ui
index cb5846e..dca11c2 100644
--- a/geest/ui/create_project_panel_base.ui
+++ b/geest/ui/create_project_panel_base.ui
@@ -6,7 +6,7 @@
0
0
- 551
+ 554
884
@@ -198,7 +198,7 @@
- 10
+ 1
100000
diff --git a/test/test_data/wee_score/_combined.qml b/test/test_data/wee_score/_combined.qml
new file mode 100644
index 0000000..05c5c53
--- /dev/null
+++ b/test/test_data/wee_score/_combined.qml
@@ -0,0 +1,176 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ None
+ WholeRaster
+ Estimated
+ 0.02
+ 0.98
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+