diff -Nru saga-8.2.1+dfsg/debian/changelog saga-8.2.2+dfsg/debian/changelog --- saga-8.2.1+dfsg/debian/changelog 2022-06-11 15:24:11.000000000 +0000 +++ saga-8.2.2+dfsg/debian/changelog 2022-06-16 08:06:47.000000000 +0000 @@ -1,3 +1,11 @@ +saga (8.2.2+dfsg-1) unstable; urgency=medium + + * New upstream release. + * Remove patches (applied upstream) + * Skip running autoreconf during build + + -- Johan Van de Wauw Thu, 16 Jun 2022 10:06:47 +0200 + saga (8.2.1+dfsg-3) unstable; urgency=medium * Team upload. diff -Nru saga-8.2.1+dfsg/debian/copyright saga-8.2.2+dfsg/debian/copyright --- saga-8.2.1+dfsg/debian/copyright 2022-05-17 04:53:57.000000000 +0000 +++ saga-8.2.2+dfsg/debian/copyright 2022-06-15 11:41:18.000000000 +0000 @@ -14,7 +14,6 @@ saga-gis/src/tools/imagery/imagery_svm/svm/svm.h saga-gis/src/tools/io/io_shapes_dxf/dxflib/* saga-gis/src/tools/simulation/sim_fire_spreading/fireLib.* - saga-gis/src/tools/shapes/shapes_lines_ex/ Files: * Copyright: SAGA Development Team diff -Nru saga-8.2.1+dfsg/debian/patches/fix_module_path.patch saga-8.2.2+dfsg/debian/patches/fix_module_path.patch --- saga-8.2.1+dfsg/debian/patches/fix_module_path.patch 2022-05-31 07:57:35.000000000 +0000 +++ saga-8.2.2+dfsg/debian/patches/fix_module_path.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Fix search path for modules -Author: Johan Van de Wauw -Forwarded: https://sourceforge.net/p/saga-gis/code/merge-requests/26/ - ---- a/saga-gis/src/saga_core/CMakeLists.txt -+++ b/saga-gis/src/saga_core/CMakeLists.txt -@@ -2,7 +2,7 @@ message(STATUS "folder: saga_core") - - if(NOT MSVC) # unix like systems - # define lib and share path for saga_cmd and saga_gui -- set(MTOOLSPATH "TOOLS_PATH=\"${CMAKE_INSTALL_PREFIX}/lib/saga\"") -+ set(MTOOLSPATH "TOOLS_PATH=\"${CMAKE_INSTALL_FULL_LIBDIR}/saga\"") - set(MSHAREPATH "SHARE_PATH=\"${CMAKE_INSTALL_PREFIX}/share/saga\"") - endif() - diff -Nru saga-8.2.1+dfsg/debian/patches/gdal-multiarch.patch saga-8.2.2+dfsg/debian/patches/gdal-multiarch.patch --- saga-8.2.1+dfsg/debian/patches/gdal-multiarch.patch 2022-06-11 15:23:14.000000000 +0000 +++ saga-8.2.2+dfsg/debian/patches/gdal-multiarch.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Add support for GDAL 3.5.0 Multi-Arch path. -Author: Bas Couwenberg -Bug-Debian: https://bugs.debian.org/1012675 -Forwarded: https://sourceforge.net/p/saga-gis/bugs/294/ - ---- a/saga-gis/cmake/modules/FindGDAL.cmake -+++ b/saga-gis/cmake/modules/FindGDAL.cmake -@@ -176,7 +176,7 @@ ELSE(WIN32) - SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE) - ENDIF (NOT GDAL_LIBRARY) - ELSE (APPLE) -- FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} PATHS ${GDAL_LINK_DIRECTORIES}/lib) -+ FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} gdal PATHS ${GDAL_LINK_DIRECTORIES}/lib ${GDAL_LINK_DIRECTORIES}) - ENDIF (APPLE) - - ELSE(GDAL_CONFIG) diff -Nru saga-8.2.1+dfsg/debian/patches/imagery_svm.patch saga-8.2.2+dfsg/debian/patches/imagery_svm.patch --- saga-8.2.1+dfsg/debian/patches/imagery_svm.patch 2022-05-17 04:53:58.000000000 +0000 +++ saga-8.2.2+dfsg/debian/patches/imagery_svm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Fix imagery_svm build. -Author: Bas Couwenberg -Applied-Upstream: https://sourceforge.net/p/saga-gis/code/merge-requests/25/ - ---- a/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt -+++ b/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt -@@ -10,6 +10,8 @@ if(WITH_TOOLS) - if(NOT SVM_FOUND) - set(SAGA_TOOL_CUSTOM_SOURCE_LIST ./svm/svm.cpp) - set(SAGA_TOOL_CUSTOM_HEADER_LIST ./svm/svm.h) -+ else() -+ add_compile_definitions(SYSTEM_SVM) - endif() - - include(../../CMakePluginTemplate.cmake) # load common tool template diff -Nru saga-8.2.1+dfsg/debian/patches/multiarch_cmake.patch saga-8.2.2+dfsg/debian/patches/multiarch_cmake.patch --- saga-8.2.1+dfsg/debian/patches/multiarch_cmake.patch 2022-05-17 04:53:58.000000000 +0000 +++ saga-8.2.2+dfsg/debian/patches/multiarch_cmake.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,443 +0,0 @@ -Description: Use Multi-Arch directory for libraries. -Author: Johan Van de Wauw -Applied-Upstream: https://sourceforge.net/p/saga-gis/code/merge-requests/24/ - ---- a/saga-gis/src/saga_core/saga_api/CMakeLists.txt -+++ b/saga-gis/src/saga_core/saga_api/CMakeLists.txt -@@ -163,7 +163,7 @@ set_target_properties(saga_api PROPERTIE - ) - - # where to install the library --install(TARGETS saga_api DESTINATION lib) -+install(TARGETS saga_api DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${SAGA_API_PUBLIC_HEADERS} DESTINATION include/saga/saga_api) - - if(MSVC) ---- a/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt -+++ b/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt -@@ -64,7 +64,7 @@ set_target_properties(saga_gdi PROPERTIE - SOVERSION ${SAGA_VERSION_MAJOR}) - - # where to install the binary --install(TARGETS saga_gdi DESTINATION lib) -+install(TARGETS saga_gdi DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${SAGA_GDI_PUBLIC_HEADERS} DESTINATION include/saga/saga_gdi) - - if(MSVC) ---- a/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt -+++ b/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt -@@ -72,4 +72,4 @@ else() # if(NOT MSVC) # expect g++ on Li - set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS -fPIC) - endif() - --install(TARGETS ${PROJECT_NAME} DESTINATION lib/saga) -+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/saga) ---- a/saga-gis/src/tools/CMakePluginTemplate.cmake -+++ b/saga-gis/src/tools/CMakePluginTemplate.cmake -@@ -40,7 +40,7 @@ target_compile_definitions(${PROJECT_NAM - # link saga_api - target_link_libraries(${PROJECT_NAME} saga_api) - --install(TARGETS ${PROJECT_NAME} DESTINATION lib/saga) -+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/saga) - - # reset variables - set(SAGA_TOOL_CUSTOM_SOURCE_LIST) ---- a/saga-gis/CMakeLists.txt -+++ b/saga-gis/CMakeLists.txt -@@ -53,6 +53,9 @@ include(shared_cmake/scripts/require-cpp - include(shared_cmake/scripts/enable_warnings.cmake) - include(shared_cmake/scripts/windows_version_info.cmake) - -+# Use GNU install dirs to support multiarch -+include(cmake/modules/GNUInstallDirs.cmake) -+ - # create windows resouce file - set(windows_version_rc "${CMAKE_BINARY_DIR}/win_version_info.rc") - gen_win_version_resource("${PROJECT_NAME}" "${windows_version_rc}" ---- /dev/null -+++ b/saga-gis/cmake/modules/GNUInstallDirs.cmake -@@ -0,0 +1,383 @@ -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -+# file Copyright.txt or https://cmake.org/licensing for details. -+ -+#[=======================================================================[.rst: -+GNUInstallDirs -+-------------- -+ -+Define GNU standard installation directories -+ -+Provides install directory variables as defined by the -+`GNU Coding Standards`_. -+ -+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html -+ -+Result Variables -+^^^^^^^^^^^^^^^^ -+ -+Inclusion of this module defines the following variables: -+ -+``CMAKE_INSTALL_`` -+ -+ Destination for files of a given type. This value may be passed to -+ the ``DESTINATION`` options of :command:`install` commands for the -+ corresponding file type. -+ -+``CMAKE_INSTALL_FULL_`` -+ -+ The absolute path generated from the corresponding ``CMAKE_INSTALL_`` -+ value. If the value is not already an absolute path, an absolute path -+ is constructed typically by prepending the value of the -+ :variable:`CMAKE_INSTALL_PREFIX` variable. However, there are some -+ `special cases`_ as documented below. -+ -+where ```` is one of: -+ -+``BINDIR`` -+ user executables (``bin``) -+``SBINDIR`` -+ system admin executables (``sbin``) -+``LIBEXECDIR`` -+ program executables (``libexec``) -+``SYSCONFDIR`` -+ read-only single-machine data (``etc``) -+``SHAREDSTATEDIR`` -+ modifiable architecture-independent data (``com``) -+``LOCALSTATEDIR`` -+ modifiable single-machine data (``var``) -+``RUNSTATEDIR`` -+ run-time variable data (``LOCALSTATEDIR/run``) -+``LIBDIR`` -+ object code libraries (``lib`` or ``lib64`` -+ or ``lib/`` on Debian) -+``INCLUDEDIR`` -+ C header files (``include``) -+``OLDINCLUDEDIR`` -+ C header files for non-gcc (``/usr/include``) -+``DATAROOTDIR`` -+ read-only architecture-independent data root (``share``) -+``DATADIR`` -+ read-only architecture-independent data (``DATAROOTDIR``) -+``INFODIR`` -+ info documentation (``DATAROOTDIR/info``) -+``LOCALEDIR`` -+ locale-dependent data (``DATAROOTDIR/locale``) -+``MANDIR`` -+ man documentation (``DATAROOTDIR/man``) -+``DOCDIR`` -+ documentation root (``DATAROOTDIR/doc/PROJECT_NAME``) -+ -+If the includer does not define a value the above-shown default will be -+used and the value will appear in the cache for editing by the user. -+ -+Special Cases -+^^^^^^^^^^^^^ -+ -+The following values of :variable:`CMAKE_INSTALL_PREFIX` are special: -+ -+``/`` -+ -+ For ```` other than the ``SYSCONFDIR``, ``LOCALSTATEDIR`` and -+ ``RUNSTATEDIR``, the value of ``CMAKE_INSTALL_`` is prefixed -+ with ``usr/`` if it is not user-specified as an absolute path. -+ For example, the ``INCLUDEDIR`` value ``include`` becomes ``usr/include``. -+ This is required by the `GNU Coding Standards`_, which state: -+ -+ When building the complete GNU system, the prefix will be empty -+ and ``/usr`` will be a symbolic link to ``/``. -+ -+``/usr`` -+ -+ For ```` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or -+ ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_`` is computed by -+ prepending just ``/`` to the value of ``CMAKE_INSTALL_`` -+ if it is not user-specified as an absolute path. -+ For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc``. -+ This is required by the `GNU Coding Standards`_. -+ -+``/opt/...`` -+ -+ For ```` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or -+ ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_`` is computed by -+ *appending* the prefix to the value of ``CMAKE_INSTALL_`` -+ if it is not user-specified as an absolute path. -+ For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc/opt/...``. -+ This is defined by the `Filesystem Hierarchy Standard`_. -+ -+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html -+ -+Macros -+^^^^^^ -+ -+.. command:: GNUInstallDirs_get_absolute_install_dir -+ -+ :: -+ -+ GNUInstallDirs_get_absolute_install_dir(absvar var) -+ -+ Set the given variable ``absvar`` to the absolute path contained -+ within the variable ``var``. This is to allow the computation of an -+ absolute path, accounting for all the special cases documented -+ above. While this macro is used to compute the various -+ ``CMAKE_INSTALL_FULL_`` variables, it is exposed publicly to -+ allow users who create additional path variables to also compute -+ absolute paths where necessary, using the same logic. -+#]=======================================================================] -+ -+cmake_policy(PUSH) -+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced -+ -+# Convert a cache variable to PATH type -+ -+macro(_GNUInstallDirs_cache_convert_to_path var description) -+ get_property(_GNUInstallDirs_cache_type CACHE ${var} PROPERTY TYPE) -+ if(_GNUInstallDirs_cache_type STREQUAL "UNINITIALIZED") -+ file(TO_CMAKE_PATH "${${var}}" _GNUInstallDirs_cmakepath) -+ set_property(CACHE ${var} PROPERTY TYPE PATH) -+ set_property(CACHE ${var} PROPERTY VALUE "${_GNUInstallDirs_cmakepath}") -+ set_property(CACHE ${var} PROPERTY HELPSTRING "${description}") -+ unset(_GNUInstallDirs_cmakepath) -+ endif() -+ unset(_GNUInstallDirs_cache_type) -+endmacro() -+ -+# Create a cache variable with default for a path. -+macro(_GNUInstallDirs_cache_path var default description) -+ if(NOT DEFINED ${var}) -+ set(${var} "${default}" CACHE PATH "${description}") -+ endif() -+ _GNUInstallDirs_cache_convert_to_path("${var}" "${description}") -+endmacro() -+ -+# Create a cache variable with not default for a path, with a fallback -+# when unset; used for entries slaved to other entries such as -+# DATAROOTDIR. -+macro(_GNUInstallDirs_cache_path_fallback var default description) -+ if(NOT ${var}) -+ set(${var} "" CACHE PATH "${description}") -+ set(${var} "${default}") -+ endif() -+ _GNUInstallDirs_cache_convert_to_path("${var}" "${description}") -+endmacro() -+ -+# Installation directories -+# -+ -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin" -+ "User executables (bin)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin" -+ "System admin executables (sbin)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec" -+ "Program executables (libexec)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc" -+ "Read-only single-machine data (etc)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_SHAREDSTATEDIR "com" -+ "Modifiable architecture-independent data (com)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_LOCALSTATEDIR "var" -+ "Modifiable single-machine data (var)") -+ -+# We check if the variable was manually set and not cached, in order to -+# allow projects to set the values as normal variables before including -+# GNUInstallDirs to avoid having the entries cached or user-editable. It -+# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the -+# other cases. -+# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the -+# variable is a normal one, otherwise it is a cache one. -+get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET) -+if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set -+ AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX -+ AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}")) -+ # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed. -+ # Otherwise: -+ # * if _libdir_set is false it is not executed (meaning that it is -+ # not a cache variable) -+ # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is -+ # not executed -+ # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and -+ # CMAKE_INSTALL_PREFIX are the same string it is not executed. -+ # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the -+ # execution, of this part of code, therefore at the next inclusion -+ # of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings -+ # are equal, meaning that the if is not executed the code the -+ # second time. -+ -+ set(_LIBDIR_DEFAULT "lib") -+ # Override this default 'lib' with 'lib64' iff: -+ # - we are on Linux system but NOT cross-compiling -+ # - we are NOT on debian -+ # - we are on a 64 bits system -+ # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI -+ # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -+ # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" -+ # and CMAKE_INSTALL_PREFIX is "/usr" -+ # See http://wiki.debian.org/Multiarch -+ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) -+ set(__LAST_LIBDIR_DEFAULT "lib") -+ # __LAST_LIBDIR_DEFAULT is the default value that we compute from -+ # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for -+ # the value that was last used as the default. -+ # This value is used to figure out whether the user changed the -+ # CMAKE_INSTALL_LIBDIR value manually, or if the value was the -+ # default one. When CMAKE_INSTALL_PREFIX changes, the value is -+ # updated to the new default, unless the user explicitly changed it. -+ endif() -+ if (NOT DEFINED CMAKE_SYSTEM_NAME OR NOT DEFINED CMAKE_SIZEOF_VOID_P) -+ message(AUTHOR_WARNING -+ "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. " -+ "Please enable at least one language before including GNUInstallDirs.") -+ endif() -+ if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" -+ AND NOT CMAKE_CROSSCOMPILING -+ AND NOT EXISTS "/etc/arch-release") -+ if (EXISTS "/etc/debian_version") # is this a debian system ? -+ if(CMAKE_LIBRARY_ARCHITECTURE) -+ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") -+ set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -+ endif() -+ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX -+ AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") -+ set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -+ endif() -+ endif() -+ else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -+ set(_LIBDIR_DEFAULT "lib64") -+ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) -+ set(__LAST_LIBDIR_DEFAULT "lib64") -+ endif() -+ endif() -+ endif() -+ endif() -+ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) -+ set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})") -+ elseif(DEFINED __LAST_LIBDIR_DEFAULT -+ AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}") -+ set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}") -+ endif() -+endif() -+_GNUInstallDirs_cache_convert_to_path(CMAKE_INSTALL_LIBDIR "Object code libraries (lib)") -+ -+# Save for next run -+set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run") -+unset(_libdir_set) -+unset(__LAST_LIBDIR_DEFAULT) -+ -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include" -+ "C header files (include)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" -+ "C header files for non-gcc (/usr/include)") -+_GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share" -+ "Read-only architecture-independent data root (share)") -+ -+#----------------------------------------------------------------------------- -+# Values whose defaults are relative to DATAROOTDIR. Store empty values in -+# the cache and store the defaults in local variables if the cache values are -+# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes. -+ -+_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}" -+ "Read-only architecture-independent data (DATAROOTDIR)") -+ -+if(CMAKE_SYSTEM_NAME MATCHES "^(([^kF].*)?BSD|DragonFly)$") -+ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info" -+ "Info documentation (info)") -+else() -+ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info" -+ "Info documentation (DATAROOTDIR/info)") -+endif() -+ -+if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$") -+ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man" -+ "Man documentation (man)") -+else() -+ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man" -+ "Man documentation (DATAROOTDIR/man)") -+endif() -+ -+_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale" -+ "Locale-dependent data (DATAROOTDIR/locale)") -+_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}" -+ "Documentation root (DATAROOTDIR/doc/PROJECT_NAME)") -+ -+_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_RUNSTATEDIR "${CMAKE_INSTALL_LOCALSTATEDIR}/run" -+ "Run-time variable data (LOCALSTATEDIR/run)") -+ -+#----------------------------------------------------------------------------- -+ -+mark_as_advanced( -+ CMAKE_INSTALL_BINDIR -+ CMAKE_INSTALL_SBINDIR -+ CMAKE_INSTALL_LIBEXECDIR -+ CMAKE_INSTALL_SYSCONFDIR -+ CMAKE_INSTALL_SHAREDSTATEDIR -+ CMAKE_INSTALL_LOCALSTATEDIR -+ CMAKE_INSTALL_RUNSTATEDIR -+ CMAKE_INSTALL_LIBDIR -+ CMAKE_INSTALL_INCLUDEDIR -+ CMAKE_INSTALL_OLDINCLUDEDIR -+ CMAKE_INSTALL_DATAROOTDIR -+ CMAKE_INSTALL_DATADIR -+ CMAKE_INSTALL_INFODIR -+ CMAKE_INSTALL_LOCALEDIR -+ CMAKE_INSTALL_MANDIR -+ CMAKE_INSTALL_DOCDIR -+ ) -+ -+macro(GNUInstallDirs_get_absolute_install_dir absvar var) -+ if(NOT IS_ABSOLUTE "${${var}}") -+ # Handle special cases: -+ # - CMAKE_INSTALL_PREFIX == / -+ # - CMAKE_INSTALL_PREFIX == /usr -+ # - CMAKE_INSTALL_PREFIX == /opt/... -+ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/") -+ if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR") -+ set(${absvar} "/${${var}}") -+ else() -+ if (NOT "${${var}}" MATCHES "^usr/") -+ set(${var} "usr/${${var}}") -+ endif() -+ set(${absvar} "/${${var}}") -+ endif() -+ elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") -+ if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR") -+ set(${absvar} "/${${var}}") -+ else() -+ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") -+ endif() -+ elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/.*") -+ if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR") -+ set(${absvar} "/${${var}}${CMAKE_INSTALL_PREFIX}") -+ else() -+ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") -+ endif() -+ else() -+ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") -+ endif() -+ else() -+ set(${absvar} "${${var}}") -+ endif() -+endmacro() -+ -+# Result directories -+# -+foreach(dir -+ BINDIR -+ SBINDIR -+ LIBEXECDIR -+ SYSCONFDIR -+ SHAREDSTATEDIR -+ LOCALSTATEDIR -+ RUNSTATEDIR -+ LIBDIR -+ INCLUDEDIR -+ OLDINCLUDEDIR -+ DATAROOTDIR -+ DATADIR -+ INFODIR -+ LOCALEDIR -+ MANDIR -+ DOCDIR -+ ) -+ GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_${dir} CMAKE_INSTALL_${dir}) -+endforeach() -+ -+cmake_policy(POP) diff -Nru saga-8.2.1+dfsg/debian/patches/python_fix.patch saga-8.2.2+dfsg/debian/patches/python_fix.patch --- saga-8.2.1+dfsg/debian/patches/python_fix.patch 2022-05-17 04:53:58.000000000 +0000 +++ saga-8.2.2+dfsg/debian/patches/python_fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -Description: Replace FindPythonLibs by FindPython -Author: Johan Van de Wauw -Applied-Upstream: https://sourceforge.net/p/saga-gis/code/merge-requests/23/ - ---- a/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt -+++ b/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt -@@ -25,13 +25,13 @@ set(SAGA_API_PUBLIC_HEADERS - find_package(SWIG QUIET) - if(SWIG_FOUND) - message(STATUS "SWIG for Python found") -- find_package(PythonLibs QUIET) -- if(PythonLibs_FOUND) -+ find_package(Python COMPONENTS Interpreter Development) -+ if(Python_FOUND) - # project(saga_api_python) - - message(STATUS "project: ${PROJECT_NAME}") - -- message(STATUS "PythonLibs found") -+ message(STATUS "Python found") - - if(POLICY CMP0078) # SWIG: use standard target name. - cmake_policy(SET CMP0078 NEW) -@@ -43,8 +43,8 @@ if(SWIG_FOUND) - - include(UseSWIG) - -- include_directories("${PYTHON_INCLUDE_PATH}") -- include_directories("${PYTHON_INCLUDE_PATH}/../PC") # msvc builds -+ include_directories("${Python_INCLUDE_DIRS}") -+ include_directories("${Python_INCLUDE_DIRS}/../PC") # msvc builds - include_directories("..") - - set(CMAKE_SWIG_FLAGS "-D_SAGA_PYTHON -D_SWIG_WCHAR") -@@ -57,22 +57,14 @@ if(SWIG_FOUND) - set_property(TARGET saga_api_python PROPERTY OUTPUT_NAME saga_api) - - swig_link_libraries(saga_api_python saga_api) -- swig_link_libraries(saga_api_python ${PYTHON_LIBRARIES}) -+ swig_link_libraries(saga_api_python ${Python_LIBRARIES}) - -- if(MSVC) -- set(PYTHON_SITE_PACKAGES "${PYTHON_INCLUDE_PATH}/../Lib/site-packages") -- else() #if(NOT MSVC) -- execute_process( -- COMMAND python -c "import site; print(site.getsitepackages()[0])" -- OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE -- ) -- endif() - -- if(EXISTS ${PYTHON_SITE_PACKAGES}) -- message(STATUS "Python site-packages: ${PYTHON_SITE_PACKAGES}") -- install(TARGETS saga_api_python DESTINATION ${PYTHON_SITE_PACKAGES}) -- install(FILES ${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py DESTINATION ${PYTHON_SITE_PACKAGES}) -- install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/examples/saga_helper.py DESTINATION ${PYTHON_SITE_PACKAGES}) -+ if(EXISTS ${Python_SITELIB}) -+ message(STATUS "Python site-packages: ${PYTHON_SITELIB}") -+ install(TARGETS saga_api_python DESTINATION ${Python_SITELIB}) -+ install(FILES ${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py DESTINATION ${Python_SITELIB}) -+ install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/examples/saga_helper.py DESTINATION ${Python_SITELIB}) - endif() - endif() - endif() diff -Nru saga-8.2.1+dfsg/debian/patches/series saga-8.2.2+dfsg/debian/patches/series --- saga-8.2.1+dfsg/debian/patches/series 2022-06-11 14:52:05.000000000 +0000 +++ saga-8.2.2+dfsg/debian/patches/series 2022-06-15 11:41:18.000000000 +0000 @@ -1,5 +0,0 @@ -multiarch_cmake.patch -imagery_svm.patch -python_fix.patch -fix_module_path.patch -gdal-multiarch.patch diff -Nru saga-8.2.1+dfsg/debian/rules saga-8.2.2+dfsg/debian/rules --- saga-8.2.1+dfsg/debian/rules 2022-05-17 04:53:58.000000000 +0000 +++ saga-8.2.2+dfsg/debian/rules 2022-06-15 13:31:13.000000000 +0000 @@ -10,7 +10,7 @@ UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') %: - dh $@ --with python3 --buildsystem=cmake --sourcedirectory=saga-gis + dh $@ --with python3 --buildsystem=cmake --sourcedirectory=saga-gis --without autoreconf override_dh_clean: dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1 diff -Nru saga-8.2.1+dfsg/saga-gis/cmake/modules/FindGDAL.cmake saga-8.2.2+dfsg/saga-gis/cmake/modules/FindGDAL.cmake --- saga-8.2.1+dfsg/saga-gis/cmake/modules/FindGDAL.cmake 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/cmake/modules/FindGDAL.cmake 2022-06-14 09:39:19.000000000 +0000 @@ -176,7 +176,7 @@ SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE) ENDIF (NOT GDAL_LIBRARY) ELSE (APPLE) - FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} PATHS ${GDAL_LINK_DIRECTORIES}/lib) + FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} gdal PATHS ${GDAL_LINK_DIRECTORIES}/lib ${GDAL_LINK_DIRECTORIES}) ENDIF (APPLE) ELSE(GDAL_CONFIG) diff -Nru saga-8.2.1+dfsg/saga-gis/cmake/modules/GNUInstallDirs.cmake saga-8.2.2+dfsg/saga-gis/cmake/modules/GNUInstallDirs.cmake --- saga-8.2.1+dfsg/saga-gis/cmake/modules/GNUInstallDirs.cmake 1970-01-01 00:00:00.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/cmake/modules/GNUInstallDirs.cmake 2022-06-14 09:39:19.000000000 +0000 @@ -0,0 +1,383 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +#[=======================================================================[.rst: +GNUInstallDirs +-------------- + +Define GNU standard installation directories + +Provides install directory variables as defined by the +`GNU Coding Standards`_. + +.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html + +Result Variables +^^^^^^^^^^^^^^^^ + +Inclusion of this module defines the following variables: + +``CMAKE_INSTALL_`` + + Destination for files of a given type. This value may be passed to + the ``DESTINATION`` options of :command:`install` commands for the + corresponding file type. + +``CMAKE_INSTALL_FULL_`` + + The absolute path generated from the corresponding ``CMAKE_INSTALL_`` + value. If the value is not already an absolute path, an absolute path + is constructed typically by prepending the value of the + :variable:`CMAKE_INSTALL_PREFIX` variable. However, there are some + `special cases`_ as documented below. + +where ```` is one of: + +``BINDIR`` + user executables (``bin``) +``SBINDIR`` + system admin executables (``sbin``) +``LIBEXECDIR`` + program executables (``libexec``) +``SYSCONFDIR`` + read-only single-machine data (``etc``) +``SHAREDSTATEDIR`` + modifiable architecture-independent data (``com``) +``LOCALSTATEDIR`` + modifiable single-machine data (``var``) +``RUNSTATEDIR`` + run-time variable data (``LOCALSTATEDIR/run``) +``LIBDIR`` + object code libraries (``lib`` or ``lib64`` + or ``lib/`` on Debian) +``INCLUDEDIR`` + C header files (``include``) +``OLDINCLUDEDIR`` + C header files for non-gcc (``/usr/include``) +``DATAROOTDIR`` + read-only architecture-independent data root (``share``) +``DATADIR`` + read-only architecture-independent data (``DATAROOTDIR``) +``INFODIR`` + info documentation (``DATAROOTDIR/info``) +``LOCALEDIR`` + locale-dependent data (``DATAROOTDIR/locale``) +``MANDIR`` + man documentation (``DATAROOTDIR/man``) +``DOCDIR`` + documentation root (``DATAROOTDIR/doc/PROJECT_NAME``) + +If the includer does not define a value the above-shown default will be +used and the value will appear in the cache for editing by the user. + +Special Cases +^^^^^^^^^^^^^ + +The following values of :variable:`CMAKE_INSTALL_PREFIX` are special: + +``/`` + + For ```` other than the ``SYSCONFDIR``, ``LOCALSTATEDIR`` and + ``RUNSTATEDIR``, the value of ``CMAKE_INSTALL_`` is prefixed + with ``usr/`` if it is not user-specified as an absolute path. + For example, the ``INCLUDEDIR`` value ``include`` becomes ``usr/include``. + This is required by the `GNU Coding Standards`_, which state: + + When building the complete GNU system, the prefix will be empty + and ``/usr`` will be a symbolic link to ``/``. + +``/usr`` + + For ```` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or + ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_`` is computed by + prepending just ``/`` to the value of ``CMAKE_INSTALL_`` + if it is not user-specified as an absolute path. + For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc``. + This is required by the `GNU Coding Standards`_. + +``/opt/...`` + + For ```` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or + ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_`` is computed by + *appending* the prefix to the value of ``CMAKE_INSTALL_`` + if it is not user-specified as an absolute path. + For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc/opt/...``. + This is defined by the `Filesystem Hierarchy Standard`_. + +.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html + +Macros +^^^^^^ + +.. command:: GNUInstallDirs_get_absolute_install_dir + + :: + + GNUInstallDirs_get_absolute_install_dir(absvar var) + + Set the given variable ``absvar`` to the absolute path contained + within the variable ``var``. This is to allow the computation of an + absolute path, accounting for all the special cases documented + above. While this macro is used to compute the various + ``CMAKE_INSTALL_FULL_`` variables, it is exposed publicly to + allow users who create additional path variables to also compute + absolute paths where necessary, using the same logic. +#]=======================================================================] + +cmake_policy(PUSH) +cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced + +# Convert a cache variable to PATH type + +macro(_GNUInstallDirs_cache_convert_to_path var description) + get_property(_GNUInstallDirs_cache_type CACHE ${var} PROPERTY TYPE) + if(_GNUInstallDirs_cache_type STREQUAL "UNINITIALIZED") + file(TO_CMAKE_PATH "${${var}}" _GNUInstallDirs_cmakepath) + set_property(CACHE ${var} PROPERTY TYPE PATH) + set_property(CACHE ${var} PROPERTY VALUE "${_GNUInstallDirs_cmakepath}") + set_property(CACHE ${var} PROPERTY HELPSTRING "${description}") + unset(_GNUInstallDirs_cmakepath) + endif() + unset(_GNUInstallDirs_cache_type) +endmacro() + +# Create a cache variable with default for a path. +macro(_GNUInstallDirs_cache_path var default description) + if(NOT DEFINED ${var}) + set(${var} "${default}" CACHE PATH "${description}") + endif() + _GNUInstallDirs_cache_convert_to_path("${var}" "${description}") +endmacro() + +# Create a cache variable with not default for a path, with a fallback +# when unset; used for entries slaved to other entries such as +# DATAROOTDIR. +macro(_GNUInstallDirs_cache_path_fallback var default description) + if(NOT ${var}) + set(${var} "" CACHE PATH "${description}") + set(${var} "${default}") + endif() + _GNUInstallDirs_cache_convert_to_path("${var}" "${description}") +endmacro() + +# Installation directories +# + +_GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin" + "User executables (bin)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin" + "System admin executables (sbin)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec" + "Program executables (libexec)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc" + "Read-only single-machine data (etc)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_SHAREDSTATEDIR "com" + "Modifiable architecture-independent data (com)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_LOCALSTATEDIR "var" + "Modifiable single-machine data (var)") + +# We check if the variable was manually set and not cached, in order to +# allow projects to set the values as normal variables before including +# GNUInstallDirs to avoid having the entries cached or user-editable. It +# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the +# other cases. +# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the +# variable is a normal one, otherwise it is a cache one. +get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET) +if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set + AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX + AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}")) + # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed. + # Otherwise: + # * if _libdir_set is false it is not executed (meaning that it is + # not a cache variable) + # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is + # not executed + # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and + # CMAKE_INSTALL_PREFIX are the same string it is not executed. + # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the + # execution, of this part of code, therefore at the next inclusion + # of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings + # are equal, meaning that the if is not executed the code the + # second time. + + set(_LIBDIR_DEFAULT "lib") + # Override this default 'lib' with 'lib64' iff: + # - we are on Linux system but NOT cross-compiling + # - we are NOT on debian + # - we are on a 64 bits system + # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI + # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if + # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" + # and CMAKE_INSTALL_PREFIX is "/usr" + # See http://wiki.debian.org/Multiarch + if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) + set(__LAST_LIBDIR_DEFAULT "lib") + # __LAST_LIBDIR_DEFAULT is the default value that we compute from + # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for + # the value that was last used as the default. + # This value is used to figure out whether the user changed the + # CMAKE_INSTALL_LIBDIR value manually, or if the value was the + # default one. When CMAKE_INSTALL_PREFIX changes, the value is + # updated to the new default, unless the user explicitly changed it. + endif() + if (NOT DEFINED CMAKE_SYSTEM_NAME OR NOT DEFINED CMAKE_SIZEOF_VOID_P) + message(AUTHOR_WARNING + "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. " + "Please enable at least one language before including GNUInstallDirs.") + endif() + if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" + AND NOT CMAKE_CROSSCOMPILING + AND NOT EXISTS "/etc/arch-release") + if (EXISTS "/etc/debian_version") # is this a debian system ? + if(CMAKE_LIBRARY_ARCHITECTURE) + if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") + set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") + endif() + if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX + AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") + set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") + endif() + endif() + else() # not debian, rely on CMAKE_SIZEOF_VOID_P: + if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(_LIBDIR_DEFAULT "lib64") + if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) + set(__LAST_LIBDIR_DEFAULT "lib64") + endif() + endif() + endif() + endif() + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})") + elseif(DEFINED __LAST_LIBDIR_DEFAULT + AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}") + set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}") + endif() +endif() +_GNUInstallDirs_cache_convert_to_path(CMAKE_INSTALL_LIBDIR "Object code libraries (lib)") + +# Save for next run +set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run") +unset(_libdir_set) +unset(__LAST_LIBDIR_DEFAULT) + +_GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include" + "C header files (include)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" + "C header files for non-gcc (/usr/include)") +_GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share" + "Read-only architecture-independent data root (share)") + +#----------------------------------------------------------------------------- +# Values whose defaults are relative to DATAROOTDIR. Store empty values in +# the cache and store the defaults in local variables if the cache values are +# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes. + +_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}" + "Read-only architecture-independent data (DATAROOTDIR)") + +if(CMAKE_SYSTEM_NAME MATCHES "^(([^kF].*)?BSD|DragonFly)$") + _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info" + "Info documentation (info)") +else() + _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info" + "Info documentation (DATAROOTDIR/info)") +endif() + +if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$") + _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man" + "Man documentation (man)") +else() + _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man" + "Man documentation (DATAROOTDIR/man)") +endif() + +_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale" + "Locale-dependent data (DATAROOTDIR/locale)") +_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}" + "Documentation root (DATAROOTDIR/doc/PROJECT_NAME)") + +_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_RUNSTATEDIR "${CMAKE_INSTALL_LOCALSTATEDIR}/run" + "Run-time variable data (LOCALSTATEDIR/run)") + +#----------------------------------------------------------------------------- + +mark_as_advanced( + CMAKE_INSTALL_BINDIR + CMAKE_INSTALL_SBINDIR + CMAKE_INSTALL_LIBEXECDIR + CMAKE_INSTALL_SYSCONFDIR + CMAKE_INSTALL_SHAREDSTATEDIR + CMAKE_INSTALL_LOCALSTATEDIR + CMAKE_INSTALL_RUNSTATEDIR + CMAKE_INSTALL_LIBDIR + CMAKE_INSTALL_INCLUDEDIR + CMAKE_INSTALL_OLDINCLUDEDIR + CMAKE_INSTALL_DATAROOTDIR + CMAKE_INSTALL_DATADIR + CMAKE_INSTALL_INFODIR + CMAKE_INSTALL_LOCALEDIR + CMAKE_INSTALL_MANDIR + CMAKE_INSTALL_DOCDIR + ) + +macro(GNUInstallDirs_get_absolute_install_dir absvar var) + if(NOT IS_ABSOLUTE "${${var}}") + # Handle special cases: + # - CMAKE_INSTALL_PREFIX == / + # - CMAKE_INSTALL_PREFIX == /usr + # - CMAKE_INSTALL_PREFIX == /opt/... + if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/") + if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR") + set(${absvar} "/${${var}}") + else() + if (NOT "${${var}}" MATCHES "^usr/") + set(${var} "usr/${${var}}") + endif() + set(${absvar} "/${${var}}") + endif() + elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") + if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR") + set(${absvar} "/${${var}}") + else() + set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() + elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/.*") + if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR") + set(${absvar} "/${${var}}${CMAKE_INSTALL_PREFIX}") + else() + set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() + else() + set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() + else() + set(${absvar} "${${var}}") + endif() +endmacro() + +# Result directories +# +foreach(dir + BINDIR + SBINDIR + LIBEXECDIR + SYSCONFDIR + SHAREDSTATEDIR + LOCALSTATEDIR + RUNSTATEDIR + LIBDIR + INCLUDEDIR + OLDINCLUDEDIR + DATAROOTDIR + DATADIR + INFODIR + LOCALEDIR + MANDIR + DOCDIR + ) + GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_${dir} CMAKE_INSTALL_${dir}) +endforeach() + +cmake_policy(POP) diff -Nru saga-8.2.1+dfsg/saga-gis/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/CMakeLists.txt 2022-06-14 09:39:21.000000000 +0000 @@ -53,6 +53,9 @@ include(shared_cmake/scripts/enable_warnings.cmake) include(shared_cmake/scripts/windows_version_info.cmake) +# Use GNU install dirs to support multiarch +include(cmake/modules/GNUInstallDirs.cmake) + # create windows resouce file set(windows_version_rc "${CMAKE_BINARY_DIR}/win_version_info.rc") gen_win_version_resource("${PROJECT_NAME}" "${windows_version_rc}" diff -Nru saga-8.2.1+dfsg/saga-gis/configure.ac saga-8.2.2+dfsg/saga-gis/configure.ac --- saga-8.2.1+dfsg/saga-gis/configure.ac 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/configure.ac 2022-06-14 09:39:21.000000000 +0000 @@ -3,7 +3,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(saga, 8.2.1, BUG-REPORT-ADDRESS) +AC_INIT(saga, 8.2.2, BUG-REPORT-ADDRESS) AC_CONFIG_SRCDIR([src/saga_core/saga_gui/wksp_data_menu_files.cpp]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff -Nru saga-8.2.1+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_chm saga-8.2.2+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_chm --- saga-8.2.1+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_chm 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_chm 2022-06-14 09:39:21.000000000 +0000 @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v8.2.1 +PROJECT_NUMBER = v8.2.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -58,7 +58,7 @@ # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = saga-8.2.1_api_doc +OUTPUT_DIRECTORY = saga-8.2.2_api_doc # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -1363,7 +1363,7 @@ # written to the html output directory. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_FILE = ../../saga-8.2.1_api.chm +CHM_FILE = ../../saga-8.2.2_api.chm # The HHC_LOCATION tag can be used to specify the location (absolute path # including file name) of the HTML help compiler (hhc.exe). If non-empty, diff -Nru saga-8.2.1+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_html saga-8.2.2+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_html --- saga-8.2.1+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_html 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/accessories/helper/doxygen_saga_api_html 2022-06-14 09:39:21.000000000 +0000 @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v8.2.1 +PROJECT_NUMBER = v8.2.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -58,7 +58,7 @@ # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = saga-8.2.1_api_doc +OUTPUT_DIRECTORY = saga-8.2.2_api_doc # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -1363,7 +1363,7 @@ # written to the html output directory. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_FILE = ../../saga-8.2.1_api.chm +CHM_FILE = ../../saga-8.2.2_api.chm # The HHC_LOCATION tag can be used to specify the location (absolute path # including file name) of the HTML help compiler (hhc.exe). If non-empty, diff -Nru saga-8.2.1+dfsg/saga-gis/src/accessories/helper/make_saga_release.bat saga-8.2.2+dfsg/saga-gis/src/accessories/helper/make_saga_release.bat --- saga-8.2.1+dfsg/saga-gis/src/accessories/helper/make_saga_release.bat 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/accessories/helper/make_saga_release.bat 2022-06-14 09:39:21.000000000 +0000 @@ -33,10 +33,16 @@ REM ___________________________________ REM Version -SET SAGA_VER_TEXT=8.2.1 -SET SAGA_VER_NEXT=8.2.1 +SET SAGA_VER_TEXT=8.2.2 +SET SAGA_VER_NEXT=8.2.3 SET SAGA_VERSION=saga-%SAGA_VER_TEXT% +REM Don't forget to activate the flag +REM - SWITCH_TO_BRANCH - +REM for all bug-fix-releases! +SET SWITCH_TO_BRANCH=true + +REM ___________________________________ ECHO __________________________________ ECHO ################################## ECHO # # @@ -62,15 +68,6 @@ SET /P ANSWER1= IF /i '%ANSWER1%' == 'y' ( SET GIT_BRANCH=true -) ELSE ( - REM yes for bug-fix releases (it's the master otherwise!) - ECHO. - ECHO Switch to branch %SAGA_VER_TEXT% [y/n] - SET /P ANSWER2= - IF /i '%ANSWER2%' == 'y' ( - SET SWITCH_TO_BRANCH=true - ECHO switch to branch - ) ) @@ -107,6 +104,7 @@ ) IF /i "%SWITCH_TO_BRANCH%" == "true" ( + ECHO switch to branch release-%SAGA_VER_TEXT% %GITEXE% checkout release-%SAGA_VER_TEXT% ) diff -Nru saga-8.2.1+dfsg/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt 2022-06-14 09:39:19.000000000 +0000 @@ -72,4 +72,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS -fPIC) endif() -install(TARGETS ${PROJECT_NAME} DESTINATION lib/saga) +install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/saga) diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/CMakeLists.txt 2022-06-14 09:39:19.000000000 +0000 @@ -2,7 +2,7 @@ if(NOT MSVC) # unix like systems # define lib and share path for saga_cmd and saga_gui - set(MTOOLSPATH "TOOLS_PATH=\"${CMAKE_INSTALL_PREFIX}/lib/saga\"") + set(MTOOLSPATH "TOOLS_PATH=\"${CMAKE_INSTALL_FULL_LIBDIR}/saga\"") set(MSHAREPATH "SHARE_PATH=\"${CMAKE_INSTALL_PREFIX}/share/saga\"") endif() diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_api/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_api/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_api/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_api/CMakeLists.txt 2022-06-14 09:39:19.000000000 +0000 @@ -163,7 +163,7 @@ ) # where to install the library -install(TARGETS saga_api DESTINATION lib) +install(TARGETS saga_api DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${SAGA_API_PUBLIC_HEADERS} DESTINATION include/saga/saga_api) if(MSVC) diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_api/saga_api.h saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_api/saga_api.h --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_api/saga_api.h 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_api/saga_api.h 2022-06-14 09:39:21.000000000 +0000 @@ -86,8 +86,8 @@ //--------------------------------------------------------- #define SAGA_MAJOR_VERSION 8 #define SAGA_MINOR_VERSION 2 -#define SAGA_RELEASE_NUMBER 1 -#define SAGA_VERSION SG_T("8.2.1") +#define SAGA_RELEASE_NUMBER 2 +#define SAGA_VERSION SG_T("8.2.2") /////////////////////////////////////////////////////////// diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt 2022-06-14 09:39:19.000000000 +0000 @@ -25,13 +25,13 @@ find_package(SWIG QUIET) if(SWIG_FOUND) message(STATUS "SWIG for Python found") - find_package(PythonLibs QUIET) - if(PythonLibs_FOUND) + find_package(Python COMPONENTS Interpreter Development) + if(Python_FOUND) # project(saga_api_python) message(STATUS "project: ${PROJECT_NAME}") - message(STATUS "PythonLibs found") + message(STATUS "Python found") if(POLICY CMP0078) # SWIG: use standard target name. cmake_policy(SET CMP0078 NEW) @@ -43,8 +43,8 @@ include(UseSWIG) - include_directories("${PYTHON_INCLUDE_PATH}") - include_directories("${PYTHON_INCLUDE_PATH}/../PC") # msvc builds + include_directories("${Python_INCLUDE_DIRS}") + include_directories("${Python_INCLUDE_DIRS}/../PC") # msvc builds include_directories("..") set(CMAKE_SWIG_FLAGS "-D_SAGA_PYTHON -D_SWIG_WCHAR") @@ -57,22 +57,14 @@ set_property(TARGET saga_api_python PROPERTY OUTPUT_NAME saga_api) swig_link_libraries(saga_api_python saga_api) - swig_link_libraries(saga_api_python ${PYTHON_LIBRARIES}) + swig_link_libraries(saga_api_python ${Python_LIBRARIES}) - if(MSVC) - set(PYTHON_SITE_PACKAGES "${PYTHON_INCLUDE_PATH}/../Lib/site-packages") - else() #if(NOT MSVC) - execute_process( - COMMAND python -c "import site; print(site.getsitepackages()[0])" - OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() - if(EXISTS ${PYTHON_SITE_PACKAGES}) - message(STATUS "Python site-packages: ${PYTHON_SITE_PACKAGES}") - install(TARGETS saga_api_python DESTINATION ${PYTHON_SITE_PACKAGES}) - install(FILES ${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py DESTINATION ${PYTHON_SITE_PACKAGES}) - install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/examples/saga_helper.py DESTINATION ${PYTHON_SITE_PACKAGES}) + if(EXISTS ${Python_SITELIB}) + message(STATUS "Python site-packages: ${PYTHON_SITELIB}") + install(TARGETS saga_api_python DESTINATION ${Python_SITELIB}) + install(FILES ${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py DESTINATION ${Python_SITELIB}) + install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/examples/saga_helper.py DESTINATION ${Python_SITELIB}) endif() endif() endif() diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1 saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1 --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1 2022-06-14 09:39:21.000000000 +0000 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "SAGA_CMD 1" -.TH SAGA_CMD 1 "2021-07-07" "8.2.1" " " +.TH SAGA_CMD 1 "2021-07-07" "8.2.2" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt 2022-06-14 09:39:19.000000000 +0000 @@ -64,7 +64,7 @@ SOVERSION ${SAGA_VERSION_MAJOR}) # where to install the binary -install(TARGETS saga_gdi DESTINATION lib) +install(TARGETS saga_gdi DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${SAGA_GDI_PUBLIC_HEADERS} DESTINATION include/saga/saga_gdi) if(MSVC) diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/man/saga_gui.1 saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/man/saga_gui.1 --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/man/saga_gui.1 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/man/saga_gui.1 2022-06-14 09:39:21.000000000 +0000 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "SAGA_GUI 1" -.TH SAGA_GUI 1 "2021-07-07" "8.2.1" " " +.TH SAGA_GUI 1 "2021-07-07" "8.2.2" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.bra.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.bra.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.bra.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.bra.txt 2022-06-14 09:39:21.000000000 +0000 @@ -281,8 +281,6 @@ "Activation Function" "" "Activation function" "função de ativação" "Active Variable Count" "" -"Actual Point Count" "" -"Actual number of points by return is different from header (actual, header)" "" "Add" "Adicionar" "Add All" "Adicionar todos" "Add All Fields" "Adicionar todos os campos" @@ -593,6 +591,7 @@ "Band Width" "" "Band Width for Seed Point Generation" "" "Bands" "Bandas" +"Bands as Grid Collection" "" "Bandwidth" "" "Bandwidth (Cells)" "Largura da banda (Células/pixels)" "Bandwidth for exponential and Gaussian weighting" "" @@ -601,6 +600,7 @@ "Bars" "" "Bars|" "" "Base 10 Logarithm" "" +"Base Contour Value" "" "Base Level" "Nível de base" "Base Map" "Mapa base" "Base Map Caching" "" @@ -645,7 +645,6 @@ "Block Kriging" "Bloco de kringagem" "Block Matching" "" "Block Size" "Tamanho do bloco" -"Blocks" "Blocos" "Blue" "Azul" "Blue (TM 1)" "Azul (TM 1)" "Blue Channel Color" "" @@ -853,7 +852,6 @@ "Chart (sectors):" "Gráfico (seletores)" "Chart Settings" "" "Chart Type" "Tipo do gráfico" -"Check Point Validity" "Verifique o ponto de validade" "Check Vertices" "Verifique vértices" "Check for Building Parts" "Verifique se há partes de construção" "Check the fields to export" "Verifique os campos para exportação" @@ -895,7 +893,6 @@ "Choose how to handle the No Data value of the output grid." "" "Choose how to sort the elevation dataset before sampling" "Escolha como classificar o conjunto de dados de elevação antes da amostragem" "Choose if you want to segmentate either on minima or on maxima." "Escolha se você quer segmentar sobre os mínimos ou sobre máximos." -"Choose the Point Data Record Format you like to use" "Escolha o formato do ponto de registro de dados que você gostaria de usar" "Choose the activation function used by the neronal network." "Escolher a função de ativação utilizada pela rede neronal." "Choose the classification constant to use" "Escolha a constante de classificação a ser utilizada" "Choose the file format to write. The format determines which attributes can be written and in which data depth." "" @@ -919,7 +916,6 @@ "Choose whether to reclassify a Point Cloud or to extract a subset from a Point Cloud." "Escolha se deve reclassificar uma nuvem de pontos ou extrair um subconjunto de uma nuvem de pontos." "Choosing a lower value will result in a better numerical precision but also in a longer calculation time." "" "Circle" "Círculo" -"Circle Point Distance [Degree]" "Distância do Círculo Ponto [Grau]" "Circles" "Círculos" "Circular" "Circular" "Cirrus" "" @@ -1043,7 +1039,6 @@ "Collpase Options" "Opções de colapso" "Color" "Cor" "Color Attribute" "Atributo de cor" -"Color Blending" "Misturando cor" "Color Palette" "Paleta de cor" "Color Palette Rotation" "Rotação de paleta de cor" "Color Triangle Composite" "" @@ -1141,6 +1136,7 @@ "Constraints" "Restrições" "Continue?" "" "Contour" "Contorno" +"Contour Interval" "" "Contour Length" "" "Contour Lines" "Linhas de contorno" "Contour Lines from Grid" "Linha de contorno para a grade" @@ -1370,7 +1366,6 @@ "DTM 2" "DTM 2" "DTM Filter (slope-based)" "Filtro DTM (baseado-declive)" "DTM, digital terrain model [m]" "" -"DXF" "DXF" "Daily" "" "Daily Data" "Dados diários" "Daily Extreme Temperature" "" @@ -1406,6 +1401,7 @@ "Database access through the libmysql.lib interface." "" "Database|ODBC" "" "Database|PostgreSQL" "Banco de dados | PostgreSQL" +"Dataset" "" "Dataset creation failed" "A criação de conjunto de dados falhou" "Date" "Data" "Date Column" "Coluna de data" @@ -1871,6 +1867,7 @@ "Execute" "Executar" "Execute SQL" "Execute SQL" "Execute Tool" "Excluir ferramenta" +"Executing" "" "Execution" "Execução" "Execution failed" "" "Execution has been stopped by user!" "A execução foi interrompida pelo usuário!" @@ -2020,7 +2017,6 @@ "Figure" "Figura" "File" "Arquivo" "File Cache" "Arquivo de cache" -"File Creation Day/Year" "" "File Encoding" "" "File Format" "" "File Name" "Nome do Arquivo" @@ -2030,7 +2026,6 @@ "File error" "Erro no arquivo" "File not found!" "" "File path" "Caminho do arquivo" -"File signature is not 'LASF'!" "Assinatura de arquivo não é 'LASF'!" "File with Coefficients" "Arquivo com Coeficientes" "Filename" "Nome do arquivo" "Filename Digits" "" @@ -2133,7 +2128,6 @@ "Flatten Polygon Layer" "Camada de nivelamento de polígono" "Flattening" "Aplainamento" "Flattening (f)" "Aplainamento (f)" -"Flightline Edge" "" "Floating Point (4 byte)" "Ponto flutuante (4 byte)" "Floating Point (8 byte)" "Ponto flutuante (8 byte)" "Floating Point Numbers" "" @@ -2337,7 +2331,6 @@ "Generalized Surface" "" "Generate Shapes" "Gerar shapes" "Generated Shapefile." "Arquivos de shapes gerado" -"Generating Software" "" "Gentle AdaBoost" "" "Geo-Reference" "Georeferência" "GeoJSON (*.geojson)" "" @@ -2550,9 +2543,6 @@ "Hauptgerinne-Parameter (erweitertes HD-Modell)" "Parâmetro-Hauptgerinne(erweitertes Modelo-HD)" "Having" "" "Header Lines" "" -"Header Point Count" "" -"Header Size" "" -"Header Summary" "" "Headline" "Linha de cabeçalho" "Heads" "Cabeçalhos" "Heavy Clay" "" @@ -2751,7 +2741,6 @@ "Imaginary" "Imaginário" "Import" "Importar" "Import ASTER Scene" "" -"Import Additional Attributes" "" "Import All Attributes" "" "Import Atlas Boundary File" "Importar arquivo de Atlas Boundary" "Import Binary Raw Data" "Importar dados binários brutos" @@ -2759,12 +2748,10 @@ "Import CRU Grids" "" "Import Classification" "" "Import DB Table from MySQL" "" -"Import DXF Files" "Importar arquivos DXF" "Import ESRI Arc/Info Grid" "Importar gradeESRI Arc/Info" "Import ESRI E00 File" "" "Import Erdas LAN/GIS" "Importar Erdas LAN/GIS" "Import Extents" "" -"Import Filter" "Importar filtro" "Import GPX" "Importar GPX" "Import GStat Shapes" "Importar Shapes GSTAT " "Import Grid from Table" "Importar grade a partir de tabela" @@ -2787,6 +2774,7 @@ "Import SRTM30 DEM" "Importar MDE SRTM30" "Import Scalable Vector Graphics (SVG) File" "Importar arquivo Scalable Vector Graphics (SVG)" "Import Sentinel-2 Scene" "" +"Import Sentinel-3 OLCI Scene" "" "Import Shapes" "Importar shapes" "Import Shapes from PostGIS" "Importar shapes a partir de PostGIS" "Import Shapes from XYZ" "Importar shapes a partir de XYZ" @@ -3088,11 +3076,7 @@ "LAS 1.4" "" "LAS Class 1" "" "LAS Class 2" "" -"LAS File" "Arquivo LAS" "LAS Files" "" -"LAS Files (*.las)|*.las|All Files|*.*" "Arquivos LAS (*.las)|* .las |Todos os arquivos|*.*" -"LAS header exception" "" -"LAS reader exception" "" "LAZ Files" "" "LCZC" "" "LCZC (Filtered)" "" @@ -3279,7 +3263,6 @@ "Linear Trend" "" "Linear percent stretch allows you to trim extreme values from both ends of the histogram using the percentage specified here." "" "Lines" "Linhas" -"Lines (extended)" "Linhas (estendidas)" "Lines with Property Attributes" "" "Link" "" "Link Prefix" "" @@ -3505,7 +3488,6 @@ "Material" "" "Material for Accumulation" "Acumulação de material" "Matrix signular\n" "Matriz signular\n" -"Max" "" "Max Iterations" "Interações máximas" "Max Lamda" "Lamda máxima" "Max. Number of Classes" "Número máximo de Classes" @@ -3521,7 +3503,6 @@ "Maximum Brightness [%]" "" "Maximum Categories" "" "Maximum Cells (C Correction Analysis)" "Máximo de Células (C Análise de Correção)" -"Maximum Color" "" "Maximum Contour Value" "Valor máximo do contorno" "Maximum Curvature" "Curvatura máxima" "Maximum Deposition along Path" "" @@ -3684,7 +3665,6 @@ "Midslope Ridges" "Cumes cituados em meio a encosta" "Midslope Ridges, Small Hills in Plains" "Cumes situados em meio a encosta, pequenas colinas em planos" "Miller Cylindrical" "" -"Min" "" "Min. Flow Speed (m/s)" "Fluxo mínimo de velocidade (m/s)" "Min. Segment Length" "Comprimento mínimo do segmento" "Min. Size" "Tamanho mínimo" @@ -3699,8 +3679,6 @@ "Minimum Area" "" "Minimum Bounding Box" "Mínimo caixa delimitadora" "Minimum Cloud Cover Fraction" "" -"Minimum Color" "" -"Minimum Contour Value" "Valor mínimo Contour" "Minimum Cost" "" "Minimum Curvature" "Curvatura mínima" "Minimum DQV" "" @@ -3747,7 +3725,6 @@ "Minimum Value" "Valor mínimo" "Minimum Velocity [m/h]" "" "Minimum Weight" "" -"Minimum and Maximum Attributes (min, max)" "" "Minimum and maximum [%], the range for histogram stretch." "" "Minimum and maximum of attribute range []." "Mínimo e máximo de gama atributo []." "Minimum and maximum values used to define the histogram classes." "" @@ -4055,7 +4032,6 @@ "No|Yes|" "Não|Sim|" "Nu" "" "Number Of Splits" "" -"Number Var. Length Records" "" "Number for..." "" "Number in Latitudinal Direction" "Número de Direção Latitudinal" "Number in Meridional Direction" "Número de Direção Meridional" @@ -4099,13 +4075,10 @@ "Number of Numeric Value Classes" "Número de classes de valor numérico" "Number of Pairs" "Número de pares" "Number of Parts" "Número de partes" -"Number of Point Records" "" "Number of Points" "Número de pontos" -"Number of Points by Return" "" "Number of Points for Local Interpolation" "Número de pontos para a interpolação local" "Number of Points in Cell" "Número de pontos na celula" "Number of Records" "Número de registros" -"Number of Returns by Pulse" "" "Number of Returns of Given Pulse" "" "Number of Row Cells" "Número de células na linha" "Number of Rows" "Número de linhas" @@ -4143,9 +4116,7 @@ "Number of nearest points, which will be evaluated for filtering. Set to zero to investigate all points in search radius." "Número de pontos mais próximos, os quais serão avaliados para a filtragem. Defina como zero para investigar todos os pontos no raio de busca." "Number of neurons" "Número de neurônios" "Number of points" "Número de pontos" -"Number of points in the simplified line" "Número de pontos na linha simplificada" "Number of points on each side of the section" "" -"Number of points per return:" "Número de pontos por retorno:" "Number of raindays is greater than model timespan!" "" "Number of raster files found in directory" "Número de arquivos raster encontrados no diretório" "Number of removed shapes" "" @@ -4200,7 +4171,6 @@ "Offset distance to symbol (either screen or map units)." "" "Offset distance to symbol relative to symbol's size." "" "Offset given as percentage of map size" "Deslocamento dado em porcentagem do tamanho do mapa" -"Offset to Point Data" "" "Ok" "Ok" "Okay" "Ok" "Old Value" "" @@ -4213,7 +4183,6 @@ "One or several input point cloud datasets to cut." "Um ou vários conjuntos de dados de entrada de nuvem de pontos para cortar." "One per x" "Um por x" "Online Help" "Ajuda online" -"Only Header Info" "Somente informações de cabeçalho" "Only List Connected Servers" "Somente servidores de lista conectados" "Only No Data" "" "Only Process Gaps with Less Cells" "Somente lacunas do processo com menos células" @@ -4435,8 +4404,6 @@ "Percentage Range" "" "Percentage clays" "" "Percentage of Standard Deviation" "" -"Percentage of points" "Percentagem de pontos" -"Percentage of points remaining in the simplified line" "Percentagem de pontos restantes na linha simplificada" "Percentage of standard deviation" "" "Percentage rock fragments" "" "Percentage sand" "" @@ -4495,12 +4462,11 @@ "Please provide at least one column to export!" "Por favor, forneça pelo menos uma coluna para exportar!" "Please provide either a file input or WKT as a string!" "" "Please provide some input files!" "Por favor, forneça alguns arquivos de entrada!" +"Please wait, working..." "" "Plot Holes" "Buracos na trama" "Plot hole data has to provide at the very least five attributes (horizon depth, TF, L, Ar, Mo)." "" "Point" "Ponto" "Point (2.5D)" "" -"Point Classification Histogram" "" -"Point Classifications" "" "Point Cloud" "Nuvem de Pontos" "Point Cloud %s is empty after removing overlap, skipping dataset!" "Nuvem de ponto %s está vazia após a remoção de sobreposição, pulando conjunto de dados!" "Point Cloud Attribute Calculator" "Calculadora de atributo para Nuvem de ponto" @@ -4521,16 +4487,12 @@ "Point Cloud to reclassify/extract" "Reclassificar/extrair Nuvem de pontos" "Point Clouds" "Nuvens de ponto" "Point Clouds Viewer" "Visualizador de Nuvens de ponto" -"Point Data Format" "" "Point Data Record Format" "Formato de gravação de dados de ponto" -"Point Data Record Length" "" -"Point Inspection Summary" "" "Point Position" "Posição do ponto " "Point Size" "Tamanho do ponto" "Point Size: Default" "Tamanho do ponto: Padrão" "Point Size: Scaling" "Tamanho do ponto: Escalonado" "Point Source ID" "" -"Point Source Id" "" "Point Statistics for Polygons" "Estatísticas apontam para polígonos" "Point Thinning" "" "Point View Settings" "Configurações de visualização de ponto" @@ -4539,7 +4501,6 @@ "Point clouds viewer." "Visualizador de nuvens de Ponto." "Point insertion distance [map units]." "Distância de inserção de ponto [mapa unidades]." "Point shapefile with source point(s)" "Shapefile de ponto com ponto de origem(s)" -"Point summary contains no points!" "Resumo do ponto não contém pontos!" "Point to Keep" "Ponto para manter" "Point to Line Distances" "" "Point to Point Distances" "" @@ -4584,7 +4545,6 @@ "Polygons' and target grid's extent do not intersect." "" "Polyline" "" "Polyline (2.5D)" "" -"Polylines" "Multiplas linhas" "Polynom" "Polynômio" "Polynomial Coefficients" "Coeficientes polinomiais" "Polynomial Order" "Ordem polinomial" @@ -4606,7 +4566,6 @@ "Positive Openness" "Abertura positiva" "Positive values result in a shift in E direction." "Os valores positivos resultam em uma mudança na direção E." "Positive values result in a shift in N direction." "Os valores positivos resultam em uma mudança na direção N." -"Possible error" "Possível erro" "Post-Processing" "" "PostGIS" "" "PostGIS extension added" "" @@ -4699,7 +4658,6 @@ "Print Layout" "Layout de impressão" "Print Preview" "Visualização de Impressão" "Print Setup" "Configuração de impressão" -"Print only information available in LAS header." "Imprimir única informação disponível no cabeçalho LAS." "Priority Index" "Índice de prioridade" "Probabilities" "Probabilidades" "Probability" "Probabilidade" @@ -4708,7 +4666,7 @@ "Probability Threshold" "Limiar de probabilidade" "Process Area" "" "Process Path" "" -"Process Update Frequency [milliseconds]" "Processo de atualização de frequência [milissegundos]" +"Process Update Frequency" "" "Processed DEM" "MDE processado" "Processing" "Processamento" "Processing ..." "" @@ -4739,7 +4697,6 @@ "Proj4 definition string error" "Erro de definição de sequência Proj4" "Project" "" "Project File" "Arquivo de projeto" -"Project ID/GUID" "" "Project has been saved." "O projeto foi salvo." "Project has been successfully loaded." "O projeto foi carregado com êxito." "Projected Coordinate System" "Sistema de Coordenadas Projetadas" @@ -4820,9 +4777,7 @@ "RGB Value Range" "" "RGB Values" "Valores RGB" "RGB coded data" "Dados codificados em RGB" -"RGB color" "" "RGB to IHS" "" -"RGB value range" "" "RGB-Coded Color" "" "RGP Color" "" "RMSE" "RMSE" @@ -4868,7 +4823,6 @@ "Randomize Direction" "" "Range" "Alcance" "Range of Records" "" -"Range of Red, Green, Blue values in LAS file." "" "Rank" "Rank" "Rank Filter" "Filtro de Rank" "Rao's Q" "" @@ -5032,7 +4986,6 @@ "Rescale Values (0-255)" "Re-escalar valores (0-255)" "Rescale to 0 - 1" "" "Resection (Terrestrial)" "Ressecação (Terrestre)" -"Reserved" "" "Reset" "" "Resets flow accumulation raster." "" "Residual" "" @@ -5063,8 +5016,6 @@ "Resulting Value" "Valor resultante" "Results" "Resultados" "Return" "" -"Return Count" "" -"Return Number" "" "Returns" "" "Returns resulting grid's no-data value" "" "Returns tables's no-data value" "" @@ -5305,8 +5256,6 @@ "Scaling applied to coloring choices (i) grid's standard deviation, (ii) grid's value range, (iii) specified value range" "" "Scaling factor for perimeter and area (squared). meter to feet = 1 / 0.3048 = 3.2808" "" "Scan Angle" "" -"Scan Angle Rank" "" -"Scan Direction Flag" "" "Scatterplot" "Dimensão" "Scene Classification" "" "Scheme" "" @@ -5382,7 +5331,6 @@ "Select Temperature Column" "Selecionar coluna de temperatura" "Select a layer to copy settings from it." "Selecionar uma camada para copiar as configurações a partir dela." "Select a mode of operation." "" -"Select additional attributes to become imported, if these are available." "" "Select an input table and at least one output feature!" "Selecionar uma tabela de entrada e pelo menos uma feição de saída!" "Select and Delete" "" "Select at least one output feature!" "Selecionar pelo menos uma feição de saída!" @@ -5421,7 +5369,8 @@ "Selection Color" "Seleção de Cores" "Selection Method" "Método de seleção" "Semi-Global Block Matching" "" -"Semicolon separated list of band indexes. If empty (default) all bands will be imported." "" +"Semicolon separated list of band indexes (zero-based). If empty (default) all bands will be imported." "" +"Semicolon separated list of subset names or indexes (zero-based). If empty (default) all subsets will be imported (if there are any)." "" "Semimajor Axis (a)" "Semi-eixo (a)" "Semimajor Axis and Eccentricity" "Semi-eixo e excentricidade" "Semimajor Axis and Eccentricity Squared" "Semi-eixo e excentricidade esquadriada" @@ -5595,7 +5544,6 @@ "Simple Kriging (3D)" "" "Simple, flow path and swath profiles." "Simpes, caminho de fluxo e perfis de faixa." "Simplified Lines" "Linhas simplificadas" -"Simplify Lines" "Simplificar linhas" "Simpson Index" "" "Simulación (Viento variable)" "Simulação (variação de vento)" "Simulando..." "Simulando ..." @@ -5831,7 +5779,6 @@ "Split Lines at Points" "Linhas divididas em pontos" "Split Lines with Lines" "Linhas de divisão com linhas" "Split Parts" "Dividir Partes" -"Split Polygon Parts" "Partes de divisão de Polígono" "Split RGB Composite" "Dividir composição RGB" "Split Shapes Layer" "Dividir camada de Shapes" "Split Shapes Layer Completely" "Dividir camada Shapes completamente" @@ -5887,6 +5834,7 @@ "Static table" "Tabela estática" "Statistics" "Estatísticas" "Statistics Field(s)" "" +"Statistics are based on a subset of the data set. The sample size to be used can be changed in the settings." "" "Statistics for Grids" "Estatísticas para grades" "Statistics for Grids from Files" "" "Std.Dev." "Std.Dev." @@ -5945,6 +5893,7 @@ "Subbasin Inflow" "Afluxo de sub-bacia" "Subbasins" "Sub-bacias" "Subdued escarpment" "Escarpa subjugada" +"Subsets" "" "Substitute Value" "" "Subsurface flow (m/dt)" "" "SubsurfaceViewer Files" "" @@ -5966,7 +5915,6 @@ "Summary" "Resumo" "Summary Table" "" "Summary table." "Tabela de resumo." -"Summary:\n" "Resumo:\n" "Summary_" "" "Summit" "" "Summit Extraction" "" @@ -6017,7 +5965,6 @@ "Synchronize Map Extents" "Sincronizar extensões de mapa" "Synchronize with look-up table classification of another grid (gui only)." "" "Synthesized Grid" "Grade sintetizada" -"System Identifier" "" "T Curvature" "Curvatura T" "T Slope" "Declive T" "T Vertical Distance to Channel Network" "Distância vertical T a Rede Canal" @@ -6107,6 +6054,7 @@ "Target Projection" "" "Target Projection Error" "" "Target Range" "Intervalo alvo" +"Target Resolution" "" "Target System" "Sistema alvo" "Target X Coordinate" "" "Target X coordinate" "Coordenada alvo X" @@ -6194,7 +6142,6 @@ "The GDAL raster format (driver) to be used." "Formato raster GDAL (driver) a ser usado." "The GeoTIFF File to be created." "Arquivo GeoTIFF a ser criado." "The GeoTRANS engine could not be initialized !!\n\n" "" -"The LAS output file." "O arquivo de saída LAS." "The LAS/LAZ output file." "" "The SAGA grids to be exported." "Grade SAGA a ser exportada." "The absolute minimum and maximum values are equal." "" @@ -6581,7 +6528,6 @@ "Tools for the georeferencing of spatial data." "Ferramentas para o georreferenciamento de dados espaciais." "Tools for the gridding of points and other vector data." "Ferramentas para o gradeamento de pontos e outros dados vetoriais." "Tools for the handling of virtual datasets." "Ferramentas para a manipulação de conjuntos de dados virtuais." -"Tools for the import and export of DXF files." "Ferramentas para a importação e exportação de arquivos DXF." "Tools for the import and export of gridded data." "Ferramentas para a importação e exportação de dados da grade." "Tools for the import and export of tables." "Ferramentas para a importação e exportação de tabelas." "Tools for the import and export of vector data." "Ferramentas para a importação e exportação de dados vetoriais." @@ -6617,8 +6563,6 @@ "Total Curvature" "" "Total Insolation" "Insolação total" "Total Kinetic Energy" "" -"Total Points" "" -"Total Pulses" "" "Total area is zero or minimum elevation is equal or lower than maximum elevation!" "A área total é zero ou a elevação mínima é igual ou inferior a elevação máxima!" "Total flow (in watershed) (m^3/dt)" "" "Total flow (m/dt)" "" @@ -6734,12 +6678,9 @@ "Unable to connect to server." "Não é possível conectar ao servidor." "Unable to create filtered mask grid!" "Não é possível criar grade de máscara filtrados!" "Unable to create grid for the eroded image!" "Não é possível criar grade para a imagem corroída!" -"Unable to open LAS file" "" -"Unable to open LAS file!" "Não é possível abrir arquivo LAS!" "Unable to open RDB2 file! Exception: %s" "" "Unable to open input file!" "Não é possível abrir o arquivo de entrada!" "Unable to open output file %s!" "Não é possível abrir arquivo de saída% s!" -"Unable to read points from LAS file!" "Não é possível ler pontos do arquivo LAS!" "Unable to save %s file!" "Não foi possível salvar o arquivo %s!" "Unable to save file %s!" "Não foi possível salvar o arquivo %s!" "Uncertainty in routing direction expressed as standard deviation (degree)." "" @@ -6769,8 +6710,6 @@ "Unknown" "Desconhecido" "Unknown Authority Code" "" "Unknown Error" "Erro desconhecido" -"Unknown LAS header exception!" "Exceção de cabeçalho LAS desconhecida!" -"Unknown LAS reader exception!" "Exceção leitor LAS desconhecida!" "Unknown RDB2 reader exception!" "" "Unkown operation value %d in grid cell %d,%d (x,y), computing accuflux ..." "" "Unreferenced Grids" "Grades não referenciadas" @@ -6795,6 +6734,7 @@ "Update values lower limit" "Atualizar de valores do-limite mais baixo" "Update values upper limit" "Atualizar valores do limite superior" "Update view during simulation." "Atualizar vista durante a simulação." +"Updating" "" "Upland Drainages" "Drenagens de terra firme" "Upland Drainages, Headwaters" "Drenagens de terra firme, Cabeceiras" "Upper" "Superior" @@ -6987,7 +6927,6 @@ "Vertikale Zufluesse" "Vertikale Zufluesse" "ViGrA" "ViGrA" "Victor Olaya (c) 2004" "Victor Olaya (c) 2004" -"Victor Olaya (c) 2005" "Victor Olaya (c) 2005" "Victor Olaya, Volker Wichmann (c) 2004-17" "" "View Metadata" "" "Virtual" "Virtual" @@ -7273,10 +7212,6 @@ "[cells]" "" "[cmol/kg]" "" "[degree]" "" -"[deprecated] Export LAS Files" "" -"[deprecated] Import LAS Files" "" -"[deprecated] LAS" "" -"[deprecated] LAS Info" "" "[deprecated] Neural Networks (OpenCV)" "" "[deprecated] Point Cloud Viewer" "[obsoleta] Visualizador de nuvem de pontos" "[deprecated] TIN Viewer" "[obsoleta] Visualizador TIN " @@ -7286,6 +7221,7 @@ "[kg/m^3]" "" "[m/s]" "" "[m]" "" +"[milliseconds]" "" "[mm]" "" "[not set]|" "" "[permille]" "" @@ -7332,9 +7268,9 @@ "all bands" "" "all classes" "todas as classes" "all directions" "" -"all entities" "todas as entidades" "all input records found a join" "" "all join table records found at least one join" "" +"all lines at once" "" "all points within search distance" "" "all polygons" "" "all quadrants" "todos os quadrantes" @@ -7486,7 +7422,6 @@ "check this in case parameter 'water' is absolute water level" "verificar isso no parâmetro caso a água seja o nível de água absoluta" "check this in case seed cells are coded with absolute water level" "verificar isso no caso de células de sementes sejam codificadas com nível de água absoluta" "checked" "verificado" -"choose vertex type for resulting contours" "escolher o tipo de vértice para o resultando dos contornos" "circle" "círculo" "circle in rhombus" "círculo em losango" "circle in square" "círculo em quadrado" @@ -7701,6 +7636,8 @@ "do not show" "" "do not sort" "não classificar" "do not update" "não atualizar" +"doi:10.1007/s00035-014-0124-0" "" +"doi:10.1111/geb.12897" "" "down" "diminuição" "downscaled" "" "downscaling" "diminuição gradual" @@ -7783,6 +7720,7 @@ "failed to allocate memory for output points" "" "failed to allocate memory for phi calculation" "" "failed to allocate memory for target data." "" +"failed to apply georeferencing" "" "failed to build basic statistics" "" "failed to change client encoding to UTF-8" "" "failed to connect to server." "" @@ -7802,6 +7740,7 @@ "failed to derive temperatures" "" "failed to estimate target extent" "não foi possivel estimar extensão alvo" "failed to fit model function to empirical variogram." "" +"failed to import band" "" "failed to import subset" "" "failed to import table" "" "failed to initialise search engine" "falhou ao inicializar motor de busca" @@ -7839,6 +7778,7 @@ "failed to store data" "" "failed to write data" "" "failed: could not find a suitable import driver" "falhou: não foi possível encontrar um controlador de importação adequado" +"failed: there is no intersection of dataset's extent and targeted extent." "" "false" "" "fat" "gordo/expesso" "feathering" "difusão" @@ -7877,9 +7817,6 @@ "fixed cell height" "" "fixed interval" "intervalo fixo" "fixed value" "valor fixo" -"flagged as keypoints" "" -"flagged as synthetic" "" -"flagged as withheld" "" "floating" "flutuante" "floating point numbers" "" "flow accumulation threshold (cells) for linear flow routing" "fluxo de acumulação limiar (células) para roteamento de fluxo linear" @@ -7907,6 +7844,7 @@ "generation" "" "geographical" "geográfico" "geometric" "" +"georeferencing" "" "give output of an edge twice, i.e. once for each of the two adjacent polygons" "dar saída de uma aresta duas vezes, ou seja, uma vez para cada um dos dois polígonos adjacentes" "given as map units or meters if polar coordinates switch is on; ignored if set to zero" "expressa em unidades do mapa ou metros, se as coordenadas polares do interruptor está ligado; ignorado se definido como zero" "given in degree clockwise from North direction" "em graus no sentido horário do Norte" @@ -7918,6 +7856,7 @@ "graph and root node" "" "green > blue" "verde > azul" "green > grey > blue" "verde > cinza > blue" +"green > red" "" "green > red > blue" "verde > vermelho > azul" "green channel color" "cor do canal verde" "greyscale" "escala de cinza" @@ -8058,6 +7997,8 @@ "invalid image file path" "" "invalid input" "entrada inválida" "invalid input data" "" +"invalid input lines" "" +"invalid input polygons" "" "invalid input!" "entrada inválida!" "invalid lines layer" "" "invalid lookup table." "tabela de pesquisa inválida." @@ -8073,7 +8014,6 @@ "invalid point cloud" "nuvem de pontos inválida" "invalid points have been skipped" "pontos inválidos foram ignorados" "invalid points layer" "camada de pontos inválidos" -"invalid points skipped!" "" "invalid polygons" "polígonos inválidos" "invalid polygons layer" "" "invalid production date" "data de produção inválida" @@ -8144,6 +8084,7 @@ "line and polygon" "" "line simplification can only be applied to lines and polygons" "a linha de simplificação só pode ser aplicada a linhas e polígonos" "line tracing" "" +"line-by-line" "" "linear" "linear" "linear intervals" "" "linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)" "linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)" @@ -8362,7 +8303,6 @@ "no scaling" "sem escala" "no seed points identified" "não há pontos de sementes identificadas" "no self-intersecting polygons detected" "não há polígonos de auto-interseção detectados" -"no shapes for intersection found" "nenhum shape de interseção encontrado" "no shapes in list" "" "no shapes in selection" "não há shapes na seleção" "no sinks" "não skins" @@ -8474,8 +8414,6 @@ "one single class specified by class identifier" "uma única classe especificada pelo identificador de classe" "one-class SVM" "uma classe SVM" "online" "conectados" -"only entities with layer definition" "apenas entidades com definição de camada" -"only entities without layer definition" "apenas entidades sem definição de camada" "only points with given minimum number of points in search radius will be processed" "apenas os pontos com o número mínimo de pontos dado no raio de busca serão processados" "only show within scale range; values are given as extent measured in map units" "mostrar apenas dentro da faixa de escala; Os valores são dados em medida de unidades de mapa" "only z" "apenas z" @@ -8551,9 +8489,7 @@ "points have been filtered" "Os pontos foram filtrados" "points have been imported with success" "Os pontos foram importados com sucesso" "points layer and grid do not intersect at all" "pontos de camada e grade não se cruzam em tudo" -"points read" "ler pontos" "points removed" "" -"points written" "pontos escritos" "polar coordinates given in degree" "coordenadas polares dadas em graus" "polygon" "polígono" "polygon by polygon" "" @@ -8563,6 +8499,7 @@ "polygon wise (cell area)" "polígono sagaz (área da célula)" "polygon wise (cell centers)" "polígono sagaz (centros da célula)" "polygons" "polígonos" +"polygons and lines extents do not intersect at all" "" "polylines" "polilinhas" "polynomial" "polinomial" "polynomial trend" "tendência polinomial" @@ -8656,10 +8593,8 @@ "restore model from file" "modelo de restauração de arquivo" "restricts extrapolation by assigning minimal allowed weight for a vertex (normally \"-1\" or so; lower values correspond to lower reliability; \"0\" means no extrapolation)" "" "retrieving class information" "" -"return" "retorno" "rgb coded raster map to be draped" "rgb mapa raster codificado para ser envolto" "rgb coded values" "valores rgb codificados" -"rgb color" "cor rgb" "rhombus" "losango" "right" "direita" "right-angled" "" diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.ger.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.ger.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.ger.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.ger.txt 2022-06-14 09:39:21.000000000 +0000 @@ -281,8 +281,6 @@ "Activation Function" "" "Activation function" "" "Active Variable Count" "" -"Actual Point Count" "" -"Actual number of points by return is different from header (actual, header)" "" "Add" "" "Add All" "" "Add All Fields" "" @@ -593,6 +591,7 @@ "Band Width" "" "Band Width for Seed Point Generation" "" "Bands" "Banden" +"Bands as Grid Collection" "" "Bandwidth" "" "Bandwidth (Cells)" "Bandbreite (Zellen)" "Bandwidth for exponential and Gaussian weighting" "" @@ -601,6 +600,7 @@ "Bars" "" "Bars|" "" "Base 10 Logarithm" "" +"Base Contour Value" "" "Base Level" "Ausgangsniveau" "Base Map" "" "Base Map Caching" "" @@ -645,7 +645,6 @@ "Block Kriging" "Block Kriging" "Block Matching" "" "Block Size" "Block Größe" -"Blocks" "Blöcke" "Blue" "Blau" "Blue (TM 1)" "" "Blue Channel Color" "" @@ -853,7 +852,6 @@ "Chart (sectors):" "Diagramm (Sektoren)" "Chart Settings" "" "Chart Type" "Diagrammtyp" -"Check Point Validity" "Kontrollpunkt Gültigkeit" "Check Vertices" "" "Check for Building Parts" "" "Check the fields to export" "" @@ -895,7 +893,6 @@ "Choose how to handle the No Data value of the output grid." "" "Choose how to sort the elevation dataset before sampling" "" "Choose if you want to segmentate either on minima or on maxima." "Wähle bei einer Aufteilung entweder minima oder maxima." -"Choose the Point Data Record Format you like to use" "Wähle das zu benutzende Punktdatenaufzeichnungsformat " "Choose the activation function used by the neronal network." "" "Choose the classification constant to use" "" "Choose the file format to write. The format determines which attributes can be written and in which data depth." "" @@ -919,7 +916,6 @@ "Choose whether to reclassify a Point Cloud or to extract a subset from a Point Cloud." "Wähle ob Punktwolken reklassifiziert oder eine Teilmenge einer Punktwolke ausgewählt werden soll" "Choosing a lower value will result in a better numerical precision but also in a longer calculation time." "" "Circle" "Kreis" -"Circle Point Distance [Degree]" "Entfernung der Kreislinienpunkte [in Grad]" "Circles" "Kreise" "Circular" "Kreisförmig" "Cirrus" "" @@ -1043,7 +1039,6 @@ "Collpase Options" "" "Color" "Farbe" "Color Attribute" "Farbattribute" -"Color Blending" "Farbe Mischung" "Color Palette" "Farbverlauf" "Color Palette Rotation" "Farbe Palettenwechsel" "Color Triangle Composite" "" @@ -1141,6 +1136,7 @@ "Constraints" "Einschränkungen" "Continue?" "" "Contour" "" +"Contour Interval" "" "Contour Length" "" "Contour Lines" "Isolinien" "Contour Lines from Grid" "Isolinien von Rasterdaten" @@ -1370,7 +1366,6 @@ "DTM 2" "" "DTM Filter (slope-based)" "DGM Filter (Neigungsbasiert)" "DTM, digital terrain model [m]" "" -"DXF" "" "Daily" "" "Daily Data" "" "Daily Extreme Temperature" "" @@ -1406,6 +1401,7 @@ "Database access through the libmysql.lib interface." "" "Database|ODBC" "" "Database|PostgreSQL" "" +"Dataset" "" "Dataset creation failed" "" "Date" "" "Date Column" "Datumsspalte" @@ -1871,6 +1867,7 @@ "Execute" "Ausführen" "Execute SQL" "" "Execute Tool" "Werkzeug ausführen" +"Executing" "" "Execution" "Ausführung" "Execution failed" "" "Execution has been stopped by user!" "" @@ -2020,7 +2017,6 @@ "Figure" "Bild" "File" "Datei" "File Cache" "Datei Speicher" -"File Creation Day/Year" "" "File Encoding" "" "File Format" "" "File Name" "Dateiname" @@ -2030,7 +2026,6 @@ "File error" "Dateifehler" "File not found!" "" "File path" "Dateipfad" -"File signature is not 'LASF'!" "Dateikennzeichnung ist nicht ´LASF´!" "File with Coefficients" "" "Filename" "" "Filename Digits" "" @@ -2133,7 +2128,6 @@ "Flatten Polygon Layer" "" "Flattening" "Abplattung" "Flattening (f)" "Abplattung (f)" -"Flightline Edge" "" "Floating Point (4 byte)" "Fließkommazahl (4 Byte)" "Floating Point (8 byte)" "Fließkommazahl (8 Byte)" "Floating Point Numbers" "" @@ -2337,7 +2331,6 @@ "Generalized Surface" "" "Generate Shapes" "Erzeuge Vektoren" "Generated Shapefile." "Erzeuge Vektordatei." -"Generating Software" "" "Gentle AdaBoost" "" "Geo-Reference" "Georeferenz" "GeoJSON (*.geojson)" "" @@ -2550,9 +2543,6 @@ "Hauptgerinne-Parameter (erweitertes HD-Modell)" "" "Having" "" "Header Lines" "" -"Header Point Count" "" -"Header Size" "" -"Header Summary" "" "Headline" "" "Heads" "Köpfe" "Heavy Clay" "" @@ -2751,7 +2741,6 @@ "Imaginary" "Imaginär" "Import" "Import" "Import ASTER Scene" "" -"Import Additional Attributes" "" "Import All Attributes" "" "Import Atlas Boundary File" "Import Atlas Boundary Datei" "Import Binary Raw Data" "Import binäre RAW Daten" @@ -2759,12 +2748,10 @@ "Import CRU Grids" "" "Import Classification" "" "Import DB Table from MySQL" "" -"Import DXF Files" "Import DXF Dateien" "Import ESRI Arc/Info Grid" "Import ESRI Arc/Info Raster" "Import ESRI E00 File" "" "Import Erdas LAN/GIS" "Import Erdas LAN/GIS" "Import Extents" "" -"Import Filter" "Import Filter" "Import GPX" "Import GPX" "Import GStat Shapes" "Import GStat Vektoren" "Import Grid from Table" "Import Raster von Tabelle" @@ -2787,6 +2774,7 @@ "Import SRTM30 DEM" "Import SRTM30 DGM" "Import Scalable Vector Graphics (SVG) File" "Import Scalable Vektor Graphics (SVG) Dateien" "Import Sentinel-2 Scene" "" +"Import Sentinel-3 OLCI Scene" "" "Import Shapes" "" "Import Shapes from PostGIS" "" "Import Shapes from XYZ" "Import Vektoren von XYZ" @@ -3088,11 +3076,7 @@ "LAS 1.4" "" "LAS Class 1" "" "LAS Class 2" "" -"LAS File" "LAS Datei" "LAS Files" "" -"LAS Files (*.las)|*.las|All Files|*.*" "LAS Dateien (*.las)|*.las|Alle Dateien|*.*" -"LAS header exception" "" -"LAS reader exception" "" "LAZ Files" "" "LCZC" "" "LCZC (Filtered)" "" @@ -3279,7 +3263,6 @@ "Linear Trend" "" "Linear percent stretch allows you to trim extreme values from both ends of the histogram using the percentage specified here." "" "Lines" "Linien" -"Lines (extended)" "" "Lines with Property Attributes" "" "Link" "" "Link Prefix" "" @@ -3505,7 +3488,6 @@ "Material" "" "Material for Accumulation" "" "Matrix signular\n" "singulare Matrix\n" -"Max" "" "Max Iterations" "Maximale Iterationen" "Max Lamda" "Max Lamda" "Max. Number of Classes" "Max. Anzahl der Klassen" @@ -3521,7 +3503,6 @@ "Maximum Brightness [%]" "" "Maximum Categories" "" "Maximum Cells (C Correction Analysis)" "Maximum Zellen (C Korrekturanalyse)" -"Maximum Color" "" "Maximum Contour Value" "Maximaler Isolinienwert" "Maximum Curvature" "" "Maximum Deposition along Path" "" @@ -3684,7 +3665,6 @@ "Midslope Ridges" "" "Midslope Ridges, Small Hills in Plains" "" "Miller Cylindrical" "" -"Min" "" "Min. Flow Speed (m/s)" "minimale Strömungsgeschwindigkeit (m/s)" "Min. Segment Length" "Minimale Segmentlänge" "Min. Size" "Minimale Größe" @@ -3699,8 +3679,6 @@ "Minimum Area" "" "Minimum Bounding Box" "" "Minimum Cloud Cover Fraction" "" -"Minimum Color" "" -"Minimum Contour Value" "Minimaler Isolinienwert" "Minimum Cost" "" "Minimum Curvature" "" "Minimum DQV" "" @@ -3747,7 +3725,6 @@ "Minimum Value" "minimaler Wert" "Minimum Velocity [m/h]" "" "Minimum Weight" "" -"Minimum and Maximum Attributes (min, max)" "" "Minimum and maximum [%], the range for histogram stretch." "" "Minimum and maximum of attribute range []." "" "Minimum and maximum values used to define the histogram classes." "" @@ -4055,7 +4032,6 @@ "No|Yes|" "Nein|Ja|" "Nu" "" "Number Of Splits" "" -"Number Var. Length Records" "" "Number for..." "" "Number in Latitudinal Direction" "" "Number in Meridional Direction" "" @@ -4099,13 +4075,10 @@ "Number of Numeric Value Classes" "" "Number of Pairs" "Anzahl der Paare" "Number of Parts" "Anzahl der Teile" -"Number of Point Records" "" "Number of Points" "Anzahl der Punkte" -"Number of Points by Return" "" "Number of Points for Local Interpolation" "Anzahl der Punkte für lokale Interpolation" "Number of Points in Cell" "Punktanzahl in Zelle" "Number of Records" "Anzahl der Datensätze" -"Number of Returns by Pulse" "" "Number of Returns of Given Pulse" "" "Number of Row Cells" "Anzahl der Reihenzellen" "Number of Rows" "Anzahl der Reihen" @@ -4143,9 +4116,7 @@ "Number of nearest points, which will be evaluated for filtering. Set to zero to investigate all points in search radius." "Anzahl der nächsten Punkte, die für die Filterung berücksichtigt werden. Eintragen von null untersucht alle Punkte im Suchradius." "Number of neurons" "" "Number of points" "Anzahl Punkt" -"Number of points in the simplified line" "Punktanzahl in vereinfachter Linie" "Number of points on each side of the section" "" -"Number of points per return:" "Anzahl der Punkte pro Rückgabe:" "Number of raindays is greater than model timespan!" "" "Number of raster files found in directory" "" "Number of removed shapes" "" @@ -4200,7 +4171,6 @@ "Offset distance to symbol (either screen or map units)." "" "Offset distance to symbol relative to symbol's size." "" "Offset given as percentage of map size" "" -"Offset to Point Data" "" "Ok" "OK" "Okay" "" "Old Value" "" @@ -4213,7 +4183,6 @@ "One or several input point cloud datasets to cut." "" "One per x" "Einer per x" "Online Help" "Online Hilfe" -"Only Header Info" "Nur Kopfzeilen Info" "Only List Connected Servers" "" "Only No Data" "" "Only Process Gaps with Less Cells" "Nur Bearbeitung von Lücken mit wenigen Zellen" @@ -4435,8 +4404,6 @@ "Percentage Range" "" "Percentage clays" "" "Percentage of Standard Deviation" "" -"Percentage of points" "Prozentanteil der Punkte" -"Percentage of points remaining in the simplified line" "Prozentanteil der Punkte, die in der vereinfachten Linie verbleiben" "Percentage of standard deviation" "" "Percentage rock fragments" "" "Percentage sand" "" @@ -4495,12 +4462,11 @@ "Please provide at least one column to export!" "" "Please provide either a file input or WKT as a string!" "" "Please provide some input files!" "" +"Please wait, working..." "" "Plot Holes" "Zeichnungslöcher" "Plot hole data has to provide at the very least five attributes (horizon depth, TF, L, Ar, Mo)." "" "Point" "Punkt" "Point (2.5D)" "" -"Point Classification Histogram" "" -"Point Classifications" "" "Point Cloud" "Punktwolken" "Point Cloud %s is empty after removing overlap, skipping dataset!" "" "Point Cloud Attribute Calculator" "Punktwolken Attributrechner" @@ -4521,16 +4487,12 @@ "Point Cloud to reclassify/extract" "Punktwolken zu reklassifizieren / Auszug" "Point Clouds" "Punktwolken" "Point Clouds Viewer" "" -"Point Data Format" "" "Point Data Record Format" "Punktdaten Datensatzformat" -"Point Data Record Length" "" -"Point Inspection Summary" "" "Point Position" "Punkt Position" "Point Size" "Punktgröße" "Point Size: Default" "Punktgröße: Voreinstellung" "Point Size: Scaling" "Punktgröße: Maßstab" "Point Source ID" "" -"Point Source Id" "" "Point Statistics for Polygons" "Punkt Statistik für Polygone" "Point Thinning" "" "Point View Settings" "" @@ -4539,7 +4501,6 @@ "Point clouds viewer." "Punktwolkenbetrachter." "Point insertion distance [map units]." "" "Point shapefile with source point(s)" "Punkt Vektordatei mit Ausgangspunkten" -"Point summary contains no points!" "Punktzusammenfassung enthält keine Punkte!" "Point to Keep" "" "Point to Line Distances" "" "Point to Point Distances" "" @@ -4584,7 +4545,6 @@ "Polygons' and target grid's extent do not intersect." "" "Polyline" "" "Polyline (2.5D)" "" -"Polylines" "Hilfslinien" "Polynom" "Polynom" "Polynomial Coefficients" "Polynomial Koeffizient" "Polynomial Order" "" @@ -4606,7 +4566,6 @@ "Positive Openness" "" "Positive values result in a shift in E direction." "Positive Werte resultieren in einem Verschieben in Ost-Richtung" "Positive values result in a shift in N direction." "Positive Werte resultieren in einem Verschieben in Nord-Richtung" -"Possible error" "möglicher Fehler" "Post-Processing" "" "PostGIS" "" "PostGIS extension added" "" @@ -4699,7 +4658,6 @@ "Print Layout" "" "Print Preview" "Druckvorschau" "Print Setup" "Druckeinstellungen" -"Print only information available in LAS header." "Drucke nur Informationen aus der LAS Kopfzeile." "Priority Index" "Vorrangiger Index" "Probabilities" "" "Probability" "" @@ -4708,7 +4666,7 @@ "Probability Threshold" "" "Process Area" "" "Process Path" "" -"Process Update Frequency [milliseconds]" "Prozess Update Frequenz [Millisekunden]" +"Process Update Frequency" "" "Processed DEM" "" "Processing" "Verarbeitung" "Processing ..." "" @@ -4739,7 +4697,6 @@ "Proj4 definition string error" "" "Project" "" "Project File" "Projektdatei" -"Project ID/GUID" "" "Project has been saved." "Projekt wurde gespeichert." "Project has been successfully loaded." "Projekt wurde erfolgreich geladen." "Projected Coordinate System" "Projeziertes Koordinatensystem" @@ -4820,9 +4777,7 @@ "RGB Value Range" "" "RGB Values" "" "RGB coded data" "RGB kodierte Daten" -"RGB color" "" "RGB to IHS" "" -"RGB value range" "" "RGB-Coded Color" "" "RGP Color" "" "RMSE" "" @@ -4868,7 +4823,6 @@ "Randomize Direction" "" "Range" "Bereich" "Range of Records" "" -"Range of Red, Green, Blue values in LAS file." "" "Rank" "Rankzahl" "Rank Filter" "Rangzahlfilter" "Rao's Q" "" @@ -5032,7 +4986,6 @@ "Rescale Values (0-255)" "Massstabsänderung Werte (0-255)" "Rescale to 0 - 1" "" "Resection (Terrestrial)" "" -"Reserved" "" "Reset" "" "Resets flow accumulation raster." "" "Residual" "" @@ -5063,8 +5016,6 @@ "Resulting Value" "sich ergebender Wert" "Results" "Ergebnisse" "Return" "" -"Return Count" "" -"Return Number" "" "Returns" "" "Returns resulting grid's no-data value" "" "Returns tables's no-data value" "" @@ -5305,8 +5256,6 @@ "Scaling applied to coloring choices (i) grid's standard deviation, (ii) grid's value range, (iii) specified value range" "" "Scaling factor for perimeter and area (squared). meter to feet = 1 / 0.3048 = 3.2808" "" "Scan Angle" "" -"Scan Angle Rank" "" -"Scan Direction Flag" "" "Scatterplot" "" "Scene Classification" "" "Scheme" "" @@ -5382,7 +5331,6 @@ "Select Temperature Column" "Wähle Temperaturspalte" "Select a layer to copy settings from it." "" "Select a mode of operation." "" -"Select additional attributes to become imported, if these are available." "" "Select an input table and at least one output feature!" "" "Select and Delete" "" "Select at least one output feature!" "" @@ -5421,7 +5369,8 @@ "Selection Color" "Farbauswahl" "Selection Method" "" "Semi-Global Block Matching" "" -"Semicolon separated list of band indexes. If empty (default) all bands will be imported." "" +"Semicolon separated list of band indexes (zero-based). If empty (default) all bands will be imported." "" +"Semicolon separated list of subset names or indexes (zero-based). If empty (default) all subsets will be imported (if there are any)." "" "Semimajor Axis (a)" "große Halbachse (a)" "Semimajor Axis and Eccentricity" "große Halbachse und Exzentrizität" "Semimajor Axis and Eccentricity Squared" "große Halbachse und Exzentrizität quadriert" @@ -5595,7 +5544,6 @@ "Simple Kriging (3D)" "" "Simple, flow path and swath profiles." "Einfach, Fliessweg und Bahnprofile" "Simplified Lines" "vereinfachte Linien" -"Simplify Lines" "Linien vereinfachen" "Simpson Index" "" "Simulación (Viento variable)" "Simulation" "Simulando..." "Simulieren..." @@ -5831,7 +5779,6 @@ "Split Lines at Points" "" "Split Lines with Lines" "" "Split Parts" "Trenne Teile" -"Split Polygon Parts" "" "Split RGB Composite" "" "Split Shapes Layer" "Trenne Vektorebenen" "Split Shapes Layer Completely" "Teile Vektorebenen komplett" @@ -5887,6 +5834,7 @@ "Static table" "" "Statistics" "Statistik" "Statistics Field(s)" "" +"Statistics are based on a subset of the data set. The sample size to be used can be changed in the settings." "" "Statistics for Grids" "Statistik für Raster" "Statistics for Grids from Files" "" "Std.Dev." "Standardabweichung" @@ -5945,6 +5893,7 @@ "Subbasin Inflow" "Teilbecken Zufluss" "Subbasins" "Teilbecken" "Subdued escarpment" "" +"Subsets" "" "Substitute Value" "" "Subsurface flow (m/dt)" "" "SubsurfaceViewer Files" "" @@ -5966,7 +5915,6 @@ "Summary" "Zusammenfassung" "Summary Table" "" "Summary table." "tabellarische Zusammenfassung." -"Summary:\n" "Zusammenfassung:\n" "Summary_" "" "Summit" "" "Summit Extraction" "" @@ -6017,7 +5965,6 @@ "Synchronize Map Extents" "" "Synchronize with look-up table classification of another grid (gui only)." "" "Synthesized Grid" "" -"System Identifier" "" "T Curvature" "T Kurvatur" "T Slope" "T Neigung" "T Vertical Distance to Channel Network" "T Vertikale Entfernung zum Gewässernetz" @@ -6107,6 +6054,7 @@ "Target Projection" "" "Target Projection Error" "" "Target Range" "Zielbereich" +"Target Resolution" "" "Target System" "" "Target X Coordinate" "" "Target X coordinate" "" @@ -6194,7 +6142,6 @@ "The GDAL raster format (driver) to be used." "" "The GeoTIFF File to be created." "" "The GeoTRANS engine could not be initialized !!\n\n" "" -"The LAS output file." "Die LAS-Ausgabedatei. " "The LAS/LAZ output file." "" "The SAGA grids to be exported." "" "The absolute minimum and maximum values are equal." "" @@ -6581,7 +6528,6 @@ "Tools for the georeferencing of spatial data." "Werkzeuge für die Georeferenzierung" "Tools for the gridding of points and other vector data." "Werkzeuge für das Rastern von Punkten und anderen Vektordaten" "Tools for the handling of virtual datasets." "Werkzeuge für die Handhabung virtueller Datensätze" -"Tools for the import and export of DXF files." "Werkzeuge für den Import und Export von DXF Dateien." "Tools for the import and export of gridded data." "Werkzeuge für den Import und Export gerasterter Daten." "Tools for the import and export of tables." "Werkzeuge für den Import und Export von Tabellen." "Tools for the import and export of vector data." "Werkzeuge für den Import und Export von Vektordaten." @@ -6617,8 +6563,6 @@ "Total Curvature" "" "Total Insolation" "Gesamt Sonneneinstrahlung" "Total Kinetic Energy" "" -"Total Points" "" -"Total Pulses" "" "Total area is zero or minimum elevation is equal or lower than maximum elevation!" "" "Total flow (in watershed) (m^3/dt)" "" "Total flow (m/dt)" "" @@ -6734,12 +6678,9 @@ "Unable to connect to server." "Keine Verbindung zum Server." "Unable to create filtered mask grid!" "" "Unable to create grid for the eroded image!" "" -"Unable to open LAS file" "" -"Unable to open LAS file!" "LAS Datei kann nicht geöffnet werden!" "Unable to open RDB2 file! Exception: %s" "" "Unable to open input file!" "Eingabedatei kann nicht geöffnet werden!" "Unable to open output file %s!" "" -"Unable to read points from LAS file!" "Kann keine Punkte von LAS Datei lesen!" "Unable to save %s file!" "" "Unable to save file %s!" "" "Uncertainty in routing direction expressed as standard deviation (degree)." "" @@ -6769,8 +6710,6 @@ "Unknown" "Unbekannt" "Unknown Authority Code" "" "Unknown Error" "Unbekannter Fehler" -"Unknown LAS header exception!" "" -"Unknown LAS reader exception!" "" "Unknown RDB2 reader exception!" "" "Unkown operation value %d in grid cell %d,%d (x,y), computing accuflux ..." "" "Unreferenced Grids" "" @@ -6795,6 +6734,7 @@ "Update values lower limit" "" "Update values upper limit" "" "Update view during simulation." "Aktualisiere Darstellung während der Simulation." +"Updating" "" "Upland Drainages" "" "Upland Drainages, Headwaters" "" "Upper" "" @@ -6987,7 +6927,6 @@ "Vertikale Zufluesse" "" "ViGrA" "" "Victor Olaya (c) 2004" "" -"Victor Olaya (c) 2005" "" "Victor Olaya, Volker Wichmann (c) 2004-17" "" "View Metadata" "" "Virtual" "" @@ -7273,10 +7212,6 @@ "[cells]" "" "[cmol/kg]" "" "[degree]" "" -"[deprecated] Export LAS Files" "" -"[deprecated] Import LAS Files" "" -"[deprecated] LAS" "" -"[deprecated] LAS Info" "" "[deprecated] Neural Networks (OpenCV)" "" "[deprecated] Point Cloud Viewer" "" "[deprecated] TIN Viewer" "" @@ -7286,6 +7221,7 @@ "[kg/m^3]" "" "[m/s]" "" "[m]" "" +"[milliseconds]" "" "[mm]" "" "[not set]|" "" "[permille]" "" @@ -7332,9 +7268,9 @@ "all bands" "" "all classes" "alle Klassen" "all directions" "" -"all entities" "alle Instanzen" "all input records found a join" "" "all join table records found at least one join" "" +"all lines at once" "" "all points within search distance" "" "all polygons" "" "all quadrants" "alle Quadranten" @@ -7486,7 +7422,6 @@ "check this in case parameter 'water' is absolute water level" "Überprüfe dieses für den Fall dass der Parameter `Wasser`der absolute Wasserpegel ist" "check this in case seed cells are coded with absolute water level" "überprüfe dieses wenn die Keimzellen mit dem absoluten Wasserpegel kodiert sind " "checked" "" -"choose vertex type for resulting contours" "" "circle" "Kreis" "circle in rhombus" "Kreis in Rhombus" "circle in square" "Kreis in Quadrat" @@ -7701,6 +7636,8 @@ "do not show" "" "do not sort" "" "do not update" "nicht aktualisieren" +"doi:10.1007/s00035-014-0124-0" "" +"doi:10.1111/geb.12897" "" "down" "herunter" "downscaled" "" "downscaling" "" @@ -7783,6 +7720,7 @@ "failed to allocate memory for output points" "" "failed to allocate memory for phi calculation" "" "failed to allocate memory for target data." "" +"failed to apply georeferencing" "" "failed to build basic statistics" "" "failed to change client encoding to UTF-8" "" "failed to connect to server." "" @@ -7802,6 +7740,7 @@ "failed to derive temperatures" "" "failed to estimate target extent" "" "failed to fit model function to empirical variogram." "" +"failed to import band" "" "failed to import subset" "" "failed to import table" "" "failed to initialise search engine" "Initialisierung der Suchmaschine fehlgeschlagen" @@ -7839,6 +7778,7 @@ "failed to store data" "" "failed to write data" "" "failed: could not find a suitable import driver" "fehlgeschlagen: konnte keinen passenden Importtreiber finden" +"failed: there is no intersection of dataset's extent and targeted extent." "" "false" "" "fat" "" "feathering" "" @@ -7877,9 +7817,6 @@ "fixed cell height" "" "fixed interval" "" "fixed value" "fester Wert" -"flagged as keypoints" "" -"flagged as synthetic" "" -"flagged as withheld" "" "floating" "" "floating point numbers" "" "flow accumulation threshold (cells) for linear flow routing" "" @@ -7907,6 +7844,7 @@ "generation" "" "geographical" "geographisch" "geometric" "" +"georeferencing" "" "give output of an edge twice, i.e. once for each of the two adjacent polygons" "" "given as map units or meters if polar coordinates switch is on; ignored if set to zero" "als Karteneinheiten oder Meter gegeben wenn Polarkoordinaten eingestellt sind; bei Einstellung 0 ignoriert" "given in degree clockwise from North direction" "gegeben in Grad im Uhrzeigersinn aus Nordrichtung" @@ -7918,6 +7856,7 @@ "graph and root node" "" "green > blue" "grün > blau" "green > grey > blue" "grün > grau > blau" +"green > red" "" "green > red > blue" "grün > rot > blau" "green channel color" "grüner Farbkanal" "greyscale" "Graustufen" @@ -8058,6 +7997,8 @@ "invalid image file path" "" "invalid input" "unzulässige Eingabe" "invalid input data" "" +"invalid input lines" "" +"invalid input polygons" "" "invalid input!" "ungültige Eingabe!" "invalid lines layer" "" "invalid lookup table." "" @@ -8073,7 +8014,6 @@ "invalid point cloud" "" "invalid points have been skipped" "ungültige Punkte werden übersprungen" "invalid points layer" "ungültige Punktebene" -"invalid points skipped!" "" "invalid polygons" "" "invalid polygons layer" "" "invalid production date" "" @@ -8144,6 +8084,7 @@ "line and polygon" "" "line simplification can only be applied to lines and polygons" "Linienvereinfachung kann nur mit Linien oder Polygonen genutzt werden" "line tracing" "" +"line-by-line" "" "linear" "linear" "linear intervals" "" "linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)" "" @@ -8362,7 +8303,6 @@ "no scaling" "" "no seed points identified" "keine Saatpunkte gefunden" "no self-intersecting polygons detected" "" -"no shapes for intersection found" "keine Vektoren für Schnittmenge gefunden" "no shapes in list" "" "no shapes in selection" "keine Vektoren in Auswahl" "no sinks" "keine Senken" @@ -8474,8 +8414,6 @@ "one single class specified by class identifier" "eine einzelne Klasse spezifiziert durch Klassenidentifizierer" "one-class SVM" "" "online" "online" -"only entities with layer definition" "nur Instanzen mit Ebenendefinition" -"only entities without layer definition" "nur Instanzen ohne Ebenendefinition" "only points with given minimum number of points in search radius will be processed" "nur Punkte mit einer gegebenen Mindestanzahl von Punkten im Suchradius werden bearbeitet" "only show within scale range; values are given as extent measured in map units" "" "only z" "nur z" @@ -8551,9 +8489,7 @@ "points have been filtered" "Punkte wurden gefiltert" "points have been imported with success" "Punkte wurden erfolgreich eingelesen" "points layer and grid do not intersect at all" "" -"points read" "Punkte gelesen" "points removed" "" -"points written" "Punkte geschrieben" "polar coordinates given in degree" "" "polygon" "" "polygon by polygon" "" @@ -8563,6 +8499,7 @@ "polygon wise (cell area)" "" "polygon wise (cell centers)" "" "polygons" "Polygone" +"polygons and lines extents do not intersect at all" "" "polylines" "" "polynomial" "" "polynomial trend" "" @@ -8656,10 +8593,8 @@ "restore model from file" "" "restricts extrapolation by assigning minimal allowed weight for a vertex (normally \"-1\" or so; lower values correspond to lower reliability; \"0\" means no extrapolation)" "" "retrieving class information" "" -"return" "return" "rgb coded raster map to be draped" "" "rgb coded values" "" -"rgb color" "RGB Farbe" "rhombus" "Rhombus" "right" "rechts" "right-angled" "" diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.lng.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.lng.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.lng.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.lng.txt 2022-06-14 09:39:21.000000000 +0000 @@ -281,8 +281,6 @@ "Activation Function" "" "Activation function" "" "Active Variable Count" "" -"Actual Point Count" "" -"Actual number of points by return is different from header (actual, header)" "" "Add" "" "Add All" "" "Add All Fields" "" @@ -593,6 +591,7 @@ "Band Width" "" "Band Width for Seed Point Generation" "" "Bands" "" +"Bands as Grid Collection" "" "Bandwidth" "" "Bandwidth (Cells)" "" "Bandwidth for exponential and Gaussian weighting" "" @@ -601,6 +600,7 @@ "Bars" "" "Bars|" "" "Base 10 Logarithm" "" +"Base Contour Value" "" "Base Level" "" "Base Map" "" "Base Map Caching" "" @@ -645,7 +645,6 @@ "Block Kriging" "" "Block Matching" "" "Block Size" "" -"Blocks" "" "Blue" "" "Blue (TM 1)" "" "Blue Channel Color" "" @@ -853,7 +852,6 @@ "Chart (sectors):" "" "Chart Settings" "" "Chart Type" "" -"Check Point Validity" "" "Check Vertices" "" "Check for Building Parts" "" "Check the fields to export" "" @@ -895,7 +893,6 @@ "Choose how to handle the No Data value of the output grid." "" "Choose how to sort the elevation dataset before sampling" "" "Choose if you want to segmentate either on minima or on maxima." "" -"Choose the Point Data Record Format you like to use" "" "Choose the activation function used by the neronal network." "" "Choose the classification constant to use" "" "Choose the file format to write. The format determines which attributes can be written and in which data depth." "" @@ -919,7 +916,6 @@ "Choose whether to reclassify a Point Cloud or to extract a subset from a Point Cloud." "" "Choosing a lower value will result in a better numerical precision but also in a longer calculation time." "" "Circle" "" -"Circle Point Distance [Degree]" "" "Circles" "" "Circular" "" "Cirrus" "" @@ -1043,7 +1039,6 @@ "Collpase Options" "" "Color" "" "Color Attribute" "" -"Color Blending" "" "Color Palette" "" "Color Palette Rotation" "" "Color Triangle Composite" "" @@ -1141,6 +1136,7 @@ "Constraints" "" "Continue?" "" "Contour" "" +"Contour Interval" "" "Contour Length" "" "Contour Lines" "" "Contour Lines from Grid" "" @@ -1370,7 +1366,6 @@ "DTM 2" "" "DTM Filter (slope-based)" "" "DTM, digital terrain model [m]" "" -"DXF" "" "Daily" "" "Daily Data" "" "Daily Extreme Temperature" "" @@ -1406,6 +1401,7 @@ "Database access through the libmysql.lib interface." "" "Database|ODBC" "" "Database|PostgreSQL" "" +"Dataset" "" "Dataset creation failed" "" "Date" "" "Date Column" "" @@ -1871,6 +1867,7 @@ "Execute" "" "Execute SQL" "" "Execute Tool" "" +"Executing" "" "Execution" "" "Execution failed" "" "Execution has been stopped by user!" "" @@ -2020,7 +2017,6 @@ "Figure" "" "File" "" "File Cache" "" -"File Creation Day/Year" "" "File Encoding" "" "File Format" "" "File Name" "" @@ -2030,7 +2026,6 @@ "File error" "" "File not found!" "" "File path" "" -"File signature is not 'LASF'!" "" "File with Coefficients" "" "Filename" "" "Filename Digits" "" @@ -2133,7 +2128,6 @@ "Flatten Polygon Layer" "" "Flattening" "" "Flattening (f)" "" -"Flightline Edge" "" "Floating Point (4 byte)" "" "Floating Point (8 byte)" "" "Floating Point Numbers" "" @@ -2337,7 +2331,6 @@ "Generalized Surface" "" "Generate Shapes" "" "Generated Shapefile." "" -"Generating Software" "" "Gentle AdaBoost" "" "Geo-Reference" "" "GeoJSON (*.geojson)" "" @@ -2550,9 +2543,6 @@ "Hauptgerinne-Parameter (erweitertes HD-Modell)" "" "Having" "" "Header Lines" "" -"Header Point Count" "" -"Header Size" "" -"Header Summary" "" "Headline" "" "Heads" "" "Heavy Clay" "" @@ -2751,7 +2741,6 @@ "Imaginary" "" "Import" "" "Import ASTER Scene" "" -"Import Additional Attributes" "" "Import All Attributes" "" "Import Atlas Boundary File" "" "Import Binary Raw Data" "" @@ -2759,12 +2748,10 @@ "Import CRU Grids" "" "Import Classification" "" "Import DB Table from MySQL" "" -"Import DXF Files" "" "Import ESRI Arc/Info Grid" "" "Import ESRI E00 File" "" "Import Erdas LAN/GIS" "" "Import Extents" "" -"Import Filter" "" "Import GPX" "" "Import GStat Shapes" "" "Import Grid from Table" "" @@ -2787,6 +2774,7 @@ "Import SRTM30 DEM" "" "Import Scalable Vector Graphics (SVG) File" "" "Import Sentinel-2 Scene" "" +"Import Sentinel-3 OLCI Scene" "" "Import Shapes" "" "Import Shapes from PostGIS" "" "Import Shapes from XYZ" "" @@ -3088,11 +3076,7 @@ "LAS 1.4" "" "LAS Class 1" "" "LAS Class 2" "" -"LAS File" "" "LAS Files" "" -"LAS Files (*.las)|*.las|All Files|*.*" "" -"LAS header exception" "" -"LAS reader exception" "" "LAZ Files" "" "LCZC" "" "LCZC (Filtered)" "" @@ -3279,7 +3263,6 @@ "Linear Trend" "" "Linear percent stretch allows you to trim extreme values from both ends of the histogram using the percentage specified here." "" "Lines" "" -"Lines (extended)" "" "Lines with Property Attributes" "" "Link" "" "Link Prefix" "" @@ -3505,7 +3488,6 @@ "Material" "" "Material for Accumulation" "" "Matrix signular\n" "" -"Max" "" "Max Iterations" "" "Max Lamda" "" "Max. Number of Classes" "" @@ -3521,7 +3503,6 @@ "Maximum Brightness [%]" "" "Maximum Categories" "" "Maximum Cells (C Correction Analysis)" "" -"Maximum Color" "" "Maximum Contour Value" "" "Maximum Curvature" "" "Maximum Deposition along Path" "" @@ -3684,7 +3665,6 @@ "Midslope Ridges" "" "Midslope Ridges, Small Hills in Plains" "" "Miller Cylindrical" "" -"Min" "" "Min. Flow Speed (m/s)" "" "Min. Segment Length" "" "Min. Size" "" @@ -3699,8 +3679,6 @@ "Minimum Area" "" "Minimum Bounding Box" "" "Minimum Cloud Cover Fraction" "" -"Minimum Color" "" -"Minimum Contour Value" "" "Minimum Cost" "" "Minimum Curvature" "" "Minimum DQV" "" @@ -3747,7 +3725,6 @@ "Minimum Value" "" "Minimum Velocity [m/h]" "" "Minimum Weight" "" -"Minimum and Maximum Attributes (min, max)" "" "Minimum and maximum [%], the range for histogram stretch." "" "Minimum and maximum of attribute range []." "" "Minimum and maximum values used to define the histogram classes." "" @@ -4055,7 +4032,6 @@ "No|Yes|" "" "Nu" "" "Number Of Splits" "" -"Number Var. Length Records" "" "Number for..." "" "Number in Latitudinal Direction" "" "Number in Meridional Direction" "" @@ -4099,13 +4075,10 @@ "Number of Numeric Value Classes" "" "Number of Pairs" "" "Number of Parts" "" -"Number of Point Records" "" "Number of Points" "" -"Number of Points by Return" "" "Number of Points for Local Interpolation" "" "Number of Points in Cell" "" "Number of Records" "" -"Number of Returns by Pulse" "" "Number of Returns of Given Pulse" "" "Number of Row Cells" "" "Number of Rows" "" @@ -4143,9 +4116,7 @@ "Number of nearest points, which will be evaluated for filtering. Set to zero to investigate all points in search radius." "" "Number of neurons" "" "Number of points" "" -"Number of points in the simplified line" "" "Number of points on each side of the section" "" -"Number of points per return:" "" "Number of raindays is greater than model timespan!" "" "Number of raster files found in directory" "" "Number of removed shapes" "" @@ -4200,7 +4171,6 @@ "Offset distance to symbol (either screen or map units)." "" "Offset distance to symbol relative to symbol's size." "" "Offset given as percentage of map size" "" -"Offset to Point Data" "" "Ok" "" "Okay" "" "Old Value" "" @@ -4213,7 +4183,6 @@ "One or several input point cloud datasets to cut." "" "One per x" "" "Online Help" "" -"Only Header Info" "" "Only List Connected Servers" "" "Only No Data" "" "Only Process Gaps with Less Cells" "" @@ -4435,8 +4404,6 @@ "Percentage Range" "" "Percentage clays" "" "Percentage of Standard Deviation" "" -"Percentage of points" "" -"Percentage of points remaining in the simplified line" "" "Percentage of standard deviation" "" "Percentage rock fragments" "" "Percentage sand" "" @@ -4495,12 +4462,11 @@ "Please provide at least one column to export!" "" "Please provide either a file input or WKT as a string!" "" "Please provide some input files!" "" +"Please wait, working..." "" "Plot Holes" "" "Plot hole data has to provide at the very least five attributes (horizon depth, TF, L, Ar, Mo)." "" "Point" "" "Point (2.5D)" "" -"Point Classification Histogram" "" -"Point Classifications" "" "Point Cloud" "" "Point Cloud %s is empty after removing overlap, skipping dataset!" "" "Point Cloud Attribute Calculator" "" @@ -4521,16 +4487,12 @@ "Point Cloud to reclassify/extract" "" "Point Clouds" "" "Point Clouds Viewer" "" -"Point Data Format" "" "Point Data Record Format" "" -"Point Data Record Length" "" -"Point Inspection Summary" "" "Point Position" "" "Point Size" "" "Point Size: Default" "" "Point Size: Scaling" "" "Point Source ID" "" -"Point Source Id" "" "Point Statistics for Polygons" "" "Point Thinning" "" "Point View Settings" "" @@ -4539,7 +4501,6 @@ "Point clouds viewer." "" "Point insertion distance [map units]." "" "Point shapefile with source point(s)" "" -"Point summary contains no points!" "" "Point to Keep" "" "Point to Line Distances" "" "Point to Point Distances" "" @@ -4584,7 +4545,6 @@ "Polygons' and target grid's extent do not intersect." "" "Polyline" "" "Polyline (2.5D)" "" -"Polylines" "" "Polynom" "" "Polynomial Coefficients" "" "Polynomial Order" "" @@ -4606,7 +4566,6 @@ "Positive Openness" "" "Positive values result in a shift in E direction." "" "Positive values result in a shift in N direction." "" -"Possible error" "" "Post-Processing" "" "PostGIS" "" "PostGIS extension added" "" @@ -4699,7 +4658,6 @@ "Print Layout" "" "Print Preview" "" "Print Setup" "" -"Print only information available in LAS header." "" "Priority Index" "" "Probabilities" "" "Probability" "" @@ -4708,7 +4666,7 @@ "Probability Threshold" "" "Process Area" "" "Process Path" "" -"Process Update Frequency [milliseconds]" "" +"Process Update Frequency" "" "Processed DEM" "" "Processing" "" "Processing ..." "" @@ -4739,7 +4697,6 @@ "Proj4 definition string error" "" "Project" "" "Project File" "" -"Project ID/GUID" "" "Project has been saved." "" "Project has been successfully loaded." "" "Projected Coordinate System" "" @@ -4820,9 +4777,7 @@ "RGB Value Range" "" "RGB Values" "" "RGB coded data" "" -"RGB color" "" "RGB to IHS" "" -"RGB value range" "" "RGB-Coded Color" "" "RGP Color" "" "RMSE" "" @@ -4868,7 +4823,6 @@ "Randomize Direction" "" "Range" "" "Range of Records" "" -"Range of Red, Green, Blue values in LAS file." "" "Rank" "" "Rank Filter" "" "Rao's Q" "" @@ -5032,7 +4986,6 @@ "Rescale Values (0-255)" "" "Rescale to 0 - 1" "" "Resection (Terrestrial)" "" -"Reserved" "" "Reset" "" "Resets flow accumulation raster." "" "Residual" "" @@ -5063,8 +5016,6 @@ "Resulting Value" "" "Results" "" "Return" "" -"Return Count" "" -"Return Number" "" "Returns" "" "Returns resulting grid's no-data value" "" "Returns tables's no-data value" "" @@ -5305,8 +5256,6 @@ "Scaling applied to coloring choices (i) grid's standard deviation, (ii) grid's value range, (iii) specified value range" "" "Scaling factor for perimeter and area (squared). meter to feet = 1 / 0.3048 = 3.2808" "" "Scan Angle" "" -"Scan Angle Rank" "" -"Scan Direction Flag" "" "Scatterplot" "" "Scene Classification" "" "Scheme" "" @@ -5382,7 +5331,6 @@ "Select Temperature Column" "" "Select a layer to copy settings from it." "" "Select a mode of operation." "" -"Select additional attributes to become imported, if these are available." "" "Select an input table and at least one output feature!" "" "Select and Delete" "" "Select at least one output feature!" "" @@ -5421,7 +5369,8 @@ "Selection Color" "" "Selection Method" "" "Semi-Global Block Matching" "" -"Semicolon separated list of band indexes. If empty (default) all bands will be imported." "" +"Semicolon separated list of band indexes (zero-based). If empty (default) all bands will be imported." "" +"Semicolon separated list of subset names or indexes (zero-based). If empty (default) all subsets will be imported (if there are any)." "" "Semimajor Axis (a)" "" "Semimajor Axis and Eccentricity" "" "Semimajor Axis and Eccentricity Squared" "" @@ -5595,7 +5544,6 @@ "Simple Kriging (3D)" "" "Simple, flow path and swath profiles." "" "Simplified Lines" "" -"Simplify Lines" "" "Simpson Index" "" "Simulación (Viento variable)" "" "Simulando..." "" @@ -5831,7 +5779,6 @@ "Split Lines at Points" "" "Split Lines with Lines" "" "Split Parts" "" -"Split Polygon Parts" "" "Split RGB Composite" "" "Split Shapes Layer" "" "Split Shapes Layer Completely" "" @@ -5887,6 +5834,7 @@ "Static table" "" "Statistics" "" "Statistics Field(s)" "" +"Statistics are based on a subset of the data set. The sample size to be used can be changed in the settings." "" "Statistics for Grids" "" "Statistics for Grids from Files" "" "Std.Dev." "" @@ -5945,6 +5893,7 @@ "Subbasin Inflow" "" "Subbasins" "" "Subdued escarpment" "" +"Subsets" "" "Substitute Value" "" "Subsurface flow (m/dt)" "" "SubsurfaceViewer Files" "" @@ -5966,7 +5915,6 @@ "Summary" "" "Summary Table" "" "Summary table." "" -"Summary:\n" "" "Summary_" "" "Summit" "" "Summit Extraction" "" @@ -6017,7 +5965,6 @@ "Synchronize Map Extents" "" "Synchronize with look-up table classification of another grid (gui only)." "" "Synthesized Grid" "" -"System Identifier" "" "T Curvature" "" "T Slope" "" "T Vertical Distance to Channel Network" "" @@ -6107,6 +6054,7 @@ "Target Projection" "" "Target Projection Error" "" "Target Range" "" +"Target Resolution" "" "Target System" "" "Target X Coordinate" "" "Target X coordinate" "" @@ -6194,7 +6142,6 @@ "The GDAL raster format (driver) to be used." "" "The GeoTIFF File to be created." "" "The GeoTRANS engine could not be initialized !!\n\n" "" -"The LAS output file." "" "The LAS/LAZ output file." "" "The SAGA grids to be exported." "" "The absolute minimum and maximum values are equal." "" @@ -6581,7 +6528,6 @@ "Tools for the georeferencing of spatial data." "" "Tools for the gridding of points and other vector data." "" "Tools for the handling of virtual datasets." "" -"Tools for the import and export of DXF files." "" "Tools for the import and export of gridded data." "" "Tools for the import and export of tables." "" "Tools for the import and export of vector data." "" @@ -6617,8 +6563,6 @@ "Total Curvature" "" "Total Insolation" "" "Total Kinetic Energy" "" -"Total Points" "" -"Total Pulses" "" "Total area is zero or minimum elevation is equal or lower than maximum elevation!" "" "Total flow (in watershed) (m^3/dt)" "" "Total flow (m/dt)" "" @@ -6734,12 +6678,9 @@ "Unable to connect to server." "" "Unable to create filtered mask grid!" "" "Unable to create grid for the eroded image!" "" -"Unable to open LAS file" "" -"Unable to open LAS file!" "" "Unable to open RDB2 file! Exception: %s" "" "Unable to open input file!" "" "Unable to open output file %s!" "" -"Unable to read points from LAS file!" "" "Unable to save %s file!" "" "Unable to save file %s!" "" "Uncertainty in routing direction expressed as standard deviation (degree)." "" @@ -6769,8 +6710,6 @@ "Unknown" "" "Unknown Authority Code" "" "Unknown Error" "" -"Unknown LAS header exception!" "" -"Unknown LAS reader exception!" "" "Unknown RDB2 reader exception!" "" "Unkown operation value %d in grid cell %d,%d (x,y), computing accuflux ..." "" "Unreferenced Grids" "" @@ -6795,6 +6734,7 @@ "Update values lower limit" "" "Update values upper limit" "" "Update view during simulation." "" +"Updating" "" "Upland Drainages" "" "Upland Drainages, Headwaters" "" "Upper" "" @@ -6987,7 +6927,6 @@ "Vertikale Zufluesse" "" "ViGrA" "" "Victor Olaya (c) 2004" "" -"Victor Olaya (c) 2005" "" "Victor Olaya, Volker Wichmann (c) 2004-17" "" "View Metadata" "" "Virtual" "" @@ -7273,10 +7212,6 @@ "[cells]" "" "[cmol/kg]" "" "[degree]" "" -"[deprecated] Export LAS Files" "" -"[deprecated] Import LAS Files" "" -"[deprecated] LAS" "" -"[deprecated] LAS Info" "" "[deprecated] Neural Networks (OpenCV)" "" "[deprecated] Point Cloud Viewer" "" "[deprecated] TIN Viewer" "" @@ -7286,6 +7221,7 @@ "[kg/m^3]" "" "[m/s]" "" "[m]" "" +"[milliseconds]" "" "[mm]" "" "[not set]|" "" "[permille]" "" @@ -7332,9 +7268,9 @@ "all bands" "" "all classes" "" "all directions" "" -"all entities" "" "all input records found a join" "" "all join table records found at least one join" "" +"all lines at once" "" "all points within search distance" "" "all polygons" "" "all quadrants" "" @@ -7486,7 +7422,6 @@ "check this in case parameter 'water' is absolute water level" "" "check this in case seed cells are coded with absolute water level" "" "checked" "" -"choose vertex type for resulting contours" "" "circle" "" "circle in rhombus" "" "circle in square" "" @@ -7701,6 +7636,8 @@ "do not show" "" "do not sort" "" "do not update" "" +"doi:10.1007/s00035-014-0124-0" "" +"doi:10.1111/geb.12897" "" "down" "" "downscaled" "" "downscaling" "" @@ -7783,6 +7720,7 @@ "failed to allocate memory for output points" "" "failed to allocate memory for phi calculation" "" "failed to allocate memory for target data." "" +"failed to apply georeferencing" "" "failed to build basic statistics" "" "failed to change client encoding to UTF-8" "" "failed to connect to server." "" @@ -7802,6 +7740,7 @@ "failed to derive temperatures" "" "failed to estimate target extent" "" "failed to fit model function to empirical variogram." "" +"failed to import band" "" "failed to import subset" "" "failed to import table" "" "failed to initialise search engine" "" @@ -7839,6 +7778,7 @@ "failed to store data" "" "failed to write data" "" "failed: could not find a suitable import driver" "" +"failed: there is no intersection of dataset's extent and targeted extent." "" "false" "" "fat" "" "feathering" "" @@ -7877,9 +7817,6 @@ "fixed cell height" "" "fixed interval" "" "fixed value" "" -"flagged as keypoints" "" -"flagged as synthetic" "" -"flagged as withheld" "" "floating" "" "floating point numbers" "" "flow accumulation threshold (cells) for linear flow routing" "" @@ -7907,6 +7844,7 @@ "generation" "" "geographical" "" "geometric" "" +"georeferencing" "" "give output of an edge twice, i.e. once for each of the two adjacent polygons" "" "given as map units or meters if polar coordinates switch is on; ignored if set to zero" "" "given in degree clockwise from North direction" "" @@ -7918,6 +7856,7 @@ "graph and root node" "" "green > blue" "" "green > grey > blue" "" +"green > red" "" "green > red > blue" "" "green channel color" "" "greyscale" "" @@ -8058,6 +7997,8 @@ "invalid image file path" "" "invalid input" "" "invalid input data" "" +"invalid input lines" "" +"invalid input polygons" "" "invalid input!" "" "invalid lines layer" "" "invalid lookup table." "" @@ -8073,7 +8014,6 @@ "invalid point cloud" "" "invalid points have been skipped" "" "invalid points layer" "" -"invalid points skipped!" "" "invalid polygons" "" "invalid polygons layer" "" "invalid production date" "" @@ -8144,6 +8084,7 @@ "line and polygon" "" "line simplification can only be applied to lines and polygons" "" "line tracing" "" +"line-by-line" "" "linear" "" "linear intervals" "" "linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)" "" @@ -8362,7 +8303,6 @@ "no scaling" "" "no seed points identified" "" "no self-intersecting polygons detected" "" -"no shapes for intersection found" "" "no shapes in list" "" "no shapes in selection" "" "no sinks" "" @@ -8474,8 +8414,6 @@ "one single class specified by class identifier" "" "one-class SVM" "" "online" "" -"only entities with layer definition" "" -"only entities without layer definition" "" "only points with given minimum number of points in search radius will be processed" "" "only show within scale range; values are given as extent measured in map units" "" "only z" "" @@ -8551,9 +8489,7 @@ "points have been filtered" "" "points have been imported with success" "" "points layer and grid do not intersect at all" "" -"points read" "" "points removed" "" -"points written" "" "polar coordinates given in degree" "" "polygon" "" "polygon by polygon" "" @@ -8563,6 +8499,7 @@ "polygon wise (cell area)" "" "polygon wise (cell centers)" "" "polygons" "" +"polygons and lines extents do not intersect at all" "" "polylines" "" "polynomial" "" "polynomial trend" "" @@ -8656,10 +8593,8 @@ "restore model from file" "" "restricts extrapolation by assigning minimal allowed weight for a vertex (normally \"-1\" or so; lower values correspond to lower reliability; \"0\" means no extrapolation)" "" "retrieving class information" "" -"return" "" "rgb coded raster map to be draped" "" "rgb coded values" "" -"rgb color" "" "rhombus" "" "right" "" "right-angled" "" diff -Nru saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.rus.txt saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.rus.txt --- saga-8.2.1+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.rus.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/saga_core/saga_gui/res/saga.rus.txt 2022-06-14 09:39:21.000000000 +0000 @@ -281,8 +281,6 @@ "Activation Function" "Функция активации" "Activation function" "Функция активации" "Active Variable Count" "Активировать посчёт переменных" -"Actual Point Count" "" -"Actual number of points by return is different from header (actual, header)" "" "Add" "Добавить" "Add All" "Добавить все" "Add All Fields" "Добавить все поля" @@ -593,6 +591,7 @@ "Band Width" "" "Band Width for Seed Point Generation" "" "Bands" "" +"Bands as Grid Collection" "" "Bandwidth" "" "Bandwidth (Cells)" "" "Bandwidth for exponential and Gaussian weighting" "" @@ -601,6 +600,7 @@ "Bars" "" "Bars|" "" "Base 10 Logarithm" "Логарифм по основанию 10" +"Base Contour Value" "" "Base Level" "Базовый уровень" "Base Map" "Базовая карта" "Base Map Caching" "Кэширование базовой карты" @@ -645,7 +645,6 @@ "Block Kriging" "" "Block Matching" "" "Block Size" "" -"Blocks" "" "Blue" "" "Blue (TM 1)" "" "Blue Channel Color" "" @@ -853,7 +852,6 @@ "Chart (sectors):" "Диаграмма (сектора):" "Chart Settings" "" "Chart Type" "Тип диаграммы" -"Check Point Validity" "Проверить валидность точки" "Check Vertices" "Проверить вершины" "Check for Building Parts" "" "Check the fields to export" "" @@ -895,7 +893,6 @@ "Choose how to handle the No Data value of the output grid." "" "Choose how to sort the elevation dataset before sampling" "" "Choose if you want to segmentate either on minima or on maxima." "" -"Choose the Point Data Record Format you like to use" "" "Choose the activation function used by the neronal network." "" "Choose the classification constant to use" "" "Choose the file format to write. The format determines which attributes can be written and in which data depth." "" @@ -919,7 +916,6 @@ "Choose whether to reclassify a Point Cloud or to extract a subset from a Point Cloud." "" "Choosing a lower value will result in a better numerical precision but also in a longer calculation time." "" "Circle" "" -"Circle Point Distance [Degree]" "" "Circles" "" "Circular" "" "Cirrus" "" @@ -1043,7 +1039,6 @@ "Collpase Options" "" "Color" "Цвет" "Color Attribute" "Атрибут цвета" -"Color Blending" "Смешение цвета" "Color Palette" "Палитра цветов" "Color Palette Rotation" "" "Color Triangle Composite" "" @@ -1141,6 +1136,7 @@ "Constraints" "" "Continue?" "" "Contour" "Контур" +"Contour Interval" "" "Contour Length" "" "Contour Lines" "Контурные линии" "Contour Lines from Grid" "Контурные линии из растров" @@ -1370,7 +1366,6 @@ "DTM 2" "" "DTM Filter (slope-based)" "" "DTM, digital terrain model [m]" "" -"DXF" "" "Daily" "" "Daily Data" "" "Daily Extreme Temperature" "" @@ -1406,6 +1401,7 @@ "Database access through the libmysql.lib interface." "" "Database|ODBC" "База данных|ODBC" "Database|PostgreSQL" "База данных|PostgreSQL" +"Dataset" "" "Dataset creation failed" "" "Date" "Дата" "Date Column" "" @@ -1871,6 +1867,7 @@ "Execute" "Выполнить" "Execute SQL" "Выполнить SQL" "Execute Tool" "Выполнить инструмент" +"Executing" "" "Execution" "Выполнение" "Execution failed" "" "Execution has been stopped by user!" "" @@ -2020,7 +2017,6 @@ "Figure" "" "File" "Файл" "File Cache" "" -"File Creation Day/Year" "" "File Encoding" "" "File Format" "" "File Name" "" @@ -2030,7 +2026,6 @@ "File error" "" "File not found!" "" "File path" "" -"File signature is not 'LASF'!" "" "File with Coefficients" "" "Filename" "" "Filename Digits" "" @@ -2133,7 +2128,6 @@ "Flatten Polygon Layer" "Свести слой полигонов" "Flattening" "Сведение" "Flattening (f)" "Сведение (f)" -"Flightline Edge" "" "Floating Point (4 byte)" "Плавающая точка (4 байта)" "Floating Point (8 byte)" "Плавающая точка (8 байт)" "Floating Point Numbers" "Числа с плавающей точкой" @@ -2337,7 +2331,6 @@ "Generalized Surface" "" "Generate Shapes" "Сгенерировать шейп-слой" "Generated Shapefile." "" -"Generating Software" "" "Gentle AdaBoost" "" "Geo-Reference" "" "GeoJSON (*.geojson)" "" @@ -2550,9 +2543,6 @@ "Hauptgerinne-Parameter (erweitertes HD-Modell)" "" "Having" "" "Header Lines" "" -"Header Point Count" "" -"Header Size" "" -"Header Summary" "" "Headline" "" "Heads" "" "Heavy Clay" "" @@ -2751,7 +2741,6 @@ "Imaginary" "Воображаемый" "Import" "Импорт" "Import ASTER Scene" "Импорт сцены ASTER" -"Import Additional Attributes" "" "Import All Attributes" "" "Import Atlas Boundary File" "Импорт файла границы атласа" "Import Binary Raw Data" "Импорт двоичных данных" @@ -2759,12 +2748,10 @@ "Import CRU Grids" "Импорт растров CRU" "Import Classification" "Импорт классификации" "Import DB Table from MySQL" "Импорт таблицы базы данных из MySQL" -"Import DXF Files" "Импорт файлов DFX" "Import ESRI Arc/Info Grid" "Импорт растров ESRI Arc/Info" "Import ESRI E00 File" "Импорт файла ESRI E00" "Import Erdas LAN/GIS" "Импорт Erdas LAN/GIS" "Import Extents" "Импорт пространства" -"Import Filter" "Импорт фильтра" "Import GPX" "Импорт GPX" "Import GStat Shapes" "Импорт векторов GStat" "Import Grid from Table" "Импорт растра из таблицы" @@ -2787,6 +2774,7 @@ "Import SRTM30 DEM" "Импорт SRTM30 DEM" "Import Scalable Vector Graphics (SVG) File" "Импорт масштабируемой векторной графики SVG-файл" "Import Sentinel-2 Scene" "" +"Import Sentinel-3 OLCI Scene" "" "Import Shapes" "Импорт векторов" "Import Shapes from PostGIS" "Импорт векторов из PostGIS" "Import Shapes from XYZ" "Импорт векторов из XYZ" @@ -3088,11 +3076,7 @@ "LAS 1.4" "" "LAS Class 1" "" "LAS Class 2" "" -"LAS File" "" "LAS Files" "" -"LAS Files (*.las)|*.las|All Files|*.*" "" -"LAS header exception" "" -"LAS reader exception" "" "LAZ Files" "" "LCZC" "" "LCZC (Filtered)" "" @@ -3279,7 +3263,6 @@ "Linear Trend" "" "Linear percent stretch allows you to trim extreme values from both ends of the histogram using the percentage specified here." "" "Lines" "Линии" -"Lines (extended)" "" "Lines with Property Attributes" "" "Link" "" "Link Prefix" "" @@ -3505,7 +3488,6 @@ "Material" "" "Material for Accumulation" "" "Matrix signular\n" "" -"Max" "" "Max Iterations" "" "Max Lamda" "" "Max. Number of Classes" "" @@ -3521,7 +3503,6 @@ "Maximum Brightness [%]" "" "Maximum Categories" "" "Maximum Cells (C Correction Analysis)" "" -"Maximum Color" "" "Maximum Contour Value" "" "Maximum Curvature" "" "Maximum Deposition along Path" "" @@ -3684,7 +3665,6 @@ "Midslope Ridges" "" "Midslope Ridges, Small Hills in Plains" "" "Miller Cylindrical" "" -"Min" "" "Min. Flow Speed (m/s)" "" "Min. Segment Length" "" "Min. Size" "" @@ -3699,8 +3679,6 @@ "Minimum Area" "" "Minimum Bounding Box" "" "Minimum Cloud Cover Fraction" "" -"Minimum Color" "" -"Minimum Contour Value" "" "Minimum Cost" "" "Minimum Curvature" "" "Minimum DQV" "" @@ -3747,7 +3725,6 @@ "Minimum Value" "" "Minimum Velocity [m/h]" "" "Minimum Weight" "" -"Minimum and Maximum Attributes (min, max)" "" "Minimum and maximum [%], the range for histogram stretch." "" "Minimum and maximum of attribute range []." "" "Minimum and maximum values used to define the histogram classes." "" @@ -4055,7 +4032,6 @@ "No|Yes|" "" "Nu" "" "Number Of Splits" "" -"Number Var. Length Records" "" "Number for..." "" "Number in Latitudinal Direction" "" "Number in Meridional Direction" "" @@ -4099,13 +4075,10 @@ "Number of Numeric Value Classes" "" "Number of Pairs" "" "Number of Parts" "" -"Number of Point Records" "" "Number of Points" "" -"Number of Points by Return" "" "Number of Points for Local Interpolation" "" "Number of Points in Cell" "" "Number of Records" "" -"Number of Returns by Pulse" "" "Number of Returns of Given Pulse" "" "Number of Row Cells" "" "Number of Rows" "" @@ -4143,9 +4116,7 @@ "Number of nearest points, which will be evaluated for filtering. Set to zero to investigate all points in search radius." "" "Number of neurons" "" "Number of points" "" -"Number of points in the simplified line" "" "Number of points on each side of the section" "" -"Number of points per return:" "" "Number of raindays is greater than model timespan!" "" "Number of raster files found in directory" "" "Number of removed shapes" "" @@ -4200,7 +4171,6 @@ "Offset distance to symbol (either screen or map units)." "" "Offset distance to symbol relative to symbol's size." "" "Offset given as percentage of map size" "" -"Offset to Point Data" "" "Ok" "" "Okay" "" "Old Value" "" @@ -4213,7 +4183,6 @@ "One or several input point cloud datasets to cut." "" "One per x" "" "Online Help" "" -"Only Header Info" "" "Only List Connected Servers" "" "Only No Data" "" "Only Process Gaps with Less Cells" "" @@ -4435,8 +4404,6 @@ "Percentage Range" "" "Percentage clays" "" "Percentage of Standard Deviation" "" -"Percentage of points" "" -"Percentage of points remaining in the simplified line" "" "Percentage of standard deviation" "" "Percentage rock fragments" "" "Percentage sand" "" @@ -4495,12 +4462,11 @@ "Please provide at least one column to export!" "" "Please provide either a file input or WKT as a string!" "" "Please provide some input files!" "" +"Please wait, working..." "" "Plot Holes" "" "Plot hole data has to provide at the very least five attributes (horizon depth, TF, L, Ar, Mo)." "" "Point" "Точка" "Point (2.5D)" "Точка (2.5D)" -"Point Classification Histogram" "Гистограмма классификации точек" -"Point Classifications" "Классификации точек" "Point Cloud" "Облако точек" "Point Cloud %s is empty after removing overlap, skipping dataset!" "Облако точек %s оказалось пустым после удаления перехлёста, пропускамем датасет!" "Point Cloud Attribute Calculator" "Калькулятор атрибутов облака точек" @@ -4521,16 +4487,12 @@ "Point Cloud to reclassify/extract" "Облако точек в переклассификацию / извлечение" "Point Clouds" "Облака точек" "Point Clouds Viewer" "Просмотрщик облаков точек" -"Point Data Format" "Формат точечных данных" "Point Data Record Format" "Формат записи точечных данных" -"Point Data Record Length" "Длина записи точечтных данных" -"Point Inspection Summary" "Отчёт обледования точек" "Point Position" "Положение точки" "Point Size" "Размер точки" "Point Size: Default" "" "Point Size: Scaling" "" "Point Source ID" "" -"Point Source Id" "" "Point Statistics for Polygons" "Добавить статистику точек для полигонов" "Point Thinning" "" "Point View Settings" "" @@ -4539,7 +4501,6 @@ "Point clouds viewer." "" "Point insertion distance [map units]." "" "Point shapefile with source point(s)" "" -"Point summary contains no points!" "" "Point to Keep" "" "Point to Line Distances" "" "Point to Point Distances" "" @@ -4584,7 +4545,6 @@ "Polygons' and target grid's extent do not intersect." "" "Polyline" "" "Polyline (2.5D)" "" -"Polylines" "" "Polynom" "" "Polynomial Coefficients" "" "Polynomial Order" "" @@ -4606,7 +4566,6 @@ "Positive Openness" "" "Positive values result in a shift in E direction." "" "Positive values result in a shift in N direction." "" -"Possible error" "" "Post-Processing" "" "PostGIS" "" "PostGIS extension added" "" @@ -4699,7 +4658,6 @@ "Print Layout" "" "Print Preview" "" "Print Setup" "" -"Print only information available in LAS header." "" "Priority Index" "" "Probabilities" "" "Probability" "" @@ -4708,7 +4666,7 @@ "Probability Threshold" "" "Process Area" "" "Process Path" "" -"Process Update Frequency [milliseconds]" "" +"Process Update Frequency" "" "Processed DEM" "" "Processing" "" "Processing ..." "" @@ -4739,7 +4697,6 @@ "Proj4 definition string error" "" "Project" "Проект" "Project File" "Файл проекта" -"Project ID/GUID" "" "Project has been saved." "" "Project has been successfully loaded." "" "Projected Coordinate System" "" @@ -4820,9 +4777,7 @@ "RGB Value Range" "" "RGB Values" "" "RGB coded data" "" -"RGB color" "" "RGB to IHS" "" -"RGB value range" "" "RGB-Coded Color" "" "RGP Color" "" "RMSE" "" @@ -4868,7 +4823,6 @@ "Randomize Direction" "" "Range" "" "Range of Records" "" -"Range of Red, Green, Blue values in LAS file." "" "Rank" "" "Rank Filter" "" "Rao's Q" "" @@ -5032,7 +4986,6 @@ "Rescale Values (0-255)" "" "Rescale to 0 - 1" "" "Resection (Terrestrial)" "" -"Reserved" "" "Reset" "Сброс" "Resets flow accumulation raster." "" "Residual" "" @@ -5063,8 +5016,6 @@ "Resulting Value" "Получаемое значение" "Results" "Результаты" "Return" "" -"Return Count" "" -"Return Number" "" "Returns" "" "Returns resulting grid's no-data value" "Возвращает значение нет-данных растра" "Returns tables's no-data value" "Возвращает значение нет-данных таблицы" @@ -5305,8 +5256,6 @@ "Scaling applied to coloring choices (i) grid's standard deviation, (ii) grid's value range, (iii) specified value range" "" "Scaling factor for perimeter and area (squared). meter to feet = 1 / 0.3048 = 3.2808" "" "Scan Angle" "" -"Scan Angle Rank" "" -"Scan Direction Flag" "" "Scatterplot" "График рассеивания" "Scene Classification" "" "Scheme" "Схема" @@ -5382,7 +5331,6 @@ "Select Temperature Column" "" "Select a layer to copy settings from it." "" "Select a mode of operation." "" -"Select additional attributes to become imported, if these are available." "" "Select an input table and at least one output feature!" "" "Select and Delete" "Выбрать и удалить" "Select at least one output feature!" "" @@ -5421,7 +5369,8 @@ "Selection Color" "" "Selection Method" "" "Semi-Global Block Matching" "" -"Semicolon separated list of band indexes. If empty (default) all bands will be imported." "" +"Semicolon separated list of band indexes (zero-based). If empty (default) all bands will be imported." "" +"Semicolon separated list of subset names or indexes (zero-based). If empty (default) all subsets will be imported (if there are any)." "" "Semimajor Axis (a)" "" "Semimajor Axis and Eccentricity" "" "Semimajor Axis and Eccentricity Squared" "" @@ -5595,7 +5544,6 @@ "Simple Kriging (3D)" "" "Simple, flow path and swath profiles." "" "Simplified Lines" "" -"Simplify Lines" "" "Simpson Index" "" "Simulación (Viento variable)" "" "Simulando..." "" @@ -5831,7 +5779,6 @@ "Split Lines at Points" "Разделить линии на точках" "Split Lines with Lines" "Разделить линии линиями" "Split Parts" "Разделить части" -"Split Polygon Parts" "Разделить части полигонов" "Split RGB Composite" "Разделить композит RGB" "Split Shapes Layer" "Разделить шейп-слой" "Split Shapes Layer Completely" "Разделить шейп-слой полностью" @@ -5887,6 +5834,7 @@ "Static table" "" "Statistics" "" "Statistics Field(s)" "" +"Statistics are based on a subset of the data set. The sample size to be used can be changed in the settings." "" "Statistics for Grids" "" "Statistics for Grids from Files" "" "Std.Dev." "" @@ -5945,6 +5893,7 @@ "Subbasin Inflow" "" "Subbasins" "" "Subdued escarpment" "" +"Subsets" "" "Substitute Value" "" "Subsurface flow (m/dt)" "" "SubsurfaceViewer Files" "" @@ -5966,7 +5915,6 @@ "Summary" "" "Summary Table" "Таблица результатов" "Summary table." "" -"Summary:\n" "" "Summary_" "" "Summit" "" "Summit Extraction" "" @@ -6017,7 +5965,6 @@ "Synchronize Map Extents" "Синхронизировать окна карты" "Synchronize with look-up table classification of another grid (gui only)." "" "Synthesized Grid" "Синтезированный растр" -"System Identifier" "" "T Curvature" "" "T Slope" "" "T Vertical Distance to Channel Network" "" @@ -6107,6 +6054,7 @@ "Target Projection" "" "Target Projection Error" "" "Target Range" "" +"Target Resolution" "" "Target System" "" "Target X Coordinate" "" "Target X coordinate" "" @@ -6194,7 +6142,6 @@ "The GDAL raster format (driver) to be used." "" "The GeoTIFF File to be created." "Создаваемый файл GeoTIFF." "The GeoTRANS engine could not be initialized !!\n\n" "" -"The LAS output file." "" "The LAS/LAZ output file." "" "The SAGA grids to be exported." "Растры SAGA для экспорта." "The absolute minimum and maximum values are equal." "" @@ -6581,7 +6528,6 @@ "Tools for the georeferencing of spatial data." "" "Tools for the gridding of points and other vector data." "" "Tools for the handling of virtual datasets." "" -"Tools for the import and export of DXF files." "" "Tools for the import and export of gridded data." "" "Tools for the import and export of tables." "" "Tools for the import and export of vector data." "" @@ -6617,8 +6563,6 @@ "Total Curvature" "" "Total Insolation" "" "Total Kinetic Energy" "" -"Total Points" "" -"Total Pulses" "" "Total area is zero or minimum elevation is equal or lower than maximum elevation!" "" "Total flow (in watershed) (m^3/dt)" "" "Total flow (m/dt)" "" @@ -6734,12 +6678,9 @@ "Unable to connect to server." "" "Unable to create filtered mask grid!" "" "Unable to create grid for the eroded image!" "" -"Unable to open LAS file" "" -"Unable to open LAS file!" "" "Unable to open RDB2 file! Exception: %s" "" "Unable to open input file!" "" "Unable to open output file %s!" "" -"Unable to read points from LAS file!" "" "Unable to save %s file!" "" "Unable to save file %s!" "" "Uncertainty in routing direction expressed as standard deviation (degree)." "" @@ -6769,8 +6710,6 @@ "Unknown" "" "Unknown Authority Code" "" "Unknown Error" "" -"Unknown LAS header exception!" "" -"Unknown LAS reader exception!" "" "Unknown RDB2 reader exception!" "" "Unkown operation value %d in grid cell %d,%d (x,y), computing accuflux ..." "" "Unreferenced Grids" "" @@ -6795,6 +6734,7 @@ "Update values lower limit" "" "Update values upper limit" "" "Update view during simulation." "" +"Updating" "" "Upland Drainages" "" "Upland Drainages, Headwaters" "" "Upper" "" @@ -6987,7 +6927,6 @@ "Vertikale Zufluesse" "" "ViGrA" "" "Victor Olaya (c) 2004" "" -"Victor Olaya (c) 2005" "" "Victor Olaya, Volker Wichmann (c) 2004-17" "" "View Metadata" "" "Virtual" "" @@ -7273,10 +7212,6 @@ "[cells]" "" "[cmol/kg]" "" "[degree]" "" -"[deprecated] Export LAS Files" "" -"[deprecated] Import LAS Files" "" -"[deprecated] LAS" "" -"[deprecated] LAS Info" "" "[deprecated] Neural Networks (OpenCV)" "" "[deprecated] Point Cloud Viewer" "" "[deprecated] TIN Viewer" "" @@ -7286,6 +7221,7 @@ "[kg/m^3]" "" "[m/s]" "" "[m]" "" +"[milliseconds]" "" "[mm]" "" "[not set]|" "" "[permille]" "" @@ -7332,9 +7268,9 @@ "all bands" "" "all classes" "" "all directions" "" -"all entities" "" "all input records found a join" "" "all join table records found at least one join" "" +"all lines at once" "" "all points within search distance" "" "all polygons" "" "all quadrants" "" @@ -7486,7 +7422,6 @@ "check this in case parameter 'water' is absolute water level" "" "check this in case seed cells are coded with absolute water level" "" "checked" "" -"choose vertex type for resulting contours" "" "circle" "" "circle in rhombus" "" "circle in square" "" @@ -7701,6 +7636,8 @@ "do not show" "" "do not sort" "" "do not update" "" +"doi:10.1007/s00035-014-0124-0" "" +"doi:10.1111/geb.12897" "" "down" "" "downscaled" "" "downscaling" "" @@ -7783,6 +7720,7 @@ "failed to allocate memory for output points" "" "failed to allocate memory for phi calculation" "" "failed to allocate memory for target data." "" +"failed to apply georeferencing" "" "failed to build basic statistics" "" "failed to change client encoding to UTF-8" "" "failed to connect to server." "" @@ -7802,6 +7740,7 @@ "failed to derive temperatures" "" "failed to estimate target extent" "" "failed to fit model function to empirical variogram." "" +"failed to import band" "" "failed to import subset" "" "failed to import table" "" "failed to initialise search engine" "" @@ -7839,6 +7778,7 @@ "failed to store data" "" "failed to write data" "" "failed: could not find a suitable import driver" "" +"failed: there is no intersection of dataset's extent and targeted extent." "" "false" "" "fat" "" "feathering" "" @@ -7877,9 +7817,6 @@ "fixed cell height" "" "fixed interval" "" "fixed value" "" -"flagged as keypoints" "" -"flagged as synthetic" "" -"flagged as withheld" "" "floating" "" "floating point numbers" "" "flow accumulation threshold (cells) for linear flow routing" "" @@ -7907,6 +7844,7 @@ "generation" "" "geographical" "" "geometric" "" +"georeferencing" "" "give output of an edge twice, i.e. once for each of the two adjacent polygons" "" "given as map units or meters if polar coordinates switch is on; ignored if set to zero" "" "given in degree clockwise from North direction" "" @@ -7918,6 +7856,7 @@ "graph and root node" "" "green > blue" "" "green > grey > blue" "" +"green > red" "" "green > red > blue" "" "green channel color" "" "greyscale" "" @@ -8058,6 +7997,8 @@ "invalid image file path" "" "invalid input" "" "invalid input data" "" +"invalid input lines" "" +"invalid input polygons" "" "invalid input!" "" "invalid lines layer" "" "invalid lookup table." "" @@ -8073,7 +8014,6 @@ "invalid point cloud" "" "invalid points have been skipped" "" "invalid points layer" "" -"invalid points skipped!" "" "invalid polygons" "" "invalid polygons layer" "" "invalid production date" "" @@ -8144,6 +8084,7 @@ "line and polygon" "" "line simplification can only be applied to lines and polygons" "" "line tracing" "" +"line-by-line" "" "linear" "" "linear intervals" "" "linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)" "" @@ -8362,7 +8303,6 @@ "no scaling" "" "no seed points identified" "" "no self-intersecting polygons detected" "" -"no shapes for intersection found" "" "no shapes in list" "" "no shapes in selection" "" "no sinks" "" @@ -8474,8 +8414,6 @@ "one single class specified by class identifier" "" "one-class SVM" "" "online" "" -"only entities with layer definition" "" -"only entities without layer definition" "" "only points with given minimum number of points in search radius will be processed" "" "only show within scale range; values are given as extent measured in map units" "" "only z" "" @@ -8551,9 +8489,7 @@ "points have been filtered" "" "points have been imported with success" "" "points layer and grid do not intersect at all" "" -"points read" "" "points removed" "" -"points written" "" "polar coordinates given in degree" "" "polygon" "" "polygon by polygon" "" @@ -8563,6 +8499,7 @@ "polygon wise (cell area)" "" "polygon wise (cell centers)" "" "polygons" "" +"polygons and lines extents do not intersect at all" "" "polylines" "" "polynomial" "" "polynomial trend" "" @@ -8656,10 +8593,8 @@ "restore model from file" "" "restricts extrapolation by assigning minimal allowed weight for a vertex (normally \"-1\" or so; lower values correspond to lower reliability; \"0\" means no extrapolation)" "" "retrieving class information" "" -"return" "" "rgb coded raster map to be draped" "" "rgb coded values" "" -"rgb color" "" "rhombus" "" "right" "" "right-angled" "" diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.cpp saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.cpp --- saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.cpp 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.cpp 2022-06-14 09:39:21.000000000 +0000 @@ -101,12 +101,14 @@ //--------------------------------------------------------- double CT_Get_ETpot_Hargreave (double T, double Tmin, double Tmax, double R0) { - if( (T + 17.8) <= 0. || Tmin >= Tmax ) + if( (T + 17.8) < 0. || Tmin >= Tmax ) { return( 0. ); } - double ETpot = 0.0023 * R0 * (T + 17.8) * sqrt(Tmax - Tmin); // reference crop evapotranspiration mm per day + // original formula wants R0 as water equivalent >> [mm/day] = [MJ/m2/day] / 2.45 ! + + double ETpot = 0.0023 * (R0 / 2.45) * (T + 17.8) * sqrt(Tmax - Tmin); // reference crop evapotranspiration mm per day return( ETpot < 0. ? 0. : ETpot ); } @@ -114,7 +116,7 @@ //--------------------------------------------------------- double CT_Get_ETpot_Hargreave (double T, double Tmin, double Tmax, int DayOfYear, double Latitude) { - double R0 = CT_Get_Radiation_Daily_TopOfAtmosphere(DayOfYear, Latitude, false); + double R0 = CT_Get_Radiation_Daily_TopOfAtmosphere(DayOfYear, Latitude); return( CT_Get_ETpot_Hargreave(T, Tmin, Tmax, R0) ); } diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.h saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.h --- saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.h 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/climate_tools.h 2022-06-14 09:39:19.000000000 +0000 @@ -66,7 +66,7 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -double CT_Get_Radiation_Daily_TopOfAtmosphere (int DayOfYear, double Latitude, bool bWaterEquivalent = true); +double CT_Get_Radiation_Daily_TopOfAtmosphere (int DayOfYear, double Latitude, bool bWaterEquivalent = false); /////////////////////////////////////////////////////////// diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/daily_sun.cpp saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/daily_sun.cpp --- saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/daily_sun.cpp 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/daily_sun.cpp 2022-06-14 09:39:19.000000000 +0000 @@ -313,7 +313,7 @@ #pragma omp parallel for for(int x=0; xasDouble(x, y), false); // top of atmosphere radiation: 100 * [MJ/m2] >> [J/cm2] + double SR = 100. * CT_Get_Radiation_Daily_TopOfAtmosphere(DayOfYear, pLat->asDouble(x, y)); // top of atmosphere radiation: 100 * [MJ/m2] >> [J/cm2] SR *= 0.19 + 0.55 * Sunshine; // ToA radiation >> global radiation diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/evapotranspiration.cpp saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/evapotranspiration.cpp --- saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/evapotranspiration.cpp 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/evapotranspiration.cpp 2022-06-14 09:39:19.000000000 +0000 @@ -605,7 +605,7 @@ #pragma omp parallel for for(int y=0; yasDouble(x, y), false); // top of atmosphere radiation: 100 * [MJ/m2] >> [J/cm2] + double SR = 100. * CT_Get_Radiation_Daily_TopOfAtmosphere(Day, pLat->asDouble(x, y)); // top of atmosphere radiation: 100 * [MJ/m2] >> [J/cm2] SR *= 0.19 + 0.55 * Sunshine; // ToA radiation >> global radiation @@ -616,7 +616,7 @@ } //----------------------------------------------------- - double const_R0 = CT_Get_Radiation_Daily_TopOfAtmosphere(Day, const_Lat, false); // [MJ/m2/day] + double const_R0 = CT_Get_Radiation_Daily_TopOfAtmosphere(Day, const_Lat); // [MJ/m2/day] //----------------------------------------------------- for(int y=0; yasDouble(x, y) : const_WS ) #define GET_P (pP ? pP ->asDouble(x, y) : const_P ) #define GET_SR (pSR ? pSR ->asDouble(x, y) : const_SR ) - #define GET_R0 (pLat ? CT_Get_Radiation_Daily_TopOfAtmosphere(Day, pLat->asDouble(x, y), false) : const_R0) // [MJ/m^2/day] + #define GET_R0 (pLat ? CT_Get_Radiation_Daily_TopOfAtmosphere(Day, pLat->asDouble(x, y)) : const_R0) // [MJ/m^2/day] switch( Method ) { diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/treeline.cpp saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/treeline.cpp --- saga-8.2.1+dfsg/saga-gis/src/tools/climate/climate_tools/treeline.cpp 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/climate/climate_tools/treeline.cpp 2022-06-14 09:39:21.000000000 +0000 @@ -60,7 +60,7 @@ m_DT_min = 0.9; m_LGS_min = 94; m_SMT_min = 6.4; - m_SW_min = 0.2 / 100.0; + m_SW_min = 0.2 / 100.; } //--------------------------------------------------------- @@ -105,7 +105,7 @@ //--------------------------------------------------------- bool CCT_Growing_Season::Set_SW_min(double Value) { - if( Value >= 0.0 ) + if( Value >= 0. ) { m_SW_min = Value; @@ -141,9 +141,9 @@ //----------------------------------------------------- double dHi, dLo; - if( is_Growing(SWC, Latitude, 0.0) ) + if( is_Growing(SWC, Latitude, 0.) ) { - dLo = 0.0; // below tree line + dLo = 0.; // below tree line if( is_Growing(SWC, Latitude, dHi = maxDiff) == true ) { @@ -154,7 +154,7 @@ } else { - dHi = 0.0; // above tree line + dHi = 0.; // above tree line if( is_Growing(SWC, Latitude, dLo = -maxDiff) == false ) { @@ -165,9 +165,9 @@ } //----------------------------------------------------- - while( dHi - dLo > 10.0 ) + while( dHi - dLo > 10. ) { - if( is_Growing(SWC, Latitude, Height = dLo + (dHi - dLo) / 2.0) ) // below tree line + if( is_Growing(SWC, Latitude, Height = dLo + (dHi - dLo) / 2.) ) // below tree line { dLo = Height; } @@ -178,7 +178,7 @@ } //----------------------------------------------------- - Height = dLo + (dHi - dLo) / 2.0; + Height = dLo + (dHi - dLo) / 2.; return( true ); } @@ -246,7 +246,7 @@ for(i=0; i<365; i++) // 1. identify growing days { - bGrowing[i] = T[i] >= m_DT_min && (!Snow || Snow[i] <= 0.0) && (!(S0 && S1) || (S0[i] > 0.0 || (S1[i] > 0.0 && S1[i] >= m_SW_min * m_Soil.Get_Capacity(1)))); + bGrowing[i] = T[i] >= m_DT_min && (!Snow || Snow[i] <= 0.) && (!(S0 && S1) || (S0[i] > 0. || (S1[i] > 0. && S1[i] >= m_SW_min * m_Soil.Get_Capacity(1)))); } for(i=0; i<365; i++) // 2. evaluate growing days @@ -318,19 +318,19 @@ Parameters.Add_Grid_or_Const("", "SWC" , _TL("Soil Water Capacity of Profile"), _TL("Total soil water capacity (mm H2O)."), - 220.0, 0.0, true + 220., 0., true ); Parameters.Add_Double("SWC", "SWC_SURFACE" , _TL("Top Soil Water Capacity"), _TL(""), - 30.0, 0.0, true + 10., 0., true ); Parameters.Add_Double("SWC", "SW1_RESIST" , _TL("Transpiration Resistance"), _TL(""), - 0.5, 0.01, true + 1., 0.01, true ); Parameters.Add_Double("", @@ -386,7 +386,7 @@ Parameters.Add_Double("", "SW_MIN" , _TL("Minimum Soil Water Content (Percent)"), _TL(""), - 2.0, 0.0, true + 2., 0., true ); Parameters.Add_Int("", @@ -404,7 +404,7 @@ Parameters.Add_Double("", "TLH_MAX_DIFF" , _TL("Maximum Tree Line Height Difference"), _TL(""), - 3000.0, 0.0, true + 3000., 0., true ); } @@ -477,7 +477,7 @@ m_Model.Set_DT_min (Parameters( "DT_MIN")->asDouble()); m_Model.Set_SMT_min(Parameters("SMT_MIN")->asDouble()); m_Model.Set_LGS_min(Parameters("LGS_MIN")->asInt ()); - m_Model.Set_SW_min (Parameters( "SW_MIN")->asDouble() / 100.0); + m_Model.Set_SW_min (Parameters( "SW_MIN")->asDouble() / 100.); //----------------------------------------------------- for(int y=0; yasInt() == 0 ? 1. : 100.; + //----------------------------------------------------- Process_Set_Text(_TL("processing")); @@ -209,7 +220,7 @@ for(int iClass=0; iClassGet_Grid_Count(); iClass++) { - pCoverages->Get_Grid(iClass)->Set_Value(x, y, Get_Coverage(Cell, iClass)); + pCoverages->Get_Grid(iClass)->Set_Value(x, y, Scale * Get_Coverage(Cell, iClass)); } } } @@ -272,26 +283,50 @@ //----------------------------------------------------- else { - CSG_Unique_Number_Statistics Classes; + CSG_Parameter *pLUT = DataObject_Get_Parameter(m_pClasses, "COLORS_TYPE"); // Color Classification Type: Lookup Table + + pLUT = pLUT && pLUT->asInt() == 1 ? DataObject_Get_Parameter(m_pClasses, "LUT") : NULL; - for(sLong iCell=0; iCellasTable() ) { - if( !m_pClasses->is_NoData(iCell) ) + CSG_Table &Classes = *pLUT->asTable(); + + m_Classes.Add_Field("MAX", m_pClasses->Get_Type()); + + m_Classes.Set_Count(Classes.Get_Count()); + + for(int iClass=0; iClassasDouble(iCell); + m_Classes[iClass].Set_Value(0, Classes[iClass].asString(1)); // Name + m_Classes[iClass].Set_Value(1, Classes[iClass].asDouble(3)); // Minimum + m_Classes[iClass].Set_Value(2, Classes[iClass].asDouble(4)); // Maximum } } //------------------------------------------------- - m_Classes.Set_Count(Classes.Get_Count()); - - for(int iClass=0; iClassis_NoData(iCell) ) + { + Classes += m_pClasses->asDouble(iCell); + } + } + + //------------------------------------------------- + m_Classes.Set_Count(Classes.Get_Count()); + + for(int iClass=0; iClassasInt() == 0 ? 1. : 100.; switch( Parameters("DATADEPTH")->asInt() ) { - case 0: Type = SG_DATATYPE_Byte ; Scaling = 1. / 250.; break; // 0.004 - default: Type = SG_DATATYPE_Word ; Scaling = 1. / 62500.; break; // 0.000016 - case 2: Type = SG_DATATYPE_Float ; Scaling = 1. ; break; - case 3: Type = SG_DATATYPE_Double; Scaling = 1. ; break; + case 0: Type = SG_DATATYPE_Byte ; Scaling = Scale / 250.; break; // fraction => 0.004 or percent => 0.4 + default: Type = SG_DATATYPE_Word ; Scaling = Scale / 62500.; break; // fraction => 0.000016 or percent => 0.0016 + case 2: Type = SG_DATATYPE_Float ; Scaling = 1. ; break; + case 3: Type = SG_DATATYPE_Double; Scaling = 1. ; break; } CSG_Parameter_Grid_List *pCoverages = Parameters("COVERAGES")->asGridList(); @@ -336,9 +371,20 @@ } pGrid->Fmt_Name("%s [%s]", m_pClasses->Get_Name(), m_Classes[iClass].asString(0)); - pGrid->Set_NoData_Value(Parameters("NO_DATA")->asBool() ? 0. : -1.); + pGrid->Set_Scaling(Scaling); + pGrid->Set_Unit(Parameters("UNIT")->asInt() == 0 ? _TL("fraction") : _TL("percent")); + + if( Parameters("NO_DATA")->asBool() ) + { + pGrid->Set_NoData_Value(0.); + } + else if( Type == SG_DATATYPE_Byte ) + { + pGrid->Set_NoData_Value(255.); + } + pCoverages->Add_Item(pGrid); } @@ -354,11 +400,11 @@ //--------------------------------------------------------- inline bool CCoverage_of_Categories::Cmp_Class(int x, int y, int iClass) { - if( m_pClasses->is_InGrid(x, y) ) + if( is_InGrid(x, y) ) { double Value = m_pClasses->asDouble(x, y); - if( m_Classes.Get_Field_Count() > 2 ) + if( m_Classes.Get_Field_Count() > 2 && m_Classes[iClass].asDouble(1) < m_Classes[iClass].asDouble(2) ) { return( Value >= m_Classes[iClass].asDouble(1) && Value < m_Classes[iClass].asDouble(2) diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt saga-8.2.2+dfsg/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt --- saga-8.2.1+dfsg/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt 2022-04-21 06:31:05.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt 2022-06-14 09:39:20.000000000 +0000 @@ -10,6 +10,8 @@ if(NOT SVM_FOUND) set(SAGA_TOOL_CUSTOM_SOURCE_LIST ./svm/svm.cpp) set(SAGA_TOOL_CUSTOM_HEADER_LIST ./svm/svm.h) + else() + add_compile_definitions(SYSTEM_SVM) endif() include(../../CMakePluginTemplate.cmake) # load common tool template diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.cpp saga-8.2.2+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.cpp --- saga-8.2.1+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.cpp 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.cpp 2022-06-14 09:39:20.000000000 +0000 @@ -1,6 +1,3 @@ -/********************************************************** - * Version $Id$ - *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -51,15 +48,6 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- - - -/////////////////////////////////////////////////////////// -// // -// // -// // -/////////////////////////////////////////////////////////// - -//--------------------------------------------------------- #include "Grid_To_Contour.h" @@ -72,79 +60,33 @@ //--------------------------------------------------------- CGrid_To_Contour::CGrid_To_Contour(void) { - //----------------------------------------------------- Set_Name (_TL("Contour Lines from Grid")); Set_Author ("O.Conrad (c) 2001"); Set_Description (_TW( - "Derive contour lines (isolines) from grid. " + "Derive contour lines (isolines) from a grid. " )); - //----------------------------------------------------- - Parameters.Add_Grid( - "" , "GRID" , _TL("Grid"), - _TL(""), - PARAMETER_INPUT - ); - - Parameters.Add_Shapes( - "" , "CONTOUR" , _TL("Contour"), - _TL(""), - PARAMETER_OUTPUT, SHAPE_TYPE_Line - ); + Parameters.Add_Grid("", "GRID", _TL("Grid"), _TL(""), PARAMETER_INPUT); - Parameters.Add_Shapes( - "" , "POLYGONS" , _TL("Polygons"), - _TL(""), - PARAMETER_OUTPUT_OPTIONAL, SHAPE_TYPE_Polygon - ); + Parameters.Add_Shapes("" , "CONTOUR" , _TL("Contour" ), _TL(""), PARAMETER_OUTPUT , SHAPE_TYPE_Line ); + Parameters.Add_Choice("CONTOUR" , "VERTEX" , _TL("Vertex Type"), _TL(""), "x, y|x, y, z", 0); + Parameters.Add_Bool ("CONTOUR" , "LINE_PARTS", _TL("Split Parts"), _TL(""), true); - Parameters.Add_Choice( - "" , "VERTEX" , _TL("Vertex Type"), - _TL("choose vertex type for resulting contours"), - CSG_String::Format("%s|%s|", - SG_T("x, y"), - SG_T("x, y, z") - ), 0 - ); + Parameters.Add_Shapes("" , "POLYGONS" , _TL("Polygons" ), _TL(""), PARAMETER_OUTPUT_OPTIONAL, SHAPE_TYPE_Polygon); + Parameters.Add_Bool ("POLYGONS", "POLY_PARTS", _TL("Split Parts"), _TL(""), false); - Parameters.Add_Double( - "" , "SCALE" , _TL("Interpolation Scale"), + Parameters.Add_Double("", + "SCALE" , _TL("Interpolation Scale"), _TL("set greater one for line smoothing"), - 1.0, 0, true - ); - - Parameters.Add_Bool( - "" , "LINE_PARTS" , _TL("Split Parts"), - _TL(""), - true - ); - - Parameters.Add_Bool( - "" , "POLY_PARTS" , _TL("Split Polygon Parts"), - _TL(""), - false - ); - - Parameters.Add_Double( - "" , "ZMIN" , _TL("Minimum Contour Value"), - _TL(""), - 0.0 - ); - - Parameters.Add_Double( - "" , "ZMAX" , _TL("Maximum Contour Value"), - _TL(""), - 10000.0 + 1., 0., true ); - Parameters.Add_Double( - "" , "ZSTEP" , _TL("Equidistance"), - _TL(""), - 10.0, 0, true - ); + Parameters.Add_Double("", "ZSTEP", _TL("Contour Interval" ), _TL(""), 100., 0., true); + Parameters.Add_Double("", "ZMIN" , _TL("Base Contour Value" ), _TL(""), 0.); + Parameters.Add_Double("", "ZMAX" , _TL("Maximum Contour Value"), _TL(""), 1000.); } @@ -157,13 +99,13 @@ { if( pParameter->Cmp_Identifier("GRID") && pParameter->asGrid() != NULL ) { - double zStep = SG_Get_Rounded_To_SignificantFigures(pParameter->asGrid()->Get_Range() / 10.0, 1); + double zStep = SG_Get_Rounded_To_SignificantFigures(pParameter->asGrid()->Get_Range() / 10., 1); pParameters->Get_Parameter("ZSTEP")->Set_Value(zStep); - pParameters->Set_Enabled("ZMAX", zStep > 0.0); + pParameters->Set_Enabled("ZMAX", zStep > 0.); - if( zStep > 0.0 ) + if( zStep > 0. ) { pParameters->Get_Parameter("ZMIN")->Set_Value(zStep * floor(pParameter->asGrid()->Get_Min() / zStep)); pParameters->Get_Parameter("ZMAX")->Set_Value(zStep * ceil (pParameter->asGrid()->Get_Max() / zStep)); @@ -183,7 +125,7 @@ { if( pParameter->Cmp_Identifier("ZSTEP") ) { - pParameters->Set_Enabled("ZMAX", pParameter->asDouble() > 0.0); + pParameters->Set_Enabled("ZMAX", pParameter->asDouble() > 0.); } if( pParameter->Cmp_Identifier("POLYGONS") ) @@ -203,50 +145,44 @@ //--------------------------------------------------------- bool CGrid_To_Contour::On_Execute(void) { - CSG_Grid Grid; + m_pGrid = Parameters("GRID" )->asGrid (); + m_pContours = Parameters("CONTOUR" )->asShapes(); + m_pPolygons = Parameters("POLYGONS" )->asShapes(); - //----------------------------------------------------- - m_pGrid = Parameters("GRID" )->asGrid (); - m_pContours = Parameters("CONTOUR" )->asShapes(); - m_pPolygons = Parameters("POLYGONS" )->asShapes(); - - m_bParts = Parameters("LINE_PARTS")->asBool () && !m_pPolygons; // only split parts if polygons are not requested + m_bParts = Parameters("LINE_PARTS")->asBool () && !m_pPolygons; // only split parts if polygons are not requested - double zMin = Parameters("ZMIN" )->asDouble(); - double zMax = Parameters("ZMAX" )->asDouble(); - double zStep = Parameters("ZSTEP" )->asDouble(); + double zMin = Parameters("ZMIN" )->asDouble(); + double zMax = Parameters("ZMAX" )->asDouble(); + double zStep = Parameters("ZSTEP" )->asDouble(); //----------------------------------------------------- - CSG_String Name; + m_pContours->Create(SHAPE_TYPE_Line, NULL, NULL, Parameters("VERTEX")->asInt() == 0 ? SG_VERTEX_TYPE_XY : SG_VERTEX_TYPE_XYZ); - if( zStep <= 0 ) // just one contour value (zMin) - { - zStep = 1; - zMax = zMin; + m_pContours->Add_Field("ID" , SG_DATATYPE_Int ); + m_pContours->Add_Field("VALUE", SG_DATATYPE_Double); - Name = Name.Format("%s [%s %s]", m_pGrid->Get_Name(), _TL("Contour" ), SG_Get_String(zMin ).c_str()); - } - else + if( zStep > 0. ) { if( zMin < m_pGrid->Get_Min() ) { - zMin += zStep * (int)((m_pGrid->Get_Min() - zMin) / zStep); + zMin += zStep * (int)((m_pGrid->Get_Min() - zMin) / zStep); } - Name = Name.Format("%s [%s %s]", m_pGrid->Get_Name(), _TL("Interval"), SG_Get_String(zStep).c_str()); - } + if( zMax > m_pGrid->Get_Max() ) + { + zMax = m_pGrid->Get_Max(); + } - if( zMax > m_pGrid->Get_Max() ) + m_pContours->Fmt_Name("%s [%s %s]", m_pGrid->Get_Name(), _TL("Interval"), SG_Get_String(zStep).c_str()); + } + else // just one contour value (zMin) { - zMax = m_pGrid->Get_Max(); + zStep = 1.; zMax = zMin; + + m_pContours->Fmt_Name("%s [%s %s]", m_pGrid->Get_Name(), _TL("Contour" ), SG_Get_String(zMin ).c_str()); } //----------------------------------------------------- - m_pContours->Create(SHAPE_TYPE_Line, Name, NULL, Parameters("VERTEX")->asInt() == 0 ? SG_VERTEX_TYPE_XY : SG_VERTEX_TYPE_XYZ); - - m_pContours->Add_Field("ID", SG_DATATYPE_Int); - m_pContours->Add_Field("Z" , SG_DATATYPE_Double); - if( m_pPolygons ) { m_pPolygons->Create(SHAPE_TYPE_Polygon, m_pContours->Get_Name(), NULL, @@ -260,20 +196,20 @@ } //----------------------------------------------------- - double Scale = Parameters("SCALE")->asDouble(); + double Scale = Parameters("SCALE")->asDouble(); CSG_Grid Scaled; - if( Scale > 0.0 && Scale != 1.0 ) + if( Scale > 0. && Scale != 1. ) { - if( !Grid.Create(CSG_Grid_System(m_pGrid->Get_Cellsize() / Scale, m_pGrid->Get_Extent()), m_pGrid->Get_Type()) ) + if( !Scaled.Create(CSG_Grid_System(m_pGrid->Get_Cellsize() / Scale, m_pGrid->Get_Extent())) ) { Error_Set(_TL("could allocate memory for scaled grid")); return( false ); } - Grid.Assign(m_pGrid, GRID_RESAMPLING_BSpline); + Scaled.Assign(m_pGrid, GRID_RESAMPLING_BSpline); - m_pGrid = &Grid; + m_pGrid = &Scaled; } //----------------------------------------------------- @@ -374,13 +310,10 @@ //--------------------------------------------------------- bool CGrid_To_Contour::Get_Contour(double z) { - int x, y; - - //----------------------------------------------------- - #pragma omp parallel for private(x, y) - for(y=0; yGet_NY(); y++) // Find Border Cells + #pragma omp parallel for + for(int y=0; yGet_NY(); y++) // Find Border Cells { - for(x=0; xGet_NX(); x++) + for(int x=0; xGet_NX(); x++) { if( !m_pGrid->is_NoData(x, y) ) { @@ -401,15 +334,15 @@ //----------------------------------------------------- if( m_bParts == false ) { - CSG_Shape *pContour = m_pContours->Add_Shape(); + CSG_Shape *pContour = m_pContours->Add_Shape(); pContour->Set_Value(0, m_pContours->Get_Count()); pContour->Set_Value(1, z); } - for(y=0; yGet_NY(); y++) // find unclosed contours first so that these start/end at edges and not somewhere else + for(int y=0; yGet_NY(); y++) // find unclosed contours first so that these start/end at edges and not somewhere else { - for(x=0; xGet_NX(); x++) + for(int x=0; xGet_NX(); x++) { if( m_Edge.asInt(x, y) && is_Edge(x, y) ) { @@ -418,9 +351,9 @@ } } - for(y=0; yGet_NY(); y++) + for(int y=0; yGet_NY(); y++) { - for(x=0; xGet_NX(); x++) + for(int x=0; xGet_NX(); x++) { while( Get_Contour(z, x, y) ); } @@ -438,7 +371,6 @@ //--------------------------------------------------------- bool CGrid_To_Contour::Get_Contour(double z, int x, int y) { - //----------------------------------------------------- bool bRow; if( Get_Row(x, y) ) @@ -455,30 +387,29 @@ } //----------------------------------------------------- - int iPart; - CSG_Shape *pContour; + CSG_Shape *pContour; - if( m_bParts == false ) + if( m_bParts ) { - pContour = m_pContours->Get_Shape(m_pContours->Get_Count() - 1); - iPart = pContour->Get_Part_Count(); - } - else - { - pContour = m_pContours->Add_Shape(); - iPart = 0; + pContour = m_pContours->Add_Shape(); pContour->Set_Value(0, m_pContours->Get_Count()); pContour->Set_Value(1, z); } + else + { + pContour = m_pContours->Get_Shape(m_pContours->Get_Count() - 1); + } + + int iPart = m_bParts ? 0 : pContour->Get_Part_Count(); //----------------------------------------------------- for(int Dir=0, x0=x, y0=y, bRow0=bRow?1:0; Dir>=0; ) { - int zx = bRow ? x + 1 : x; - int zy = bRow ? y : y + 1; + int zx = bRow ? x + 1 : x; + int zy = bRow ? y : y + 1; - double d = m_pGrid->asDouble(x, y); d = (d - z) / (d - m_pGrid->asDouble(zx, zy)); + double d = m_pGrid->asDouble(x, y); d = (d - z) / (d - m_pGrid->asDouble(zx, zy)); pContour->Add_Point( m_pGrid->Get_XMin() + m_pGrid->Get_Cellsize() * (x + d * (zx - x)), @@ -492,15 +423,14 @@ if( Get_Contour_Cell(Dir, x, y, bRow) || Get_Contour_Cell(Dir, x, y, bRow) ) { - if( bRow ) { Set_Row(x , y , false); } else { Set_Col(x , y , false); } + if( bRow ) { Set_Row(x , y , false); } else { Set_Col(x , y , false); } } else { - if( bRow0 ) { Set_Row(x0, y0, false); } else { Set_Col(x0, y0, false); } + if( bRow0 ) { Set_Row(x0, y0, false); } else { Set_Col(x0, y0, false); } Dir = -1; } - } //----------------------------------------------------- @@ -565,23 +495,20 @@ //--------------------------------------------------------- bool CGrid_To_Contour::Get_Polygons(CSG_Shape_Line *pContour_Lo, CSG_Shape_Line *pContour_Hi) { - int x, y; + double zMin = pContour_Lo ? pContour_Lo->asDouble(1) : m_pGrid->Get_Min(); + double zMax = pContour_Hi ? pContour_Hi->asDouble(1) : m_pGrid->Get_Max(); - //----------------------------------------------------- - double zMin = pContour_Lo ? pContour_Lo->asDouble(1) : m_pGrid->Get_Min(); - double zMax = pContour_Hi ? pContour_Hi->asDouble(1) : m_pGrid->Get_Max(); - - #pragma omp parallel for private(x, y) - for(y=0; yGet_NY(); y++) + #pragma omp parallel for + for(int y=0; yGet_NY(); y++) { - for(x=0; xGet_NX(); x++) + for(int x=0; xGet_NX(); x++) { m_Edge.Set_Value(x, y, is_Edge(x, y) && zMin <= m_pGrid->asDouble(x, y) && m_pGrid->asDouble(x, y) <= zMax ? EDGE_LINE : 0); } } //----------------------------------------------------- - CSG_Shape_Polygon *pPolygon = (CSG_Shape_Polygon *)m_pPolygons->Add_Shape(); + CSG_Shape_Polygon *pPolygon = (CSG_Shape_Polygon *)m_pPolygons->Add_Shape(); pPolygon->Set_Value(0, m_pPolygons->Get_Count()); pPolygon->Set_Value(1, zMin); @@ -596,15 +523,15 @@ Segments.Add_Field("x1", SG_DATATYPE_Int); Segments.Add_Field("y1", SG_DATATYPE_Int); - if( pContour_Lo ) { Add_Contour(Segments, pPolygon, pContour_Lo); } - if( pContour_Hi ) { Add_Contour(Segments, pPolygon, pContour_Hi); } + if( pContour_Lo ) { Add_Contour(Segments, pPolygon, pContour_Lo); } + if( pContour_Hi ) { Add_Contour(Segments, pPolygon, pContour_Hi); } //----------------------------------------------------- if( Segments.Get_Count() == 0 ) // no edge crossing line { - for(y=0; yGet_NY(); y++) + for(int y=0; yGet_NY(); y++) { - for(x=0; xGet_NX(); x++) + for(int x=0; xGet_NX(); x++) { if( m_Edge.asInt(x, y) == EDGE_LINE ) // add outer ring { @@ -625,9 +552,9 @@ //----------------------------------------------------- // { CSG_Grid *pGrid = SG_Create_Grid(m_Edge); pGrid->Set_NoData_Value(0); DataObject_Add(pGrid); } - for(y=0; yGet_NY(); y++) + for(int y=0; yGet_NY(); y++) { - for(x=0; xGet_NX(); x++) + for(int x=0; xGet_NX(); x++) { if( m_Edge.asInt(x, y) == EDGE_NODE_ONE ) { @@ -640,14 +567,14 @@ //----------------------------------------------------- while( Segments.Get_Count() > 0 ) { - int iPart = pPolygon->Get_Part_Count(); + int iPart = pPolygon->Get_Part_Count(); - CSG_Shape *pSegment = Segments.Get_Shape(0); + CSG_Shape *pSegment = Segments.Get_Shape(0); - int x = pSegment->asInt(2); - int y = pSegment->asInt(3); + int x = pSegment->asInt(2); + int y = pSegment->asInt(3); - bool bAscending = true; + bool bAscending = true; do { @@ -668,16 +595,13 @@ //--------------------------------------------------------- bool CGrid_To_Contour::Add_Contour(CSG_Shapes &Segments, CSG_Shape_Polygon *pPolygon, CSG_Shape_Line *pContour) { - //----------------------------------------------------- - for(int iPart=0; iPartGet_Part_Count(); iPart++) + for(int iPart=0, x, y; iPartGet_Part_Count(); iPart++) { - CSG_Shape_Part *pPart = pContour->Get_Part(iPart); + CSG_Shape_Part *pPart = pContour->Get_Part(iPart); if( !CSG_Point(pPart->Get_Point(0, true)).is_Equal(pPart->Get_Point(0, false)) ) // island { - CSG_Shape *pSegment = Segments.Add_Shape(); pSegment->Add_Part(pPart); - - int x, y; + CSG_Shape *pSegment = Segments.Add_Shape(); pSegment->Add_Part(pPart); m_Edge.Get_System().Get_World_to_Grid(x, y, pPart->Get_Point(0, true)); m_Edge.Set_Value(x, y, m_Edge.asInt(x, y) == EDGE_NODE_ONE ? EDGE_NODE_TWO : EDGE_NODE_ONE); @@ -702,19 +626,16 @@ //--------------------------------------------------------- bool CGrid_To_Contour::Add_Edge(CSG_Shapes &Segments, int x, int y) { - int i; - - //----------------------------------------------------- - CSG_Shape *pSegment = NULL; + CSG_Shape *pSegment = NULL; - for(i=0; i<8 && !pSegment; i+=2) + for(int i=0; i<8 && !pSegment; i+=2) { - int ix = CSG_Grid_System::Get_xTo(i, x); - int iy = CSG_Grid_System::Get_yTo(i, y); + int ix = CSG_Grid_System::Get_xTo(i, x); + int iy = CSG_Grid_System::Get_yTo(i, y); if( m_Edge.is_InGrid(ix, iy) && m_Edge.asInt(ix, iy) == EDGE_LINE ) { - pSegment = Segments.Add_Shape(); + pSegment = Segments.Add_Shape(); pSegment->Set_Value(0, x); pSegment->Set_Value(1, y); @@ -725,14 +646,14 @@ if( !pSegment ) { - for(i=0; i<8 && !pSegment; i+=2) + for(int i=0; i<8 && !pSegment; i+=2) { - int ix = CSG_Grid_System::Get_xTo(i, x); - int iy = CSG_Grid_System::Get_yTo(i, y); + int ix = CSG_Grid_System::Get_xTo(i, x); + int iy = CSG_Grid_System::Get_yTo(i, y); if( m_Edge.is_InGrid(ix, iy) && m_Edge.asInt(ix, iy) == EDGE_NODE_ONE ) { - pSegment = Segments.Add_Shape(); + pSegment = Segments.Add_Shape(); pSegment->Set_Value(0, x); pSegment->Set_Value(1, y); @@ -745,26 +666,26 @@ } //----------------------------------------------------- - int iLast = -1; + int iLast = -1; for(bool bNext=true; bNext; ) { - bNext = false; + bNext = false; m_Edge.Set_Value(x, y, 0); - for(i=0; i<8 && !bNext; i+=2) + for(int i=0; i<8 && !bNext; i+=2) { - int ix = CSG_Grid_System::Get_xTo(i, x); - int iy = CSG_Grid_System::Get_yTo(i, y); + int ix = CSG_Grid_System::Get_xTo(i, x); + int iy = CSG_Grid_System::Get_yTo(i, y); if( m_Edge.is_InGrid(ix, iy) && m_Edge.asInt(ix, iy) == EDGE_LINE ) { - bNext = true; + bNext = true; if( i != iLast ) { - iLast = i; + iLast = i; pSegment->Add_Point(m_Edge.Get_System().Get_Grid_to_World(x, y)); } @@ -779,8 +700,8 @@ for(int i=0; i<8; i+=2) { - int ix = CSG_Grid_System::Get_xTo(i, x); - int iy = CSG_Grid_System::Get_yTo(i, y); + int ix = CSG_Grid_System::Get_xTo(i, x); + int iy = CSG_Grid_System::Get_yTo(i, y); if( m_Edge.is_InGrid(ix, iy) && m_Edge.asInt(ix, iy) != 0 ) { @@ -847,20 +768,20 @@ //--------------------------------------------------------- bool CGrid_To_Contour::Split_Polygon_Parts(CSG_Shapes *pPolygons) { - CSG_Shapes Polygons(*pPolygons); + CSG_Shapes Polygons(*pPolygons); pPolygons->Del_Shapes(); //----------------------------------------------------- for(int iPolygon=0; iPolygonGet_Part_Count() && Process_Get_Okay(); iPart++) { if( !pPolygon->is_Lake(iPart) ) { - CSG_Shape_Polygon *pPart = (CSG_Shape_Polygon *)pPolygons->Add_Shape(pPolygon, SHAPE_COPY_ATTR); + CSG_Shape_Polygon *pPart = (CSG_Shape_Polygon *)pPolygons->Add_Shape(pPolygon, SHAPE_COPY_ATTR); pPart->Add_Part(pPolygon->Get_Part(iPart)); diff -Nru saga-8.2.1+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.h saga-8.2.2+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.h --- saga-8.2.1+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.h 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.h 2022-06-14 09:39:20.000000000 +0000 @@ -1,6 +1,3 @@ -/********************************************************** - * Version $Id$ - *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -51,15 +48,6 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- - - -/////////////////////////////////////////////////////////// -// // -// // -// // -/////////////////////////////////////////////////////////// - -//--------------------------------------------------------- #ifndef HEADER_INCLUDED__Grid_To_Contour_H #define HEADER_INCLUDED__Grid_To_Contour_H @@ -72,8 +60,7 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -//--------------------------------------------------------- -#include "MLB_Interface.h" +#include /////////////////////////////////////////////////////////// diff -Nru saga-8.2.1+dfsg/saga-gis/version.cmake saga-8.2.2+dfsg/saga-gis/version.cmake --- saga-8.2.1+dfsg/saga-gis/version.cmake 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga-gis/version.cmake 2022-06-14 09:39:21.000000000 +0000 @@ -1,7 +1,7 @@ # The version number. set (SAGA_VERSION_MAJOR 8) set (SAGA_VERSION_MINOR 2) -set (SAGA_VERSION_PATCH 1) +set (SAGA_VERSION_PATCH 2) # get git commit hash (or dirty if git is not installed) diff -Nru saga-8.2.1+dfsg/saga_setup_win32.iss saga-8.2.2+dfsg/saga_setup_win32.iss --- saga-8.2.1+dfsg/saga_setup_win32.iss 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga_setup_win32.iss 2022-06-14 09:39:21.000000000 +0000 @@ -1,5 +1,5 @@ -; To build installer (for example, saga-8.2.1_setup.exe). -; - Unzip the SAGA binary files in their own folder (for example, saga-8.2.1.zip). +; To build installer (for example, saga-8.2.2_setup.exe). +; - Unzip the SAGA binary files in their own folder (for example, saga-8.2.2.zip). ; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.). ; - Open saga.iss in Inno Setup. ; - Choose Build | Compile. @@ -7,7 +7,7 @@ [Setup] AppName=SAGA - System for Automated Geoscientific Analyses -AppVerName=SAGA 8.2.1 +AppVerName=SAGA 8.2.2 DefaultDirName={commonpf}\SAGA DefaultGroupName=SAGA @@ -19,9 +19,9 @@ SolidCompression=yes OutputDir=. -OutputBaseFilename=saga-8.2.1_win32_setup +OutputBaseFilename=saga-8.2.2_win32_setup -VersionInfoVersion=8.2.1.0 +VersionInfoVersion=8.2.2.0 VersionInfoCompany=SAGA User Group Association VersionInfoCopyright=(c) 2005-2018 by O. Conrad VersionInfoDescription=SAGA single-file installer @@ -47,5 +47,5 @@ Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\saga_gui.exe"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}" -Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.1"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.1"; ValueType: string; ValueName: "Version"; ValueData: "8.2.1.0" +Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.2"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.2"; ValueType: string; ValueName: "Version"; ValueData: "8.2.2.0" diff -Nru saga-8.2.1+dfsg/saga_setup_x64.iss saga-8.2.2+dfsg/saga_setup_x64.iss --- saga-8.2.1+dfsg/saga_setup_x64.iss 2022-04-21 06:31:06.000000000 +0000 +++ saga-8.2.2+dfsg/saga_setup_x64.iss 2022-06-14 09:39:21.000000000 +0000 @@ -1,5 +1,5 @@ -; To build installer (for example, saga-8.2.1_setup.exe). -; - Unzip the SAGA binary files in their own folder (for example, saga-8.2.1.zip). +; To build installer (for example, saga-8.2.2_setup.exe). +; - Unzip the SAGA binary files in their own folder (for example, saga-8.2.2.zip). ; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.). ; - Open saga.iss in Inno Setup. ; - Choose Build | Compile. @@ -7,7 +7,7 @@ [Setup] AppName=SAGA - System for Automated Geoscientific Analyses -AppVerName=SAGA 8.2.1 +AppVerName=SAGA 8.2.2 ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 @@ -22,9 +22,9 @@ SolidCompression=yes OutputDir=. -OutputBaseFilename=saga-8.2.1_x64_setup +OutputBaseFilename=saga-8.2.2_x64_setup -VersionInfoVersion=8.2.1.0 +VersionInfoVersion=8.2.2.0 VersionInfoCompany=SAGA User Group Association VersionInfoCopyright=(c) 2005-2018 by O. Conrad VersionInfoDescription=SAGA single-file installer @@ -50,5 +50,5 @@ Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\saga_gui.exe"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}" -Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.1"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.1"; ValueType: string; ValueName: "Version"; ValueData: "8.2.1.0" +Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.2"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.2.2"; ValueType: string; ValueName: "Version"; ValueData: "8.2.2.0"