diff --git a/CHANGES.rst b/CHANGES.rst index 89077d69..1c452ad3 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,7 +10,7 @@ - Sideview: X marker and red path remain when different maptool is selected (#891) - Sideview: Water colors now different for each result (#891) - Sideview: autoscale now takes culvert into account (#891) -- Sideview: minor changes in look&feel (#891) +- Sideview: minor changes in look&feel (#891, #900) - Sideview: current route is now kept when maptool is deselected (#891) - Graph: added batch delete option (#884) - Graph: features with same id, but different layer should have different color (#895) @@ -20,7 +20,7 @@ - Visualization: Remove legend subgroup hidden feature (#769) - Visualization: fix TypeError for result without net cumulative discharge (#903) - Water balance: enable selection of multipolygons (#885) - +- Results: changed notification when working directory not set in settings (#899) 3.1.8 (2023-09-04) ------------------ diff --git a/gui/threedi_plugin_grid_result_dialog.py b/gui/threedi_plugin_grid_result_dialog.py index 06ddc650..3e390a99 100644 --- a/gui/threedi_plugin_grid_result_dialog.py +++ b/gui/threedi_plugin_grid_result_dialog.py @@ -10,7 +10,6 @@ from qgis.core import QgsSettings from qgis.PyQt.QtGui import QStandardItemModel, QStandardItem from threedi_results_analysis.utils.workingdir import list_local_schematisations -from threedi_results_analysis.utils.user_messages import pop_up_critical logger = logging.getLogger(__name__) @@ -195,8 +194,9 @@ def refresh(self): self.model.clear() self.model.setHorizontalHeaderLabels(self.header_labels) threedi_working_dir = QgsSettings().value("threedi/working_dir", "") + self.messageLabel.setText("") if not threedi_working_dir: - pop_up_critical("3Di Working Directory not yet set. Please set this in the 3Di Models & Simulations settings.") + self.messageLabel.setText("Please set your 3Di working directory in the 3Di Models & Simulations settings to be able to load computational grids and results from your 3Di working directory.") return local_schematisations = list_local_schematisations(threedi_working_dir) diff --git a/gui/threedi_plugin_grid_result_dialog.ui b/gui/threedi_plugin_grid_result_dialog.ui index c26d8c04..366d7602 100644 --- a/gui/threedi_plugin_grid_result_dialog.ui +++ b/gui/threedi_plugin_grid_result_dialog.ui @@ -31,6 +31,19 @@ + + + + color : red; + + + + + + true + + +