diff --git a/DATA/PROJECT/Montue/Montue.ini b/DATA/PROJECT/Montue/Montue.ini index d5dd2a787..d217ea5ea 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/DATA/TEMPLATE/crop_default.db b/DATA/TEMPLATE/crop_default.db index e396c9a1f..f70b27a13 100644 Binary files a/DATA/TEMPLATE/crop_default.db and b/DATA/TEMPLATE/crop_default.db differ diff --git a/agrolib/project/project.cpp b/agrolib/project/project.cpp index 7ef9dd2ac..dc86f2746 100644 --- 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 index 42aca58fe..5d18a6462 100644 --- 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"); }