update 3D

ARPA-SIMC · Jul 24, 2024 · ec21ef5 · ec21ef5
1 parent 81a08f6
commit ec21ef5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/DATA/PROJECT/Montue/Montue.ini b/DATA/PROJECT/Montue/Montue.ini
@@ -21,4 +21,9 @@ output_points=./outputPoints/outPoints.csv
 [settings]
 parameters_file=./SETTINGS/parameters.ini
 log_file=./LOG/Montue.txt
-tile_map=GOOGLE
+tile_map=GOOGLE
+
+[output]
+waterContent=20,40,55,65,95,105,115,125,140
+waterPotential=20,55,65,115,125
+factorOfSafety=20,55,65,95,105,115,125
diff --git a/DATA/TEMPLATE/crop_default.db b/DATA/TEMPLATE/crop_default.db
diff --git a/agrolib/project/project.cpp b/agrolib/project/project.cpp
@@ -1102,7 +1102,8 @@ bool Project::loadDEM(QString myFileName)
 
     setProxyDEM();
     interpolationSettings.setProxyLoaded(false);
-    if (! updateProxy()) return false;
+    if (! updateProxy())
+        return false;
 
     //set interpolation settings DEM
     interpolationSettings.setCurrentDEM(&DEM);
@@ -1899,7 +1900,7 @@ bool Project::loadProxyGrids()
             }
             else
             {
-                errorString = "Error loading proxy grid " + fileName;
+                errorString = "Error loading raster proxy:\n" + fileName + "\nHow to fix it: check the proxy section in the parameters.ini";
                 return false;
             }
 
@@ -1972,13 +1973,11 @@ bool Project::updateProxy()
     {
         if (! interpolationSettings.getProxyLoaded())
         {
-            if (loadProxyGrids())
-            {
-                interpolationSettings.setProxyLoaded(true);
-            }
-            else
+            if (! loadProxyGrids())
                 return false;
 
+            interpolationSettings.setProxyLoaded(true);
+
             if (meteoPointsDbHandler != nullptr)
             {
                 if (! readProxyValues())

diff --git a/bin/CRITERIA3D/mainwindow.cpp b/bin/CRITERIA3D/mainwindow.cpp
@@ -835,7 +835,7 @@ void MainWindow::on_actionOpenProject_triggered()
 
     if (! myProject.loadCriteria3DProject(fileName))
     {
-        myProject.logError("Error opening project: " + myProject.errorString);
+        myProject.logError("*** Error opening the project! ***\n" + myProject.errorString);
         myProject.loadCriteria3DProject(myProject.getApplicationPath() + "default.ini");
     }