From a10943142c4b47ca1ea384567fce8a163b7d0597 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@kartoza.com>
Date: Fri, 8 Nov 2024 16:04:23 +0000
Subject: [PATCH 1/2] Implement Make the select country more clear #577

---
 geest/gui/panels/setup_panel.py | 18 ++++++++++
 geest/ui/setup_panel_base.ui    | 62 +++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/geest/gui/panels/setup_panel.py b/geest/gui/panels/setup_panel.py
index 2a79b9b..013dc94 100644
--- a/geest/gui/panels/setup_panel.py
+++ b/geest/gui/panels/setup_panel.py
@@ -85,8 +85,26 @@ def initUI(self):
             self.working_dir = self.previous_project_combo.currentText()
             self.set_project_directory()
 
+        self.load_boundary_button.clicked.connect(self.load_boundary)
+
         self.progress_bar.setVisible(False)
 
+    def load_boundary(self):
+        """Load a boundary layer from a file."""
+        file_dialog = QFileDialog()
+        file_dialog.setFileMode(QFileDialog.ExistingFile)
+        file_dialog.setNameFilter("GeoPackage (*.gpkg);;Shapefile (*.shp)")
+        if file_dialog.exec_():
+            file_path = file_dialog.selectedFiles()[0]
+            layer = QgsVectorLayer(file_path, "Boundary", "ogr")
+            if not layer.isValid():
+                QMessageBox.critical(
+                    self, "Error", "Could not load the boundary layer."
+                )
+                return
+            self.layer_combo.setLayer(layer)
+            self.field_combo.setLayer(layer)
+
     def select_directory(self):
         directory = QFileDialog.getExistingDirectory(
             self, "Select Working Directory", self.working_dir
diff --git a/geest/ui/setup_panel_base.ui b/geest/ui/setup_panel_base.ui
index b70e33c..f3dbb31 100644
--- a/geest/ui/setup_panel_base.ui
+++ b/geest/ui/setup_panel_base.ui
@@ -13,8 +13,8 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
     <widget class="QLabel" name="banner_label">
      <property name="text">
       <string/>
@@ -27,7 +27,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>**Geospatial Assessment of Women Employment and Business Opportunities in the Renewable Energy Sector**</string>
@@ -43,14 +43,14 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>To get started, we need to select a project folder. The contents of this folder will be managed by Geest. It will store the project file and the working analysis results.</string>
@@ -63,7 +63,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QPushButton" name="open_existing_project_button">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -76,7 +76,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0">
     <widget class="QToolButton" name="create_new_project_button">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -89,7 +89,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0">
     <widget class="QGroupBox" name="open_project_group">
      <property name="title">
       <string>Open an existing project folder</string>
@@ -115,27 +115,30 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="7" column="0">
     <widget class="QGroupBox" name="new_project_group">
      <property name="title">
       <string>Start a new project</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="label_4">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="project_path_label">
         <property name="text">
          <string>The folder you select should be empty.</string>
         </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0" colspan="2">
        <widget class="QPushButton" name="create_project_directory_button">
         <property name="text">
          <string>📂 Create or select a project directory</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0" colspan="2">
        <widget class="QLabel" name="label_8">
         <property name="text">
          <string>If you do not have a boundary layer you can quickly add one using the button below:</string>
@@ -145,14 +148,14 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="3" column="0" colspan="2">
        <widget class="QPushButton" name="world_map_button">
         <property name="text">
          <string>Add World Layer</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="4" column="0" colspan="2">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>For new projects you need to select a boundary layer ...</string>
@@ -162,10 +165,17 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="5" column="0">
        <widget class="QgsMapLayerComboBox" name="layer_combo"/>
       </item>
-      <item>
+      <item row="5" column="1">
+       <widget class="QToolButton" name="load_boundary_button">
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0" colspan="2">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>... and the boundary name column:</string>
@@ -175,17 +185,17 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="7" column="0" colspan="2">
        <widget class="QgsFieldComboBox" name="field_combo"/>
       </item>
-      <item>
+      <item row="8" column="0" colspan="2">
        <widget class="QCheckBox" name="use_boundary_crs">
         <property name="text">
          <string>Use Coordinate Reference System of your boundary layer</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="9" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QSpinBox" name="cell_size_spinbox">
@@ -215,7 +225,7 @@
         </item>
        </layout>
       </item>
-      <item>
+      <item row="10" column="0" colspan="2">
        <widget class="QLabel" name="label_9">
         <property name="text">
          <string>If needed, use the QGIS selection tool to **select your areas of interest** and then press continue to prepare the project. This may take a few minutes....</string>
@@ -228,7 +238,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="11" column="0" colspan="2">
        <widget class="QPushButton" name="prepare_project_button">
         <property name="text">
          <string>⚙️ Prepare project</string>
@@ -238,7 +248,7 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="8" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -251,14 +261,14 @@
      </property>
     </spacer>
    </item>
-   <item>
+   <item row="9" column="0">
     <widget class="QProgressBar" name="progress_bar">
      <property name="value">
       <number>0</number>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="11" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>This plugin is built with support from the Canada Clean Energy and Forest Climate Facility (CCEFCFy), the Geospatial Operational Support Team (GOST, DECSC) for the project Geospatial Assessment of Women Employment and Business Opportunities in the Renewable Energy Sector.   </string>

From 435d75e096b00812250011ffd9b1ee26a74642a9 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@kartoza.com>
Date: Fri, 8 Nov 2024 16:13:52 +0000
Subject: [PATCH 2/2] Fix boundary layer selection

---
 geest/gui/panels/setup_panel.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/geest/gui/panels/setup_panel.py b/geest/gui/panels/setup_panel.py
index e79c4af..bfce728 100644
--- a/geest/gui/panels/setup_panel.py
+++ b/geest/gui/panels/setup_panel.py
@@ -93,7 +93,7 @@ def load_boundary(self):
         """Load a boundary layer from a file."""
         file_dialog = QFileDialog()
         file_dialog.setFileMode(QFileDialog.ExistingFile)
-        file_dialog.setNameFilter("GeoPackage (*.gpkg);;Shapefile (*.shp)")
+        file_dialog.setNameFilter("Shapefile (*.shp);;GeoPackage (*.gpkg)")
         if file_dialog.exec_():
             file_path = file_dialog.selectedFiles()[0]
             layer = QgsVectorLayer(file_path, "Boundary", "ogr")
@@ -102,6 +102,8 @@ def load_boundary(self):
                     self, "Error", "Could not load the boundary layer."
                 )
                 return
+            # Load the layer in QGIS
+            QgsProject.instance().addMapLayer(layer)
             self.layer_combo.setLayer(layer)
             self.field_combo.setLayer(layer)