diff --git a/geest/core/workflows/default_index_score_workflow.py b/geest/core/workflows/default_index_score_workflow.py index 34446a46..61670cb6 100644 --- a/geest/core/workflows/default_index_score_workflow.py +++ b/geest/core/workflows/default_index_score_workflow.py @@ -39,7 +39,7 @@ def __init__( super().__init__( item, cell_size_m, feedback, context ) # ⭐️ Item is a reference - whatever you change in this item will directly update the tree - self.index_score = int( + self.index_score = float( (self.attributes.get("default_index_score", 0) / 100) * 5 ) self.features_layer = True # Normally we would set this to a QgsVectorLayer but in this workflow it is not needed diff --git a/geest/gui/panels/create_project_panel.py b/geest/gui/panels/create_project_panel.py index cca8b13d..ff8037fa 100644 --- a/geest/gui/panels/create_project_panel.py +++ b/geest/gui/panels/create_project_panel.py @@ -53,6 +53,9 @@ def initUI(self): self.banner_label.setPixmap( QPixmap(resources_path("resources", "geest-banner.png")) ) + self.folder_status_label.setPixmap( + QPixmap(resources_path("resources", "icons", "failed.svg")) + ) self.layer_combo.setFilters(QgsMapLayerProxyModel.PolygonLayer) # self.field_combo = QgsFieldComboBox() # QgsFieldComboBox for selecting fields @@ -109,6 +112,9 @@ def create_new_project_folder(self): ) # Update last used project self.project_path_label.setText(directory) self.create_project_directory_button.setText("📂 Change Project Folder") + self.folder_status_label.setPixmap( + QPixmap(resources_path("resources", "icons", "completed-success.svg")) + ) def create_project(self): """Triggered when the Continue button is pressed.""" diff --git a/geest/ui/create_project_panel_base.ui b/geest/ui/create_project_panel_base.ui index 13158c86..731e46e3 100644 --- a/geest/ui/create_project_panel_base.ui +++ b/geest/ui/create_project_panel_base.ui @@ -14,44 +14,88 @@ Form - - - + + + + + + + ../resources/geest-banner.png + + true + + + + + + <html><head/><body><p align="center"><span style=" font-size:16pt; font-weight:600;">GEEST Project Creation</span></p></body></html> + + + Qt::RichText + + + Qt::AlignCenter + + + true + + + + + + + Qt::Horizontal + + + + + 16 - - 10 - - - 100000 + + <html><head/><body><p><span style=" font-size:12pt;">A GEEST project is simply a folder with files that are managed by the GEEST plugin. The outputs and working files created during the analysis will be stored in this folder. </span><span style=" font-size:12pt; font-weight:600;">It needs to be an empty folder that contains no other files.</span></p></body></html> - - 100 + + Qt::AlignJustify|Qt::AlignTop - - 100 + + true - - - - - 0 - 0 - + + + + + 16 + - + <html><head/><body><p><span style=" font-size:12pt;">Now select a layer containing the </span><span style=" font-size:12pt; font-weight:600;">Admin0</span><span style=" font-size:12pt;"> boundary for your study area and the column in your dataset with the name of our area.</span></p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true - + + + + + 16 + + + + + @@ -63,7 +107,14 @@ - + + + + Use Coordinate Reference System of your boundary layer + + + + true @@ -82,32 +133,85 @@ - - + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + true + 16 - - <html><head/><body><p><span style=" font-size:12pt;">Now select a layer containing the </span><span style=" font-size:12pt; font-weight:600;">Admin0</span><span style=" font-size:12pt;"> boundary for your study area and the column in your dataset with the name of our area.</span></p></body></html> + + 10 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + 100000 - - true + + 100 + + + 100 - - - - Qt::Horizontal + + + + + 16 + - + + + + + + + 32 + 32 + + + + TextLabel + + + true + + + + + + + + 16 + + + + 📂 Create or select a project directory + + + + + + @@ -166,101 +270,17 @@ - - - - - 16 - - - - - - - - Use Coordinate Reference System of your boundary layer + + + + + 0 + 0 + - - - - - - ../resources/geest-banner.png - - - true - - - - - - - - 16 - - - - - - - - - 16 - - - - <html><head/><body><p><span style=" font-size:12pt;">A GEEST project is simply a folder with files that are managed by the GEEST plugin. The outputs and working files created during the analysis will be stored in this folder. </span><span style=" font-size:12pt; font-weight:600;">It needs to be an empty folder that contains no other files.</span></p></body></html> - - - Qt::AlignJustify|Qt::AlignTop - - - true - - - - - - - <html><head/><body><p align="center"><span style=" font-size:16pt; font-weight:600;">GEEST Project Creation</span></p></body></html> - - - Qt::RichText - - - Qt::AlignCenter - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 16 - - - - 📂 Create or select a project directory - diff --git a/geest/ui/insights_panel_base.ui b/geest/ui/insights_panel_base.ui new file mode 100644 index 00000000..1faabb44 --- /dev/null +++ b/geest/ui/insights_panel_base.ui @@ -0,0 +1,262 @@ + + + SetupPanelBase + + + + 0 + 0 + 560 + 848 + + + + Form + + + + + + + + + ../resources/geest-banner.png + + + true + + + + + + + <html><head/><body><p align="center"><span style=" font-size:16pt; font-weight:600;">GEEST Insights</span></p></body></html> + + + Qt::RichText + + + Qt::AlignCenter + + + true + + + + + + + Qt::Horizontal + + + + + + + + 16 + + + + <html><head/><body><p>Geest Insights enable the user to obtain further refined insights from the score rasters produced in the previous analysis based on discrete descriptive classes. Population data can also be combined with the discrete score output dataset, allowing for more nuanced insights that account for both the level of enablement and population. Additionally, you have the option to aggregate results based on specific boundaries of interest.</p></body></html> + + + Qt::AlignJustify|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + + 20 + 132 + + + + + + + + Subnational Boundaries (Optional) + + + + + + + + + + 14 + + + + + + + + ... + + + + + + + + + Population + + + + + + + + + + 14 + + + + + + + + ... + + + + + + + + + RE Zoning Raster + + + + + + + + + + 14 + + + + + + + + ... + + + + + + + + + RE Zoning Points + + + + + + + + + + 14 + + + + + + + + ... + + + + + + + + + Qt::Vertical + + + + 20 + 132 + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16 + + + + ◀️ + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 16 + + + + ▶️ + + + + + + + + + +