[saga] 02/04: Imported Upstream version 2.2.6+dfsg
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Thu Mar 31 14:36:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository saga.
commit 59af8e419b4524e4a9a0e7b18f8e741ec8c38deb
Author: Johan Van de Wauw <johan at vandewauw.be>
Date: Thu Mar 31 16:26:26 2016 +0200
Imported Upstream version 2.2.6+dfsg
---
README | 2 +-
configure | 162 +---
configure.ac | 31 +-
src/modules/climate/climate_tools/Makefile.am | 8 +-
src/modules/climate/climate_tools/Makefile.in | 5 +-
src/modules/climate/climate_tools/daily_sun.cpp | 20 +-
.../climate/climate_tools/etp_hargreave.cpp | 2 -
.../climate_tools/grid_levels_interpolation.h | 2 +-
src/modules/contrib/contrib_peregro/Makefile.am | 8 +-
src/modules/contrib/contrib_peregro/Makefile.in | 5 +-
src/modules/db/db_odbc/Makefile.am | 8 +-
src/modules/db/db_odbc/Makefile.in | 5 +-
src/modules/db/db_odbc/get_connection.h | 8 +-
src/modules/db/db_odbc/table.h | 12 +-
src/modules/db/db_pgsql/Makefile.am | 8 +-
src/modules/db/db_pgsql/Makefile.in | 5 +-
src/modules/db/db_pgsql/get_connection.h | 14 +-
src/modules/db/db_pgsql/pgis_raster.h | 8 +-
src/modules/db/db_pgsql/pgis_shapes.h | 6 +-
src/modules/db/db_pgsql/table.h | 12 +-
src/modules/docs/docs_html/Makefile.am | 8 +-
src/modules/docs/docs_html/Makefile.in | 5 +-
src/modules/docs/docs_pdf/Makefile.am | 8 +-
src/modules/docs/docs_pdf/Makefile.in | 5 +-
src/modules/garden/garden_3d_viewer/Makefile.am | 11 +-
src/modules/garden/garden_3d_viewer/Makefile.in | 8 +-
src/modules/garden/garden_fractals/Makefile.am | 8 +-
src/modules/garden/garden_fractals/Makefile.in | 5 +-
src/modules/garden/garden_games/Makefile.am | 8 +-
src/modules/garden/garden_games/Makefile.in | 5 +-
.../garden/garden_learn_to_program/Makefile.am | 8 +-
.../garden/garden_learn_to_program/Makefile.in | 5 +-
src/modules/garden/garden_webservices/Makefile.am | 11 +-
src/modules/garden/garden_webservices/Makefile.in | 8 +-
.../grid_analysis/LeastCostPathProfile_Points.cpp | 4 +-
src/modules/grid/grid_analysis/Makefile.am | 10 +-
src/modules/grid/grid_analysis/Makefile.in | 7 +-
src/modules/grid/grid_analysis/Soil_Texture.h | 6 +-
.../grid/grid_analysis/fragmentation_base.h | 4 +-
.../grid/grid_calculus/Grid_Geometric_Figures.h | 4 +-
src/modules/grid/grid_calculus/Grid_Random_Field.h | 4 +-
.../grid/grid_calculus/Grid_Random_Terrain.h | 4 +-
src/modules/grid/grid_calculus/Makefile.am | 10 +-
src/modules/grid/grid_calculus/Makefile.in | 7 +-
.../grid/grid_calculus/gradient_cartes_polar.h | 4 +-
.../grid/grid_calculus/grid_metric_conversion.h | 2 +-
src/modules/grid/grid_calculus/kff_synth.h | 4 +-
src/modules/grid/grid_calculus_bsl/Makefile.am | 10 +-
src/modules/grid/grid_calculus_bsl/Makefile.in | 7 +-
src/modules/grid/grid_filter/Makefile.am | 10 +-
src/modules/grid/grid_filter/Makefile.in | 7 +-
src/modules/grid/grid_gridding/Interpolation.cpp | 12 +-
src/modules/grid/grid_gridding/Interpolation.h | 4 +-
.../Interpolation_NaturalNeighbour.cpp | 8 +-
src/modules/grid/grid_gridding/Makefile.am | 13 +-
src/modules/grid/grid_gridding/Makefile.in | 8 +-
src/modules/grid/grid_gridding/Shapes2Grid.cpp | 18 +-
src/modules/grid/grid_gridding/kernel_density.cpp | 12 +-
src/modules/grid/grid_gridding/nn/config.h | 2 +-
src/modules/grid/grid_gridding/nn/delaunay.c | 297 ++++++-
src/modules/grid/grid_gridding/nn/nn.h | 8 -
.../grid/grid_spline/Gridding_Spline_Base.cpp | 16 +-
.../grid/grid_spline/Gridding_Spline_Base.h | 4 +-
.../grid/grid_spline/MBASpline_for_Categories.cpp | 10 +-
.../grid/grid_spline/MBASpline_for_Categories.h | 2 +-
src/modules/grid/grid_spline/Makefile.am | 10 +-
src/modules/grid/grid_spline/Makefile.in | 7 +-
src/modules/grid/grid_tools/Grid_Resample.cpp | 15 +-
.../grid_tools/Grid_Value_Replace_Interactive.cpp | 4 +-
src/modules/grid/grid_tools/Makefile.am | 10 +-
src/modules/grid/grid_tools/Makefile.in | 7 +-
src/modules/grid/grid_visualisation/Makefile.am | 10 +-
src/modules/grid/grid_visualisation/Makefile.in | 7 +-
.../imagery/imagery_classification/Makefile.am | 8 +-
.../imagery/imagery_classification/Makefile.in | 5 +-
src/modules/imagery/imagery_maxent/Makefile.am | 8 +-
src/modules/imagery/imagery_maxent/Makefile.in | 5 +-
src/modules/imagery/imagery_opencv/Makefile.am | 8 +-
src/modules/imagery/imagery_opencv/Makefile.in | 5 +-
.../imagery/imagery_photogrammetry/Makefile.am | 8 +-
.../imagery/imagery_photogrammetry/Makefile.in | 5 +-
.../imagery/imagery_segmentation/Makefile.am | 8 +-
.../imagery/imagery_segmentation/Makefile.in | 5 +-
src/modules/imagery/imagery_svm/Makefile.am | 8 +-
src/modules/imagery/imagery_svm/Makefile.in | 5 +-
src/modules/imagery/imagery_tools/Makefile.am | 8 +-
src/modules/imagery/imagery_tools/Makefile.in | 5 +-
src/modules/imagery/imagery_tools/landsat_acca.h | 4 +-
src/modules/imagery/imagery_tools/landsat_import.h | 2 +-
src/modules/imagery/imagery_tools/landsat_toar.h | 4 +-
src/modules/imagery/imagery_tools/pansharpening.h | 10 +-
.../imagery/imagery_vigra/MLB_Interface.cpp | 4 +-
src/modules/imagery/imagery_vigra/Makefile.am | 8 +-
src/modules/imagery/imagery_vigra/Makefile.in | 5 +-
.../imagery/imagery_vigra/vigra_random_forest.cpp | 49 +-
.../imagery/imagery_vigra/vigra_random_forest.h | 21 +
src/modules/io/Makefile.am | 4 +-
src/modules/io/Makefile.in | 9 +-
src/modules/io/io_esri_e00/Makefile.am | 8 +-
src/modules/io/io_esri_e00/Makefile.in | 5 +-
src/modules/io/io_gdal/Makefile.am | 8 +-
src/modules/io/io_gdal/Makefile.in | 5 +-
src/modules/io/io_gdal/gdal_catalogue.cpp | 2 +-
src/modules/io/io_gdal/gdal_import_wms.cpp | 55 +-
src/modules/io/io_gdal/gdal_import_wms.h | 2 +-
src/modules/io/io_gps/Makefile.am | 8 +-
src/modules/io/io_gps/Makefile.in | 5 +-
src/modules/io/io_grid/Makefile.am | 8 +-
src/modules/io/io_grid/Makefile.in | 5 +-
src/modules/io/io_grid/bmp_export.h | 2 +-
src/modules/io/io_grid/citygml_import.h | 2 +-
src/modules/io/io_grid/erdas_lan.h | 2 +-
src/modules/io/io_grid/esri_arcinfo.h | 4 +-
src/modules/io/io_grid/grid_table.h | 2 +-
src/modules/io/io_grid/import_clip_resample.h | 2 +-
src/modules/io/io_grid/mola.h | 2 +-
src/modules/io/io_grid/raw.h | 2 +-
src/modules/io/io_grid/srtm30.h | 2 +-
src/modules/io/io_grid/surfer.h | 4 +-
src/modules/io/io_grid/usgs_srtm.h | 2 +-
src/modules/io/io_grid/wrf.h | 4 +-
src/modules/io/io_grid/xyz.h | 4 +-
src/modules/io/io_grid_grib2/MLB_Interface.cpp | 64 --
src/modules/io/io_grid_grib2/MLB_Interface.h | 19 -
src/modules/io/io_grid_grib2/Makefile.am | 76 --
src/modules/io/io_grid_grib2/Makefile.in | 990 ---------------------
src/modules/io/io_grid_grib2/grib2_import.cpp | 150 ----
src/modules/io/io_grid_grib2/grib2_import.h | 40 -
src/modules/io/io_grid_image/Makefile.am | 11 +-
src/modules/io/io_grid_image/Makefile.in | 8 +-
src/modules/io/io_grid_image/grid_export.h | 4 +-
src/modules/io/io_grid_image/grid_import.h | 4 +-
src/modules/io/io_grid_image/grid_to_kml.cpp | 6 +-
src/modules/io/io_grid_image/grid_to_kml.h | 6 +-
src/modules/io/io_shapes/Makefile.am | 14 +-
src/modules/io/io_shapes/Makefile.in | 11 +-
src/modules/io/io_shapes/atlas_bna.h | 4 +-
src/modules/io/io_shapes/generate.h | 2 +-
src/modules/io/io_shapes/gpx.h | 4 +-
src/modules/io/io_shapes/gstat.h | 4 +-
src/modules/io/io_shapes/pointcloud_from_file.h | 2 +-
.../io/io_shapes/pointcloud_from_text_file.h | 2 +-
.../io/io_shapes/pointcloud_to_text_file.cpp | 2 +-
src/modules/io/io_shapes/pointcloud_to_text_file.h | 2 +-
src/modules/io/io_shapes/stl.h | 4 +-
src/modules/io/io_shapes/surfer_bln.h | 4 +-
src/modules/io/io_shapes/svg.h | 4 +-
src/modules/io/io_shapes/wasp_map.h | 4 +-
src/modules/io/io_shapes/wktb.h | 4 +-
src/modules/io/io_shapes/xyz.h | 4 +-
src/modules/io/io_shapes_dxf/Makefile.am | 8 +-
src/modules/io/io_shapes_dxf/Makefile.in | 5 +-
src/modules/io/io_shapes_dxf/dxf_import.h | 2 +-
src/modules/io/io_shapes_las/Makefile.am | 8 +-
src/modules/io/io_shapes_las/Makefile.in | 5 +-
src/modules/io/io_shapes_las/las_export.cpp | 7 +-
src/modules/io/io_shapes_las/las_export.h | 2 +-
src/modules/io/io_shapes_las/las_import.cpp | 2 +-
src/modules/io/io_shapes_las/las_import.h | 2 +-
src/modules/io/io_shapes_las/las_info.cpp | 3 +-
src/modules/io/io_shapes_las/las_info.h | 2 +-
src/modules/io/io_table/Makefile.am | 8 +-
src/modules/io/io_table/Makefile.in | 5 +-
src/modules/io/io_table/io_table_txt.h | 8 +-
src/modules/io/io_virtual/Makefile.am | 16 +-
src/modules/io/io_virtual/Makefile.in | 13 +-
src/modules/io/io_virtual/pc_create_spcvf.h | 4 +-
src/modules/io/io_virtual/pc_get_grid_spcvf.h | 6 +-
src/modules/io/io_virtual/pc_get_subset_spcvf.cpp | 6 +-
src/modules/io/io_virtual/pc_get_subset_spcvf.h | 6 +-
.../io/io_virtual/pc_remove_overlap_from_spcvf.cpp | 6 +-
.../io/io_virtual/pc_remove_overlap_from_spcvf.h | 4 +-
.../io/io_virtual/pc_tileshape_from_spcvf.cpp | 4 +-
.../io/io_virtual/pc_tileshape_from_spcvf.h | 4 +-
.../pointcloud/pointcloud_tools/Makefile.am | 14 +-
.../pointcloud/pointcloud_tools/Makefile.in | 11 +-
.../pointcloud_tools/pc_attribute_calculator.h | 4 +-
.../pointcloud_tools/pc_cluster_analysis.h | 4 +-
src/modules/pointcloud/pointcloud_tools/pc_cut.h | 6 +-
.../pointcloud_tools/pc_drop_attribute.h | 4 +-
.../pointcloud/pointcloud_tools/pc_from_grid.h | 4 +-
.../pointcloud/pointcloud_tools/pc_from_shapes.h | 4 +-
.../pointcloud/pointcloud_tools/pc_from_table.h | 4 +-
src/modules/pointcloud/pointcloud_tools/pc_merge.h | 4 +-
.../pointcloud_tools/pc_reclass_extract.h | 4 +-
.../pointcloud_tools/pc_thinning_simple.h | 4 +-
.../pointcloud/pointcloud_tools/pc_to_grid.h | 4 +-
.../pointcloud/pointcloud_tools/pc_to_shapes.h | 4 +-
.../pointcloud/pointcloud_tools/pc_transform.h | 4 +-
.../pointcloud/pointcloud_viewer/Makefile.am | 11 +-
.../pointcloud/pointcloud_viewer/Makefile.in | 8 +-
src/modules/projection/pj_georeference/Makefile.am | 8 +-
src/modules/projection/pj_georeference/Makefile.in | 5 +-
.../pj_georeference/direct_georeferencing.cpp | 10 +-
src/modules/projection/pj_proj4/Makefile.am | 10 +-
src/modules/projection/pj_proj4/Makefile.in | 7 +-
src/modules/projection/pj_proj4/PROJ4_Grid.h | 4 +-
src/modules/projection/pj_proj4/PROJ4_Shapes.h | 4 +-
src/modules/projection/pj_proj4/crs_base.cpp | 9 +-
src/modules/projection/pj_proj4/crs_base.h | 4 +-
src/modules/projection/pj_proj4/crs_distance.h | 6 +-
.../projection/pj_proj4/crs_grid_geogcoords.h | 4 +-
src/modules/projection/pj_proj4/crs_indicatrix.h | 4 +-
src/modules/projection/pj_proj4/gcs_graticule.h | 4 +-
src/modules/projection/pj_proj4/gcs_lon_range.h | 4 +-
.../shapes/shapes_grid/Grid_Classes_To_Shapes.h | 4 +-
src/modules/shapes/shapes_grid/Grid_Polygon_Clip.h | 4 +-
.../shapes_grid/Grid_Statistics_AddTo_Polygon.h | 4 +-
.../shapes_grid/Grid_Statistics_For_Points.h | 2 +-
src/modules/shapes/shapes_grid/Grid_To_Contour.h | 4 +-
src/modules/shapes/shapes_grid/Grid_To_Gradient.h | 4 +-
src/modules/shapes/shapes_grid/Grid_To_Points.h | 4 +-
.../shapes/shapes_grid/Grid_To_Points_Random.h | 4 +-
.../shapes/shapes_grid/Grid_Values_AddTo_Points.h | 4 +-
.../shapes/shapes_grid/Grid_Values_AddTo_Shapes.h | 4 +-
src/modules/shapes/shapes_grid/Makefile.am | 10 +-
src/modules/shapes/shapes_grid/Makefile.in | 7 +-
src/modules/shapes/shapes_grid/grid_extent.h | 2 +-
.../shapes_grid/grid_local_extremes_to_points.h | 4 +-
.../shapes/shapes_grid/grid_rectangle_clip.h | 4 +-
src/modules/shapes/shapes_lines/Makefile.am | 8 +-
src/modules/shapes/shapes_lines/Makefile.in | 5 +-
.../shapes/shapes_lines/line_split_with_lines.cpp | 4 +-
src/modules/shapes/shapes_points/Makefile.am | 10 +-
src/modules/shapes/shapes_points/Makefile.in | 7 +-
.../shapes/shapes_points/gps_track_aggregation.h | 2 +-
src/modules/shapes/shapes_polygons/Makefile.am | 10 +-
src/modules/shapes/shapes_polygons/Makefile.in | 7 +-
.../shapes/shapes_polygons/Polygon_Intersection.h | 4 +-
.../shapes/shapes_polygons/polygon_shared_edges.h | 4 +-
src/modules/shapes/shapes_tools/Makefile.am | 10 +-
src/modules/shapes/shapes_tools/Makefile.in | 7 +-
src/modules/shapes/shapes_transect/Makefile.am | 10 +-
src/modules/shapes/shapes_transect/Makefile.in | 7 +-
.../simulation/sim_cellular_automata/Makefile.am | 8 +-
.../simulation/sim_cellular_automata/Makefile.in | 5 +-
.../simulation/sim_ecosystems_hugget/Makefile.am | 8 +-
.../simulation/sim_ecosystems_hugget/Makefile.in | 5 +-
src/modules/simulation/sim_erosion/Makefile.am | 8 +-
src/modules/simulation/sim_erosion/Makefile.in | 5 +-
.../simulation/sim_fire_spreading/Makefile.am | 8 +-
.../simulation/sim_fire_spreading/Makefile.in | 5 +-
src/modules/simulation/sim_hydrology/Makefile.am | 8 +-
src/modules/simulation/sim_hydrology/Makefile.in | 5 +-
src/modules/simulation/sim_ihacres/Makefile.am | 8 +-
src/modules/simulation/sim_ihacres/Makefile.in | 5 +-
src/modules/simulation/sim_qm_of_esp/Makefile.am | 8 +-
src/modules/simulation/sim_qm_of_esp/Makefile.in | 5 +-
src/modules/simulation/sim_rivflow/Makefile.am | 8 +-
src/modules/simulation/sim_rivflow/Makefile.in | 5 +-
src/modules/statistics/statistics_grid/Makefile.am | 8 +-
src/modules/statistics/statistics_grid/Makefile.in | 5 +-
src/modules/statistics/statistics_grid/grid_pca.h | 4 +-
.../statistics/statistics_kriging/Makefile.am | 11 +-
.../statistics/statistics_kriging/Makefile.in | 8 +-
.../statistics/statistics_kriging/kriging_base.cpp | 11 +-
.../statistics/statistics_points/Makefile.am | 8 +-
.../statistics/statistics_points/Makefile.in | 5 +-
.../statistics/statistics_regression/Makefile.am | 8 +-
.../statistics/statistics_regression/Makefile.in | 5 +-
.../statistics_regression/gw_multi_regression.cpp | 15 +-
.../statistics_regression/gw_regression.cpp | 13 +-
.../statistics_regression/point_trend_surface.cpp | 12 +-
.../table_regression_multiple.h | 4 +-
.../statistics/statistics_regression/table_trend.h | 4 +-
src/modules/table/table_calculus/Makefile.am | 10 +-
src/modules/table/table_calculus/Makefile.in | 7 +-
.../table/table_calculus/table_fill_record_gaps.h | 2 +-
src/modules/table/table_tools/Makefile.am | 10 +-
src/modules/table/table_tools/Makefile.in | 7 +-
.../table/table_tools/table_change_date_format.h | 4 +-
.../terrain_analysis/ta_channels/Makefile.am | 8 +-
.../terrain_analysis/ta_channels/Makefile.in | 5 +-
.../terrain_analysis/ta_compound/Makefile.am | 8 +-
.../terrain_analysis/ta_compound/Makefile.in | 5 +-
.../terrain_analysis/ta_hydrology/CellBalance.h | 2 +-
.../ta_hydrology/Erosion_LS_Fields.h | 2 +-
.../terrain_analysis/ta_hydrology/FlowDepth.h | 2 +-
.../ta_hydrology/IsochronesConst.h | 2 +-
.../terrain_analysis/ta_hydrology/IsochronesVar.h | 4 +-
.../terrain_analysis/ta_hydrology/LakeFlood.h | 4 +-
.../terrain_analysis/ta_hydrology/Makefile.am | 8 +-
.../terrain_analysis/ta_hydrology/Makefile.in | 5 +-
.../ta_hydrology/SAGA_Wetness_Index.h | 2 +-
.../terrain_analysis/ta_hydrology/Sinuosity.h | 2 +-
.../terrain_analysis/ta_hydrology/SlopeLength.h | 2 +-
.../ta_hydrology/TopographicIndices.h | 8 +-
.../ta_hydrology/melton_ruggedness.h | 2 +-
.../terrain_analysis/ta_lighting/HillShade.cpp | 4 +-
.../terrain_analysis/ta_lighting/Makefile.am | 8 +-
.../terrain_analysis/ta_lighting/Makefile.in | 5 +-
.../ta_lighting/SolarRadiation.cpp | 84 +-
.../terrain_analysis/ta_lighting/SolarRadiation.h | 4 +-
.../terrain_analysis/ta_morphometry/Makefile.am | 8 +-
.../terrain_analysis/ta_morphometry/Makefile.in | 5 +-
.../ta_morphometry/mass_balance_index.h | 2 +-
.../terrain_analysis/ta_morphometry/ruggedness.h | 4 +-
.../terrain_analysis/ta_preprocessor/Makefile.am | 8 +-
.../terrain_analysis/ta_preprocessor/Makefile.in | 5 +-
.../ta_preprocessor/Pit_Eliminator.cpp | 2 +-
.../ta_profiles/Grid_Profile_From_Lines.cpp | 2 +-
.../terrain_analysis/ta_profiles/Makefile.am | 8 +-
.../terrain_analysis/ta_profiles/Makefile.in | 5 +-
.../ta_slope_stability/Makefile.am | 8 +-
.../ta_slope_stability/Makefile.in | 5 +-
src/modules/tin/tin_tools/Makefile.am | 10 +-
src/modules/tin/tin_tools/Makefile.in | 7 +-
src/modules/tin/tin_tools/TIN_Flow_Parallel.h | 4 +-
src/modules/tin/tin_tools/TIN_Flow_Trace.h | 4 +-
src/modules/tin/tin_tools/TIN_From_Grid.h | 4 +-
.../tin/tin_tools/TIN_From_Grid_Specific_Points.h | 4 +-
src/modules/tin/tin_tools/TIN_From_Shapes.h | 4 +-
src/modules/tin/tin_tools/TIN_Gradient.h | 4 +-
src/modules/tin/tin_tools/TIN_To_Shapes.h | 4 +-
src/modules/tin/tin_viewer/Makefile.am | 11 +-
src/modules/tin/tin_viewer/Makefile.in | 8 +-
src/saga_core/saga_api/Makefile.am | 19 +-
src/saga_core/saga_api/Makefile.in | 10 +-
src/saga_core/saga_api/api_core.cpp | 120 +--
src/saga_core/saga_api/api_core.h | 47 +-
src/saga_core/saga_api/datetime.cpp | 118 +++
src/saga_core/saga_api/datetime.h | 49 +-
src/saga_core/saga_api/module_chain.cpp | 24 +-
src/saga_core/saga_api/parameter.cpp | 147 ++-
src/saga_core/saga_api/parameter_data.cpp | 101 ++-
src/saga_core/saga_api/parameters.cpp | 47 +-
src/saga_core/saga_api/parameters.h | 55 +-
src/saga_core/saga_api/saga_api.h | 4 +-
src/saga_core/saga_cmd/Makefile.am | 13 +-
src/saga_core/saga_cmd/Makefile.in | 8 +-
src/saga_core/saga_cmd/module_library.cpp | 57 +-
src/saga_core/saga_gdi/Makefile.am | 11 +-
src/saga_core/saga_gdi/Makefile.in | 8 +-
src/saga_core/saga_gui/Makefile.am | 24 +-
src/saga_core/saga_gui/Makefile.in | 22 +-
src/saga_core/saga_gui/active_history.cpp | 4 +-
src/saga_core/saga_gui/data_source_pgsql.cpp | 41 +-
src/saga_core/saga_gui/info.cpp | 6 +-
src/saga_core/saga_gui/parameters_control.cpp | 104 ++-
src/saga_core/saga_gui/parameters_control.h | 5 +-
src/saga_core/saga_gui/res/colours.bmp | Bin
src/saga_core/saga_gui/res/resource.h | 0
src/saga_core/saga_gui/res/saga.appdata.xml | 0
src/saga_core/saga_gui/res/saga.bra.txt | 703 +++++++--------
src/saga_core/saga_gui/res/saga.desktop | 3 +-
src/saga_core/saga_gui/res/saga.ger.txt | 225 +++--
src/saga_core/saga_gui/res/saga.ico | Bin
src/saga_core/saga_gui/res/saga.lng.txt | 225 +++--
src/saga_core/saga_gui/res/saga.png | Bin
src/saga_core/saga_gui/res/saga_dic.txt | 0
src/saga_core/saga_gui/res/saga_gui.rc | 0
src/saga_core/saga_gui/res/saga_icon_128.png | Bin
src/saga_core/saga_gui/res/saga_icon_16.png | Bin 0 -> 1330 bytes
src/saga_core/saga_gui/res/saga_icon_192.png | Bin 0 -> 18982 bytes
src/saga_core/saga_gui/res/saga_icon_24.png | Bin 0 -> 1783 bytes
src/saga_core/saga_gui/res/saga_icon_32.png | Bin 0 -> 2582 bytes
src/saga_core/saga_gui/res/saga_icon_48.png | Bin 0 -> 4169 bytes
src/saga_core/saga_gui/res/saga_icon_64.png | Bin
src/saga_core/saga_gui/res/saga_icon_72.png | Bin 0 -> 6659 bytes
src/saga_core/saga_gui/res/saga_icon_8.png | Bin 0 -> 993 bytes
src/saga_core/saga_gui/res/saga_icon_80.png | Bin 0 -> 7531 bytes
src/saga_core/saga_gui/res/saga_icon_96.png | Bin 0 -> 9053 bytes
src/saga_core/saga_gui/res/saga_srs.txt | 0
src/saga_core/saga_gui/res/saga_tip.txt | 0
src/saga_core/saga_gui/res/tool_menus.xml | 0
src/saga_core/saga_gui/res/tool_menus_example.xml | 0
src/saga_core/saga_gui/res_images.cpp | 12 +-
src/saga_core/saga_gui/res_images.h | 8 +-
src/saga_core/saga_gui/saga_frame.cpp | 138 +--
src/saga_core/saga_gui/saga_frame.h | 14 +-
src/saga_core/saga_gui/view_base.cpp | 12 +-
src/saga_core/saga_gui/view_base.h | 12 +-
src/saga_core/saga_gui/view_histogram.cpp | 16 +-
src/saga_core/saga_gui/view_histogram.h | 3 +-
src/saga_core/saga_gui/view_layout.cpp | 3 +-
src/saga_core/saga_gui/view_map_3d.cpp | 3 +-
src/saga_core/saga_gui/view_table.cpp | 22 +-
src/saga_core/saga_gui/view_table.h | 4 +-
src/saga_core/saga_gui/view_table_diagram.cpp | 71 +-
src/saga_core/saga_gui/view_table_diagram.h | 4 +-
src/saga_core/saga_gui/wksp_base_item.h | 4 +-
src/saga_core/saga_gui/wksp_data_control.cpp | 4 +-
src/saga_core/saga_gui/wksp_data_item.cpp | 4 +-
src/saga_core/saga_gui/wksp_data_item.h | 4 +-
src/saga_core/saga_gui/wksp_data_manager.cpp | 6 +-
src/saga_core/saga_gui/wksp_layer.cpp | 4 +-
src/saga_core/saga_gui/wksp_layer.h | 4 +-
src/saga_core/saga_gui/wksp_map.cpp | 6 +-
src/saga_core/saga_gui/wksp_map.h | 6 +-
src/saga_core/saga_gui/wksp_map_basemap.cpp | 76 +-
src/saga_core/saga_gui/wksp_module_manager.cpp | 122 ++-
src/saga_core/saga_gui/wksp_module_manager.h | 3 +-
src/saga_core/saga_gui/wksp_table.cpp | 4 +-
src/saga_core/saga_gui/wksp_table.h | 4 +-
src/scripting/helper/make_saga_release.bat | 2 +-
.../saga_cmd_param_interface/param_interface.py | 4 +-
.../helpers/saga_cmd_param_interface/tools.py | 2 +-
397 files changed, 2766 insertions(+), 3886 deletions(-)
diff --git a/README b/README
index 9040856..dd2cbf9 100755
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
_______________________________________________________________________________
- SAGA 2.2.5 - System for Automated Geoscientific Analyses
+ SAGA 2.2.6 - System for Automated Geoscientific Analyses
_______________________________________________________________________________
* Introduction
diff --git a/configure b/configure
index 1d91600..f6baa08 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for saga 2.2.5.
+# Generated by GNU Autoconf 2.69 for saga 2.2.6.
#
# Report bugs to <BUG-REPORT-ADDRESS>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='saga'
PACKAGE_TARNAME='saga'
-PACKAGE_VERSION='2.2.5'
-PACKAGE_STRING='saga 2.2.5'
+PACKAGE_VERSION='2.2.6'
+PACKAGE_STRING='saga 2.2.6'
PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
PACKAGE_URL=''
@@ -657,8 +657,6 @@ SAGA_PYTHON_FALSE
SAGA_PYTHON_TRUE
DISABLELIBHARU
HARU_LIB
-SYSTEM_GRIB2C_FALSE
-SYSTEM_GRIB2C_TRUE
HAVE_HARU_FALSE
HAVE_HARU_TRUE
HAVE_VIGRA_FALSE
@@ -686,8 +684,6 @@ POSTGRESQL_LDFLAGS
POSTGRESQL_CFLAGS
POSTGRESQL_VERSION
PG_CONFIG
-SAGA_UNICODE_FALSE
-SAGA_UNICODE_TRUE
LOCAL_INCS
LOCAL_LIBS
POW_LIB
@@ -831,7 +827,6 @@ enable_odbc
enable_openmp
enable_triangle
enable_libfire
-with_system_grib2c
enable_python
'
ac_precious_vars='build_alias
@@ -1389,7 +1384,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures saga 2.2.5 to adapt to many kinds of systems.
+\`configure' configures saga 2.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1459,7 +1454,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of saga 2.2.5:";;
+ short | recursive ) echo "Configuration of saga 2.2.6:";;
esac
cat <<\_ACEOF
@@ -1500,9 +1495,6 @@ Optional Packages:
--with-local=dir search /usr/local or other directory for includes and libs
--with-postgresql=[ARG] use PostgreSQL library [default=yes], optionally
specify path to pg_config
- --with-system_grib2c Use system version of grib2c instead of embedded
- copy, requires this library (and the header) to be
- found.
Some influential environment variables:
CXX C++ compiler command
@@ -1588,7 +1580,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-saga configure 2.2.5
+saga configure 2.2.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2132,7 +2124,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by saga $as_me 2.2.5, which was
+It was created by saga $as_me 2.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2999,7 +2991,7 @@ fi
# Define the identity of the package.
PACKAGE='saga'
- VERSION='2.2.5'
+ VERSION='2.2.6'
cat >>confdefs.h <<_ACEOF
@@ -15559,46 +15551,6 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then :
FFTWFOUND=1
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jas_calloc in -ljasper" >&5
-$as_echo_n "checking for jas_calloc in -ljasper... " >&6; }
-if ${ac_cv_lib_jasper_jas_calloc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljasper $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jas_calloc ();
-int
-main ()
-{
-return jas_calloc ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_jasper_jas_calloc=yes
-else
- ac_cv_lib_jasper_jas_calloc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_calloc" >&5
-$as_echo "$ac_cv_lib_jasper_jas_calloc" >&6; }
-if test "x$ac_cv_lib_jasper_jas_calloc" = xyes; then :
- JASPERFOUND=1
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas" >&5
$as_echo_n "checking for LAS_GetVersion in -llas... " >&6; }
if ${ac_cv_lib_las_LAS_GetVersion+:} false; then :
@@ -15841,45 +15793,6 @@ if test "x$ac_cv_lib_gomp_omp_get_num_threads" = xyes; then :
GOMPFOUND=1
fi
-ac_fn_c_check_header_mongrel "$LINENO" "grib2.h" "ac_cv_header_grib2_h" "$ac_includes_default"
-if test "x$ac_cv_header_grib2_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgrib2c" >&5
-$as_echo_n "checking for main in -lgrib2c... " >&6; }
-if ${ac_cv_lib_grib2c_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgrib2c $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_grib2c_main=yes
-else
- ac_cv_lib_grib2c_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_grib2c_main" >&5
-$as_echo "$ac_cv_lib_grib2c_main" >&6; }
-if test "x$ac_cv_lib_grib2c_main" = xyes; then :
- GRIB2FOUND=1
-fi
-
-fi
-
-
# Checks for header files.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
@@ -16999,16 +16912,7 @@ fi
# wxwidgets
# the test could be extended to check for wx-config --version too
-if test "`wx-config --list | grep unicode`" != "" ; then
- if true; then
- SAGA_UNICODE_TRUE=
- SAGA_UNICODE_FALSE='#'
-else
- SAGA_UNICODE_TRUE='#'
- SAGA_UNICODE_FALSE=
-fi
-
-else
+if test "`wx-config --list | grep unicode`" == "" ; then
as_fn_error $? "SAGA requires a unicode build of wxGTK" "$LINENO" 5
exit
fi
@@ -17437,6 +17341,22 @@ else
fi
+
+ if test -n "$CVFOUND" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building with OpenCV" >&5
+$as_echo " Building with OpenCV" >&6; }
+ fi
+
+ if test -n "$LASFOUND" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building with libLAS" >&5
+$as_echo " Building with libLAS" >&6; }
+ fi
+
+ if test -n "$VIGRAFOUND" -a -n "$FFTWFOUND" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building with VIGRA" >&5
+$as_echo " Building with VIGRA" >&6; }
+ fi
+
if test -n "$HARUFOUND" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using lhpdf (libharu) from system libs." >&5
$as_echo " using lhpdf (libharu) from system libs." >&6; }
@@ -17450,23 +17370,6 @@ $as_echo " libharu was not found, pdf creation will be disabled" >&6; }
fi
-# Check whether --with-system_grib2c was given.
-if test "${with_system_grib2c+set}" = set; then :
- withval=$with_system_grib2c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system grib2c" >&5
-$as_echo " using system grib2c" >&6; };
- system_grib2c=true
-
-fi
-
- if test -n "$GRIB2FOUND" -a x$system_grib2c=xtrue; then
- SYSTEM_GRIB2C_TRUE=
- SYSTEM_GRIB2C_FALSE='#'
-else
- SYSTEM_GRIB2C_TRUE='#'
- SYSTEM_GRIB2C_FALSE=
-fi
-
-
@@ -18177,7 +18080,7 @@ $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
fi
#AC_CONFIG_FILES([Makefile])
-ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/contrib/Makefile src/modules/contrib/contrib_peregro/Makefile src/modules/db/Makefile src/modules/db/db_odbc [...]
+ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/contrib/Makefile src/modules/contrib/contrib_peregro/Makefile src/modules/db/Makefile src/modules/db/db_odbc [...]
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -18317,10 +18220,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${SAGA_UNICODE_TRUE}" && test -z "${SAGA_UNICODE_FALSE}"; then
- as_fn_error $? "conditional \"SAGA_UNICODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_POSTGRESQL_TRUE}" && test -z "${HAVE_POSTGRESQL_FALSE}"; then
as_fn_error $? "conditional \"HAVE_POSTGRESQL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18365,10 +18264,6 @@ if test -z "${HAVE_HARU_TRUE}" && test -z "${HAVE_HARU_FALSE}"; then
as_fn_error $? "conditional \"HAVE_HARU\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${SYSTEM_GRIB2C_TRUE}" && test -z "${SYSTEM_GRIB2C_FALSE}"; then
- as_fn_error $? "conditional \"SYSTEM_GRIB2C\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${SAGA_PYTHON_TRUE}" && test -z "${SAGA_PYTHON_FALSE}"; then
as_fn_error $? "conditional \"SAGA_PYTHON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18770,7 +18665,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by saga $as_me 2.2.5, which was
+This file was extended by saga $as_me 2.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18836,7 +18731,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-saga config.status 2.2.5
+saga config.status 2.2.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -19392,7 +19287,6 @@ do
"src/modules/io/io_gdal/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_gdal/Makefile" ;;
"src/modules/io/io_gps/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_gps/Makefile" ;;
"src/modules/io/io_grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid/Makefile" ;;
- "src/modules/io/io_grid_grib2/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid_grib2/Makefile" ;;
"src/modules/io/io_grid_image/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid_image/Makefile" ;;
"src/modules/io/io_shapes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes/Makefile" ;;
"src/modules/io/io_shapes_dxf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes_dxf/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index e5cafd9..83010d9 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-# $Id: configure.ac 2832 2016-02-25 12:41:39Z oconrad $
+# $Id: configure.ac 2852 2016-03-23 08:44:46Z reklov_w $
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(saga, 2.2.5, BUG-REPORT-ADDRESS)
+AC_INIT(saga, 2.2.6, 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])
@@ -20,14 +20,12 @@ AC_PROG_LIBTOOL
AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
-AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found])
AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
-AC_CHECK_HEADER(grib2.h,[ AC_CHECK_LIB(grib2c, main,GRIB2FOUND=1)])
# Checks for header files.
AC_HEADER_STDC
@@ -82,9 +80,7 @@ fi
# wxwidgets
# the test could be extended to check for wx-config --version too
-if test "`wx-config --list | grep unicode`" != "" ; then
- AM_CONDITIONAL(SAGA_UNICODE, true)
-else
+if test "`wx-config --list | grep unicode`" == "" ; then
AC_MSG_ERROR(SAGA requires a unicode build of wxGTK)
exit
fi
@@ -198,6 +194,19 @@ fi
AM_CONDITIONAL(HAVE_VIGRA, test -n "$VIGRAFOUND" -a -n "$FFTWFOUND")
AM_CONDITIONAL(HAVE_HARU, test -n "$HARUFOUND")
+
+ if test -n "$CVFOUND" ; then
+ AC_MSG_RESULT([ Building with OpenCV])
+ fi
+
+ if test -n "$LASFOUND" ; then
+ AC_MSG_RESULT([ Building with libLAS])
+ fi
+
+ if test -n "$VIGRAFOUND" -a -n "$FFTWFOUND" ; then
+ AC_MSG_RESULT([ Building with VIGRA])
+ fi
+
if test -n "$HARUFOUND" ; then
AC_MSG_RESULT([ using lhpdf (libharu) from system libs.])
DISABLELIBHARU=""
@@ -208,13 +217,6 @@ fi
HARU_LIB=""
fi
-AC_ARG_WITH(system_grib2c,
- AS_HELP_STRING([--with-system_grib2c],[Use system version of grib2c instead of embedded copy, requires this library (and the header) to be found.]),
- AC_MSG_RESULT([ using system grib2c]);
- system_grib2c=true
- ,
- )
-AM_CONDITIONAL(SYSTEM_GRIB2C, test -n "$GRIB2FOUND" -a x$system_grib2c=xtrue)
AC_SUBST(HARU_LIB)
AC_SUBST(DISABLELIBHARU)
@@ -285,7 +287,6 @@ AC_OUTPUT(Makefile \
src/modules/io/io_gdal/Makefile \
src/modules/io/io_gps/Makefile \
src/modules/io/io_grid/Makefile \
- src/modules/io/io_grid_grib2/Makefile \
src/modules/io/io_grid_image/Makefile \
src/modules/io/io_shapes/Makefile \
src/modules/io/io_shapes_dxf/Makefile \
diff --git a/src/modules/climate/climate_tools/Makefile.am b/src/modules/climate/climate_tools/Makefile.am
index be16d24..e908d9f 100755
--- a/src/modules/climate/climate_tools/Makefile.am
+++ b/src/modules/climate/climate_tools/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libclimate_tools.la
libclimate_tools_la_SOURCES =\
diff --git a/src/modules/climate/climate_tools/Makefile.in b/src/modules/climate/climate_tools/Makefile.in
index 47d3ce5..6350e07 100644
--- a/src/modules/climate/climate_tools/Makefile.in
+++ b/src/modules/climate/climate_tools/Makefile.in
@@ -365,10 +365,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libclimate_tools.la
libclimate_tools_la_SOURCES = \
diff --git a/src/modules/climate/climate_tools/daily_sun.cpp b/src/modules/climate/climate_tools/daily_sun.cpp
index a1b375f..f2987e1 100755
--- a/src/modules/climate/climate_tools/daily_sun.cpp
+++ b/src/modules/climate/climate_tools/daily_sun.cpp
@@ -61,8 +61,6 @@
//---------------------------------------------------------
#include "daily_sun.h"
-#include <saga_api/datetime.h>
-
///////////////////////////////////////////////////////////
// //
@@ -89,22 +87,10 @@ CDaily_Sun::CDaily_Sun(void)
Parameters.Add_Grid(NULL, "LENGTH" , _TL("Day Length" ), _TL(""), PARAMETER_OUTPUT);
//-----------------------------------------------------
- Parameters.Add_Value(
- NULL , "YEAR" , _TL("Year"),
- _TL(""),
- PARAMETER_TYPE_Int, CSG_DateTime::Get_Current_Year()
- );
-
- Parameters.Add_Choice(
- NULL , "MONTH" , _TL("Month"),
- _TL(""),
- CSG_DateTime::Get_Month_Choices(), CSG_DateTime::Get_Current_Month()
- );
-
- Parameters.Add_Value(
+ Parameters.Add_Date(
NULL , "DAY" , _TL("Day of Month"),
_TL(""),
- PARAMETER_TYPE_Int, CSG_DateTime::Get_Current_Day(), 1, true, 31, true
+ CSG_DateTime::Now().Get_JDN()
);
Parameters.Add_Choice(
@@ -178,7 +164,7 @@ bool CDaily_Sun::On_Execute(void)
bool bWorld = Parameters("TIME")->asInt() == 1;
//-----------------------------------------------------
- CSG_DateTime Time((CSG_DateTime::TSG_DateTime)Parameters("DAY")->asInt(), (CSG_DateTime::Month)Parameters("MONTH")->asInt(), Parameters("YEAR")->asInt());
+ CSG_DateTime Time(Parameters("DAY")->asDate()->Get_Date());
Time.Reset_Time();
diff --git a/src/modules/climate/climate_tools/etp_hargreave.cpp b/src/modules/climate/climate_tools/etp_hargreave.cpp
index 5e25bb6..eb5b338 100755
--- a/src/modules/climate/climate_tools/etp_hargreave.cpp
+++ b/src/modules/climate/climate_tools/etp_hargreave.cpp
@@ -61,8 +61,6 @@
//---------------------------------------------------------
#include "etp_hargreave.h"
-#include <saga_api/datetime.h>
-
///////////////////////////////////////////////////////////
// //
diff --git a/src/modules/climate/climate_tools/grid_levels_interpolation.h b/src/modules/climate/climate_tools/grid_levels_interpolation.h
index d1dfef7..5902dd8 100755
--- a/src/modules/climate/climate_tools/grid_levels_interpolation.h
+++ b/src/modules/climate/climate_tools/grid_levels_interpolation.h
@@ -78,7 +78,7 @@ class CGrid_Levels_Interpolation : public CSG_Module_Grid
public:
CGrid_Levels_Interpolation(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/contrib/contrib_peregro/Makefile.am b/src/modules/contrib/contrib_peregro/Makefile.am
index c44f9c2..2dac323 100755
--- a/src/modules/contrib/contrib_peregro/Makefile.am
+++ b/src/modules/contrib/contrib_peregro/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libcontrib_perego.la
libcontrib_perego_la_SOURCES =\
diff --git a/src/modules/contrib/contrib_peregro/Makefile.in b/src/modules/contrib/contrib_peregro/Makefile.in
index b298d0d..9569255 100644
--- a/src/modules/contrib/contrib_peregro/Makefile.in
+++ b/src/modules/contrib/contrib_peregro/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libcontrib_perego.la
libcontrib_perego_la_SOURCES = \
diff --git a/src/modules/db/db_odbc/Makefile.am b/src/modules/db/db_odbc/Makefile.am
index e562d1c..a552864 100755
--- a/src/modules/db/db_odbc/Makefile.am
+++ b/src/modules/db/db_odbc/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) $(DEP_LIBS) -shared -lodbc -avoid-version
pkglib_LTLIBRARIES = libdb_odbc.la
libdb_odbc_la_SOURCES =\
diff --git a/src/modules/db/db_odbc/Makefile.in b/src/modules/db/db_odbc/Makefile.in
index 7bb44c1..13adb2d 100644
--- a/src/modules/db/db_odbc/Makefile.in
+++ b/src/modules/db/db_odbc/Makefile.in
@@ -365,10 +365,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1828 2013-09-05 21:36:10Z manfred-e $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@DEP_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) $(DEP_LIBS) -shared -lodbc -avoid-version
pkglib_LTLIBRARIES = libdb_odbc.la
libdb_odbc_la_SOURCES = \
diff --git a/src/modules/db/db_odbc/get_connection.h b/src/modules/db/db_odbc/get_connection.h
index 9df63b2..f2b6a7e 100755
--- a/src/modules/db/db_odbc/get_connection.h
+++ b/src/modules/db/db_odbc/get_connection.h
@@ -87,7 +87,7 @@ class CGet_Servers : public CSG_Module
public:
CGet_Servers(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -145,7 +145,7 @@ class CDel_Connections : public CSG_Module
public:
CDel_Connections(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -167,7 +167,7 @@ class CTransaction : public CSG_ODBC_Module
public:
CTransaction(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -189,7 +189,7 @@ class CExecute_SQL : public CSG_ODBC_Module
public:
CExecute_SQL(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/db/db_odbc/table.h b/src/modules/db/db_odbc/table.h
index 83b7034..7034217 100755
--- a/src/modules/db/db_odbc/table.h
+++ b/src/modules/db/db_odbc/table.h
@@ -87,7 +87,7 @@ class CTable_List : public CSG_ODBC_Module
public:
CTable_List(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -107,7 +107,7 @@ class CTable_Info : public CSG_ODBC_Module
public:
CTable_Info(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -129,7 +129,7 @@ class CTable_Load : public CSG_ODBC_Module
public:
CTable_Load(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
@@ -151,7 +151,7 @@ class CTable_Save : public CSG_ODBC_Module
public:
CTable_Save(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
@@ -173,7 +173,7 @@ class CTable_Drop : public CSG_ODBC_Module
public:
CTable_Drop(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
@@ -195,7 +195,7 @@ class CTable_Query : public CSG_ODBC_Module
public:
CTable_Query(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
diff --git a/src/modules/db/db_pgsql/Makefile.am b/src/modules/db/db_pgsql/Makefile.am
index 1ce8020..38c8a75 100755
--- a/src/modules/db/db_pgsql/Makefile.am
+++ b/src/modules/db/db_pgsql/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core $(POSTGRESQL_CFLAGS)
-AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) $(POSTGRESQL_LDFLAGS) $(DEP_LIBS) -shared -lpq -avoid-version
pkglib_LTLIBRARIES = libdb_pgsql.la
libdb_pgsql_la_SOURCES =\
diff --git a/src/modules/db/db_pgsql/Makefile.in b/src/modules/db/db_pgsql/Makefile.in
index 0d60876..cf311e1 100644
--- a/src/modules/db/db_pgsql/Makefile.in
+++ b/src/modules/db/db_pgsql/Makefile.in
@@ -365,10 +365,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1790 2013-08-20 09:23:17Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@DEP_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core $(POSTGRESQL_CFLAGS)
-AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) $(POSTGRESQL_LDFLAGS) $(DEP_LIBS) -shared -lpq -avoid-version
pkglib_LTLIBRARIES = libdb_pgsql.la
libdb_pgsql_la_SOURCES = \
diff --git a/src/modules/db/db_pgsql/get_connection.h b/src/modules/db/db_pgsql/get_connection.h
index fbfe637..76c13e1 100755
--- a/src/modules/db/db_pgsql/get_connection.h
+++ b/src/modules/db/db_pgsql/get_connection.h
@@ -85,7 +85,7 @@ class CGet_Connections : public CSG_Module
public:
CGet_Connections(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -141,7 +141,7 @@ class CDel_Connections : public CSG_Module
public:
CDel_Connections(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -163,7 +163,7 @@ class CTransaction_Start : public CSG_PG_Module
public:
CTransaction_Start(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -185,7 +185,7 @@ class CTransaction_Stop : public CSG_PG_Module
public:
CTransaction_Stop(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -205,7 +205,7 @@ class CExecute_SQL : public CSG_PG_Module
public:
CExecute_SQL(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -225,7 +225,7 @@ class CDatabase_Create : public CSG_Module
public:
CDatabase_Create(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -245,7 +245,7 @@ class CDatabase_Destroy : public CSG_Module
public:
CDatabase_Destroy(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/db/db_pgsql/pgis_raster.h b/src/modules/db/db_pgsql/pgis_raster.h
index cad1509..40c293c 100755
--- a/src/modules/db/db_pgsql/pgis_raster.h
+++ b/src/modules/db/db_pgsql/pgis_raster.h
@@ -85,7 +85,7 @@ class CRaster_Load : public CSG_PG_Module
public:
CRaster_Load(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Raster") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Raster") ); }
protected:
@@ -108,7 +108,7 @@ class CRaster_Load_Band : public CSG_PG_Module
public:
CRaster_Load_Band(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Raster") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Raster") ); }
protected:
@@ -132,7 +132,7 @@ class CRaster_Save : public CSG_PG_Module
public:
CRaster_Save(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Raster") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Raster") ); }
protected:
@@ -156,7 +156,7 @@ class CRaster_SRID_Update : public CSG_PG_Module
public:
CRaster_SRID_Update(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Raster") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Raster") ); }
protected:
diff --git a/src/modules/db/db_pgsql/pgis_shapes.h b/src/modules/db/db_pgsql/pgis_shapes.h
index cafe375..d37b27b 100755
--- a/src/modules/db/db_pgsql/pgis_shapes.h
+++ b/src/modules/db/db_pgsql/pgis_shapes.h
@@ -85,7 +85,7 @@ class CShapes_Load : public CSG_PG_Module
public:
CShapes_Load(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Shapes") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Shapes") ); }
protected:
@@ -107,7 +107,7 @@ class CShapes_Save : public CSG_PG_Module
public:
CShapes_Save(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Shapes") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Shapes") ); }
protected:
@@ -129,7 +129,7 @@ class CShapes_SRID_Update : public CSG_PG_Module
public:
CShapes_SRID_Update(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Shapes") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Shapes") ); }
protected:
diff --git a/src/modules/db/db_pgsql/table.h b/src/modules/db/db_pgsql/table.h
index 357ee01..e5dcdc8 100755
--- a/src/modules/db/db_pgsql/table.h
+++ b/src/modules/db/db_pgsql/table.h
@@ -85,7 +85,7 @@ class CTable_List : public CSG_PG_Module
public:
CTable_List(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -105,7 +105,7 @@ class CTable_Info : public CSG_PG_Module
public:
CTable_Info(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -127,7 +127,7 @@ class CTable_Load : public CSG_PG_Module
public:
CTable_Load(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
@@ -149,7 +149,7 @@ class CTable_Save : public CSG_PG_Module
public:
CTable_Save(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
@@ -171,7 +171,7 @@ class CTable_Drop : public CSG_PG_Module
public:
CTable_Drop(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
@@ -193,7 +193,7 @@ class CTable_Query : public CSG_PG_Module
public:
CTable_Query(void);
- virtual CSG_String Get_MenuPath (void) { return( SG_T("R:Tables") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tables") ); }
protected:
diff --git a/src/modules/docs/docs_html/Makefile.am b/src/modules/docs/docs_html/Makefile.am
index edc4fba..9970f80 100755
--- a/src/modules/docs/docs_html/Makefile.am
+++ b/src/modules/docs/docs_html/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libdocs_html.la
libdocs_html_la_SOURCES =\
diff --git a/src/modules/docs/docs_html/Makefile.in b/src/modules/docs/docs_html/Makefile.in
index 3afb91c..b5ecfcc 100644
--- a/src/modules/docs/docs_html/Makefile.in
+++ b/src/modules/docs/docs_html/Makefile.in
@@ -365,10 +365,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libdocs_html.la
libdocs_html_la_SOURCES = \
diff --git a/src/modules/docs/docs_pdf/Makefile.am b/src/modules/docs/docs_pdf/Makefile.am
index aad6852..b6e12d4 100755
--- a/src/modules/docs/docs_pdf/Makefile.am
+++ b/src/modules/docs/docs_pdf/Makefile.am
@@ -4,13 +4,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
+
if HAVE_HARU
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(DISABLELIBHARU) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(DISABLELIBHARU) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(HARU_LIB)
pkglib_LTLIBRARIES = libdocs_pdf.la
libdocs_pdf_la_SOURCES =\
diff --git a/src/modules/docs/docs_pdf/Makefile.in b/src/modules/docs/docs_pdf/Makefile.in
index 086745d..06d7051 100644
--- a/src/modules/docs/docs_pdf/Makefile.in
+++ b/src/modules/docs/docs_pdf/Makefile.in
@@ -370,10 +370,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
- at HAVE_HARU_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ at HAVE_HARU_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
@HAVE_HARU_TRUE at CXX_INCS = -I$(top_srcdir)/src/saga_core
- at HAVE_HARU_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(DISABLELIBHARU) $(GOMPFLAGS)
+ at HAVE_HARU_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(DISABLELIBHARU) $(GOMPFLAGS)
@HAVE_HARU_TRUE at AM_LDFLAGS = -fPIC -shared -avoid-version $(HARU_LIB)
@HAVE_HARU_TRUE at pkglib_LTLIBRARIES = libdocs_pdf.la
@HAVE_HARU_TRUE at libdocs_pdf_la_SOURCES = \
diff --git a/src/modules/garden/garden_3d_viewer/Makefile.am b/src/modules/garden/garden_3d_viewer/Makefile.am
index 53fa646..87f64fc 100755
--- a/src/modules/garden/garden_3d_viewer/Makefile.am
+++ b/src/modules/garden/garden_3d_viewer/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/garden/garden_3d_viewer/Makefile.in b/src/modules/garden/garden_3d_viewer/Makefile.in
index 88ba47b..d3cb708 100644
--- a/src/modules/garden/garden_3d_viewer/Makefile.in
+++ b/src/modules/garden/garden_3d_viewer/Makefile.in
@@ -363,11 +363,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/garden/garden_fractals/Makefile.am b/src/modules/garden/garden_fractals/Makefile.am
index e06b9c3..a97b810 100755
--- a/src/modules/garden/garden_fractals/Makefile.am
+++ b/src/modules/garden/garden_fractals/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgarden_fractals.la
libgarden_fractals_la_SOURCES =\
diff --git a/src/modules/garden/garden_fractals/Makefile.in b/src/modules/garden/garden_fractals/Makefile.in
index 109739f..4e39e3f 100644
--- a/src/modules/garden/garden_fractals/Makefile.in
+++ b/src/modules/garden/garden_fractals/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgarden_fractals.la
libgarden_fractals_la_SOURCES = \
diff --git a/src/modules/garden/garden_games/Makefile.am b/src/modules/garden/garden_games/Makefile.am
index 7683aef..6b4682c 100755
--- a/src/modules/garden/garden_games/Makefile.am
+++ b/src/modules/garden/garden_games/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgarden_games.la
libgarden_games_la_SOURCES =\
diff --git a/src/modules/garden/garden_games/Makefile.in b/src/modules/garden/garden_games/Makefile.in
index 79a1f4f..7e76345 100644
--- a/src/modules/garden/garden_games/Makefile.in
+++ b/src/modules/garden/garden_games/Makefile.in
@@ -365,10 +365,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgarden_games.la
libgarden_games_la_SOURCES = \
diff --git a/src/modules/garden/garden_learn_to_program/Makefile.am b/src/modules/garden/garden_learn_to_program/Makefile.am
index 1b32546..5592a49 100755
--- a/src/modules/garden/garden_learn_to_program/Makefile.am
+++ b/src/modules/garden/garden_learn_to_program/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgarden_learn_to_program.la
libgarden_learn_to_program_la_SOURCES =\
diff --git a/src/modules/garden/garden_learn_to_program/Makefile.in b/src/modules/garden/garden_learn_to_program/Makefile.in
index 5ba4970..dd68d41 100644
--- a/src/modules/garden/garden_learn_to_program/Makefile.in
+++ b/src/modules/garden/garden_learn_to_program/Makefile.in
@@ -369,10 +369,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgarden_learn_to_program.la
libgarden_learn_to_program_la_SOURCES = \
diff --git a/src/modules/garden/garden_webservices/Makefile.am b/src/modules/garden/garden_webservices/Makefile.am
index 9400167..91734b7 100755
--- a/src/modules/garden/garden_webservices/Makefile.am
+++ b/src/modules/garden/garden_webservices/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/garden/garden_webservices/Makefile.in b/src/modules/garden/garden_webservices/Makefile.in
index 993a255..3c5e219 100644
--- a/src/modules/garden/garden_webservices/Makefile.in
+++ b/src/modules/garden/garden_webservices/Makefile.in
@@ -362,11 +362,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp b/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp
index 6fd47e3..c4028b0 100755
--- a/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp
+++ b/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: LeastCostPathProfile_Points.cpp 2768 2016-02-01 16:48:14Z oconrad $
+ * Version $Id: LeastCostPathProfile_Points.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
///////////////////////////////////////////////////////////
// //
@@ -109,7 +109,7 @@ CLeastCostPathProfile_Points::CLeastCostPathProfile_Points(void)
Parameters.Add_Grid_List(
NULL , "VALUES" , _TL("Values"),
- _TL("Allows to write cell values from additional grids to the output"),
+ _TL("Allows writing cell values from additional grids to the output"),
PARAMETER_INPUT_OPTIONAL
);
diff --git a/src/modules/grid/grid_analysis/Makefile.am b/src/modules/grid/grid_analysis/Makefile.am
index 9ac2d69..38a7ab5 100755
--- a/src/modules/grid/grid_analysis/Makefile.am
+++ b/src/modules/grid/grid_analysis/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2758 2016-01-22 13:55:24Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_analysis.la
libgrid_analysis_la_SOURCES =\
diff --git a/src/modules/grid/grid_analysis/Makefile.in b/src/modules/grid/grid_analysis/Makefile.in
index 35f2eaf..f19d489 100644
--- a/src/modules/grid/grid_analysis/Makefile.in
+++ b/src/modules/grid/grid_analysis/Makefile.in
@@ -369,13 +369,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2758 2016-01-22 13:55:24Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_analysis.la
libgrid_analysis_la_SOURCES = \
diff --git a/src/modules/grid/grid_analysis/Soil_Texture.h b/src/modules/grid/grid_analysis/Soil_Texture.h
index 3f08ab4..5c2f5be 100755
--- a/src/modules/grid/grid_analysis/Soil_Texture.h
+++ b/src/modules/grid/grid_analysis/Soil_Texture.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Soil_Texture.h 2365 2015-01-09 15:12:03Z oconrad $
+ * Version $Id: Soil_Texture.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ class CSoil_Texture : public CSG_Module_Grid
public:
CSoil_Texture(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Soil Analysis") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Soil Analysis") ); }
protected:
@@ -96,7 +96,7 @@ class CSoil_Texture_Table : public CSG_Module
public:
CSoil_Texture_Table(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Soil Analysis") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Soil Analysis") ); }
protected:
diff --git a/src/modules/grid/grid_analysis/fragmentation_base.h b/src/modules/grid/grid_analysis/fragmentation_base.h
index 85a9bed..169900a 100755
--- a/src/modules/grid/grid_analysis/fragmentation_base.h
+++ b/src/modules/grid/grid_analysis/fragmentation_base.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: fragmentation_base.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: fragmentation_base.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -124,7 +124,7 @@ public:
CFragmentation_Base(void);
virtual ~CFragmentation_Base(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Fragmentation Analysis") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Fragmentation Analysis") ); }
protected:
diff --git a/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h b/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h
index f1c731e..d831c46 100755
--- a/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h
+++ b/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Geometric_Figures.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_Geometric_Figures.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CGrid_Geometric_Figures(void);
virtual ~CGrid_Geometric_Figures(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Generation") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Generation") ); }
protected:
diff --git a/src/modules/grid/grid_calculus/Grid_Random_Field.h b/src/modules/grid/grid_calculus/Grid_Random_Field.h
index e3763d3..5c93898 100755
--- a/src/modules/grid/grid_calculus/Grid_Random_Field.h
+++ b/src/modules/grid/grid_calculus/Grid_Random_Field.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Random_Field.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_Random_Field.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class CGrid_Random_Field : public CSG_Module
public:
CGrid_Random_Field(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Generation") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Generation") ); }
protected:
diff --git a/src/modules/grid/grid_calculus/Grid_Random_Terrain.h b/src/modules/grid/grid_calculus/Grid_Random_Terrain.h
index 65f4ebf..a659fc8 100755
--- a/src/modules/grid/grid_calculus/Grid_Random_Terrain.h
+++ b/src/modules/grid/grid_calculus/Grid_Random_Terrain.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Random_Terrain.h 2448 2015-03-19 14:44:48Z oconrad $
+ * Version $Id: Grid_Random_Terrain.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
/*******************************************************************************
Grid_Random_Terrain.h
@@ -53,7 +53,7 @@ class CGrid_Random_Terrain : public CSG_Module
public:
CGrid_Random_Terrain(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Generation") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Generation") ); }
protected:
diff --git a/src/modules/grid/grid_calculus/Makefile.am b/src/modules/grid/grid_calculus/Makefile.am
index 5a4e9e2..89f393d 100755
--- a/src/modules/grid/grid_calculus/Makefile.am
+++ b/src/modules/grid/grid_calculus/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 1937 2014-01-11 18:22:42Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_calculus.la
libgrid_calculus_la_SOURCES =\
diff --git a/src/modules/grid/grid_calculus/Makefile.in b/src/modules/grid/grid_calculus/Makefile.in
index 14c17fe..9d0699b 100644
--- a/src/modules/grid/grid_calculus/Makefile.in
+++ b/src/modules/grid/grid_calculus/Makefile.in
@@ -370,13 +370,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 1937 2014-01-11 18:22:42Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_calculus.la
libgrid_calculus_la_SOURCES = \
diff --git a/src/modules/grid/grid_calculus/gradient_cartes_polar.h b/src/modules/grid/grid_calculus/gradient_cartes_polar.h
index 922ff76..39b94ab 100755
--- a/src/modules/grid/grid_calculus/gradient_cartes_polar.h
+++ b/src/modules/grid/grid_calculus/gradient_cartes_polar.h
@@ -53,7 +53,7 @@ class CGradient_Cartes_To_Polar : public CSG_Module_Grid
public:
CGradient_Cartes_To_Polar(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversions") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversions") ); }
protected:
@@ -73,7 +73,7 @@ class CGradient_Polar_To_Cartes : public CSG_Module_Grid
public:
CGradient_Polar_To_Cartes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversions") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversions") ); }
protected:
diff --git a/src/modules/grid/grid_calculus/grid_metric_conversion.h b/src/modules/grid/grid_calculus/grid_metric_conversion.h
index e5341f3..c75d42d 100755
--- a/src/modules/grid/grid_calculus/grid_metric_conversion.h
+++ b/src/modules/grid/grid_calculus/grid_metric_conversion.h
@@ -85,7 +85,7 @@ class CGrid_Metric_Conversion : public CSG_Module_Grid
public:
CGrid_Metric_Conversion(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversions") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversions") ); }
protected:
diff --git a/src/modules/grid/grid_calculus/kff_synth.h b/src/modules/grid/grid_calculus/kff_synth.h
index 69598a6..b8eb46e 100755
--- a/src/modules/grid/grid_calculus/kff_synth.h
+++ b/src/modules/grid/grid_calculus/kff_synth.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: kff_synth.h 1937 2014-01-11 18:22:42Z reklov_w $
+ * Version $Id: kff_synth.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ class Ckff_synthesis : public CSG_Module
public:
Ckff_synthesis (void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Generation") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Generation") ); }
protected:
diff --git a/src/modules/grid/grid_calculus_bsl/Makefile.am b/src/modules/grid/grid_calculus_bsl/Makefile.am
index e26592e..de25096 100755
--- a/src/modules/grid/grid_calculus_bsl/Makefile.am
+++ b/src/modules/grid/grid_calculus_bsl/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_calculus_bsl.la
libgrid_calculus_bsl_la_SOURCES =\
diff --git a/src/modules/grid/grid_calculus_bsl/Makefile.in b/src/modules/grid/grid_calculus_bsl/Makefile.in
index 15d1b94..0df47b1 100644
--- a/src/modules/grid/grid_calculus_bsl/Makefile.in
+++ b/src/modules/grid/grid_calculus_bsl/Makefile.in
@@ -366,13 +366,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_calculus_bsl.la
libgrid_calculus_bsl_la_SOURCES = \
diff --git a/src/modules/grid/grid_filter/Makefile.am b/src/modules/grid/grid_filter/Makefile.am
index 3a1e508..f08c3fa 100755
--- a/src/modules/grid/grid_filter/Makefile.am
+++ b/src/modules/grid/grid_filter/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2815 2016-02-22 22:47:52Z johanvdw $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_filter.la
libgrid_filter_la_SOURCES =\
diff --git a/src/modules/grid/grid_filter/Makefile.in b/src/modules/grid/grid_filter/Makefile.in
index 5d38026..d860a2f 100644
--- a/src/modules/grid/grid_filter/Makefile.in
+++ b/src/modules/grid/grid_filter/Makefile.in
@@ -371,13 +371,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2815 2016-02-22 22:47:52Z johanvdw $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_filter.la
libgrid_filter_la_SOURCES = \
diff --git a/src/modules/grid/grid_gridding/Interpolation.cpp b/src/modules/grid/grid_gridding/Interpolation.cpp
index 7784fff..524ef92 100755
--- a/src/modules/grid/grid_gridding/Interpolation.cpp
+++ b/src/modules/grid/grid_gridding/Interpolation.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Interpolation.cpp 2569 2015-09-02 10:42:56Z oconrad $
+ * Version $Id: Interpolation.cpp 2871 2016-03-30 11:32:35Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -102,13 +102,17 @@ int CInterpolation::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parame
m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes());
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CInterpolation::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -128,8 +132,6 @@ bool CInterpolation::On_Execute(void)
//-----------------------------------------------------
bool bResult = false;
- m_Grid_Target.Cmd_Update(m_pShapes); // if called from saga_cmd
-
if( (m_pGrid = m_Grid_Target.Get_Grid()) != NULL )
{
m_pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), Parameters("FIELD")->asString(), Get_Name().c_str()));
diff --git a/src/modules/grid/grid_gridding/Interpolation.h b/src/modules/grid/grid_gridding/Interpolation.h
index 36856b0..c262ed1 100755
--- a/src/modules/grid/grid_gridding/Interpolation.h
+++ b/src/modules/grid/grid_gridding/Interpolation.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Interpolation.h 2381 2015-01-30 16:37:39Z oconrad $
+ * Version $Id: Interpolation.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class grid_gridding_EXPORT CInterpolation : public CSG_Module
public:
CInterpolation(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Interpolation from Points") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Interpolation from Points") ); }
protected:
diff --git a/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp b/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp
index 2bbe52a..3a8c5c9 100755
--- a/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp
+++ b/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Interpolation_NaturalNeighbour.cpp 2447 2015-03-19 14:43:42Z oconrad $
+ * Version $Id: Interpolation_NaturalNeighbour.cpp 2854 2016-03-23 09:09:10Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -63,7 +63,11 @@
//---------------------------------------------------------
#include "Interpolation_NaturalNeighbour.h"
-#include "nn/nn.h"
+//---------------------------------------------------------
+extern "C"
+{
+ #include "nn/nn.h"
+}
///////////////////////////////////////////////////////////
diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am
index 30669cc..c085f81 100755
--- a/src/modules/grid/grid_gridding/Makefile.am
+++ b/src/modules/grid/grid_gridding/Makefile.am
@@ -1,18 +1,13 @@
#
-# $Id: Makefile.am 2812 2016-02-22 19:48:39Z johanvdw $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -D_SAGA_UNICODE
-endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES =\
diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in
index b6a4096..74c0119 100644
--- a/src/modules/grid/grid_gridding/Makefile.in
+++ b/src/modules/grid/grid_gridding/Makefile.in
@@ -394,14 +394,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2812 2016-02-22 19:48:39Z johanvdw $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@DEP_DEFS = -D_SAGA_UNICODE
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES = Interpolation.cpp \
diff --git a/src/modules/grid/grid_gridding/Shapes2Grid.cpp b/src/modules/grid/grid_gridding/Shapes2Grid.cpp
index 84c1fbd..ae0c0ae 100755
--- a/src/modules/grid/grid_gridding/Shapes2Grid.cpp
+++ b/src/modules/grid/grid_gridding/Shapes2Grid.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Shapes2Grid.cpp 2569 2015-09-02 10:42:56Z oconrad $
+ * Version $Id: Shapes2Grid.cpp 2871 2016-03-30 11:32:35Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -177,30 +177,34 @@ CShapes2Grid::CShapes2Grid(void)
//---------------------------------------------------------
int CShapes2Grid::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("INPUT")) )
+ if( !SG_STR_CMP(pParameter->Get_Identifier(), "INPUT") )
{
m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes());
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CShapes2Grid::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("INPUT")) )
+ if( !SG_STR_CMP(pParameter->Get_Identifier(), "INPUT") )
{
pParameters->Set_Enabled("LINE_TYPE", pParameter->asShapes() && pParameter->asShapes()->Get_Type() == SHAPE_TYPE_Line);
pParameters->Set_Enabled("POLY_TYPE", pParameter->asShapes() && pParameter->asShapes()->Get_Type() == SHAPE_TYPE_Polygon);
}
- if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("OUTPUT")) )
+ if( !SG_STR_CMP(pParameter->Get_Identifier(), "OUTPUT") )
{
pParameters->Set_Enabled("FIELD" , pParameter->asInt() == 2);
pParameters->Set_Enabled("MULTIPLE" , pParameter->asInt() == 2);
}
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -265,8 +269,6 @@ bool CShapes2Grid::On_Execute(void)
}
//-----------------------------------------------------
- m_Grid_Target.Cmd_Update(m_pShapes); // if called from saga_cmd
-
if( (m_pGrid = m_Grid_Target.Get_Grid("GRID", Get_Grid_Type(Parameters("GRID_TYPE")->asInt()))) == NULL )
{
return( false );
diff --git a/src/modules/grid/grid_gridding/kernel_density.cpp b/src/modules/grid/grid_gridding/kernel_density.cpp
index 5604f14..501aa2b 100755
--- a/src/modules/grid/grid_gridding/kernel_density.cpp
+++ b/src/modules/grid/grid_gridding/kernel_density.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: kernel_density.cpp 2569 2015-09-02 10:42:56Z oconrad $
+ * Version $Id: kernel_density.cpp 2871 2016-03-30 11:32:35Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -150,13 +150,17 @@ int CKernel_Density::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Param
m_Grid_Target.Set_User_Defined(pParameters, Extent);
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CKernel_Density::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -185,8 +189,6 @@ bool CKernel_Density::On_Execute(void)
}
//-----------------------------------------------------
- m_Grid_Target.Cmd_Update(pPoints); // if called from saga_cmd
-
if( (m_pGrid = m_Grid_Target.Get_Grid()) == NULL )
{
return( false );
diff --git a/src/modules/grid/grid_gridding/nn/config.h b/src/modules/grid/grid_gridding/nn/config.h
index fc0109d..37eef6a 100755
--- a/src/modules/grid/grid_gridding/nn/config.h
+++ b/src/modules/grid/grid_gridding/nn/config.h
@@ -4,6 +4,6 @@
#define copysign _copysign
#define rint (int)
#define M_PI 3.14159265358979323846
-#define TRILIBRARY
#define NO_TIMER
#endif
+#define TRILIBRARY
diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c b/src/modules/grid/grid_gridding/nn/delaunay.c
index fa55f33..d47be0b 100755
--- a/src/modules/grid/grid_gridding/nn/delaunay.c
+++ b/src/modules/grid/grid_gridding/nn/delaunay.c
@@ -32,7 +32,6 @@
#include <string.h>
#include <limits.h>
#include <float.h>
-#include "triangle.h"
#include "istack.h"
#include "nan.h"
#include "delaunay.h"
@@ -49,6 +48,40 @@
#define N_SEARCH_TURNON 20
#define N_FLAGS_TURNON 1000
#define N_FLAGS_INC 100
+
+static delaunay* delaunay_create()
+{
+ delaunay* d = malloc(sizeof(delaunay));
+
+ d->npoints = 0;
+ d->points = NULL;
+ d->xmin = DBL_MAX;
+ d->xmax = -DBL_MAX;
+ d->ymin = DBL_MAX;
+ d->ymax = -DBL_MAX;
+ d->ntriangles = 0;
+ d->triangles = NULL;
+ d->circles = NULL;
+ d->neighbours = NULL;
+ d->n_point_triangles = NULL;
+ d->point_triangles = NULL;
+ d->nedges = 0;
+ d->edges = NULL;
+ d->flags = NULL;
+ d->first_id = -1;
+ d->t_in = NULL;
+ d->t_out = NULL;
+ d->nflags = 0;
+ d->nflagsallocated = 0;
+ d->flagids = NULL;
+
+ return d;
+}
+
+//---------------------------------------------------------
+#ifndef USE_QHULL
+
+#include "triangle.h"
static void tio_init(struct triangulateio* tio)
{
@@ -109,35 +142,6 @@ static void tio_destroy(struct triangulateio* tio)
free(tio->normlist);
}
-static delaunay* delaunay_create()
-{
- delaunay* d = malloc(sizeof(delaunay));
-
- d->npoints = 0;
- d->points = NULL;
- d->xmin = DBL_MAX;
- d->xmax = -DBL_MAX;
- d->ymin = DBL_MAX;
- d->ymax = -DBL_MAX;
- d->ntriangles = 0;
- d->triangles = NULL;
- d->circles = NULL;
- d->neighbours = NULL;
- d->n_point_triangles = NULL;
- d->point_triangles = NULL;
- d->nedges = 0;
- d->edges = NULL;
- d->flags = NULL;
- d->first_id = -1;
- d->t_in = NULL;
- d->t_out = NULL;
- d->nflags = 0;
- d->nflagsallocated = 0;
- d->flagids = NULL;
-
- return d;
-}
-
static void tio2delaunay(struct triangulateio* tio_out, delaunay* d)
{
int i, j;
@@ -315,6 +319,233 @@ delaunay* delaunay_build(int np, point points[], int ns, int segments[], int nh,
return d;
}
+
+//---------------------------------------------------------
+#else /* USE_QHULL */
+
+#include <qhull/qhull_a.h>
+
+/* returns 1 if a,b,c are clockwise ordered */
+static int cw(delaunay *d, triangle *t)
+{
+ point* pa = &d->points[t->vids[0]];
+ point* pb = &d->points[t->vids[1]];
+ point* pc = &d->points[t->vids[2]];
+
+ return ((pb->x - pa->x)*(pc->y - pa->y) < (pc->x - pa->x)*(pb->y - pa->y));
+}
+
+delaunay* delaunay_build(int np, point points[], int ns, int segments[], int nh, double holes[])
+{
+ delaunay* d = delaunay_create();
+
+ coordT *qpoints; /* array of coordinates for each point */
+ boolT ismalloc = False; /* True if qhull should free points */
+ char flags[64] = "qhull d Qbb Qt"; /* option flags for qhull */
+ facetT *facet,*neighbor,**neighborp; /* variables to walk through facets */
+ vertexT *vertex, **vertexp; /* variables to walk through vertex */
+
+ int curlong, totlong; /* memory remaining after qh_memfreeshort */
+ FILE *outfile = stdout;
+ FILE *errfile = stderr; /* error messages from qhull code */
+
+ int i, j;
+ int exitcode;
+ int dim, ntriangles;
+ int numfacets, numsimplicial, numridges, totneighbors, numcoplanars, numtricoplanars;
+
+ dim = 2;
+
+ assert(sizeof(realT) == sizeof(double)); /* Qhull was compiled with doubles? */
+
+ if (np == 0 || ns > 0 || nh > 0) {
+ fprintf(stderr, "segments=%d holes=%d\n, aborting Qhull implementation, use 'triangle' instead.\n", ns, nh);
+ free(d);
+ return NULL;
+ }
+
+ qpoints = (coordT *) malloc(np * (dim+1) * sizeof(coordT));
+
+ for (i=0; i<np; i++) {
+ qpoints[i*dim] = points[i].x;
+ qpoints[i*dim+1] = points[i].y;
+ }
+
+ if (!nn_verbose)
+ outfile = NULL;
+ if (nn_verbose)
+ strcat(flags, " s");
+ if (nn_verbose > 1)
+ strcat(flags, " Ts");
+
+ if (nn_verbose)
+ fflush(stderr);
+
+ /*
+ * climax
+ */
+
+ exitcode = qh_new_qhull (dim, np, qpoints, ismalloc,
+ flags, outfile, errfile);
+
+ if(!exitcode) {
+
+ if (nn_verbose)
+ fflush(stderr);
+
+ d->xmin = DBL_MAX;
+ d->xmax = -DBL_MAX;
+ d->ymin = DBL_MAX;
+ d->ymax = -DBL_MAX;
+
+ d->npoints = np;
+ d->points = malloc(np * sizeof(point));
+ for (i = 0; i < np; ++i) {
+ point* p = &d->points[i];
+
+ p->x = points[i].x;
+ p->y = points[i].y;
+ p->z = points[i].z;
+
+ if (p->x < d->xmin)
+ d->xmin = p->x;
+ if (p->x > d->xmax)
+ d->xmax = p->x;
+ if (p->y < d->ymin)
+ d->ymin = p->y;
+ if (p->y > d->ymax)
+ d->ymax = p->y;
+ }
+
+ if (nn_verbose) {
+ fprintf(stderr, "input:\n");
+ for (i = 0; i < np; ++i) {
+ point* p = &d->points[i];
+
+ fprintf(stderr, " %d: %15.7g %15.7g %15.7g\n",
+ i, p->x, p->y, p->z);
+ }
+ }
+
+ qh_findgood_all (qh facet_list);
+ qh_countfacets (qh facet_list, NULL, !qh_ALL, &numfacets,
+ &numsimplicial, &totneighbors, &numridges,
+ &numcoplanars, &numtricoplanars);
+
+ ntriangles = 0;
+ FORALLfacets {
+ if (!facet->upperdelaunay && facet->simplicial)
+ ntriangles++;
+ }
+
+ d->ntriangles = ntriangles;
+ d->triangles = malloc(d->ntriangles * sizeof(triangle));
+ d->neighbours = malloc(d->ntriangles * sizeof(triangle_neighbours));
+ d->circles = malloc(d->ntriangles * sizeof(circle));
+
+ if (nn_verbose)
+ fprintf(stderr, "triangles:\tneighbors:\n");
+
+ i = 0;
+ FORALLfacets {
+ if (!facet->upperdelaunay && facet->simplicial) {
+ triangle* t = &d->triangles[i];
+ triangle_neighbours* n = &d->neighbours[i];
+ circle* c = &d->circles[i];
+
+ j = 0;
+ FOREACHvertex_(facet->vertices)
+ t->vids[j++] = qh_pointid(vertex->point);
+
+ j = 0;
+ FOREACHneighbor_(facet)
+ n->tids[j++] = neighbor->visitid ? neighbor->visitid - 1 : - 1;
+
+ /* Put triangle vertices in counterclockwise order, as
+ * 'triangle' do.
+ * The same needs to be done with the neighbors.
+ *
+ * The following works, i.e., it seems that Qhull maintains a
+ * relationship between the vertices and the neighbors
+ * triangles, but that is not said anywhere, so if this stop
+ * working in a future Qhull release, you know what you have
+ * to do, reorder the neighbors.
+ */
+
+ if(cw(d, t)) {
+ int tmp = t->vids[1];
+ t->vids[1] = t->vids[2];
+ t->vids[2] = tmp;
+
+ tmp = n->tids[1];
+ n->tids[1] = n->tids[2];
+ n->tids[2] = tmp;
+ }
+
+ circle_build1(c, &d->points[t->vids[0]], &d->points[t->vids[1]],
+ &d->points[t->vids[2]]);
+
+ if (nn_verbose)
+ fprintf(stderr, " %d: (%d,%d,%d)\t(%d,%d,%d)\n",
+ i, t->vids[0], t->vids[1], t->vids[2], n->tids[0],
+ n->tids[1], n->tids[2]);
+
+ i++;
+ }
+ }
+
+ d->flags = calloc(d->ntriangles, sizeof(int));
+
+ d->n_point_triangles = calloc(d->npoints, sizeof(int));
+ for (i = 0; i < d->ntriangles; ++i) {
+ triangle* t = &d->triangles[i];
+
+ for (j = 0; j < 3; ++j)
+ d->n_point_triangles[t->vids[j]]++;
+ }
+ d->point_triangles = malloc(d->npoints * sizeof(int*));
+ for (i = 0; i < d->npoints; ++i) {
+ if (d->n_point_triangles[i] > 0)
+ d->point_triangles[i] = malloc(d->n_point_triangles[i] * sizeof(int));
+ else
+ d->point_triangles[i] = NULL;
+ d->n_point_triangles[i] = 0;
+ }
+ for (i = 0; i < d->ntriangles; ++i) {
+ triangle* t = &d->triangles[i];
+
+ for (j = 0; j < 3; ++j) {
+ int vid = t->vids[j];
+
+ d->point_triangles[vid][d->n_point_triangles[vid]] = i;
+ d->n_point_triangles[vid]++;
+ }
+ }
+
+ d->nedges = 0;
+ d->edges = NULL;
+
+ d->t_in = NULL;
+ d->t_out = NULL;
+ d->first_id = -1;
+
+ } else {
+ free(d);
+ d = NULL;
+ }
+
+ free(qpoints);
+ qh_freeqhull(!qh_ALL); /* free long memory */
+ qh_memfreeshort (&curlong, &totlong); /* free short memory and memory allocator */
+ if (curlong || totlong)
+ fprintf (errfile,
+ "qhull: did not free %d bytes of long memory (%d pieces)\n",
+ totlong, curlong);
+
+ return d;
+}
+#endif /* USE_QHULL */
+
/* Destroys Delaunay triangulation.
*
@@ -335,6 +566,12 @@ void delaunay_destroy(delaunay* d)
}
if (d->nedges > 0)
free(d->edges);
+#ifdef USE_QHULL
+ /* This is a shallow copy if we're not using qhull so we don't
+ * need to free it */
+ if (d->points != NULL)
+ free(d->points);
+#endif
if (d->n_point_triangles != NULL)
free(d->n_point_triangles);
if (d->flags != NULL)
diff --git a/src/modules/grid/grid_gridding/nn/nn.h b/src/modules/grid/grid_gridding/nn/nn.h
index b1a9636..f0d5c7f 100755
--- a/src/modules/grid/grid_gridding/nn/nn.h
+++ b/src/modules/grid/grid_gridding/nn/nn.h
@@ -18,10 +18,6 @@
#if !defined(_NN_H)
#define _NN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef enum { SIBSON, NON_SIBSONIAN } NN_RULE;
/* "point" is a basic data structure in this package.
@@ -350,9 +346,5 @@ extern char* nn_version;
* debugging purposes).
*/
extern int nn_test_vertice;
-
-#ifdef __cplusplus
-}
-#endif
#endif /* _NN_H */
diff --git a/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp b/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp
index f630e02..84aa620 100755
--- a/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp
+++ b/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Gridding_Spline_Base.cpp 2569 2015-09-02 10:42:56Z oconrad $
+ * Version $Id: Gridding_Spline_Base.cpp 2871 2016-03-30 11:32:35Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -119,16 +119,20 @@ int CGridding_Spline_Base::On_Parameter_Changed(CSG_Parameters *pParameters, CSG
if( !SG_STR_CMP(pParameter->Get_Identifier(), "GRID") && pParameter->asGrid() )
{
- m_Grid_Target.Set_User_Defined(pParameters, pParameter->asGrid()->Get_Extent(), pParameter->asGrid()->Get_NY(), false, 0);
+ m_Grid_Target.Set_User_Defined(pParameters, pParameter->asGrid()->Get_System());
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CGridding_Spline_Base::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -165,8 +169,6 @@ bool CGridding_Spline_Base::_Get_Grid(void)
{
CSG_Grid *pPoints = Parameters("GRID")->asGrid();
- m_Grid_Target.Cmd_Update(pPoints->Get_Extent()); // if called from saga_cmd
-
if( (m_pGrid = m_Grid_Target.Get_Grid()) == NULL )
{
return( false );
@@ -180,8 +182,6 @@ bool CGridding_Spline_Base::_Get_Grid(void)
{
CSG_Shapes *pPoints = Parameters("SHAPES")->asShapes();
- m_Grid_Target.Cmd_Update(pPoints); // if called from saga_cmd
-
if( (m_pGrid = m_Grid_Target.Get_Grid()) == NULL )
{
return( false );
diff --git a/src/modules/grid/grid_spline/Gridding_Spline_Base.h b/src/modules/grid/grid_spline/Gridding_Spline_Base.h
index d1a4966..9c9ceba 100755
--- a/src/modules/grid/grid_spline/Gridding_Spline_Base.h
+++ b/src/modules/grid/grid_spline/Gridding_Spline_Base.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Gridding_Spline_Base.h 2221 2014-09-04 16:02:43Z oconrad $
+ * Version $Id: Gridding_Spline_Base.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class grid_spline_EXPORT CGridding_Spline_Base : public CSG_Module
public:
CGridding_Spline_Base(bool bGridPoints = false);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Spline Interpolation") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Spline Interpolation") ); }
protected:
diff --git a/src/modules/grid/grid_spline/MBASpline_for_Categories.cpp b/src/modules/grid/grid_spline/MBASpline_for_Categories.cpp
index 73cfd47..9d18f96 100755
--- a/src/modules/grid/grid_spline/MBASpline_for_Categories.cpp
+++ b/src/modules/grid/grid_spline/MBASpline_for_Categories.cpp
@@ -111,13 +111,17 @@ int CMBASpline_for_Categories::On_Parameter_Changed(CSG_Parameters *pParameters,
m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes());
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CMBASpline_for_Categories::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -149,8 +153,6 @@ bool CMBASpline_for_Categories::On_Execute(void)
//-----------------------------------------------------
CSG_Grid *pGrid, *pProp, Prop;
- m_Grid_Target.Cmd_Update(&Points); // if called from saga_cmd
-
if( !(pGrid = m_Grid_Target.Get_Grid("CATEGORIES", nCategories < 128 ? SG_DATATYPE_Char : SG_DATATYPE_Int))
|| !(pProp = m_Grid_Target.Get_Grid("PROPABILITY")) )
{
diff --git a/src/modules/grid/grid_spline/MBASpline_for_Categories.h b/src/modules/grid/grid_spline/MBASpline_for_Categories.h
index 8b57529..862c3ed 100755
--- a/src/modules/grid/grid_spline/MBASpline_for_Categories.h
+++ b/src/modules/grid/grid_spline/MBASpline_for_Categories.h
@@ -85,7 +85,7 @@ class CMBASpline_for_Categories : public CSG_Module
public:
CMBASpline_for_Categories(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Spline Interpolation") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Spline Interpolation") ); }
protected:
diff --git a/src/modules/grid/grid_spline/Makefile.am b/src/modules/grid/grid_spline/Makefile.am
index 1de9a1e..73a2a75 100755
--- a/src/modules/grid/grid_spline/Makefile.am
+++ b/src/modules/grid/grid_spline/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2388 2015-02-01 22:28:39Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_spline.la
libgrid_spline_la_SOURCES =\
diff --git a/src/modules/grid/grid_spline/Makefile.in b/src/modules/grid/grid_spline/Makefile.in
index 1695a7f..1ffd003 100644
--- a/src/modules/grid/grid_spline/Makefile.in
+++ b/src/modules/grid/grid_spline/Makefile.in
@@ -365,13 +365,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2388 2015-02-01 22:28:39Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_spline.la
libgrid_spline_la_SOURCES = \
diff --git a/src/modules/grid/grid_tools/Grid_Resample.cpp b/src/modules/grid/grid_tools/Grid_Resample.cpp
index a5b2204..97af94c 100755
--- a/src/modules/grid/grid_tools/Grid_Resample.cpp
+++ b/src/modules/grid/grid_tools/Grid_Resample.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Resample.cpp 2755 2016-01-19 15:57:08Z oconrad $
+ * Version $Id: Grid_Resample.cpp 2871 2016-03-30 11:32:35Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -146,16 +146,7 @@ int CGrid_Resample::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parame
{
if( !SG_STR_CMP(pParameter->Get_Identifier(), "PARAMETERS_GRID_SYSTEM") && pParameter->asGrid_System() )
{
- CSG_Grid_System Input = *pParameter->asGrid_System();
-
- m_Grid_Target.Set_User_Defined(pParameters, Input.Get_Extent(), Input.Get_NY(), false, 0);
- }
-
- if(0&& !SG_UI_Get_Window_Main() && !SG_STR_CMP(pParameter->Get_Identifier(), "INPUT") && pParameter->asGridList()->Get_Count() > 0 )
- {
- CSG_Grid_System Input = pParameter->asGridList()->asGrid(0)->Get_System();
-
- m_Grid_Target.Set_User_Defined(pParameters, Input.Get_Extent(), Input.Get_NY(), false, 0);
+ m_Grid_Target.Set_User_Defined(pParameters, *pParameter->asGrid_System());
}
m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
@@ -215,8 +206,6 @@ bool CGrid_Resample::On_Execute(void)
//-----------------------------------------------------
CSG_Grid_System Input = pInputs->asGrid(0)->Get_System();
- m_Grid_Target.Cmd_Update(Input.Get_Extent()); // if called from saga_cmd
-
CSG_Grid_System Output = m_Grid_Target.Get_System();
if( Input.Get_Extent().Intersects(Output.Get_Extent()) == INTERSECTION_None )
diff --git a/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp b/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp
index 58db38b..356254e 100755
--- a/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp
+++ b/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Value_Replace_Interactive.cpp 2574 2015-09-04 12:30:31Z oconrad $
+ * Version $Id: Grid_Value_Replace_Interactive.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
/*******************************************************************************
Grid_Value_Replace_Interactive.cpp
@@ -45,7 +45,7 @@ CGrid_Value_Replace_Interactive::CGrid_Value_Replace_Interactive(void)
Set_Author ("Victor Olaya (c) 2004");
Set_Description (_TW(
- "The module allows to interactively change cell values of the input grid. "
+ "The module allows one to interactively change cell values of the input grid. "
"Once the module is executed and running, you can use the Action tool to select "
"grid cells. While working on a grid, you can change (and apply) the 'New Value' "
"and the 'Method' parameters without stopping and re-starting the module.\n"
diff --git a/src/modules/grid/grid_tools/Makefile.am b/src/modules/grid/grid_tools/Makefile.am
index 3040c1b..2c79645 100755
--- a/src/modules/grid/grid_tools/Makefile.am
+++ b/src/modules/grid/grid_tools/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2528 2015-06-30 16:08:22Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_tools.la
libgrid_tools_la_SOURCES =\
diff --git a/src/modules/grid/grid_tools/Makefile.in b/src/modules/grid/grid_tools/Makefile.in
index 4565ee2..92a7a6e 100644
--- a/src/modules/grid/grid_tools/Makefile.in
+++ b/src/modules/grid/grid_tools/Makefile.in
@@ -373,13 +373,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2528 2015-06-30 16:08:22Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_tools.la
libgrid_tools_la_SOURCES = \
diff --git a/src/modules/grid/grid_visualisation/Makefile.am b/src/modules/grid/grid_visualisation/Makefile.am
index 473a828..5e4ea40 100755
--- a/src/modules/grid/grid_visualisation/Makefile.am
+++ b/src/modules/grid/grid_visualisation/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2526 2015-06-29 16:04:38Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_visualisation.la
libgrid_visualisation_la_SOURCES =\
diff --git a/src/modules/grid/grid_visualisation/Makefile.in b/src/modules/grid/grid_visualisation/Makefile.in
index 7cc6f44..667399b 100644
--- a/src/modules/grid/grid_visualisation/Makefile.in
+++ b/src/modules/grid/grid_visualisation/Makefile.in
@@ -366,13 +366,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2526 2015-06-29 16:04:38Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libgrid_visualisation.la
libgrid_visualisation_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_classification/Makefile.am b/src/modules/imagery/imagery_classification/Makefile.am
index a3f4c33..279c114 100755
--- a/src/modules/imagery/imagery_classification/Makefile.am
+++ b/src/modules/imagery/imagery_classification/Makefile.am
@@ -1,12 +1,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_classification.la
libimagery_classification_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_classification/Makefile.in b/src/modules/imagery/imagery_classification/Makefile.in
index a265c69..8252016 100644
--- a/src/modules/imagery/imagery_classification/Makefile.in
+++ b/src/modules/imagery/imagery_classification/Makefile.in
@@ -365,10 +365,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_classification.la
libimagery_classification_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_maxent/Makefile.am b/src/modules/imagery/imagery_maxent/Makefile.am
index c9132ab..49fd9f3 100755
--- a/src/modules/imagery/imagery_maxent/Makefile.am
+++ b/src/modules/imagery/imagery_maxent/Makefile.am
@@ -1,12 +1,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_maxent.la
libimagery_maxent_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_maxent/Makefile.in b/src/modules/imagery/imagery_maxent/Makefile.in
index 3b43ed8..eff057d 100644
--- a/src/modules/imagery/imagery_maxent/Makefile.in
+++ b/src/modules/imagery/imagery_maxent/Makefile.in
@@ -361,10 +361,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_maxent.la
libimagery_maxent_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_opencv/Makefile.am b/src/modules/imagery/imagery_opencv/Makefile.am
index 1d476da..3516cb9 100755
--- a/src/modules/imagery/imagery_opencv/Makefile.am
+++ b/src/modules/imagery/imagery_opencv/Makefile.am
@@ -4,13 +4,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
+
if HAVE_CV
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
pkglib_LTLIBRARIES = libimagery_opencv.la
libimagery_opencv_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_opencv/Makefile.in b/src/modules/imagery/imagery_opencv/Makefile.in
index 0b17a9b..08a4e1e 100644
--- a/src/modules/imagery/imagery_opencv/Makefile.in
+++ b/src/modules/imagery/imagery_opencv/Makefile.in
@@ -372,10 +372,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1856 2013-10-17 09:46:51Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
- at HAVE_CV_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ at HAVE_CV_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
@HAVE_CV_TRUE at CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
- at HAVE_CV_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+ at HAVE_CV_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
@HAVE_CV_TRUE at AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
@HAVE_CV_TRUE at pkglib_LTLIBRARIES = libimagery_opencv.la
@HAVE_CV_TRUE at libimagery_opencv_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_photogrammetry/Makefile.am b/src/modules/imagery/imagery_photogrammetry/Makefile.am
index 138d75a..d2ba002 100755
--- a/src/modules/imagery/imagery_photogrammetry/Makefile.am
+++ b/src/modules/imagery/imagery_photogrammetry/Makefile.am
@@ -1,12 +1,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_photogrammetry.la
libimagery_photogrammetry_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_photogrammetry/Makefile.in b/src/modules/imagery/imagery_photogrammetry/Makefile.in
index aaaed05..1975eba 100644
--- a/src/modules/imagery/imagery_photogrammetry/Makefile.in
+++ b/src/modules/imagery/imagery_photogrammetry/Makefile.in
@@ -362,10 +362,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_photogrammetry.la
libimagery_photogrammetry_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_segmentation/Makefile.am b/src/modules/imagery/imagery_segmentation/Makefile.am
index 7667be3..9cd3fc5 100755
--- a/src/modules/imagery/imagery_segmentation/Makefile.am
+++ b/src/modules/imagery/imagery_segmentation/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_segmentation.la
libimagery_segmentation_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_segmentation/Makefile.in b/src/modules/imagery/imagery_segmentation/Makefile.in
index 4e7505f..ba75d31 100644
--- a/src/modules/imagery/imagery_segmentation/Makefile.in
+++ b/src/modules/imagery/imagery_segmentation/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_segmentation.la
libimagery_segmentation_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_svm/Makefile.am b/src/modules/imagery/imagery_svm/Makefile.am
index a92c3bd..e558c1a 100755
--- a/src/modules/imagery/imagery_svm/Makefile.am
+++ b/src/modules/imagery/imagery_svm/Makefile.am
@@ -1,12 +1,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_svm.la
libimagery_svm_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_svm/Makefile.in b/src/modules/imagery/imagery_svm/Makefile.in
index 57b255a..6fb697a 100644
--- a/src/modules/imagery/imagery_svm/Makefile.in
+++ b/src/modules/imagery/imagery_svm/Makefile.in
@@ -360,10 +360,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_svm.la
libimagery_svm_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_tools/Makefile.am b/src/modules/imagery/imagery_tools/Makefile.am
index a8e53e0..2b40346 100755
--- a/src/modules/imagery/imagery_tools/Makefile.am
+++ b/src/modules/imagery/imagery_tools/Makefile.am
@@ -1,12 +1,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_tools.la
libimagery_tools_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_tools/Makefile.in b/src/modules/imagery/imagery_tools/Makefile.in
index 5fedf83..ed42077 100644
--- a/src/modules/imagery/imagery_tools/Makefile.in
+++ b/src/modules/imagery/imagery_tools/Makefile.in
@@ -363,10 +363,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libimagery_tools.la
libimagery_tools_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_tools/landsat_acca.h b/src/modules/imagery/imagery_tools/landsat_acca.h
index b7070ed..9e081a1 100755
--- a/src/modules/imagery/imagery_tools/landsat_acca.h
+++ b/src/modules/imagery/imagery_tools/landsat_acca.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: landsat_acca.h 1938 2014-01-12 13:44:06Z reklov_w $
+ * Version $Id: landsat_acca.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -86,7 +86,7 @@ public:
CLandsat_ACCA(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Landsat") ); }
protected:
diff --git a/src/modules/imagery/imagery_tools/landsat_import.h b/src/modules/imagery/imagery_tools/landsat_import.h
index b10d547..1a75373 100755
--- a/src/modules/imagery/imagery_tools/landsat_import.h
+++ b/src/modules/imagery/imagery_tools/landsat_import.h
@@ -86,7 +86,7 @@ public: ////// public members and functions: //////////////
CLandsat_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Landsat") ); }
protected: /// protected members and functions: ///////////
diff --git a/src/modules/imagery/imagery_tools/landsat_toar.h b/src/modules/imagery/imagery_tools/landsat_toar.h
index fa428a3..9fe15c5 100755
--- a/src/modules/imagery/imagery_tools/landsat_toar.h
+++ b/src/modules/imagery/imagery_tools/landsat_toar.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: landsat_toar.h 1938 2014-01-12 13:44:06Z reklov_w $
+ * Version $Id: landsat_toar.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ class CLandsat_TOAR : public CSG_Module
public:
CLandsat_TOAR(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Landsat") ); }
protected:
diff --git a/src/modules/imagery/imagery_tools/pansharpening.h b/src/modules/imagery/imagery_tools/pansharpening.h
index 3df61f6..2f5f3d4 100755
--- a/src/modules/imagery/imagery_tools/pansharpening.h
+++ b/src/modules/imagery/imagery_tools/pansharpening.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pansharpening.h 1938 2014-01-12 13:44:06Z reklov_w $
+ * Version $Id: pansharpening.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ class CPanSharp_IHS : public CSG_Module_Grid
public:
CPanSharp_IHS(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Image Sharpening") ); }
protected:
@@ -95,7 +95,7 @@ class CPanSharp_Brovey : public CSG_Module_Grid
public:
CPanSharp_Brovey(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Image Sharpening") ); }
protected:
@@ -115,7 +115,7 @@ class CPanSharp_CN : public CSG_Module_Grid
public:
CPanSharp_CN(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Image Sharpening") ); }
protected:
@@ -135,7 +135,7 @@ class CPanSharp_PCA : public CSG_Module_Grid
public:
CPanSharp_PCA(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Image Sharpening") ); }
protected:
diff --git a/src/modules/imagery/imagery_vigra/MLB_Interface.cpp b/src/modules/imagery/imagery_vigra/MLB_Interface.cpp
index e1c611d..6d34c7b 100755
--- a/src/modules/imagery/imagery_vigra/MLB_Interface.cpp
+++ b/src/modules/imagery/imagery_vigra/MLB_Interface.cpp
@@ -140,8 +140,8 @@ CSG_Module * Create_Module(int i)
case 6: return( new CViGrA_FFT_Inverse );
case 7: return( new CViGrA_FFT_Real );
case 8: return( new CViGrA_FFT_Filter );
- case 9: return( new CViGrA_Random_Forest );
- case 10: return( new CViGrA_RF_Presence );
+ case 9: return( new_CViGrA_Random_Forest );
+ case 10: return( new_CViGrA_RF_Presence );
default: return( NULL );
}
diff --git a/src/modules/imagery/imagery_vigra/Makefile.am b/src/modules/imagery/imagery_vigra/Makefile.am
index a568df3..94f1785 100755
--- a/src/modules/imagery/imagery_vigra/Makefile.am
+++ b/src/modules/imagery/imagery_vigra/Makefile.am
@@ -4,13 +4,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
+
if HAVE_VIGRA
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version -lvigraimpex -lfftw3
pkglib_LTLIBRARIES = libimagery_vigra.la
libimagery_vigra_la_SOURCES =\
diff --git a/src/modules/imagery/imagery_vigra/Makefile.in b/src/modules/imagery/imagery_vigra/Makefile.in
index d89008e..c44b18d 100644
--- a/src/modules/imagery/imagery_vigra/Makefile.in
+++ b/src/modules/imagery/imagery_vigra/Makefile.in
@@ -375,10 +375,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1896 2013-12-10 14:56:59Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
- at HAVE_VIGRA_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ at HAVE_VIGRA_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
@HAVE_VIGRA_TRUE at CXX_INCS = -I$(top_srcdir)/src/saga_core
- at HAVE_VIGRA_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+ at HAVE_VIGRA_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
@HAVE_VIGRA_TRUE at AM_LDFLAGS = -fPIC -shared -avoid-version -lvigraimpex -lfftw3
@HAVE_VIGRA_TRUE at pkglib_LTLIBRARIES = libimagery_vigra.la
@HAVE_VIGRA_TRUE at libimagery_vigra_la_SOURCES = \
diff --git a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
index 97ffe2d..1c59fb4 100755
--- a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
+++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
@@ -61,40 +61,13 @@
//---------------------------------------------------------
#include "vigra_random_forest.h"
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
//---------------------------------------------------------
-#if !defined(VIGRA_VERSION_MAJOR) || VIGRA_VERSION_MAJOR < 1 || VIGRA_VERSION_MINOR < 10
-// define some dummies
-#include <vigra/matrix.hxx>
-class CRandom_Forest
-{
-public:
- CRandom_Forest(CSG_Parameters *pParameters) {}
- static bool Parameters_Create (CSG_Parameters &Parameters) { return( true ); }
- bool Load_Model (bool bLoadNow) { return( true ); }
- bool Train_Model (const CSG_Matrix &Data) { return( true ); }
- int Get_Feature_Count (void) { return( 0 ); }
- int Get_Prediction (vigra::Matrix<double> features) { return( 0 ); }
- vigra::Matrix<double> Get_Probabilities (vigra::Matrix<double> features) { vigra::Matrix<double> p(0, 0); return( p ); }
-};
-#else
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
+#if defined(VIGRA_VERSION_MAJOR) && VIGRA_VERSION_MAJOR >= 1 && VIGRA_VERSION_MINOR >= 10
//---------------------------------------------------------
#include <vigra/random_forest.hxx>
+//---------------------------------------------------------
#define WITH_HDF5
#if defined(WITH_HDF5)
#include <vigra/random_forest_hdf5_impex.hxx>
@@ -340,14 +313,6 @@ vigra::Matrix<double> CRandom_Forest::Get_Probabilities(vigra::Matrix<double> fe
///////////////////////////////////////////////////////////
// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-#endif // !defined(VIGRA_VERSION_MAJOR) || VIGRA_VERSION_MAJOR < 1 || VIGRA_VERSION_MINOR < 10
-
-
-///////////////////////////////////////////////////////////
-// //
// //
// //
///////////////////////////////////////////////////////////
@@ -1211,3 +1176,13 @@ bool CViGrA_RF_Presence::Get_Training(CSG_Matrix &Data, int x, int y, int ID)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#endif // defined(VIGRA_VERSION_MAJOR) && VIGRA_VERSION_MAJOR >= 1 && VIGRA_VERSION_MINOR >= 10
+
+
+///////////////////////////////////////////////////////////
+// //
+// //
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
diff --git a/src/modules/imagery/imagery_vigra/vigra_random_forest.h b/src/modules/imagery/imagery_vigra/vigra_random_forest.h
index 9cd7c8c..901a176 100755
--- a/src/modules/imagery/imagery_vigra/vigra_random_forest.h
+++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.h
@@ -72,6 +72,9 @@
//---------------------------------------------------------
#include "vigra.h"
+//---------------------------------------------------------
+#if defined(VIGRA_VERSION_MAJOR) && VIGRA_VERSION_MAJOR >= 1 && VIGRA_VERSION_MINOR >= 10
+
///////////////////////////////////////////////////////////
// //
@@ -153,4 +156,22 @@ private:
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#define new_CViGrA_Random_Forest new CViGrA_Random_Forest
+#define new_CViGrA_RF_Presence new CViGrA_RF_Presence
+
+#else // defined(VIGRA_VERSION_MAJOR) && VIGRA_VERSION_MAJOR >= 1 && VIGRA_VERSION_MINOR >= 10
+
+#define new_CViGrA_Random_Forest MLB_INTERFACE_SKIP_MODULE
+#define new_CViGrA_RF_Presence MLB_INTERFACE_SKIP_MODULE
+
+#endif
+
+
+///////////////////////////////////////////////////////////
+// //
+// //
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
#endif // #ifndef HEADER_INCLUDED__vigra_random_forest_H
diff --git a/src/modules/io/Makefile.am b/src/modules/io/Makefile.am
index f348fd5..6ad425f 100755
--- a/src/modules/io/Makefile.am
+++ b/src/modules/io/Makefile.am
@@ -1,5 +1,5 @@
if WITH_GUI
-SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_grid_image io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
+SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_image io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
else
-SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
+SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
endif
diff --git a/src/modules/io/Makefile.in b/src/modules/io/Makefile.in
index 60a5256..44a2219 100644
--- a/src/modules/io/Makefile.in
+++ b/src/modules/io/Makefile.in
@@ -148,9 +148,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 \
- io_shapes io_shapes_dxf io_shapes_las io_table io_virtual \
- io_grid_image
+DIST_SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_shapes \
+ io_shapes_dxf io_shapes_las io_table io_virtual io_grid_image
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -324,8 +323,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- at WITH_GUI_FALSE@SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
- at WITH_GUI_TRUE@SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_grid_image io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
+ at WITH_GUI_FALSE@SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
+ at WITH_GUI_TRUE@SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_image io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
all: all-recursive
.SUFFIXES:
diff --git a/src/modules/io/io_esri_e00/Makefile.am b/src/modules/io/io_esri_e00/Makefile.am
index 803c688..52b0c60 100755
--- a/src/modules/io/io_esri_e00/Makefile.am
+++ b/src/modules/io/io_esri_e00/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_esri_e00.la
libio_esri_e00_la_SOURCES =\
diff --git a/src/modules/io/io_esri_e00/Makefile.in b/src/modules/io/io_esri_e00/Makefile.in
index 142e80e..d9e0d0f 100644
--- a/src/modules/io/io_esri_e00/Makefile.in
+++ b/src/modules/io/io_esri_e00/Makefile.in
@@ -368,10 +368,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_esri_e00.la
libio_esri_e00_la_SOURCES = \
diff --git a/src/modules/io/io_gdal/Makefile.am b/src/modules/io/io_gdal/Makefile.am
index 491a1ad..a029ec5 100755
--- a/src/modules/io/io_gdal/Makefile.am
+++ b/src/modules/io/io_gdal/Makefile.am
@@ -4,13 +4,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
+
DEP_LIBS = `gdal-config --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core `gdal-config --cflags`
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS)
pkglib_LTLIBRARIES = libio_gdal.la
libio_gdal_la_SOURCES =\
diff --git a/src/modules/io/io_gdal/Makefile.in b/src/modules/io/io_gdal/Makefile.in
index 620f9dc..c2e9510 100644
--- a/src/modules/io/io_gdal/Makefile.in
+++ b/src/modules/io/io_gdal/Makefile.in
@@ -367,11 +367,10 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1465 2012-08-23 09:20:00Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
DEP_LIBS = `gdal-config --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core `gdal-config --cflags`
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS)
pkglib_LTLIBRARIES = libio_gdal.la
libio_gdal_la_SOURCES = \
diff --git a/src/modules/io/io_gdal/gdal_catalogue.cpp b/src/modules/io/io_gdal/gdal_catalogue.cpp
index 9fb1465..0a7abf2 100755
--- a/src/modules/io/io_gdal/gdal_catalogue.cpp
+++ b/src/modules/io/io_gdal/gdal_catalogue.cpp
@@ -226,7 +226,7 @@ CGDAL_Catalogues::CGDAL_Catalogues(void)
Description = _TW(
"Creates raster catalogues from all raster files found in the selected directory. "
- "Catalogues are splitted according to the coordinate reference system used by the "
+ "Catalogues are split according to the coordinate reference system used by the "
"different raster files. Output are polygon layers that show the extent for each "
"raster file in it. Each extent is attributed with the original file path and "
"raster system properties.\n"
diff --git a/src/modules/io/io_gdal/gdal_import_wms.cpp b/src/modules/io/io_gdal/gdal_import_wms.cpp
index d064c1d..36f22c6 100755
--- a/src/modules/io/io_gdal/gdal_import_wms.cpp
+++ b/src/modules/io/io_gdal/gdal_import_wms.cpp
@@ -72,14 +72,14 @@ CGDAL_Import_WMS::CGDAL_Import_WMS(void)
CSG_Parameter *pNode;
//-----------------------------------------------------
- Set_Name (_TL("Import Open Street Map Image"));
+ Set_Name (_TL("Import TMS Image"));
Set_Author ("O.Conrad (c) 2016");
CSG_String Description;
Description = _TW(
- "The \"Import OSM Image\" tool imports a map image from a Tile Mapping Service (TMS) using the "
+ "The \"Import TMS Image\" tool imports a map image from a Tile Mapping Service (TMS) using the "
"\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. "
"For more information have a look at the GDAL homepage:\n"
" <a target=\"_blank\" href=\"http://www.gdal.org/\">"
@@ -112,9 +112,15 @@ CGDAL_Import_WMS::CGDAL_Import_WMS(void)
pNode = Parameters.Add_Choice(
NULL , "SERVER" , _TL("Server"),
_TL(""),
- CSG_String::Format("%s|%s|%s|",
+ CSG_String::Format("%s|%s|%s|%s|%s|%s|%s|%s|%s|",
_TL("Open Street Map"),
_TL("MapQuest"),
+ _TL("Google Map"),
+ _TL("Google Satellite"),
+ _TL("Google Hybrid"),
+ _TL("Google Terrain"),
+ _TL("Google Terrain, Streets and Water"),
+ _TL("ArcGIS MapServer Tiles"),
_TL("user defined")
), 0
);
@@ -128,7 +134,7 @@ CGDAL_Import_WMS::CGDAL_Import_WMS(void)
Parameters.Add_String(
pNode , "SERVER_USER" , _TL("Server"),
_TL(""),
- "tile.openstreetmap.org"
+ "tile.openstreetmap.org/${z}/${x}/${y}.png"
);
pNode = Parameters.Add_Value(
@@ -460,19 +466,9 @@ bool CGDAL_Import_WMS::Set_Image(CSG_Grid *pBands[3])
bool CGDAL_Import_WMS::Get_Bands(CSG_Grid *pBands[3], const CSG_Grid_System &System)
{
//-----------------------------------------------------
- CSG_String Server;
-
- switch( Parameters("SERVER")->asInt() )
- {
- default: Server = "tile.openstreetmap.org" ; break; // Open Street Map
- case 1: Server = "otile1.mqcdn.com/tiles/1.0.0/osm" ; break; // MapQuest
- case 2: Server = Parameters("SERVER_USER")->asString(); break; // user defined
- }
-
- //-----------------------------------------------------
CSG_GDAL_DataSet DataSet;
- if( DataSet.Open_Read(Get_Request(Server), System) == false || DataSet.Get_Count() != 3 )
+ if( DataSet.Open_Read(Get_Request(), System) == false || DataSet.Get_Count() != 3 )
{
return( false );
}
@@ -512,8 +508,25 @@ bool CGDAL_Import_WMS::Get_Bands(CSG_Grid *pBands[3], const CSG_Grid_System &Sys
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-CSG_String CGDAL_Import_WMS::Get_Request(const CSG_String &Server)
+CSG_String CGDAL_Import_WMS::Get_Request(void)
{
+ CSG_String Server, Projection = "EPSG:900913";
+
+ switch( Parameters("SERVER")->asInt() )
+ {
+ default: Server = "tile.openstreetmap.org/${z}/${x}/${y}.png" ; Projection = "EPSG:3857"; break; // Open Street Map
+ case 1: Server = "otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" ; Projection = "EPSG:3857"; break; // MapQuest
+ case 2: Server = "mt.google.com/vt/lyrs=m&x=${x}&y=${y}&z=${z}" ; break; // Google Map
+ case 3: Server = "mt.google.com/vt/lyrs=s&x=${x}&y=${y}&z=${z}" ; break; // Google Satellite
+ case 4: Server = "mt.google.com/vt/lyrs=y&x=${x}&y=${y}&z=${z}" ; break; // Google Hybrid
+ case 5: Server = "mt.google.com/vt/lyrs=t&x=${x}&y=${y}&z=${z}" ; break; // Google Terrain
+ case 6: Server = "mt.google.com/vt/lyrs=p&x=${x}&y=${y}&z=${z}" ; break; // Google Terrain, Streets and Water
+ case 7: Server = "services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/${z}/${y}/${x}"; break; // ArcGIS MapServer Tiles
+ case 8: Server = Parameters("SERVER_USER")->asString() ; break; // user defined
+// case x: Server = "s3.amazonaws.com/com.modestmaps.bluemarble/${z}-r${y}-c${x}.jpg" ; break; // Blue Marble
+ }
+
+ //-----------------------------------------------------
CSG_MetaData XML, *pEntry;
XML.Set_Name("GDAL_WMS");
@@ -521,7 +534,7 @@ CSG_String CGDAL_Import_WMS::Get_Request(const CSG_String &Server)
//-----------------------------------------------------
pEntry = XML.Add_Child("Service"); pEntry->Add_Property("name", "TMS");
- pEntry->Add_Child("ServerUrl" , "http://" + Server + "/${z}/${x}/${y}.png");
+ pEntry->Add_Child("ServerUrl" , "http://" + Server);
//-----------------------------------------------------
pEntry = XML.Add_Child("DataWindow"); // Define size and extents of the data. (required, except for TiledWMS and VirtualEarth)
@@ -536,8 +549,12 @@ CSG_String CGDAL_Import_WMS::Get_Request(const CSG_String &Server)
pEntry->Add_Child("YOrigin" , "top"); // Can be used to define the position of the Y origin with respect to the tile grid. Possible values are 'top', 'bottom', and 'default', where the default behavior is mini-driver-specific. (TMS mini-driver only, optional, defaults to 'bottom' for TMS)
//-----------------------------------------------------
- pEntry = XML.Add_Child("Projection", "EPSG:3857"); // Image projection (optional, defaults to value reported by mini-driver or EPSG:4326)
- pEntry = XML.Add_Child("BandsCount", 3); // Number of bands/channels, 1 for grayscale data, 3 for RGB, 4 for RGBA. (optional, defaults to 3)
+ if( !Projection.is_Empty() )
+ {
+ pEntry = XML.Add_Child("Projection", Projection); // Image projection (optional, defaults to value reported by mini-driver or EPSG:4326)
+ }
+
+ pEntry = XML.Add_Child("BandsCount", 3); // Number of bands/channels, 1 for grayscale data, 3 for RGB, 4 for RGBA. (optional, defaults to 3)
int Blocksize = Parameters("BLOCKSIZE")->asInt();
pEntry = XML.Add_Child("BlockSizeX", Blocksize); // Block size in pixels. (optional, defaults to 1024, except for VirtualEarth)
diff --git a/src/modules/io/io_gdal/gdal_import_wms.h b/src/modules/io/io_gdal/gdal_import_wms.h
index dcd6c73..28c5a62 100755
--- a/src/modules/io/io_gdal/gdal_import_wms.h
+++ b/src/modules/io/io_gdal/gdal_import_wms.h
@@ -95,7 +95,7 @@ private:
bool Get_Bands (CSG_Grid *pBands[3], const CSG_Grid_System &System);
- CSG_String Get_Request (const CSG_String &Server);
+ CSG_String Get_Request (void);
bool Get_System (CSG_Grid_System &System, CSG_Grid *pTarget);
diff --git a/src/modules/io/io_gps/Makefile.am b/src/modules/io/io_gps/Makefile.am
index b440e93..33b9e48 100755
--- a/src/modules/io/io_gps/Makefile.am
+++ b/src/modules/io/io_gps/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_gps.la
libio_gps_la_SOURCES =\
diff --git a/src/modules/io/io_gps/Makefile.in b/src/modules/io/io_gps/Makefile.in
index 070136a..ce5b49c 100644
--- a/src/modules/io/io_gps/Makefile.in
+++ b/src/modules/io/io_gps/Makefile.in
@@ -364,10 +364,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_gps.la
libio_gps_la_SOURCES = \
diff --git a/src/modules/io/io_grid/Makefile.am b/src/modules/io/io_grid/Makefile.am
index 58d8d8a..54f6afb 100755
--- a/src/modules/io/io_grid/Makefile.am
+++ b/src/modules/io/io_grid/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_grid.la
libio_grid_la_SOURCES =\
diff --git a/src/modules/io/io_grid/Makefile.in b/src/modules/io/io_grid/Makefile.in
index f11912f..ceb5b2d 100644
--- a/src/modules/io/io_grid/Makefile.in
+++ b/src/modules/io/io_grid/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_grid.la
libio_grid_la_SOURCES = \
diff --git a/src/modules/io/io_grid/bmp_export.h b/src/modules/io/io_grid/bmp_export.h
index cae6c39..6424e78 100755
--- a/src/modules/io/io_grid/bmp_export.h
+++ b/src/modules/io/io_grid/bmp_export.h
@@ -88,7 +88,7 @@ public:
CBMP_Export(void);
virtual ~CBMP_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_grid/citygml_import.h b/src/modules/io/io_grid/citygml_import.h
index fda2692..089360a 100755
--- a/src/modules/io/io_grid/citygml_import.h
+++ b/src/modules/io/io_grid/citygml_import.h
@@ -86,7 +86,7 @@ public: ////// public members and functions: //////////////
CCityGML_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected: /// protected members and functions: ///////////
diff --git a/src/modules/io/io_grid/erdas_lan.h b/src/modules/io/io_grid/erdas_lan.h
index 12ffd6b..392b9da 100755
--- a/src/modules/io/io_grid/erdas_lan.h
+++ b/src/modules/io/io_grid/erdas_lan.h
@@ -88,7 +88,7 @@ public:
CErdas_LAN_Import(void);
virtual ~CErdas_LAN_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/esri_arcinfo.h b/src/modules/io/io_grid/esri_arcinfo.h
index 0fd6d90..89fb4e2 100755
--- a/src/modules/io/io_grid/esri_arcinfo.h
+++ b/src/modules/io/io_grid/esri_arcinfo.h
@@ -80,7 +80,7 @@ class CESRI_ArcInfo_Import : public CSG_Module
public:
CESRI_ArcInfo_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -112,7 +112,7 @@ class CESRI_ArcInfo_Export : public CSG_Module_Grid
public:
CESRI_ArcInfo_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_grid/grid_table.h b/src/modules/io/io_grid/grid_table.h
index 6c1726d..349a7d6 100755
--- a/src/modules/io/io_grid/grid_table.h
+++ b/src/modules/io/io_grid/grid_table.h
@@ -88,7 +88,7 @@ public:
CGrid_Table_Import(void);
virtual ~CGrid_Table_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/import_clip_resample.h b/src/modules/io/io_grid/import_clip_resample.h
index dd5b4f5..d84ae3b 100755
--- a/src/modules/io/io_grid/import_clip_resample.h
+++ b/src/modules/io/io_grid/import_clip_resample.h
@@ -78,7 +78,7 @@ class CImport_Clip_Resample : public CSG_Module
public:
CImport_Clip_Resample(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/mola.h b/src/modules/io/io_grid/mola.h
index 0293767..fa30fb9 100755
--- a/src/modules/io/io_grid/mola.h
+++ b/src/modules/io/io_grid/mola.h
@@ -76,7 +76,7 @@ public:
CMOLA_Import(void);
virtual ~CMOLA_Import(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/raw.h b/src/modules/io/io_grid/raw.h
index a1d2d3a..5829171 100755
--- a/src/modules/io/io_grid/raw.h
+++ b/src/modules/io/io_grid/raw.h
@@ -88,7 +88,7 @@ public:
CRaw_Import(void);
virtual ~CRaw_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/srtm30.h b/src/modules/io/io_grid/srtm30.h
index d72ffb4..25990ea 100755
--- a/src/modules/io/io_grid/srtm30.h
+++ b/src/modules/io/io_grid/srtm30.h
@@ -76,7 +76,7 @@ public:
CSRTM30_Import(void);
virtual ~CSRTM30_Import(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/surfer.h b/src/modules/io/io_grid/surfer.h
index 781211c..02c286a 100755
--- a/src/modules/io/io_grid/surfer.h
+++ b/src/modules/io/io_grid/surfer.h
@@ -75,7 +75,7 @@ public:
CSurfer_Import(void);
virtual ~CSurfer_Import(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
@@ -94,7 +94,7 @@ public:
CSurfer_Export(void);
virtual ~CSurfer_Export(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_grid/usgs_srtm.h b/src/modules/io/io_grid/usgs_srtm.h
index 8b14284..5c42342 100755
--- a/src/modules/io/io_grid/usgs_srtm.h
+++ b/src/modules/io/io_grid/usgs_srtm.h
@@ -76,7 +76,7 @@ public:
CUSGS_SRTM_Import(void);
virtual ~CUSGS_SRTM_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid/wrf.h b/src/modules/io/io_grid/wrf.h
index a3aaab6..14ebeae 100755
--- a/src/modules/io/io_grid/wrf.h
+++ b/src/modules/io/io_grid/wrf.h
@@ -114,7 +114,7 @@ class CWRF_Import : public CSG_Module
public:
CWRF_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -142,7 +142,7 @@ class CWRF_Export : public CSG_Module_Grid
public:
CWRF_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_grid/xyz.h b/src/modules/io/io_grid/xyz.h
index 33b62fd..0e71a97 100755
--- a/src/modules/io/io_grid/xyz.h
+++ b/src/modules/io/io_grid/xyz.h
@@ -88,7 +88,7 @@ public:
CXYZ_Export(void);
virtual ~CXYZ_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
@@ -110,7 +110,7 @@ class CXYZ_Import : public CSG_Module
public:
CXYZ_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid_grib2/MLB_Interface.cpp b/src/modules/io/io_grid_grib2/MLB_Interface.cpp
deleted file mode 100755
index c815919..0000000
--- a/src/modules/io/io_grid_grib2/MLB_Interface.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**********************************************************
- * Version $Id: MLB_Interface.cpp 1246 2011-11-25 13:42:38Z oconrad $
- *********************************************************/
-/*
- * Thomas Schorr 2007
- */
-
-#include "MLB_Interface.h"
-
-CSG_String Get_Info(int i)
-{
- switch( i )
- {
- case MLB_INFO_Name: default:
- return( _TL("GRIB Files") );
-
- case MLB_INFO_Category:
- return( _TL("Import/Export") );
-
- case MLB_INFO_Author:
- return( _TL("Thomas Schorr (c) 2007") );
-
- case MLB_INFO_Description:
- return( _TW(
- "Import and export of GRIdded Binary (GRIB) files using the "
- "g2clib library of the National Center for Environmental Prediction (NCEP). "
- "Find more information at "
- "<a target=\"_blank\" href=\"http://www.nco.ncep.noaa.gov/\">"
- "http://www.nco.ncep.noaa.gov/</a>"
- ));
-
- case MLB_INFO_Version:
- return( _TL("0.1") );
-
- case MLB_INFO_Menu_Path:
- return( _TL("File|Grid") );
- }
-}
-
-#include "grib2_import.h"
-
-CSG_Module * Create_Module(int i)
-{
- CSG_Module *pModule;
-
- switch( i )
- {
- case 0:
- pModule = new SGGrib2Import;
- break;
-
- default:
- pModule = NULL;
- break;
- }
-
- return( pModule );
-}
-
-//{{AFX_SAGA
-
- MLB_INTERFACE
-
-//}}AFX_SAGA
diff --git a/src/modules/io/io_grid_grib2/MLB_Interface.h b/src/modules/io/io_grid_grib2/MLB_Interface.h
deleted file mode 100755
index 3c7ee1b..0000000
--- a/src/modules/io/io_grid_grib2/MLB_Interface.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/**********************************************************
- * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $
- *********************************************************/
-/*
- * Thomas Schorr 2007
- */
-
-#ifndef HEADER_INCLUDED__io_grid_grib2_H
-#define HEADER_INCLUDED__io_grid_grib2_H
-
-#include <saga_api/saga_api.h>
-
-#ifdef io_grid_grib2_EXPORTS
- #define io_grid_grib2_EXPORT _SAGA_DLL_EXPORT
-#else
- #define io_grid_grib2_EXPORT _SAGA_DLL_IMPORT
-#endif
-
-#endif // #ifndef HEADER_INCLUDED__io_grid_grib2_H
diff --git a/src/modules/io/io_grid_grib2/Makefile.am b/src/modules/io/io_grid_grib2/Makefile.am
deleted file mode 100755
index 62cfa52..0000000
--- a/src/modules/io/io_grid_grib2/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
-#
-if DEBUG
-DBGFLAGS = -g -DDEBUG
-endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG
-CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
-#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
-AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
-pkglib_LTLIBRARIES = libio_grid_grib2.la
-libio_grid_grib2_la_SOURCES =\
-grib2_import.cpp\
-MLB_Interface.cpp\
-grib2_import.h\
-MLB_Interface.h
-
-if SYSTEM_GRIB2C
-AM_LDFLAGS +=-lgrib2c
-else
-libio_grid_grib2_la_SOURCES +=\
-./g2clib-1.0.4/cmplxpack.c\
-./g2clib-1.0.4/compack.c\
-./g2clib-1.0.4/comunpack.c\
-./g2clib-1.0.4/dec_jpeg2000.c\
-./g2clib-1.0.4/dec_png.c\
-./g2clib-1.0.4/drstemplates.c\
-./g2clib-1.0.4/enc_jpeg2000.c\
-./g2clib-1.0.4/enc_png.c\
-./g2clib-1.0.4/g2_addfield.c\
-./g2clib-1.0.4/g2_addgrid.c\
-./g2clib-1.0.4/g2_addlocal.c\
-./g2clib-1.0.4/g2_create.c\
-./g2clib-1.0.4/g2_free.c\
-./g2clib-1.0.4/g2_getfld.c\
-./g2clib-1.0.4/g2_gribend.c\
-./g2clib-1.0.4/g2_info.c\
-./g2clib-1.0.4/g2_miss.c\
-./g2clib-1.0.4/g2_unpack1.c\
-./g2clib-1.0.4/g2_unpack2.c\
-./g2clib-1.0.4/g2_unpack3.c\
-./g2clib-1.0.4/g2_unpack4.c\
-./g2clib-1.0.4/g2_unpack5.c\
-./g2clib-1.0.4/g2_unpack6.c\
-./g2clib-1.0.4/g2_unpack7.c\
-./g2clib-1.0.4/gbits.c\
-./g2clib-1.0.4/getdim.c\
-./g2clib-1.0.4/getpoly.c\
-./g2clib-1.0.4/gridtemplates.c\
-./g2clib-1.0.4/int_power.c\
-./g2clib-1.0.4/jpcpack.c\
-./g2clib-1.0.4/jpcunpack.c\
-./g2clib-1.0.4/misspack.c\
-./g2clib-1.0.4/mkieee.c\
-./g2clib-1.0.4/pack_gp.c\
-./g2clib-1.0.4/pdstemplates.c\
-./g2clib-1.0.4/pngpack.c\
-./g2clib-1.0.4/pngunpack.c\
-./g2clib-1.0.4/rdieee.c\
-./g2clib-1.0.4/reduce.c\
-./g2clib-1.0.4/seekgb.c\
-./g2clib-1.0.4/simpack.c\
-./g2clib-1.0.4/simunpack.c\
-./g2clib-1.0.4/specpack.c\
-./g2clib-1.0.4/specunpack.c\
-./g2clib-1.0.4/drstemplates.h\
-./g2clib-1.0.4/grib2.h\
-./g2clib-1.0.4/gridtemplates.h\
-./g2clib-1.0.4/pdstemplates.h
-endif
-
-libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
diff --git a/src/modules/io/io_grid_grib2/Makefile.in b/src/modules/io/io_grid_grib2/Makefile.in
deleted file mode 100644
index 7000814..0000000
--- a/src/modules/io/io_grid_grib2/Makefile.in
+++ /dev/null
@@ -1,990 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
- at SYSTEM_GRIB2C_TRUE@am__append_1 = -lgrib2c
- at SYSTEM_GRIB2C_FALSE@am__append_2 = \
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/cmplxpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/compack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/comunpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/dec_jpeg2000.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/dec_png.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/drstemplates.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/enc_jpeg2000.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/enc_png.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_addfield.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_addgrid.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_addlocal.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_create.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_free.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_getfld.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_gribend.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_info.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_miss.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack1.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack2.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack3.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack4.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack5.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack6.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/g2_unpack7.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/gbits.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/getdim.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/getpoly.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/gridtemplates.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/int_power.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/jpcpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/jpcunpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/misspack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/mkieee.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/pack_gp.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/pdstemplates.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/pngpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/pngunpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/rdieee.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/reduce.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/seekgb.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/simpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/simunpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/specpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/specunpack.c\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/drstemplates.h\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/grib2.h\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/gridtemplates.h\
- at SYSTEM_GRIB2C_FALSE@./g2clib-1.0.4/pdstemplates.h
-
-subdir = src/modules/io/io_grid_grib2
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \
- $(top_srcdir)/m4/ax_pkg_swig.m4 \
- $(top_srcdir)/m4/ax_python_devel.m4 \
- $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \
- $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libio_grid_grib2_la_DEPENDENCIES = \
- $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
-am__libio_grid_grib2_la_SOURCES_DIST = grib2_import.cpp \
- MLB_Interface.cpp grib2_import.h MLB_Interface.h \
- ./g2clib-1.0.4/cmplxpack.c ./g2clib-1.0.4/compack.c \
- ./g2clib-1.0.4/comunpack.c ./g2clib-1.0.4/dec_jpeg2000.c \
- ./g2clib-1.0.4/dec_png.c ./g2clib-1.0.4/drstemplates.c \
- ./g2clib-1.0.4/enc_jpeg2000.c ./g2clib-1.0.4/enc_png.c \
- ./g2clib-1.0.4/g2_addfield.c ./g2clib-1.0.4/g2_addgrid.c \
- ./g2clib-1.0.4/g2_addlocal.c ./g2clib-1.0.4/g2_create.c \
- ./g2clib-1.0.4/g2_free.c ./g2clib-1.0.4/g2_getfld.c \
- ./g2clib-1.0.4/g2_gribend.c ./g2clib-1.0.4/g2_info.c \
- ./g2clib-1.0.4/g2_miss.c ./g2clib-1.0.4/g2_unpack1.c \
- ./g2clib-1.0.4/g2_unpack2.c ./g2clib-1.0.4/g2_unpack3.c \
- ./g2clib-1.0.4/g2_unpack4.c ./g2clib-1.0.4/g2_unpack5.c \
- ./g2clib-1.0.4/g2_unpack6.c ./g2clib-1.0.4/g2_unpack7.c \
- ./g2clib-1.0.4/gbits.c ./g2clib-1.0.4/getdim.c \
- ./g2clib-1.0.4/getpoly.c ./g2clib-1.0.4/gridtemplates.c \
- ./g2clib-1.0.4/int_power.c ./g2clib-1.0.4/jpcpack.c \
- ./g2clib-1.0.4/jpcunpack.c ./g2clib-1.0.4/misspack.c \
- ./g2clib-1.0.4/mkieee.c ./g2clib-1.0.4/pack_gp.c \
- ./g2clib-1.0.4/pdstemplates.c ./g2clib-1.0.4/pngpack.c \
- ./g2clib-1.0.4/pngunpack.c ./g2clib-1.0.4/rdieee.c \
- ./g2clib-1.0.4/reduce.c ./g2clib-1.0.4/seekgb.c \
- ./g2clib-1.0.4/simpack.c ./g2clib-1.0.4/simunpack.c \
- ./g2clib-1.0.4/specpack.c ./g2clib-1.0.4/specunpack.c \
- ./g2clib-1.0.4/drstemplates.h ./g2clib-1.0.4/grib2.h \
- ./g2clib-1.0.4/gridtemplates.h ./g2clib-1.0.4/pdstemplates.h
-am__dirstamp = $(am__leading_dot)dirstamp
- at SYSTEM_GRIB2C_FALSE@am__objects_1 = ./g2clib-1.0.4/cmplxpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/compack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/comunpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/dec_jpeg2000.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/dec_png.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/drstemplates.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/enc_jpeg2000.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/enc_png.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_addfield.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_addgrid.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_addlocal.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_create.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_free.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_getfld.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_gribend.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_info.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_miss.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack1.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack2.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack3.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack4.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack5.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack6.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/g2_unpack7.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/gbits.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/getdim.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/getpoly.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/gridtemplates.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/int_power.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/jpcpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/jpcunpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/misspack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/mkieee.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/pack_gp.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/pdstemplates.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/pngpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/pngunpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/rdieee.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/reduce.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/seekgb.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/simpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/simunpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/specpack.lo \
- at SYSTEM_GRIB2C_FALSE@ ./g2clib-1.0.4/specunpack.lo
-am_libio_grid_grib2_la_OBJECTS = grib2_import.lo MLB_Interface.lo \
- $(am__objects_1)
-libio_grid_grib2_la_OBJECTS = $(am_libio_grid_grib2_la_OBJECTS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-AM_V_P = $(am__v_P_ at AM_V@)
-am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_ at AM_V@)
-am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_ at AM_V@)
-am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
-am__v_CXX_0 = @echo " CXX " $@;
-am__v_CXX_1 =
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo " CXXLD " $@;
-am__v_CXXLD_1 =
-SOURCES = $(libio_grid_grib2_la_SOURCES)
-DIST_SOURCES = $(am__libio_grid_grib2_la_SOURCES_DIST)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLELIBHARU = @DISABLELIBHARU@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GOMPFLAGS = @GOMPFLAGS@
-GREP = @GREP@
-HARU_LIB = @HARU_LIB@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCAL_INCS = @LOCAL_INCS@
-LOCAL_LIBS = @LOCAL_LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@
-POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
-POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-#
-# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
-#
- at DEBUG_TRUE@DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG
-CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
-#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
-AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper \
- $(am__append_1)
-pkglib_LTLIBRARIES = libio_grid_grib2.la
-libio_grid_grib2_la_SOURCES = grib2_import.cpp MLB_Interface.cpp \
- grib2_import.h MLB_Interface.h $(am__append_2)
-libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_grid_grib2/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/io/io_grid_grib2/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
- }
-
-uninstall-pkglibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
- done
-
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-g2clib-1.0.4/$(am__dirstamp):
- @$(MKDIR_P) ./g2clib-1.0.4
- @: > g2clib-1.0.4/$(am__dirstamp)
-g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) ./g2clib-1.0.4/$(DEPDIR)
- @: > g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/cmplxpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/compack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/comunpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/dec_jpeg2000.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/dec_png.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/drstemplates.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/enc_jpeg2000.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/enc_png.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_addfield.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_addgrid.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_addlocal.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_create.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_free.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_getfld.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_gribend.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_info.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_miss.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack1.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack2.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack3.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack4.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack5.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack6.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/g2_unpack7.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/gbits.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/getdim.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/getpoly.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/gridtemplates.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/int_power.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/jpcpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/jpcunpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/misspack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/mkieee.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/pack_gp.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/pdstemplates.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/pngpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/pngunpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/rdieee.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/reduce.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/seekgb.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/simpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/simunpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/specpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-./g2clib-1.0.4/specunpack.lo: g2clib-1.0.4/$(am__dirstamp) \
- g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
-
-libio_grid_grib2.la: $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_DEPENDENCIES) $(EXTRA_libio_grid_grib2_la_DEPENDENCIES)
- $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
- -rm -f ./g2clib-1.0.4/*.$(OBJEXT)
- -rm -f ./g2clib-1.0.4/*.lo
-
-distclean-compile:
- -rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MLB_Interface.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grib2_import.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/cmplxpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/compack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/comunpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/dec_jpeg2000.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/dec_png.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/drstemplates.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/enc_jpeg2000.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/enc_png.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_addfield.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_addgrid.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_addlocal.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_create.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_free.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_getfld.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_gribend.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_info.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_miss.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack1.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack2.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack3.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack4.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack5.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack6.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/g2_unpack7.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/gbits.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/getdim.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/getpoly.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/gridtemplates.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/int_power.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/jpcpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/jpcunpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/misspack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/mkieee.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/pack_gp.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/pdstemplates.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/pngpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/pngunpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/rdieee.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/reduce.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/seekgb.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/simpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/simunpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/specpack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./g2clib-1.0.4/$(DEPDIR)/specunpack.Plo at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
- at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-.cpp.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
- at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
- -rm -rf ./g2clib-1.0.4/.libs ./g2clib-1.0.4/_libs
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f g2clib-1.0.4/$(DEPDIR)/$(am__dirstamp)
- -rm -f g2clib-1.0.4/$(am__dirstamp)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR) ./g2clib-1.0.4/$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR) ./g2clib-1.0.4/$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkglibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkglibLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-pkglibLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/modules/io/io_grid_grib2/grib2_import.cpp b/src/modules/io/io_grid_grib2/grib2_import.cpp
deleted file mode 100755
index 6c7c522..0000000
--- a/src/modules/io/io_grid_grib2/grib2_import.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/**********************************************************
- * Version $Id: grib2_import.cpp 911 2011-02-14 16:38:15Z reklov_w $
- *********************************************************/
-/*
- * Thomas Schorr 2007
- */
-
-#define DEBUG 1
-
-#include "grib2_import.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef _SAGA_LINUX
-#include <unistd.h>
-#endif
-
-#ifdef _SAGA_MSW
-double rint(double x)
-{
- return( (int)(0.5 + x) );
-}
-#endif
-
-
-SGGrib2Import::SGGrib2Import(void)
-{
- Set_Name (_TL("Import GRIB2 record"));
-
- Set_Author (_TL("Copyright (c) 2007 by Thomas Schorr"));
-
- Set_Description (_TW(
- "Import a GRIB2 record."
- "Under development."
- ));
-
- Parameters.Add_Grid_Output(
- NULL , "OUT_GRID" , _TL("Grid"),
- _TL("")
- );
-
- Parameters.Add_FilePath(
- NULL , "FILE" , _TL("File"),
- _TL(""),
- _TW(
- "GRIdded Binary (GRIB) files|*.grib*;*.grb*|"
- "GRIB2 files|*.grib2;*.grb2|"
- "All Files|*.*"
- )
- );
-}
-
-SGGrib2Import::~SGGrib2Import(void)
-{}
-
-
-bool SGGrib2Import::On_Execute(void)
-{
- size_t num_bytes;
- FILE *fp;
- CSG_String FileName;
- unsigned char *raw, *help;
- struct stat st;
-
- FileName = Parameters("FILE") ->asString();
- gf = NULL;
-
- if ( stat( FileName.b_str(), &st ) == -1 )
- return false;
- raw = ( unsigned char * ) malloc( st.st_size );
- if ( raw == NULL ) return false;
- if( ( fp = fopen(FileName.b_str(), "rb")) != NULL ) {
- num_bytes = 0;
- help = raw;
- while ( feof( fp ) == 0 && ferror( fp ) == 0 ) {
- num_bytes = fread( help, sizeof( unsigned char ), 1024, fp );
- help += num_bytes;
- }
- fclose( fp );
- g2_getfld( raw, 1, 1, 1, &gf );
- switch ( gf->igdtnum ) {
- case 0:
- if ( ! handle_latlon() ) return false;
- break;
- case 20:
- if ( ! handle_polar_stereographic() ) return false;
- break;
- default:
- fprintf( stderr, "unhandled grid definition template no.: %d\n", gf->igdtnum );
- if ( ! handle_latlon() ) return false;
- }
- pGrid->Set_Name( SG_File_Get_Name(FileName, false) ); // no need to use wx!!!
-// pGrid->Set_Name( wxFileName( wxString( FileName ) ).GetName() );
- Parameters( "OUT_GRID" )->Set_Value( pGrid );
- g2_free( gf );
- free( raw );
- return( true );
- }
- return( false );
-}
-
-bool SGGrib2Import::handle_latlon( void ) {
- int x, y, nx, ny;
- double cellsize, xmin, ymin;
-
- if( gf->igdtmpl == NULL || gf->fld == NULL ) // possible if jpeg/png is not supported!?
- return( false );
-
- nx = ( int ) gf->igdtmpl[ 7 ];
- ny = ( int ) gf->igdtmpl[ 8 ];
- cellsize = ( double ) ( gf->igdtmpl[ 16 ] * 1e-6 );
- xmin = ( double ) ( gf->igdtmpl[ 12 ] * 1e-6 ) + cellsize / 2.0;
- ymin = ( double ) ( gf->igdtmpl[ 11 ] * 1e-6 ) - 90.0 + cellsize / 2.0;
-#ifdef DEBUG
- fprintf( stderr, "%d %d %f %f %f\n", nx, ny, cellsize, xmin, ymin );
-#endif
-
- if ( ( nx == -1 ) || ( ny == -1 ) ||
- ( ( pGrid = SG_Create_Grid( SG_DATATYPE_Float, nx, ny, cellsize, xmin, ymin ) ) == NULL ) )
- return false;
- for ( x = 0; x < nx; x++ ) {
- for ( y = 0; y < ny; y ++ )
- pGrid->Set_Value( x, ny - y - 1, gf->fld[ y * nx + x ] );
- }
- return true;
-}
-
-bool SGGrib2Import::handle_polar_stereographic( void ) {
- /* XXX fix me XXX*/
- int x, y, nx, ny;
- double cellsize, xmin, ymin;
-
- nx = ( int ) gf->igdtmpl[ 7 ];
- ny = ( int ) gf->igdtmpl[ 8 ];
- cellsize = ( double ) ( gf->igdtmpl[ 14 ] * 1e-3 );
- xmin = ( double ) ( gf->igdtmpl[ 10 ] );
- ymin = ( double ) ( gf->igdtmpl[ 9 ] );
-#ifdef DEBUG
- fprintf( stderr, "%d %d %f %f %f\n", nx, ny, cellsize, xmin, ymin );
-#endif
-
- if ( ( nx == -1 ) || ( ny == -1 ) ||
- ( ( pGrid = SG_Create_Grid( SG_DATATYPE_Float, nx, ny, cellsize, xmin, ymin ) ) == NULL ) )
- return false;
- for ( x = 0; x < nx; x++ ) {
- for ( y = 0; y < ny; y ++ )
- pGrid->Set_Value( x, y, gf->fld[ y * nx + x ] );
- }
- return true;
-}
diff --git a/src/modules/io/io_grid_grib2/grib2_import.h b/src/modules/io/io_grid_grib2/grib2_import.h
deleted file mode 100755
index 6381b89..0000000
--- a/src/modules/io/io_grid_grib2/grib2_import.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************
- * Version $Id: grib2_import.h 1246 2011-11-25 13:42:38Z oconrad $
- *********************************************************/
-/*
- * Thomas Schorr 2007
- */
-
-#ifndef HEADER_INCLUDED__grib2_import_H
-#define HEADER_INCLUDED__grib2_import_H
-
-
-#include "MLB_Interface.h"
-extern "C" {
-#include "g2clib-1.0.4/grib2.h"
-}
-
-
-class SGGrib2Import : public CSG_Module
-{
-public:
- SGGrib2Import(void);
- virtual ~SGGrib2Import(void);
-
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
-
-
-protected:
-
- virtual bool On_Execute (void);
-
-
-private:
- CSG_Grid *pGrid;
- gribfield *gf;
- bool handle_latlon( void );
- bool handle_polar_stereographic( void );
-
-};
-
-#endif // #ifndef HEADER_INCLUDED__grib2_import_H
diff --git a/src/modules/io/io_grid_image/Makefile.am b/src/modules/io/io_grid_image/Makefile.am
index ab48d8c..7c3f2d3 100755
--- a/src/modules/io/io_grid_image/Makefile.am
+++ b/src/modules/io/io_grid_image/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/io/io_grid_image/Makefile.in b/src/modules/io/io_grid_image/Makefile.in
index 3516f4f..ff1b2d1 100644
--- a/src/modules/io/io_grid_image/Makefile.in
+++ b/src/modules/io/io_grid_image/Makefile.in
@@ -361,11 +361,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/io/io_grid_image/grid_export.h b/src/modules/io/io_grid_image/grid_export.h
index 0ebda08..2e15806 100755
--- a/src/modules/io/io_grid_image/grid_export.h
+++ b/src/modules/io/io_grid_image/grid_export.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: grid_export.h 2089 2014-04-04 12:37:27Z reklov_w $
+ * Version $Id: grid_export.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class io_grid_image_EXPORT CGrid_Export : public CSG_Module_Grid
public:
CGrid_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_grid_image/grid_import.h b/src/modules/io/io_grid_image/grid_import.h
index 52f209b..9c0b765 100755
--- a/src/modules/io/io_grid_image/grid_import.h
+++ b/src/modules/io/io_grid_image/grid_import.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: grid_import.h 2089 2014-04-04 12:37:27Z reklov_w $
+ * Version $Id: grid_import.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class io_grid_image_EXPORT CGrid_Import : public CSG_Module
public:
CGrid_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_grid_image/grid_to_kml.cpp b/src/modules/io/io_grid_image/grid_to_kml.cpp
index 46544f6..1e47604 100755
--- a/src/modules/io/io_grid_image/grid_to_kml.cpp
+++ b/src/modules/io/io_grid_image/grid_to_kml.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: grid_to_kml.cpp 2754 2016-01-18 14:06:25Z oconrad $
+ * Version $Id: grid_to_kml.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -200,7 +200,7 @@ CGrid_to_KML::CGrid_to_KML(void)
Parameters.Add_Value(
NULL , "RESAMPLING" , _TL("Interpolation"),
- _TL("resampling method used when projection is needed"),
+ _TL("Resampling method used when projection is needed"),
PARAMETER_TYPE_Bool, true
);
@@ -208,7 +208,7 @@ CGrid_to_KML::CGrid_to_KML(void)
{
Parameters.Add_Range(
NULL , "SHADE_BRIGHT", _TL("Shade Brightness"),
- _TL("Allows to scale shade brightness, [percent]"),
+ _TL("Allows one to scale shade brightness [percent]"),
0.0, 100.0, 0.0, true, 100.0, true
);
}
diff --git a/src/modules/io/io_grid_image/grid_to_kml.h b/src/modules/io/io_grid_image/grid_to_kml.h
index 6d3f7dd..37a3067 100755
--- a/src/modules/io/io_grid_image/grid_to_kml.h
+++ b/src/modules/io/io_grid_image/grid_to_kml.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: grid_to_kml.h 2542 2015-07-15 12:31:48Z oconrad $
+ * Version $Id: grid_to_kml.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ class CGrid_to_KML : public CSG_Module_Grid
public:
CGrid_to_KML(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
@@ -111,7 +111,7 @@ class CGrid_from_KML : public CSG_Module
public:
CGrid_from_KML(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes/Makefile.am b/src/modules/io/io_shapes/Makefile.am
index 912674a..bb06f5f 100755
--- a/src/modules/io/io_shapes/Makefile.am
+++ b/src/modules/io/io_shapes/Makefile.am
@@ -4,17 +4,13 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-UC_DEFS = -D_SAGA_UNICODE
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LFLG)
pkglib_LTLIBRARIES = libio_shapes.la
libio_shapes_la_SOURCES =\
diff --git a/src/modules/io/io_shapes/Makefile.in b/src/modules/io/io_shapes/Makefile.in
index 1cfb348..b7e7018 100644
--- a/src/modules/io/io_shapes/Makefile.in
+++ b/src/modules/io/io_shapes/Makefile.in
@@ -367,14 +367,11 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1373 2012-04-13 09:54:30Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LFLG)
pkglib_LTLIBRARIES = libio_shapes.la
libio_shapes_la_SOURCES = \
diff --git a/src/modules/io/io_shapes/atlas_bna.h b/src/modules/io/io_shapes/atlas_bna.h
index 80c239e..eda9aa3 100755
--- a/src/modules/io/io_shapes/atlas_bna.h
+++ b/src/modules/io/io_shapes/atlas_bna.h
@@ -87,7 +87,7 @@ class CAtlas_BNA_Import : public CSG_Module
public:
CAtlas_BNA_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -107,7 +107,7 @@ class CAtlas_BNA_Export : public CSG_Module
public:
CAtlas_BNA_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/generate.h b/src/modules/io/io_shapes/generate.h
index a2c303a..6222b51 100755
--- a/src/modules/io/io_shapes/generate.h
+++ b/src/modules/io/io_shapes/generate.h
@@ -89,7 +89,7 @@ class CGenerate_Export : public CSG_Module
public:
CGenerate_Export(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/gpx.h b/src/modules/io/io_shapes/gpx.h
index f86e40b..edf05be 100755
--- a/src/modules/io/io_shapes/gpx.h
+++ b/src/modules/io/io_shapes/gpx.h
@@ -85,7 +85,7 @@ class CGPX_Import : public CSG_Module
public:
CGPX_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -123,7 +123,7 @@ class CGPX_Export : public CSG_Module
public:
CGPX_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/gstat.h b/src/modules/io/io_shapes/gstat.h
index 1f086d4..3f2c3cc 100755
--- a/src/modules/io/io_shapes/gstat.h
+++ b/src/modules/io/io_shapes/gstat.h
@@ -84,7 +84,7 @@ public:
CGStat_Export(void);
virtual ~CGStat_Export(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Export") ); }
protected:
@@ -107,7 +107,7 @@ public:
CGStat_Import(void);
virtual ~CGStat_Import(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes/pointcloud_from_file.h b/src/modules/io/io_shapes/pointcloud_from_file.h
index 8334d9d..3196e69 100755
--- a/src/modules/io/io_shapes/pointcloud_from_file.h
+++ b/src/modules/io/io_shapes/pointcloud_from_file.h
@@ -78,7 +78,7 @@ class CPointCloud_From_File : public CSG_Module
public:
CPointCloud_From_File(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes/pointcloud_from_text_file.h b/src/modules/io/io_shapes/pointcloud_from_text_file.h
index 777d662..56c6fca 100755
--- a/src/modules/io/io_shapes/pointcloud_from_text_file.h
+++ b/src/modules/io/io_shapes/pointcloud_from_text_file.h
@@ -88,7 +88,7 @@ class CPointCloud_From_Text_File : public CSG_Module
public:
CPointCloud_From_Text_File(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes/pointcloud_to_text_file.cpp b/src/modules/io/io_shapes/pointcloud_to_text_file.cpp
index 4c82207..2686a6e 100755
--- a/src/modules/io/io_shapes/pointcloud_to_text_file.cpp
+++ b/src/modules/io/io_shapes/pointcloud_to_text_file.cpp
@@ -83,7 +83,7 @@ CPointcloud_To_Text_File::CPointcloud_To_Text_File(void)
Set_Description (_TW(
"Exports a point cloud to a text file. Once the module is executed, "
- "a pop-up dialog allows to specify the fields to be exported and their "
+ "a pop-up dialog allows one to specify the fields to be exported and their "
"decimal precision.\n\n"
"Module usage is different between SAGA GUI and SAGA CMD: With "
"SAGA GUI you will get prompted to choose the fields to export "
diff --git a/src/modules/io/io_shapes/pointcloud_to_text_file.h b/src/modules/io/io_shapes/pointcloud_to_text_file.h
index 67b0a6c..945c731 100755
--- a/src/modules/io/io_shapes/pointcloud_to_text_file.h
+++ b/src/modules/io/io_shapes/pointcloud_to_text_file.h
@@ -88,7 +88,7 @@ class CPointcloud_To_Text_File : public CSG_Module
public:
CPointcloud_To_Text_File(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/stl.h b/src/modules/io/io_shapes/stl.h
index 329905b..d11dd9d 100755
--- a/src/modules/io/io_shapes/stl.h
+++ b/src/modules/io/io_shapes/stl.h
@@ -80,7 +80,7 @@ class CSTL_Import : public CSG_Module
public:
CSTL_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -125,7 +125,7 @@ class CSTL_Export : public CSG_Module
public:
CSTL_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/surfer_bln.h b/src/modules/io/io_shapes/surfer_bln.h
index f5218a3..1938004 100755
--- a/src/modules/io/io_shapes/surfer_bln.h
+++ b/src/modules/io/io_shapes/surfer_bln.h
@@ -87,7 +87,7 @@ class CSurfer_BLN_Import : public CSG_Module
public:
CSurfer_BLN_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -107,7 +107,7 @@ class CSurfer_BLN_Export : public CSG_Module
public:
CSurfer_BLN_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/svg.h b/src/modules/io/io_shapes/svg.h
index a264370..5d4b3f4 100755
--- a/src/modules/io/io_shapes/svg.h
+++ b/src/modules/io/io_shapes/svg.h
@@ -85,7 +85,7 @@ class CSVG_Export : public CSG_Module
public:
CSVG_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
@@ -117,7 +117,7 @@ class CSVG_Import : public CSG_Module
public:
CSVG_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes/wasp_map.h b/src/modules/io/io_shapes/wasp_map.h
index 8f10840..06a2ea2 100755
--- a/src/modules/io/io_shapes/wasp_map.h
+++ b/src/modules/io/io_shapes/wasp_map.h
@@ -77,7 +77,7 @@ class CWASP_MAP_Export : public CSG_Module
public:
CWASP_MAP_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
@@ -98,7 +98,7 @@ class CWASP_MAP_Import : public CSG_Module
public:
CWASP_MAP_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes/wktb.h b/src/modules/io/io_shapes/wktb.h
index 3fa5175..e8d6c5d 100755
--- a/src/modules/io/io_shapes/wktb.h
+++ b/src/modules/io/io_shapes/wktb.h
@@ -85,7 +85,7 @@ class CWKT_Import : public CSG_Module
public:
CWKT_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -111,7 +111,7 @@ class CWKT_Export : public CSG_Module
public:
CWKT_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes/xyz.h b/src/modules/io/io_shapes/xyz.h
index c17d96c..ca2d3ac 100755
--- a/src/modules/io/io_shapes/xyz.h
+++ b/src/modules/io/io_shapes/xyz.h
@@ -83,7 +83,7 @@ class CXYZ_Export : public CSG_Module
public:
CXYZ_Export(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Export") ); }
protected:
@@ -102,7 +102,7 @@ class CXYZ_Import : public CSG_Module
public:
CXYZ_Import(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes_dxf/Makefile.am b/src/modules/io/io_shapes_dxf/Makefile.am
index 848bc49..0097e30 100755
--- a/src/modules/io/io_shapes_dxf/Makefile.am
+++ b/src/modules/io/io_shapes_dxf/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_shapes_dxf.la
libio_shapes_dxf_la_SOURCES =\
diff --git a/src/modules/io/io_shapes_dxf/Makefile.in b/src/modules/io/io_shapes_dxf/Makefile.in
index 8da6b94..ec47353 100644
--- a/src/modules/io/io_shapes_dxf/Makefile.in
+++ b/src/modules/io/io_shapes_dxf/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_shapes_dxf.la
libio_shapes_dxf_la_SOURCES = \
diff --git a/src/modules/io/io_shapes_dxf/dxf_import.h b/src/modules/io/io_shapes_dxf/dxf_import.h
index 240f85b..928cc2d 100755
--- a/src/modules/io/io_shapes_dxf/dxf_import.h
+++ b/src/modules/io/io_shapes_dxf/dxf_import.h
@@ -89,7 +89,7 @@ class CDXF_Import : public CSG_Module, DL_CreationAdapter
public:
CDXF_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes_las/Makefile.am b/src/modules/io/io_shapes_las/Makefile.am
index 2f3ceb1..8dc08f1 100755
--- a/src/modules/io/io_shapes_las/Makefile.am
+++ b/src/modules/io/io_shapes_las/Makefile.am
@@ -4,14 +4,12 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
+
if HAVE_LLAS
DEP_LIBS = -llas
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS)
pkglib_LTLIBRARIES = libio_shapes_las.la
libio_shapes_las_la_SOURCES =\
diff --git a/src/modules/io/io_shapes_las/Makefile.in b/src/modules/io/io_shapes_las/Makefile.in
index 9e39c71..7b321a9 100644
--- a/src/modules/io/io_shapes_las/Makefile.in
+++ b/src/modules/io/io_shapes_las/Makefile.in
@@ -368,11 +368,10 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
@HAVE_LLAS_TRUE at DEP_LIBS = -llas
- at HAVE_LLAS_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ at HAVE_LLAS_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
@HAVE_LLAS_TRUE at CXX_INCS = -I$(top_srcdir)/src/saga_core
- at HAVE_LLAS_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+ at HAVE_LLAS_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
@HAVE_LLAS_TRUE at AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS)
@HAVE_LLAS_TRUE at pkglib_LTLIBRARIES = libio_shapes_las.la
@HAVE_LLAS_TRUE at libio_shapes_las_la_SOURCES = \
diff --git a/src/modules/io/io_shapes_las/las_export.cpp b/src/modules/io/io_shapes_las/las_export.cpp
index 580f524..892b672 100755
--- a/src/modules/io/io_shapes_las/las_export.cpp
+++ b/src/modules/io/io_shapes_las/las_export.cpp
@@ -95,7 +95,7 @@ CLAS_Export::CLAS_Export(void)
CSG_String Description(_TW(
"This module exports a SAGA Point Cloud as ASPRS LAS file (version 1.2) "
- "using the \"libLAS\" library. It allows to write Point Data Record Formats 1 to 4. "
+ "using the \"libLAS\" library. It allows writing Point Data Record Formats 1 to 4. "
"Please have a look at the <a href=\"http://www.asprs.org/society/committees/standards/lidar_exchange_format.html\""
">ASPRS LAS 1.2 Format Specification</a> for "
"more information on the attributes supported with each format.\n"
@@ -324,8 +324,11 @@ bool CLAS_Export::On_Execute(void)
}
- for( int i=0; i<pPoints->Get_Count() && SG_UI_Process_Set_Progress(i, pPoints->Get_Count()); i++ )
+ for( int i=0; i<pPoints->Get_Count(); i++ )
{
+ if (i % 100000 == 0)
+ SG_UI_Process_Set_Progress(i, pPoints->Get_Count());
+
cntRead++;
liblas::LASPoint point;
diff --git a/src/modules/io/io_shapes_las/las_export.h b/src/modules/io/io_shapes_las/las_export.h
index 0837362..1bde8d5 100755
--- a/src/modules/io/io_shapes_las/las_export.h
+++ b/src/modules/io/io_shapes_las/las_export.h
@@ -87,7 +87,7 @@ class CLAS_Export : public CSG_Module
public:
CLAS_Export(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Export") ); }
protected:
diff --git a/src/modules/io/io_shapes_las/las_import.cpp b/src/modules/io/io_shapes_las/las_import.cpp
index 0edde8a..c0a2267 100755
--- a/src/modules/io/io_shapes_las/las_import.cpp
+++ b/src/modules/io/io_shapes_las/las_import.cpp
@@ -285,7 +285,7 @@ bool CLAS_Import::On_Execute(void)
try {
while( reader.ReadNextPoint() )
{
- if (iPoint % 100000)
+ if (iPoint % 100000 == 0)
SG_UI_Process_Set_Progress(iPoint, header.GetPointRecordsCount());
liblas::LASPoint const& point = reader.GetPoint();
diff --git a/src/modules/io/io_shapes_las/las_import.h b/src/modules/io/io_shapes_las/las_import.h
index 922c00c..236e244 100755
--- a/src/modules/io/io_shapes_las/las_import.h
+++ b/src/modules/io/io_shapes_las/las_import.h
@@ -85,7 +85,7 @@ class CLAS_Import : public CSG_Module
public:
CLAS_Import(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_shapes_las/las_info.cpp b/src/modules/io/io_shapes_las/las_info.cpp
index bdcd336..184f71e 100755
--- a/src/modules/io/io_shapes_las/las_info.cpp
+++ b/src/modules/io/io_shapes_las/las_info.cpp
@@ -504,7 +504,8 @@ bool CLAS_Info::Summarize_Points(liblas::LASReader *pReader, LASPointSummary *pS
//-----------------------------------------------------
while( bValid )
{
- SG_UI_Process_Set_Progress(i, headerPts);
+ if (i % 100000 == 0)
+ SG_UI_Process_Set_Progress(i, headerPts);
pSummary->x = p.GetX();
if( pSummary->x < pSummary->pmin.GetX() ) pSummary->pmin.SetX(pSummary->x);
diff --git a/src/modules/io/io_shapes_las/las_info.h b/src/modules/io/io_shapes_las/las_info.h
index 4a4dbc1..04678fb 100755
--- a/src/modules/io/io_shapes_las/las_info.h
+++ b/src/modules/io/io_shapes_las/las_info.h
@@ -161,7 +161,7 @@ class CLAS_Info : public CSG_Module
public:
CLAS_Info(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_table/Makefile.am b/src/modules/io/io_table/Makefile.am
index d9b7c69..cad3e56 100755
--- a/src/modules/io/io_table/Makefile.am
+++ b/src/modules/io/io_table/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_table.la
libio_table_la_SOURCES =\
diff --git a/src/modules/io/io_table/Makefile.in b/src/modules/io/io_table/Makefile.in
index 79e2fc8..e0bde96 100644
--- a/src/modules/io/io_table/Makefile.in
+++ b/src/modules/io/io_table/Makefile.in
@@ -364,10 +364,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libio_table.la
libio_table_la_SOURCES = \
diff --git a/src/modules/io/io_table/io_table_txt.h b/src/modules/io/io_table/io_table_txt.h
index c7ed610..2e33607 100755
--- a/src/modules/io/io_table/io_table_txt.h
+++ b/src/modules/io/io_table/io_table_txt.h
@@ -87,7 +87,7 @@ class CTable_Text_Export : public CSG_Module
public:
CTable_Text_Export(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Export") ); }
protected:
@@ -107,7 +107,7 @@ class CTable_Text_Import : public CSG_Module
public:
CTable_Text_Import(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
@@ -129,7 +129,7 @@ class CTable_Text_Import_Numbers : public CSG_Module
public:
CTable_Text_Import_Numbers(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
@@ -151,7 +151,7 @@ class CTable_Text_Import_Fixed_Cols : public CSG_Module
public:
CTable_Text_Import_Fixed_Cols(void);
- virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); }
+ virtual CSG_String Get_MenuPath(void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/io/io_virtual/Makefile.am b/src/modules/io/io_virtual/Makefile.am
index e59a56a..4d1c9a6 100755
--- a/src/modules/io/io_virtual/Makefile.am
+++ b/src/modules/io/io_virtual/Makefile.am
@@ -1,20 +1,16 @@
#
-# $Id: Makefile.am 2359 2014-12-27 12:46:46Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-UC_DEFS = -D_SAGA_UNICODE
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LFLG)
pkglib_LTLIBRARIES = libio_virtual.la
libio_virtual_la_SOURCES =\
diff --git a/src/modules/io/io_virtual/Makefile.in b/src/modules/io/io_virtual/Makefile.in
index a1b2438..893735b 100644
--- a/src/modules/io/io_virtual/Makefile.in
+++ b/src/modules/io/io_virtual/Makefile.in
@@ -364,17 +364,14 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2359 2014-12-27 12:46:46Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LFLG)
pkglib_LTLIBRARIES = libio_virtual.la
libio_virtual_la_SOURCES = \
diff --git a/src/modules/io/io_virtual/pc_create_spcvf.h b/src/modules/io/io_virtual/pc_create_spcvf.h
index 69e3e4d..ad272a9 100755
--- a/src/modules/io/io_virtual/pc_create_spcvf.h
+++ b/src/modules/io/io_virtual/pc_create_spcvf.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_create_spcvf.h 1976 2014-02-09 15:05:12Z reklov_w $
+ * Version $Id: pc_create_spcvf.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ class CPointCloud_Create_SPCVF : public CSG_Module
public:
CPointCloud_Create_SPCVF(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
diff --git a/src/modules/io/io_virtual/pc_get_grid_spcvf.h b/src/modules/io/io_virtual/pc_get_grid_spcvf.h
index 329ad8d..d7b9527 100755
--- a/src/modules/io/io_virtual/pc_get_grid_spcvf.h
+++ b/src/modules/io/io_virtual/pc_get_grid_spcvf.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_get_grid_spcvf.h 2385 2015-02-01 15:19:57Z reklov_w $
+ * Version $Id: pc_get_grid_spcvf.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -126,7 +126,7 @@ class CPointCloud_Get_Grid_SPCVF : public CSG_Module
public:
CPointCloud_Get_Grid_SPCVF(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
@@ -149,7 +149,7 @@ class CPointCloud_Get_Grid_SPCVF_Interactive : public CSG_Module_Interactive
public:
CPointCloud_Get_Grid_SPCVF_Interactive(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
diff --git a/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp b/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp
index ec7849f..f5b3a4a 100755
--- a/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp
+++ b/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_get_subset_spcvf.cpp 2739 2015-12-17 13:24:37Z reklov_w $
+ * Version $Id: pc_get_subset_spcvf.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -584,7 +584,7 @@ CPointCloud_Get_Subset_SPCVF::CPointCloud_Get_Subset_SPCVF(void)
Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
Set_Description (_TW(
- "The module allows to retrieve a point cloud from a virtual "
+ "The module allows one to retrieve a point cloud from a virtual "
"point cloud dataset by applying the provided area-of-interest "
"(AOI). The extent of the AOI can be provided either as polygon "
"shapefile, grid or by coordinates. Optionally, an overlap can "
@@ -892,7 +892,7 @@ CPointCloud_Get_Subset_SPCVF_Interactive::CPointCloud_Get_Subset_SPCVF_Interacti
Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
Set_Description (_TW(
- "The module allows to retrieve a point cloud from a virtual "
+ "The module allows one to retrieve a point cloud from a virtual "
"point cloud dataset by dragging a box (AOI) in a Map View.\n"
"Optionally, the query can be constrained by providing an "
"attribute field and a value range that must be met.\n"
diff --git a/src/modules/io/io_virtual/pc_get_subset_spcvf.h b/src/modules/io/io_virtual/pc_get_subset_spcvf.h
index dcd99d2..4469f5e 100755
--- a/src/modules/io/io_virtual/pc_get_subset_spcvf.h
+++ b/src/modules/io/io_virtual/pc_get_subset_spcvf.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_get_subset_spcvf.h 2384 2015-02-01 15:18:44Z reklov_w $
+ * Version $Id: pc_get_subset_spcvf.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -128,7 +128,7 @@ class CPointCloud_Get_Subset_SPCVF : public CSG_Module
public:
CPointCloud_Get_Subset_SPCVF(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
@@ -151,7 +151,7 @@ class CPointCloud_Get_Subset_SPCVF_Interactive : public CSG_Module_Interactive
public:
CPointCloud_Get_Subset_SPCVF_Interactive(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
diff --git a/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp b/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp
index 57ab761..936e9a8 100755
--- a/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp
+++ b/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_remove_overlap_from_spcvf.cpp 2359 2014-12-27 12:46:46Z reklov_w $
+ * Version $Id: pc_remove_overlap_from_spcvf.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -79,11 +79,11 @@ CPointCloud_Remove_Overlap_From_SPCVF::CPointCloud_Remove_Overlap_From_SPCVF(voi
Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
Set_Description (_TW(
- "The module allows to remove the overlap from point cloud "
+ "The module allows one to remove the overlap from point cloud "
"tiles created from a virtual point cloud dataset. The "
"tiles must have been created with an overlap and a spcvf "
"tile info file must have been outputted too. The latter "
- "decribes the original bounding boxes of the tiles (i.e. "
+ "describes the original bounding boxes of the tiles (i.e. "
"without overlap) and is used by this module to remove "
"the overlap.\n"
"A virtual point cloud dataset is a simple XML format "
diff --git a/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.h b/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.h
index f8840dd..107a653 100755
--- a/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.h
+++ b/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_remove_overlap_from_spcvf.h 2359 2014-12-27 12:46:46Z reklov_w $
+ * Version $Id: pc_remove_overlap_from_spcvf.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ class CPointCloud_Remove_Overlap_From_SPCVF : public CSG_Module
public:
CPointCloud_Remove_Overlap_From_SPCVF(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
diff --git a/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp b/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp
index 60273b0..468a325 100755
--- a/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp
+++ b/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_tileshape_from_spcvf.cpp 2390 2015-02-02 15:11:13Z reklov_w $
+ * Version $Id: pc_tileshape_from_spcvf.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -79,7 +79,7 @@ CPointCloud_Create_Tileshape_From_SPCVF::CPointCloud_Create_Tileshape_From_SPCVF
Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
Set_Description (_TW(
- "The module allows to create a polygon shapefile with the "
+ "The module allows one to create a polygon shapefile with the "
"bounding boxes of a virtual point cloud dataset. Additionally, "
"the header information of the chosen virtual point cloud "
"dataset is reported (since SPCVFDataset version 1.1).\n"
diff --git a/src/modules/io/io_virtual/pc_tileshape_from_spcvf.h b/src/modules/io/io_virtual/pc_tileshape_from_spcvf.h
index 203dbb3..38ecbe3 100755
--- a/src/modules/io/io_virtual/pc_tileshape_from_spcvf.h
+++ b/src/modules/io/io_virtual/pc_tileshape_from_spcvf.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_tileshape_from_spcvf.h 2012 2014-02-24 13:55:07Z reklov_w $
+ * Version $Id: pc_tileshape_from_spcvf.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ class CPointCloud_Create_Tileshape_From_SPCVF : public CSG_Module
public:
CPointCloud_Create_Tileshape_From_SPCVF(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Point Cloud") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Point Cloud") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/Makefile.am b/src/modules/pointcloud/pointcloud_tools/Makefile.am
index 457e925..d5a879c 100755
--- a/src/modules/pointcloud/pointcloud_tools/Makefile.am
+++ b/src/modules/pointcloud/pointcloud_tools/Makefile.am
@@ -1,17 +1,13 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-UC_DEFS = -D_SAGA_UNICODE
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LFLG)
pkglib_LTLIBRARIES = libpointcloud_tools.la
libpointcloud_tools_la_SOURCES =\
diff --git a/src/modules/pointcloud/pointcloud_tools/Makefile.in b/src/modules/pointcloud/pointcloud_tools/Makefile.in
index 5f16d56..809356d 100644
--- a/src/modules/pointcloud/pointcloud_tools/Makefile.in
+++ b/src/modules/pointcloud/pointcloud_tools/Makefile.in
@@ -365,14 +365,11 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LFLG)
pkglib_LTLIBRARIES = libpointcloud_tools.la
libpointcloud_tools_la_SOURCES = \
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_attribute_calculator.h b/src/modules/pointcloud/pointcloud_tools/pc_attribute_calculator.h
index ed15272..33a3d0c 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_attribute_calculator.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_attribute_calculator.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_attribute_calculator.h 2627 2015-10-01 09:29:25Z reklov_w $
+ * Version $Id: pc_attribute_calculator.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ public:
CPC_Attribute_Calculator(void);
virtual ~CPC_Attribute_Calculator(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_cluster_analysis.h b/src/modules/pointcloud/pointcloud_tools/pc_cluster_analysis.h
index af50c43..e1338ef 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_cluster_analysis.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_cluster_analysis.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_cluster_analysis.h 2295 2014-10-17 15:35:10Z reklov_w $
+ * Version $Id: pc_cluster_analysis.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -86,7 +86,7 @@ class CPC_Cluster_Analysis : public CSG_Module
public:
CPC_Cluster_Analysis(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Classification") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Classification") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_cut.h b/src/modules/pointcloud/pointcloud_tools/pc_cut.h
index 447477e..4d58b02 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_cut.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_cut.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_cut.h 2427 2015-02-26 16:24:53Z reklov_w $
+ * Version $Id: pc_cut.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CPC_Cut : public CSG_Module
public:
CPC_Cut(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
static bool Get_Cut (CSG_Parameter_PointCloud_List *pPointsList, CSG_Parameter_PointCloud_List *pCutList, const CSG_Rect &Extent, bool bInverse);
static bool Get_Cut (CSG_Parameter_PointCloud_List *pPointsList, CSG_Parameter_PointCloud_List *pCutList, CSG_Shapes *pPolygons, bool bInverse);
@@ -108,7 +108,7 @@ class CPC_Cut_Interactive : public CSG_Module_Interactive
public:
CPC_Cut_Interactive(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_drop_attribute.h b/src/modules/pointcloud/pointcloud_tools/pc_drop_attribute.h
index 7d2fb9b..f0068bd 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_drop_attribute.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_drop_attribute.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_drop_attribute.h 2626 2015-10-01 09:06:32Z reklov_w $
+ * Version $Id: pc_drop_attribute.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -86,7 +86,7 @@ class CPC_Drop_Attribute : public CSG_Module
public:
CPC_Drop_Attribute(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_from_grid.h b/src/modules/pointcloud/pointcloud_tools/pc_from_grid.h
index 5b41e8d..9d47d05 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_from_grid.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_from_grid.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_from_grid.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: pc_from_grid.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CPC_From_Grid : public CSG_Module_Grid
public:
CPC_From_Grid(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_from_shapes.h b/src/modules/pointcloud/pointcloud_tools/pc_from_shapes.h
index 98ebb3b..c97777d 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_from_shapes.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_from_shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_from_shapes.h 2570 2015-09-03 10:16:20Z reklov_w $
+ * Version $Id: pc_from_shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CPC_From_Shapes : public CSG_Module
public:
CPC_From_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_from_table.h b/src/modules/pointcloud/pointcloud_tools/pc_from_table.h
index 387ccdb..2f2157c 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_from_table.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_from_table.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_from_table.h 2570 2015-09-03 10:16:20Z reklov_w $
+ * Version $Id: pc_from_table.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ class CPC_From_Table : public CSG_Module
public:
CPC_From_Table(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_merge.h b/src/modules/pointcloud/pointcloud_tools/pc_merge.h
index 49aebbd..b631c58 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_merge.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_merge.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_merge.h 2608 2015-09-27 12:54:38Z reklov_w $
+ * Version $Id: pc_merge.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CPC_Merge(void);
virtual ~CPC_Merge(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.h b/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.h
index ef6a2a9..41ab7cd 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_reclass_extract.h 2561 2015-08-27 08:10:41Z reklov_w $
+ * Version $Id: pc_reclass_extract.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ public:
CPC_Reclass_Extract(void);
virtual ~CPC_Reclass_Extract(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_thinning_simple.h b/src/modules/pointcloud/pointcloud_tools/pc_thinning_simple.h
index 1964ba6..b26216e 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_thinning_simple.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_thinning_simple.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_thinning_simple.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: pc_thinning_simple.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ public:
CPC_Thinning_Simple(void);
virtual ~CPC_Thinning_Simple(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_to_grid.h b/src/modules/pointcloud/pointcloud_tools/pc_to_grid.h
index 7cb2c65..8e323fc 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_to_grid.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_to_grid.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_to_grid.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: pc_to_grid.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CPC_To_Grid : public CSG_Module
public:
CPC_To_Grid(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_to_shapes.h b/src/modules/pointcloud/pointcloud_tools/pc_to_shapes.h
index cefb1db..e1fbadf 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_to_shapes.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_to_shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_to_shapes.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: pc_to_shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CPC_To_Shapes : public CSG_Module
public:
CPC_To_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_tools/pc_transform.h b/src/modules/pointcloud/pointcloud_tools/pc_transform.h
index 13bd2e5..8cdb179 100755
--- a/src/modules/pointcloud/pointcloud_tools/pc_transform.h
+++ b/src/modules/pointcloud/pointcloud_tools/pc_transform.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: pc_transform.h 1922 2014-01-09 10:28:46Z oconrad $
+ * Version $Id: pc_transform.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ public:
CPC_Transform(void);
virtual ~CPC_Transform(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/pointcloud/pointcloud_viewer/Makefile.am b/src/modules/pointcloud/pointcloud_viewer/Makefile.am
index cbac081..d852975 100755
--- a/src/modules/pointcloud/pointcloud_viewer/Makefile.am
+++ b/src/modules/pointcloud/pointcloud_viewer/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/pointcloud/pointcloud_viewer/Makefile.in b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
index a828dd5..ddb0024 100644
--- a/src/modules/pointcloud/pointcloud_viewer/Makefile.in
+++ b/src/modules/pointcloud/pointcloud_viewer/Makefile.in
@@ -364,11 +364,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/projection/pj_georeference/Makefile.am b/src/modules/projection/pj_georeference/Makefile.am
index ee43fb0..1f0959c 100755
--- a/src/modules/projection/pj_georeference/Makefile.am
+++ b/src/modules/projection/pj_georeference/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libpj_georeference.la
libpj_georeference_la_SOURCES =\
diff --git a/src/modules/projection/pj_georeference/Makefile.in b/src/modules/projection/pj_georeference/Makefile.in
index 284fbcb..c996f6b 100644
--- a/src/modules/projection/pj_georeference/Makefile.in
+++ b/src/modules/projection/pj_georeference/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1843 2013-09-18 10:49:15Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@DEP_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libpj_georeference.la
libpj_georeference_la_SOURCES = \
diff --git a/src/modules/projection/pj_georeference/direct_georeferencing.cpp b/src/modules/projection/pj_georeference/direct_georeferencing.cpp
index 9c1ebba..d79962b 100755
--- a/src/modules/projection/pj_georeference/direct_georeferencing.cpp
+++ b/src/modules/projection/pj_georeference/direct_georeferencing.cpp
@@ -378,13 +378,17 @@ CDirect_Georeferencing::CDirect_Georeferencing(void)
//---------------------------------------------------------
int CDirect_Georeferencing::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CDirect_Georeferencing::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -448,7 +452,7 @@ bool CDirect_Georeferencing::On_Execute(void)
CSG_Grid_System System(Cellsize, r);
- m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), r, Get_NX());
+ m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), System);
if( !Dlg_Parameters("TARGET") )
{
diff --git a/src/modules/projection/pj_proj4/Makefile.am b/src/modules/projection/pj_proj4/Makefile.am
index f5cb3b6..13c40ac 100755
--- a/src/modules/projection/pj_proj4/Makefile.am
+++ b/src/modules/projection/pj_proj4/Makefile.am
@@ -1,16 +1,14 @@
#
-# $Id: Makefile.am 2462 2015-03-27 16:29:25Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
DEP_LIBS = -lproj
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS) $(LOCAL_LIBS)
pkglib_LTLIBRARIES = libpj_proj4.la
libpj_proj4_la_SOURCES =\
diff --git a/src/modules/projection/pj_proj4/Makefile.in b/src/modules/projection/pj_proj4/Makefile.in
index ddf123a..705f767 100644
--- a/src/modules/projection/pj_proj4/Makefile.in
+++ b/src/modules/projection/pj_proj4/Makefile.in
@@ -366,14 +366,13 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2462 2015-03-27 16:29:25Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
DEP_LIBS = -lproj
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@DEP_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS) $(LOCAL_LIBS)
pkglib_LTLIBRARIES = libpj_proj4.la
libpj_proj4_la_SOURCES = \
diff --git a/src/modules/projection/pj_proj4/PROJ4_Grid.h b/src/modules/projection/pj_proj4/PROJ4_Grid.h
index 6bc2a31..d42d54d 100755
--- a/src/modules/projection/pj_proj4/PROJ4_Grid.h
+++ b/src/modules/projection/pj_proj4/PROJ4_Grid.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: PROJ4_Grid.h 2752 2016-01-15 15:26:55Z oconrad $
+ * Version $Id: PROJ4_Grid.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ class pj_proj4_EXPORT CPROJ4_Grid : public CPROJ4_Base
public:
CPROJ4_Grid(int Interface, bool bInputList);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Alternatives") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Alternatives") ); }
protected:
diff --git a/src/modules/projection/pj_proj4/PROJ4_Shapes.h b/src/modules/projection/pj_proj4/PROJ4_Shapes.h
index 3e315d5..2fb31fc 100755
--- a/src/modules/projection/pj_proj4/PROJ4_Shapes.h
+++ b/src/modules/projection/pj_proj4/PROJ4_Shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: PROJ4_Shapes.h 2148 2014-06-10 12:59:52Z reklov_w $
+ * Version $Id: PROJ4_Shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ class pj_proj4_EXPORT CPROJ4_Shapes : public CPROJ4_Base
public:
CPROJ4_Shapes(int Interface, bool bInputList);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Alternatives") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Alternatives") ); }
protected:
diff --git a/src/modules/projection/pj_proj4/crs_base.cpp b/src/modules/projection/pj_proj4/crs_base.cpp
index 2d8ad68..17d7224 100755
--- a/src/modules/projection/pj_proj4/crs_base.cpp
+++ b/src/modules/projection/pj_proj4/crs_base.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: crs_base.cpp 2469 2015-04-17 13:02:24Z reklov_w $
+ * Version $Id: crs_base.cpp 2862 2016-03-24 14:59:41Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -208,7 +208,12 @@ int CCRS_Base::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *
CSG_Projection Projection;
//-----------------------------------------------------
- if( pParameters->Get_Parameter("CRS_PROJ4") )
+// if( pParameters->Get_Parameter("CRS_PROJ4") )
+// {
+// Projection.Create(pParameters->Get_Parameter("CRS_PROJ4")->asString(), SG_PROJ_FMT_Proj4);
+// }
+
+ if( !SG_STR_CMP(pParameter->Get_Identifier(), "CRS_PROJ4") )
{
Projection.Create(pParameter->asString(), SG_PROJ_FMT_Proj4);
}
diff --git a/src/modules/projection/pj_proj4/crs_base.h b/src/modules/projection/pj_proj4/crs_base.h
index fd1340b..b1b5295 100755
--- a/src/modules/projection/pj_proj4/crs_base.h
+++ b/src/modules/projection/pj_proj4/crs_base.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: crs_base.h 2148 2014-06-10 12:59:52Z reklov_w $
+ * Version $Id: crs_base.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -115,7 +115,7 @@ class pj_proj4_EXPORT CCRS_Picker : public CCRS_Base
public:
CCRS_Picker(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/projection/pj_proj4/crs_distance.h b/src/modules/projection/pj_proj4/crs_distance.h
index 253ddfa..f8e7eb0 100755
--- a/src/modules/projection/pj_proj4/crs_distance.h
+++ b/src/modules/projection/pj_proj4/crs_distance.h
@@ -110,7 +110,7 @@ class CCRS_Distance_Lines : public CSG_Module
public:
CCRS_Distance_Lines(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -130,7 +130,7 @@ class CCRS_Distance_Points : public CCRS_Base
public:
CCRS_Distance_Points(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
@@ -150,7 +150,7 @@ class CCRS_Distance_Interactive : public CSG_Module_Interactive
public:
CCRS_Distance_Interactive(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/projection/pj_proj4/crs_grid_geogcoords.h b/src/modules/projection/pj_proj4/crs_grid_geogcoords.h
index d5c8f6b..897d16a 100755
--- a/src/modules/projection/pj_proj4/crs_grid_geogcoords.h
+++ b/src/modules/projection/pj_proj4/crs_grid_geogcoords.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: crs_grid_geogcoords.h 2148 2014-06-10 12:59:52Z reklov_w $
+ * Version $Id: crs_grid_geogcoords.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CCRS_Grid_GeogCoords : public CSG_Module_Grid
public:
CCRS_Grid_GeogCoords(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/projection/pj_proj4/crs_indicatrix.h b/src/modules/projection/pj_proj4/crs_indicatrix.h
index ff8fd99..920f8a0 100755
--- a/src/modules/projection/pj_proj4/crs_indicatrix.h
+++ b/src/modules/projection/pj_proj4/crs_indicatrix.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: crs_indicatrix.h 2148 2014-06-10 12:59:52Z reklov_w $
+ * Version $Id: crs_indicatrix.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CCRS_Indicatrix : public CCRS_Transform
public:
CCRS_Indicatrix(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
diff --git a/src/modules/projection/pj_proj4/gcs_graticule.h b/src/modules/projection/pj_proj4/gcs_graticule.h
index c1b4efb..7521171 100755
--- a/src/modules/projection/pj_proj4/gcs_graticule.h
+++ b/src/modules/projection/pj_proj4/gcs_graticule.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: gcs_graticule.h 2148 2014-06-10 12:59:52Z reklov_w $
+ * Version $Id: gcs_graticule.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CGCS_Graticule : public CCRS_Base
public:
CGCS_Graticule(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/projection/pj_proj4/gcs_lon_range.h b/src/modules/projection/pj_proj4/gcs_lon_range.h
index a0792ea..ec524d8 100755
--- a/src/modules/projection/pj_proj4/gcs_lon_range.h
+++ b/src/modules/projection/pj_proj4/gcs_lon_range.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: gcs_lon_range.h 2148 2014-06-10 12:59:52Z reklov_w $
+ * Version $Id: gcs_lon_range.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CGCS_Grid_Longitude_Range : public CSG_Module_Grid
public:
CGCS_Grid_Longitude_Range(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Tools") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Tools") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_Classes_To_Shapes.h b/src/modules/shapes/shapes_grid/Grid_Classes_To_Shapes.h
index 78d712d..6afc4be 100755
--- a/src/modules/shapes/shapes_grid/Grid_Classes_To_Shapes.h
+++ b/src/modules/shapes/shapes_grid/Grid_Classes_To_Shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Classes_To_Shapes.h 2159 2014-06-12 16:07:02Z oconrad $
+ * Version $Id: Grid_Classes_To_Shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ class CGrid_Classes_To_Shapes : public CSG_Module_Grid
public:
CGrid_Classes_To_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Vectorization") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Vectorization") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_Polygon_Clip.h b/src/modules/shapes/shapes_grid/Grid_Polygon_Clip.h
index 3ef2c9e..c2184b4 100755
--- a/src/modules/shapes/shapes_grid/Grid_Polygon_Clip.h
+++ b/src/modules/shapes/shapes_grid/Grid_Polygon_Clip.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Polygon_Clip.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_Polygon_Clip.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ public:
// constructor
CGrid_Polygon_Clip(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Spatial Extent") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Spatial Extent") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_Statistics_AddTo_Polygon.h b/src/modules/shapes/shapes_grid/Grid_Statistics_AddTo_Polygon.h
index 19370e4..c9d93c4 100755
--- a/src/modules/shapes/shapes_grid/Grid_Statistics_AddTo_Polygon.h
+++ b/src/modules/shapes/shapes_grid/Grid_Statistics_AddTo_Polygon.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Statistics_AddTo_Polygon.h 2803 2016-02-19 16:34:27Z oconrad $
+ * Version $Id: Grid_Statistics_AddTo_Polygon.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class CGrid_Statistics_AddTo_Polygon : public CSG_Module_Grid
public:
CGrid_Statistics_AddTo_Polygon(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Values") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Values") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_Statistics_For_Points.h b/src/modules/shapes/shapes_grid/Grid_Statistics_For_Points.h
index 80482d5..026db4b 100755
--- a/src/modules/shapes/shapes_grid/Grid_Statistics_For_Points.h
+++ b/src/modules/shapes/shapes_grid/Grid_Statistics_For_Points.h
@@ -85,7 +85,7 @@ class CGrid_Statistics_For_Points : public CSG_Module_Grid
public:
CGrid_Statistics_For_Points(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Values") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Values") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_To_Contour.h b/src/modules/shapes/shapes_grid/Grid_To_Contour.h
index 334d31e..9e9c1f0 100755
--- a/src/modules/shapes/shapes_grid/Grid_To_Contour.h
+++ b/src/modules/shapes/shapes_grid/Grid_To_Contour.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_To_Contour.h 2483 2015-04-30 15:36:20Z oconrad $
+ * Version $Id: Grid_To_Contour.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ class CGrid_To_Contour : public CSG_Module
public:
CGrid_To_Contour(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Vectorization") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Vectorization") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_To_Gradient.h b/src/modules/shapes/shapes_grid/Grid_To_Gradient.h
index ff7878f..0ff46f0 100755
--- a/src/modules/shapes/shapes_grid/Grid_To_Gradient.h
+++ b/src/modules/shapes/shapes_grid/Grid_To_Gradient.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_To_Gradient.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_To_Gradient.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ class CGrid_To_Gradient : public CSG_Module_Grid
public:
CGrid_To_Gradient(int Method);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Vectorization") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Vectorization") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_To_Points.h b/src/modules/shapes/shapes_grid/Grid_To_Points.h
index 340559e..cab80ec 100755
--- a/src/modules/shapes/shapes_grid/Grid_To_Points.h
+++ b/src/modules/shapes/shapes_grid/Grid_To_Points.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_To_Points.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_To_Points.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ public:
CGrid_To_Points(void);
virtual ~CGrid_To_Points(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Vectorization") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Vectorization") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_To_Points_Random.h b/src/modules/shapes/shapes_grid/Grid_To_Points_Random.h
index 56616b0..ee70ff3 100755
--- a/src/modules/shapes/shapes_grid/Grid_To_Points_Random.h
+++ b/src/modules/shapes/shapes_grid/Grid_To_Points_Random.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_To_Points_Random.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_To_Points_Random.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CGrid_To_Points_Random(void);
virtual ~CGrid_To_Points_Random(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Vectorization") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Vectorization") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Points.h b/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Points.h
index 0e27640..219ff78 100755
--- a/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Points.h
+++ b/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Points.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Values_AddTo_Points.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Grid_Values_AddTo_Points.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ class CGrid_Values_AddTo_Points : public CSG_Module
public:
CGrid_Values_AddTo_Points(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Values") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Values") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Shapes.h b/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Shapes.h
index 986119a..fa647f9 100755
--- a/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Shapes.h
+++ b/src/modules/shapes/shapes_grid/Grid_Values_AddTo_Shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Grid_Values_AddTo_Shapes.h 2752 2016-01-15 15:26:55Z oconrad $
+ * Version $Id: Grid_Values_AddTo_Shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ class CGrid_Values_AddTo_Shapes : public CSG_Module
public:
CGrid_Values_AddTo_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Values") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Values") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/Makefile.am b/src/modules/shapes/shapes_grid/Makefile.am
index a1d15bd..be1c65b 100755
--- a/src/modules/shapes/shapes_grid/Makefile.am
+++ b/src/modules/shapes/shapes_grid/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2443 2015-03-18 19:52:26Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_grid.la
libshapes_grid_la_SOURCES =\
diff --git a/src/modules/shapes/shapes_grid/Makefile.in b/src/modules/shapes/shapes_grid/Makefile.in
index ce294bc..11b1d06 100644
--- a/src/modules/shapes/shapes_grid/Makefile.in
+++ b/src/modules/shapes/shapes_grid/Makefile.in
@@ -367,13 +367,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2443 2015-03-18 19:52:26Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_grid.la
libshapes_grid_la_SOURCES = \
diff --git a/src/modules/shapes/shapes_grid/grid_extent.h b/src/modules/shapes/shapes_grid/grid_extent.h
index 2f33ebb..f312d33 100755
--- a/src/modules/shapes/shapes_grid/grid_extent.h
+++ b/src/modules/shapes/shapes_grid/grid_extent.h
@@ -85,7 +85,7 @@ class CGrid_Extent : public CSG_Module_Grid
public:
CGrid_Extent(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Spatial Extent") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Spatial Extent") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/grid_local_extremes_to_points.h b/src/modules/shapes/shapes_grid/grid_local_extremes_to_points.h
index e80dade..78aedee 100755
--- a/src/modules/shapes/shapes_grid/grid_local_extremes_to_points.h
+++ b/src/modules/shapes/shapes_grid/grid_local_extremes_to_points.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: grid_local_extremes_to_points.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: grid_local_extremes_to_points.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ class CGrid_Local_Extremes_to_Points : public CSG_Module_Grid
public:
CGrid_Local_Extremes_to_Points(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Values") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Grid Values") ); }
protected:
diff --git a/src/modules/shapes/shapes_grid/grid_rectangle_clip.h b/src/modules/shapes/shapes_grid/grid_rectangle_clip.h
index c0745ff..56e7955 100755
--- a/src/modules/shapes/shapes_grid/grid_rectangle_clip.h
+++ b/src/modules/shapes/shapes_grid/grid_rectangle_clip.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: grid_rectangle_clip.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: grid_rectangle_clip.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -86,7 +86,7 @@ class CGrid_Rectangle_Clip : public CSG_Module
public:
CGrid_Rectangle_Clip(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Spatial Extent") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Spatial Extent") ); }
protected:
diff --git a/src/modules/shapes/shapes_lines/Makefile.am b/src/modules/shapes/shapes_lines/Makefile.am
index dc5d02c..06f030f 100755
--- a/src/modules/shapes/shapes_lines/Makefile.am
+++ b/src/modules/shapes/shapes_lines/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_lines.la
libshapes_lines_la_SOURCES =\
diff --git a/src/modules/shapes/shapes_lines/Makefile.in b/src/modules/shapes/shapes_lines/Makefile.in
index 0508545..101ef84 100644
--- a/src/modules/shapes/shapes_lines/Makefile.in
+++ b/src/modules/shapes/shapes_lines/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 911 2011-02-14 16:38:15Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_lines.la
libshapes_lines_la_SOURCES = \
diff --git a/src/modules/shapes/shapes_lines/line_split_with_lines.cpp b/src/modules/shapes/shapes_lines/line_split_with_lines.cpp
index da8da51..7b7e53b 100755
--- a/src/modules/shapes/shapes_lines/line_split_with_lines.cpp
+++ b/src/modules/shapes/shapes_lines/line_split_with_lines.cpp
@@ -134,7 +134,7 @@ bool CLine_Split_with_Lines::On_Execute(void)
//--------------------------------------------------------
pIntersect->Create(SHAPE_TYPE_Line,
- CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Splitted"), pSplit->Get_Name()),
+ CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Split"), pSplit->Get_Name()),
pLines
);
@@ -304,7 +304,7 @@ bool CLine_Split_at_Points::On_Execute(void)
//--------------------------------------------------------
pIntersect->Create(SHAPE_TYPE_Line,
- CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Splitted"), pSplit->Get_Name()),
+ CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Split"), pSplit->Get_Name()),
pLines
);
diff --git a/src/modules/shapes/shapes_points/Makefile.am b/src/modules/shapes/shapes_points/Makefile.am
index cd16643..39290f2 100755
--- a/src/modules/shapes/shapes_points/Makefile.am
+++ b/src/modules/shapes/shapes_points/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 1568 2012-12-14 13:00:29Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_points.la
libshapes_points_la_SOURCES =\
diff --git a/src/modules/shapes/shapes_points/Makefile.in b/src/modules/shapes/shapes_points/Makefile.in
index f260e6f..582a5e5 100644
--- a/src/modules/shapes/shapes_points/Makefile.in
+++ b/src/modules/shapes/shapes_points/Makefile.in
@@ -368,13 +368,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 1568 2012-12-14 13:00:29Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_points.la
libshapes_points_la_SOURCES = \
diff --git a/src/modules/shapes/shapes_points/gps_track_aggregation.h b/src/modules/shapes/shapes_points/gps_track_aggregation.h
index cec1940..0c40b50 100755
--- a/src/modules/shapes/shapes_points/gps_track_aggregation.h
+++ b/src/modules/shapes/shapes_points/gps_track_aggregation.h
@@ -85,7 +85,7 @@ class CGPS_Track_Aggregation : public CSG_Module
public:
CGPS_Track_Aggregation(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/shapes/shapes_polygons/Makefile.am b/src/modules/shapes/shapes_polygons/Makefile.am
index c357582..87df6db 100755
--- a/src/modules/shapes/shapes_polygons/Makefile.am
+++ b/src/modules/shapes/shapes_polygons/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2192 2014-08-13 16:58:22Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_polygons.la
libshapes_polygons_la_SOURCES =\
diff --git a/src/modules/shapes/shapes_polygons/Makefile.in b/src/modules/shapes/shapes_polygons/Makefile.in
index 5a8fbf6..034491a 100644
--- a/src/modules/shapes/shapes_polygons/Makefile.in
+++ b/src/modules/shapes/shapes_polygons/Makefile.in
@@ -368,13 +368,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2192 2014-08-13 16:58:22Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_polygons.la
libshapes_polygons_la_SOURCES = \
diff --git a/src/modules/shapes/shapes_polygons/Polygon_Intersection.h b/src/modules/shapes/shapes_polygons/Polygon_Intersection.h
index da8578b..312325e 100755
--- a/src/modules/shapes/shapes_polygons/Polygon_Intersection.h
+++ b/src/modules/shapes/shapes_polygons/Polygon_Intersection.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: Polygon_Intersection.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: Polygon_Intersection.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ class CPolygon_Overlay : public CSG_Module
public:
CPolygon_Overlay(const CSG_String &Name);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Overlay") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Overlay") ); }
protected:
diff --git a/src/modules/shapes/shapes_polygons/polygon_shared_edges.h b/src/modules/shapes/shapes_polygons/polygon_shared_edges.h
index 83494fc..e9275fb 100755
--- a/src/modules/shapes/shapes_polygons/polygon_shared_edges.h
+++ b/src/modules/shapes/shapes_polygons/polygon_shared_edges.h
@@ -86,7 +86,7 @@ public: ////// public members and functions: //////////////
CPolygon_Shared_Edges(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Landsat") ); }
protected: /// protected members and functions: ///////////
@@ -123,7 +123,7 @@ public: ////// public members and functions: //////////////
CPolygon_Vertex_Check(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Landsat") ); }
protected: /// protected members and functions: ///////////
diff --git a/src/modules/shapes/shapes_tools/Makefile.am b/src/modules/shapes/shapes_tools/Makefile.am
index 0336fc2..4e4bc3c 100755
--- a/src/modules/shapes/shapes_tools/Makefile.am
+++ b/src/modules/shapes/shapes_tools/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2417 2015-02-19 15:14:52Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_tools.la
libshapes_tools_la_SOURCES =\
diff --git a/src/modules/shapes/shapes_tools/Makefile.in b/src/modules/shapes/shapes_tools/Makefile.in
index 3b2add7..e1c60d8 100644
--- a/src/modules/shapes/shapes_tools/Makefile.in
+++ b/src/modules/shapes/shapes_tools/Makefile.in
@@ -370,13 +370,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2417 2015-02-19 15:14:52Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libshapes_tools.la
libshapes_tools_la_SOURCES = \
diff --git a/src/modules/shapes/shapes_transect/Makefile.am b/src/modules/shapes/shapes_transect/Makefile.am
index 0aac4c3..2521a9f 100755
--- a/src/modules/shapes/shapes_transect/Makefile.am
+++ b/src/modules/shapes/shapes_transect/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 1789 2013-08-20 08:28:18Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version -avoid-version
pkglib_LTLIBRARIES = libshapes_transect.la
libshapes_transect_la_SOURCES =\
diff --git a/src/modules/shapes/shapes_transect/Makefile.in b/src/modules/shapes/shapes_transect/Makefile.in
index 153e6f4..5d5c378 100644
--- a/src/modules/shapes/shapes_transect/Makefile.in
+++ b/src/modules/shapes/shapes_transect/Makefile.in
@@ -362,13 +362,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 1789 2013-08-20 08:28:18Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version -avoid-version
pkglib_LTLIBRARIES = libshapes_transect.la
libshapes_transect_la_SOURCES = \
diff --git a/src/modules/simulation/sim_cellular_automata/Makefile.am b/src/modules/simulation/sim_cellular_automata/Makefile.am
index 3c5cb25..14d6220 100755
--- a/src/modules/simulation/sim_cellular_automata/Makefile.am
+++ b/src/modules/simulation/sim_cellular_automata/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_cellular_automata.la
libsim_cellular_automata_la_SOURCES =\
diff --git a/src/modules/simulation/sim_cellular_automata/Makefile.in b/src/modules/simulation/sim_cellular_automata/Makefile.in
index e597247..86094de 100644
--- a/src/modules/simulation/sim_cellular_automata/Makefile.in
+++ b/src/modules/simulation/sim_cellular_automata/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_cellular_automata.la
libsim_cellular_automata_la_SOURCES = \
diff --git a/src/modules/simulation/sim_ecosystems_hugget/Makefile.am b/src/modules/simulation/sim_ecosystems_hugget/Makefile.am
index 6116809..c46177f 100755
--- a/src/modules/simulation/sim_ecosystems_hugget/Makefile.am
+++ b/src/modules/simulation/sim_ecosystems_hugget/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_ecosystems_hugget.la
libsim_ecosystems_hugget_la_SOURCES =\
diff --git a/src/modules/simulation/sim_ecosystems_hugget/Makefile.in b/src/modules/simulation/sim_ecosystems_hugget/Makefile.in
index 4a47739..5b5d8c8 100644
--- a/src/modules/simulation/sim_ecosystems_hugget/Makefile.in
+++ b/src/modules/simulation/sim_ecosystems_hugget/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_ecosystems_hugget.la
libsim_ecosystems_hugget_la_SOURCES = \
diff --git a/src/modules/simulation/sim_erosion/Makefile.am b/src/modules/simulation/sim_erosion/Makefile.am
index afe4bf0..a1b5b3c 100755
--- a/src/modules/simulation/sim_erosion/Makefile.am
+++ b/src/modules/simulation/sim_erosion/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_erosion.la
libsim_erosion_la_SOURCES =\
diff --git a/src/modules/simulation/sim_erosion/Makefile.in b/src/modules/simulation/sim_erosion/Makefile.in
index cea577d..90698b3 100644
--- a/src/modules/simulation/sim_erosion/Makefile.in
+++ b/src/modules/simulation/sim_erosion/Makefile.in
@@ -364,10 +364,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1537 2012-11-19 20:05:19Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_erosion.la
libsim_erosion_la_SOURCES = \
diff --git a/src/modules/simulation/sim_fire_spreading/Makefile.am b/src/modules/simulation/sim_fire_spreading/Makefile.am
index 08acfe5..e791d27 100755
--- a/src/modules/simulation/sim_fire_spreading/Makefile.am
+++ b/src/modules/simulation/sim_fire_spreading/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core -I$(top_srcdir)/src/modules/grid/grid_tools
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_fire_spreading.la
libsim_fire_spreading_la_SOURCES =\
diff --git a/src/modules/simulation/sim_fire_spreading/Makefile.in b/src/modules/simulation/sim_fire_spreading/Makefile.in
index 5512c8d..170cac6 100644
--- a/src/modules/simulation/sim_fire_spreading/Makefile.in
+++ b/src/modules/simulation/sim_fire_spreading/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core -I$(top_srcdir)/src/modules/grid/grid_tools
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_fire_spreading.la
libsim_fire_spreading_la_SOURCES = \
diff --git a/src/modules/simulation/sim_hydrology/Makefile.am b/src/modules/simulation/sim_hydrology/Makefile.am
index faffdb1..25c6b37 100755
--- a/src/modules/simulation/sim_hydrology/Makefile.am
+++ b/src/modules/simulation/sim_hydrology/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_hydrology.la
libsim_hydrology_la_SOURCES =\
diff --git a/src/modules/simulation/sim_hydrology/Makefile.in b/src/modules/simulation/sim_hydrology/Makefile.in
index 0164b21..8880845 100644
--- a/src/modules/simulation/sim_hydrology/Makefile.in
+++ b/src/modules/simulation/sim_hydrology/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_hydrology.la
libsim_hydrology_la_SOURCES = \
diff --git a/src/modules/simulation/sim_ihacres/Makefile.am b/src/modules/simulation/sim_ihacres/Makefile.am
index 3f951c7..b5423df 100755
--- a/src/modules/simulation/sim_ihacres/Makefile.am
+++ b/src/modules/simulation/sim_ihacres/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_ihacres.la
libsim_ihacres_la_SOURCES =\
diff --git a/src/modules/simulation/sim_ihacres/Makefile.in b/src/modules/simulation/sim_ihacres/Makefile.in
index e8bd022..bd23638 100644
--- a/src/modules/simulation/sim_ihacres/Makefile.in
+++ b/src/modules/simulation/sim_ihacres/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_ihacres.la
libsim_ihacres_la_SOURCES = \
diff --git a/src/modules/simulation/sim_qm_of_esp/Makefile.am b/src/modules/simulation/sim_qm_of_esp/Makefile.am
index d4eaf90..7b995b4 100755
--- a/src/modules/simulation/sim_qm_of_esp/Makefile.am
+++ b/src/modules/simulation/sim_qm_of_esp/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_qm_of_esp.la
libsim_qm_of_esp_la_SOURCES =\
diff --git a/src/modules/simulation/sim_qm_of_esp/Makefile.in b/src/modules/simulation/sim_qm_of_esp/Makefile.in
index cfd0f15..5514bae 100644
--- a/src/modules/simulation/sim_qm_of_esp/Makefile.in
+++ b/src/modules/simulation/sim_qm_of_esp/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1537 2012-11-19 20:05:19Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_qm_of_esp.la
libsim_qm_of_esp_la_SOURCES = \
diff --git a/src/modules/simulation/sim_rivflow/Makefile.am b/src/modules/simulation/sim_rivflow/Makefile.am
index 69a0d26..27fea28 100755
--- a/src/modules/simulation/sim_rivflow/Makefile.am
+++ b/src/modules/simulation/sim_rivflow/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_rivflow.la
libsim_rivflow_la_SOURCES =\
diff --git a/src/modules/simulation/sim_rivflow/Makefile.in b/src/modules/simulation/sim_rivflow/Makefile.in
index d8cdd86..b87e5f8 100644
--- a/src/modules/simulation/sim_rivflow/Makefile.in
+++ b/src/modules/simulation/sim_rivflow/Makefile.in
@@ -365,10 +365,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1537 2012-11-19 20:05:19Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libsim_rivflow.la
libsim_rivflow_la_SOURCES = \
diff --git a/src/modules/statistics/statistics_grid/Makefile.am b/src/modules/statistics/statistics_grid/Makefile.am
index 86f4601..ac0a5a6 100755
--- a/src/modules/statistics/statistics_grid/Makefile.am
+++ b/src/modules/statistics/statistics_grid/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libstatistics_grid.la
libstatistics_grid_la_SOURCES =\
diff --git a/src/modules/statistics/statistics_grid/Makefile.in b/src/modules/statistics/statistics_grid/Makefile.in
index db249f1..fb4ef86 100644
--- a/src/modules/statistics/statistics_grid/Makefile.in
+++ b/src/modules/statistics/statistics_grid/Makefile.in
@@ -369,10 +369,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1554 2012-12-05 18:29:04Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libstatistics_grid.la
libstatistics_grid_la_SOURCES = \
diff --git a/src/modules/statistics/statistics_grid/grid_pca.h b/src/modules/statistics/statistics_grid/grid_pca.h
index ddd5a00..a4f34e0 100755
--- a/src/modules/statistics/statistics_grid/grid_pca.h
+++ b/src/modules/statistics/statistics_grid/grid_pca.h
@@ -75,7 +75,7 @@ class CGrid_PCA : public CSG_Module_Grid
public:
CGrid_PCA(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Principle Components") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Principle Components") ); }
protected:
@@ -112,7 +112,7 @@ class CGrid_PCA_Inverse : public CSG_Module_Grid
public:
CGrid_PCA_Inverse(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Principle Components") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Principle Components") ); }
protected:
diff --git a/src/modules/statistics/statistics_kriging/Makefile.am b/src/modules/statistics/statistics_kriging/Makefile.am
index 788d6b0..1c5f133 100755
--- a/src/modules/statistics/statistics_kriging/Makefile.am
+++ b/src/modules/statistics/statistics_kriging/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/statistics/statistics_kriging/Makefile.in b/src/modules/statistics/statistics_kriging/Makefile.in
index 56e7e67..13a8088 100644
--- a/src/modules/statistics/statistics_kriging/Makefile.in
+++ b/src/modules/statistics/statistics_kriging/Makefile.in
@@ -365,11 +365,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/statistics/statistics_kriging/kriging_base.cpp b/src/modules/statistics/statistics_kriging/kriging_base.cpp
index 24b6062..a17189c 100755
--- a/src/modules/statistics/statistics_kriging/kriging_base.cpp
+++ b/src/modules/statistics/statistics_kriging/kriging_base.cpp
@@ -192,7 +192,9 @@ int CKriging_Base::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Paramet
m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes());
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
@@ -203,9 +205,10 @@ int CKriging_Base::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Paramet
pParameters->Set_Enabled("DBLOCK", pParameter->asBool()); // block size
}
- m_Search.On_Parameters_Enable(pParameters, pParameter);
+ m_Search .On_Parameters_Enable(pParameters, pParameter);
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -307,8 +310,6 @@ bool CKriging_Base::On_Execute(void)
//---------------------------------------------------------
bool CKriging_Base::_Initialise_Grids(void)
{
- m_Grid_Target.Cmd_Update(m_pPoints); // if called from saga_cmd
-
if( (m_pGrid = m_Grid_Target.Get_Grid("PREDICTION")) != NULL )
{
m_pGrid->Set_Name(CSG_String::Format(SG_T("%s.%s [%s]"), Parameters("POINTS")->asShapes()->Get_Name(), Parameters("FIELD")->asString(), Get_Name().c_str()));
diff --git a/src/modules/statistics/statistics_points/Makefile.am b/src/modules/statistics/statistics_points/Makefile.am
index b7f2ddd..b202056 100755
--- a/src/modules/statistics/statistics_points/Makefile.am
+++ b/src/modules/statistics/statistics_points/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libstatistics_points.la
libstatistics_points_la_SOURCES =\
diff --git a/src/modules/statistics/statistics_points/Makefile.in b/src/modules/statistics/statistics_points/Makefile.in
index 1c351ef..93afbe6 100644
--- a/src/modules/statistics/statistics_points/Makefile.in
+++ b/src/modules/statistics/statistics_points/Makefile.in
@@ -368,10 +368,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libstatistics_points.la
libstatistics_points_la_SOURCES = \
diff --git a/src/modules/statistics/statistics_regression/Makefile.am b/src/modules/statistics/statistics_regression/Makefile.am
index e980f00..89ff64d 100755
--- a/src/modules/statistics/statistics_regression/Makefile.am
+++ b/src/modules/statistics/statistics_regression/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libstatistics_regression.la
libstatistics_regression_la_SOURCES =\
diff --git a/src/modules/statistics/statistics_regression/Makefile.in b/src/modules/statistics/statistics_regression/Makefile.in
index d05511c..0f79290 100644
--- a/src/modules/statistics/statistics_regression/Makefile.in
+++ b/src/modules/statistics/statistics_regression/Makefile.in
@@ -372,10 +372,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1738 2013-06-20 11:15:45Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libstatistics_regression.la
libstatistics_regression_la_SOURCES = \
diff --git a/src/modules/statistics/statistics_regression/gw_multi_regression.cpp b/src/modules/statistics/statistics_regression/gw_multi_regression.cpp
index 93c666f..76d0bd8 100755
--- a/src/modules/statistics/statistics_regression/gw_multi_regression.cpp
+++ b/src/modules/statistics/statistics_regression/gw_multi_regression.cpp
@@ -152,17 +152,20 @@ int CGW_Multi_Regression::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_
pParameters->Set_Parameter("DW_BANDWIDTH", GWR_Fit_To_Density(pParameter->asShapes(), 4.0, 1));
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CGW_Multi_Regression::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- m_Search.On_Parameters_Enable(pParameters, pParameter);
-
m_Weighting.Enable_Parameters(pParameters);
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Search .On_Parameters_Enable(pParameters, pParameter);
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -227,11 +230,9 @@ bool CGW_Multi_Regression::On_Execute(void)
}
//-----------------------------------------------------
- m_Grid_Target.Cmd_Update(m_pPoints); // if called from saga_cmd
-
m_Weighting.Set_Parameters(&Parameters);
- m_pQuality = m_Grid_Target.Get_Grid("QUALITY");
+ m_pQuality = m_Grid_Target.Get_Grid("QUALITY" );
m_pIntercept = m_Grid_Target.Get_Grid("INTERCEPT");
if( !m_pQuality || !m_pIntercept )
diff --git a/src/modules/statistics/statistics_regression/gw_regression.cpp b/src/modules/statistics/statistics_regression/gw_regression.cpp
index b794c90..5773a33 100755
--- a/src/modules/statistics/statistics_regression/gw_regression.cpp
+++ b/src/modules/statistics/statistics_regression/gw_regression.cpp
@@ -134,17 +134,20 @@ int CGW_Regression::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parame
pParameters->Set_Parameter("DW_BANDWIDTH", GWR_Fit_To_Density(pParameter->asShapes(), 4.0, 1));
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
int CGW_Regression::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter)
{
- m_Search.On_Parameters_Enable(pParameters, pParameter);
-
m_Weighting.Enable_Parameters(pParameters);
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Search .On_Parameters_Enable(pParameters, pParameter);
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -169,8 +172,6 @@ bool CGW_Regression::On_Execute(void)
}
//-----------------------------------------------------
- m_Grid_Target.Cmd_Update(m_pPoints); // if called from saga_cmd
-
m_pQuality = m_Grid_Target.Get_Grid("QUALITY" );
m_pSlope = m_Grid_Target.Get_Grid("SLOPE" );
m_pIntercept = m_Grid_Target.Get_Grid("INTERCEPT");
diff --git a/src/modules/statistics/statistics_regression/point_trend_surface.cpp b/src/modules/statistics/statistics_regression/point_trend_surface.cpp
index c50202b..242001d 100755
--- a/src/modules/statistics/statistics_regression/point_trend_surface.cpp
+++ b/src/modules/statistics/statistics_regression/point_trend_surface.cpp
@@ -155,7 +155,9 @@ int CPoint_Trend_Surface::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_
m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes());
}
- return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameter_Changed(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameter_Changed(pParameters, pParameter) );
}
//---------------------------------------------------------
@@ -166,7 +168,9 @@ int CPoint_Trend_Surface::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_
pParameters->Set_Enabled("NODE_USER", pParameter->asInt() == 4);
}
- return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 );
+ m_Grid_Target.On_Parameters_Enable(pParameters, pParameter);
+
+ return( CSG_Module::On_Parameters_Enable(pParameters, pParameter) );
}
@@ -210,15 +214,13 @@ bool CPoint_Trend_Surface::On_Execute(void)
Set_Message();
//-----------------------------------------------------
- m_Grid_Target.Cmd_Update(pPoints); // if called from saga_cmd
-
if( (pRegression = m_Grid_Target.Get_Grid()) == NULL )
{
return( false );
}
//-----------------------------------------------------
- pRegression->Set_Name(CSG_String::Format(SG_T("%s [%s]"), Parameters("ATTRIBUTE")->asString(), _TL("Trend Surface")));
+ pRegression->Set_Name(CSG_String::Format("%s [%s]", Parameters("ATTRIBUTE")->asString(), _TL("Trend Surface")));
Set_Regression(pRegression);
diff --git a/src/modules/statistics/statistics_regression/table_regression_multiple.h b/src/modules/statistics/statistics_regression/table_regression_multiple.h
index 0dc5f4f..6250075 100755
--- a/src/modules/statistics/statistics_regression/table_regression_multiple.h
+++ b/src/modules/statistics/statistics_regression/table_regression_multiple.h
@@ -92,7 +92,7 @@ class CTable_Regression_Multiple : public CTable_Regression_Multiple_Base
public:
CTable_Regression_Multiple(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Table") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Table") ); }
};
@@ -102,7 +102,7 @@ class CTable_Regression_Multiple_Shapes : public CTable_Regression_Multiple_Base
public:
CTable_Regression_Multiple_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Shapes") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Shapes") ); }
};
diff --git a/src/modules/statistics/statistics_regression/table_trend.h b/src/modules/statistics/statistics_regression/table_trend.h
index 41f6754..d13571e 100755
--- a/src/modules/statistics/statistics_regression/table_trend.h
+++ b/src/modules/statistics/statistics_regression/table_trend.h
@@ -98,7 +98,7 @@ class CTable_Trend : public CTable_Trend_Base
public:
CTable_Trend(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Table") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Table") ); }
};
@@ -108,7 +108,7 @@ class CTable_Trend_Shapes : public CTable_Trend_Base
public:
CTable_Trend_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Shapes") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Shapes") ); }
};
diff --git a/src/modules/table/table_calculus/Makefile.am b/src/modules/table/table_calculus/Makefile.am
index 1b81cbc..0a912d6 100755
--- a/src/modules/table/table_calculus/Makefile.am
+++ b/src/modules/table/table_calculus/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2345 2014-11-27 11:27:59Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libtable_calculus.la
libtable_calculus_la_SOURCES =\
diff --git a/src/modules/table/table_calculus/Makefile.in b/src/modules/table/table_calculus/Makefile.in
index 89eff4a..4109494 100644
--- a/src/modules/table/table_calculus/Makefile.in
+++ b/src/modules/table/table_calculus/Makefile.in
@@ -365,13 +365,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2345 2014-11-27 11:27:59Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libtable_calculus.la
libtable_calculus_la_SOURCES = \
diff --git a/src/modules/table/table_calculus/table_fill_record_gaps.h b/src/modules/table/table_calculus/table_fill_record_gaps.h
index 21102be..920147c 100755
--- a/src/modules/table/table_calculus/table_fill_record_gaps.h
+++ b/src/modules/table/table_calculus/table_fill_record_gaps.h
@@ -85,7 +85,7 @@ class CTable_Fill_Record_Gaps : public CSG_Module
public:
CTable_Fill_Record_Gaps(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/table/table_tools/Makefile.am b/src/modules/table/table_tools/Makefile.am
index 3f5d6f3..af3dd06 100755
--- a/src/modules/table/table_tools/Makefile.am
+++ b/src/modules/table/table_tools/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 2366 2015-01-09 15:13:32Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libtable_tools.la
libtable_tools_la_SOURCES =\
diff --git a/src/modules/table/table_tools/Makefile.in b/src/modules/table/table_tools/Makefile.in
index c62b790..b0b9e99 100644
--- a/src/modules/table/table_tools/Makefile.in
+++ b/src/modules/table/table_tools/Makefile.in
@@ -366,13 +366,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2366 2015-01-09 15:13:32Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libtable_tools.la
libtable_tools_la_SOURCES = \
diff --git a/src/modules/table/table_tools/table_change_date_format.h b/src/modules/table/table_tools/table_change_date_format.h
index ab359de..ad3cdd8 100755
--- a/src/modules/table/table_tools/table_change_date_format.h
+++ b/src/modules/table/table_tools/table_change_date_format.h
@@ -85,7 +85,7 @@ class CTable_Change_Date_Format : public CSG_Module
public:
CTable_Change_Date_Format(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
@@ -106,7 +106,7 @@ class CTable_Change_Time_Format : public CSG_Module
public:
CTable_Change_Time_Format(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Import") ); }
protected:
diff --git a/src/modules/terrain_analysis/ta_channels/Makefile.am b/src/modules/terrain_analysis/ta_channels/Makefile.am
index f5ee269..f8a60e1 100755
--- a/src/modules/terrain_analysis/ta_channels/Makefile.am
+++ b/src/modules/terrain_analysis/ta_channels/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_channels.la
libta_channels_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_channels/Makefile.in b/src/modules/terrain_analysis/ta_channels/Makefile.in
index 98a6949..a073f1d 100644
--- a/src/modules/terrain_analysis/ta_channels/Makefile.in
+++ b/src/modules/terrain_analysis/ta_channels/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 911 2011-02-14 16:38:15Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_channels.la
libta_channels_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_compound/Makefile.am b/src/modules/terrain_analysis/ta_compound/Makefile.am
index 98c4198..ec57347 100755
--- a/src/modules/terrain_analysis/ta_compound/Makefile.am
+++ b/src/modules/terrain_analysis/ta_compound/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_compound.la
libta_compound_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_compound/Makefile.in b/src/modules/terrain_analysis/ta_compound/Makefile.in
index 47b4507..d051ae6 100644
--- a/src/modules/terrain_analysis/ta_compound/Makefile.in
+++ b/src/modules/terrain_analysis/ta_compound/Makefile.in
@@ -364,10 +364,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_compound.la
libta_compound_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_hydrology/CellBalance.h b/src/modules/terrain_analysis/ta_hydrology/CellBalance.h
index 7e71259..080e968 100755
--- a/src/modules/terrain_analysis/ta_hydrology/CellBalance.h
+++ b/src/modules/terrain_analysis/ta_hydrology/CellBalance.h
@@ -31,7 +31,7 @@ class CCellBalance : public CSG_Module_Grid
public:
CCellBalance(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Miscellaneous") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Miscellaneous") ); }
protected:
diff --git a/src/modules/terrain_analysis/ta_hydrology/Erosion_LS_Fields.h b/src/modules/terrain_analysis/ta_hydrology/Erosion_LS_Fields.h
index 69eab27..120a747 100755
--- a/src/modules/terrain_analysis/ta_hydrology/Erosion_LS_Fields.h
+++ b/src/modules/terrain_analysis/ta_hydrology/Erosion_LS_Fields.h
@@ -85,7 +85,7 @@ class CErosion_LS_Fields : public CSG_Module_Grid
public:
CErosion_LS_Fields(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
diff --git a/src/modules/terrain_analysis/ta_hydrology/FlowDepth.h b/src/modules/terrain_analysis/ta_hydrology/FlowDepth.h
index 4a4d00b..40e2930 100755
--- a/src/modules/terrain_analysis/ta_hydrology/FlowDepth.h
+++ b/src/modules/terrain_analysis/ta_hydrology/FlowDepth.h
@@ -32,7 +32,7 @@ public:
CFlowDepth(void);
virtual ~CFlowDepth(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Dynamics" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Dynamics" )); }
bool isHeader(int,int);
double CalculateFlowDepth(int,int);
diff --git a/src/modules/terrain_analysis/ta_hydrology/IsochronesConst.h b/src/modules/terrain_analysis/ta_hydrology/IsochronesConst.h
index 64d0053..9e6c55d 100755
--- a/src/modules/terrain_analysis/ta_hydrology/IsochronesConst.h
+++ b/src/modules/terrain_analysis/ta_hydrology/IsochronesConst.h
@@ -31,7 +31,7 @@ public:
CIsochronesConst(void);
virtual ~CIsochronesConst(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Dynamics" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Dynamics" )); }
protected:
virtual bool On_Execute(void);
diff --git a/src/modules/terrain_analysis/ta_hydrology/IsochronesVar.h b/src/modules/terrain_analysis/ta_hydrology/IsochronesVar.h
index e9fd5a8..5097a0f 100755
--- a/src/modules/terrain_analysis/ta_hydrology/IsochronesVar.h
+++ b/src/modules/terrain_analysis/ta_hydrology/IsochronesVar.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: IsochronesVar.h 2492 2015-05-18 12:37:39Z reklov_w $
+ * Version $Id: IsochronesVar.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
/*******************************************************************************
IsochronesVar.h
@@ -32,7 +32,7 @@ public:
CIsochronesVar(void);
virtual ~CIsochronesVar(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Dynamics" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Dynamics" )); }
protected:
virtual bool On_Execute(void);
diff --git a/src/modules/terrain_analysis/ta_hydrology/LakeFlood.h b/src/modules/terrain_analysis/ta_hydrology/LakeFlood.h
index ae8adcc..0a316b1 100755
--- a/src/modules/terrain_analysis/ta_hydrology/LakeFlood.h
+++ b/src/modules/terrain_analysis/ta_hydrology/LakeFlood.h
@@ -112,7 +112,7 @@ public:
CLakeFlood(void);
virtual ~CLakeFlood(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Miscellaneous") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Miscellaneous") ); }
protected:
@@ -139,7 +139,7 @@ public:
CLakeFloodInteractive(void);
virtual ~CLakeFloodInteractive(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Miscellaneous") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Miscellaneous") ); }
protected:
diff --git a/src/modules/terrain_analysis/ta_hydrology/Makefile.am b/src/modules/terrain_analysis/ta_hydrology/Makefile.am
index 45ff021..b2db1e4 100755
--- a/src/modules/terrain_analysis/ta_hydrology/Makefile.am
+++ b/src/modules/terrain_analysis/ta_hydrology/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_hydrology.la
libta_hydrology_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_hydrology/Makefile.in b/src/modules/terrain_analysis/ta_hydrology/Makefile.in
index 1b2808d..6caa49b 100644
--- a/src/modules/terrain_analysis/ta_hydrology/Makefile.in
+++ b/src/modules/terrain_analysis/ta_hydrology/Makefile.in
@@ -372,10 +372,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1824 2013-09-05 08:48:21Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_hydrology.la
libta_hydrology_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_hydrology/SAGA_Wetness_Index.h b/src/modules/terrain_analysis/ta_hydrology/SAGA_Wetness_Index.h
index 502b9f4..a8901df 100755
--- a/src/modules/terrain_analysis/ta_hydrology/SAGA_Wetness_Index.h
+++ b/src/modules/terrain_analysis/ta_hydrology/SAGA_Wetness_Index.h
@@ -80,7 +80,7 @@ class CSAGA_Wetness_Index : public CSG_Module_Grid
public:
CSAGA_Wetness_Index(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
diff --git a/src/modules/terrain_analysis/ta_hydrology/Sinuosity.h b/src/modules/terrain_analysis/ta_hydrology/Sinuosity.h
index 1527f3b..9e8b38c 100755
--- a/src/modules/terrain_analysis/ta_hydrology/Sinuosity.h
+++ b/src/modules/terrain_analysis/ta_hydrology/Sinuosity.h
@@ -32,7 +32,7 @@ public:
CSinuosity(void);
virtual ~CSinuosity(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Dynamics" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Dynamics" )); }
protected:
virtual bool On_Execute(void);
diff --git a/src/modules/terrain_analysis/ta_hydrology/SlopeLength.h b/src/modules/terrain_analysis/ta_hydrology/SlopeLength.h
index 60d1805..921857c 100755
--- a/src/modules/terrain_analysis/ta_hydrology/SlopeLength.h
+++ b/src/modules/terrain_analysis/ta_hydrology/SlopeLength.h
@@ -43,7 +43,7 @@ class CSlopeLength : public CSG_Module_Grid
public:
CSlopeLength(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Miscellaneous") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Miscellaneous") ); }
protected:
diff --git a/src/modules/terrain_analysis/ta_hydrology/TopographicIndices.h b/src/modules/terrain_analysis/ta_hydrology/TopographicIndices.h
index a79fe98..2f9bcb8 100755
--- a/src/modules/terrain_analysis/ta_hydrology/TopographicIndices.h
+++ b/src/modules/terrain_analysis/ta_hydrology/TopographicIndices.h
@@ -87,7 +87,7 @@ class CTWI : public CSG_Module_Grid
public:
CTWI(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
@@ -110,7 +110,7 @@ class CStream_Power : public CSG_Module_Grid
public:
CStream_Power(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
@@ -133,7 +133,7 @@ class CLS_Factor : public CSG_Module_Grid
public:
CLS_Factor(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
@@ -163,7 +163,7 @@ class CTCI_Low : public CSG_Module_Grid
public:
CTCI_Low(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
diff --git a/src/modules/terrain_analysis/ta_hydrology/melton_ruggedness.h b/src/modules/terrain_analysis/ta_hydrology/melton_ruggedness.h
index 6cf1971..364f0a2 100755
--- a/src/modules/terrain_analysis/ta_hydrology/melton_ruggedness.h
+++ b/src/modules/terrain_analysis/ta_hydrology/melton_ruggedness.h
@@ -84,7 +84,7 @@ class CMelton_Ruggedness : public CSG_Module_Grid
public:
CMelton_Ruggedness(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Topographic Indices" )); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Topographic Indices" )); }
protected:
diff --git a/src/modules/terrain_analysis/ta_lighting/HillShade.cpp b/src/modules/terrain_analysis/ta_lighting/HillShade.cpp
index 0ad2b90..9bcab9c 100755
--- a/src/modules/terrain_analysis/ta_lighting/HillShade.cpp
+++ b/src/modules/terrain_analysis/ta_lighting/HillShade.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: HillShade.cpp 2322 2014-11-03 21:29:57Z johanvdw $
+ * Version $Id: HillShade.cpp 2841 2016-03-05 11:25:04Z reklov_w $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -129,7 +129,7 @@ CHillShade::CHillShade(void)
Parameters.Add_Value(
NULL , "EXAGGERATION" , _TL("Exaggeration"),
- _TL("The terrain exaggeration factor allows to increase the shading contrasts in flat areas."),
+ _TL("The terrain exaggeration factor allows one to increase the shading contrasts in flat areas."),
PARAMETER_TYPE_Double , 4
);
diff --git a/src/modules/terrain_analysis/ta_lighting/Makefile.am b/src/modules/terrain_analysis/ta_lighting/Makefile.am
index 26ff9a8..7e903a8 100755
--- a/src/modules/terrain_analysis/ta_lighting/Makefile.am
+++ b/src/modules/terrain_analysis/ta_lighting/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_lighting.la
libta_lighting_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_lighting/Makefile.in b/src/modules/terrain_analysis/ta_lighting/Makefile.in
index 7cd0eae..bec0deb 100644
--- a/src/modules/terrain_analysis/ta_lighting/Makefile.in
+++ b/src/modules/terrain_analysis/ta_lighting/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1613 2013-02-22 11:20:39Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_lighting.la
libta_lighting_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_lighting/SolarRadiation.cpp b/src/modules/terrain_analysis/ta_lighting/SolarRadiation.cpp
index 61dec87..a7192f5 100755
--- a/src/modules/terrain_analysis/ta_lighting/SolarRadiation.cpp
+++ b/src/modules/terrain_analysis/ta_lighting/SolarRadiation.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: SolarRadiation.cpp 2636 2015-10-06 16:10:24Z oconrad $
+ * Version $Id: SolarRadiation.cpp 2873 2016-03-31 09:37:32Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -73,7 +73,7 @@
//---------------------------------------------------------
CSolarRadiation::CSolarRadiation(void)
{
- CSG_Parameter *pNode, *pNode_2;
+ CSG_Parameter *pNode;
//-----------------------------------------------------
Set_Name (_TL("Potential Incoming Solar Radiation"));
@@ -141,22 +141,6 @@ CSolarRadiation::CSolarRadiation(void)
), 1
);
- pNode = Parameters.Add_Choice(
- NULL , "UPDATE" , _TL("Update"),
- _TL("show direct insolation for each time step."),
- CSG_String::Format("%s|%s|%s|",
- _TL("do not update"),
- _TL("fit histogram stretch for each time step"),
- _TL("constant histogram stretch for all time steps")
- ), 0
- );
-
- Parameters.Add_Value(
- pNode , "UPDATE_STRETCH" , _TL("Constant Histogram Stretch"),
- _TL(""),
- PARAMETER_TYPE_Double , 1.0, 0.0, true
- );
-
//-----------------------------------------------------
pNode = Parameters.Add_Choice(
NULL , "LOCATION" , _TL("Location"),
@@ -184,6 +168,26 @@ CSolarRadiation::CSolarRadiation(void)
), 1
);
+ pNode = Parameters.Add_Date(
+ pNode , "DAY" , _TL("Day"),
+ _TL(""),
+ CSG_DateTime::Now().Get_JDN()
+ );
+
+ Parameters.Add_Date(
+ pNode , "DAY_STOP" , _TL("Last Day"),
+ _TL(""),
+ CSG_DateTime::Now().Get_JDN()
+ );
+
+ Parameters.Add_Value(
+ pNode , "DAYS_STEP" , _TL("Resolution [d]"),
+ _TL("Time step size for a range of days calculation given in days."),
+ PARAMETER_TYPE_Int , 5, 1, true
+ );
+
+ pNode = Parameters("PERIOD");
+
Parameters.Add_Value(
pNode , "MOMENT" , _TL("Moment [h]"),
_TL(""),
@@ -197,30 +201,11 @@ CSolarRadiation::CSolarRadiation(void)
);
Parameters.Add_Value(
- pNode , "HOUR_STEP" , _TL("Time Resolution [h]: Day"),
+ pNode , "HOUR_STEP" , _TL("Resolution [h]"),
_TL("Time step size for a day's calculation given in hours."),
PARAMETER_TYPE_Double , 0.5, 0.0, true, 24.0, true
);
- Parameters.Add_Value(
- pNode , "DAYS_STEP" , _TL("Time Resolution [d]: Range of Days"),
- _TL("Time step size for a range of days calculation given in days."),
- PARAMETER_TYPE_Int , 5, 1, true
- );
-
- //-----------------------------------------------------
- pNode_2 = Parameters.Add_Node(pNode, "DATE_A", _TL("Date"), _TL(""));
-
- Parameters.Add_Value (pNode_2, "DAY_A", _TL("Day" ), _TL(""), PARAMETER_TYPE_Int, CSG_DateTime::Get_Current_Day(), 1, true, 31, true);
- Parameters.Add_Choice(pNode_2, "MON_A", _TL("Month"), _TL(""), CSG_DateTime::Get_Month_Choices(), CSG_DateTime::Get_Current_Month());
- Parameters.Add_Value (pNode_2, "YEAR_A", _TL("Year" ), _TL(""), PARAMETER_TYPE_Int, CSG_DateTime::Get_Current_Year());
-
- pNode_2 = Parameters.Add_Node(pNode, "DATE_B", _TL("2nd Date (End of Range)"), _TL(""));
-
- Parameters.Add_Value (pNode_2, "DAY_B", _TL("Day" ), _TL(""), PARAMETER_TYPE_Int, CSG_DateTime::Get_Current_Day(), 1, true, 31, true);
- Parameters.Add_Choice(pNode_2, "MON_B", _TL("Month"), _TL(""), CSG_DateTime::Get_Month_Choices(), CSG_DateTime::Get_Current_Month());
- Parameters.Add_Value (pNode_2, "YEAR_B", _TL("Year" ), _TL(""), PARAMETER_TYPE_Int, CSG_DateTime::Get_Current_Year());
-
//-----------------------------------------------------
pNode = Parameters.Add_Choice(
NULL , "METHOD" , _TL("Atmospheric Effects"),
@@ -262,6 +247,23 @@ CSolarRadiation::CSolarRadiation(void)
_TL("The transmittance of the atmosphere, usually between 60 and 80 percent."),
PARAMETER_TYPE_Double, 70, 0.0, true, 100.0, true
);
+
+ //-----------------------------------------------------
+ pNode = Parameters.Add_Choice(
+ NULL , "UPDATE" , _TL("Update"),
+ _TL("show direct insolation for each time step."),
+ CSG_String::Format("%s|%s|%s|",
+ _TL("do not update"),
+ _TL("fit histogram stretch for each time step"),
+ _TL("constant histogram stretch for all time steps")
+ ), 0
+ ); pNode->Set_UseInCMD(false);
+
+ Parameters.Add_Value(
+ pNode , "UPDATE_STRETCH" , _TL("Constant Histogram Stretch"),
+ _TL(""),
+ PARAMETER_TYPE_Double , 1.0, 0.0, true
+ );
}
@@ -318,7 +320,7 @@ int CSolarRadiation::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Param
pParameters->Set_Enabled("UPDATE" , pParameter->asInt() >= 1);
pParameters->Set_Enabled("HOUR_RANGE" , pParameter->asInt() >= 1);
pParameters->Set_Enabled("HOUR_STEP" , pParameter->asInt() >= 1);
- pParameters->Set_Enabled("DATE_B" , pParameter->asInt() == 2);
+ pParameters->Set_Enabled("DAY_STOP" , pParameter->asInt() == 2);
pParameters->Set_Enabled("DAYS_STEP" , pParameter->asInt() == 2);
}
@@ -546,7 +548,7 @@ bool CSolarRadiation::Get_Insolation(void)
}
//-----------------------------------------------------
- CSG_DateTime Date((CSG_DateTime::TSG_DateTime)Parameters("DAY_A")->asInt(), (CSG_DateTime::Month)Parameters("MON_A")->asInt(), Parameters("YEAR_A")->asInt());
+ CSG_DateTime Date(Parameters("DAY")->asDate()->Get_Date());
switch( Parameters("PERIOD")->asInt() )
{
@@ -570,7 +572,7 @@ bool CSolarRadiation::Get_Insolation(void)
//-----------------------------------------------------
case 2: // Range of Days
{
- CSG_DateTime Stop((CSG_DateTime::TSG_DateTime)Parameters("DAY_B")->asInt(), (CSG_DateTime::Month)Parameters("MON_B")->asInt(), Parameters("YEAR_B")->asInt());
+ CSG_DateTime Stop(Parameters("DAY_STOP")->asDate()->Get_Date());
int dDays = Parameters("DAYS_STEP")->asInt();
diff --git a/src/modules/terrain_analysis/ta_lighting/SolarRadiation.h b/src/modules/terrain_analysis/ta_lighting/SolarRadiation.h
index 11e8b4b..7b340bb 100755
--- a/src/modules/terrain_analysis/ta_lighting/SolarRadiation.h
+++ b/src/modules/terrain_analysis/ta_lighting/SolarRadiation.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: SolarRadiation.h 2636 2015-10-06 16:10:24Z oconrad $
+ * Version $Id: SolarRadiation.h 2873 2016-03-31 09:37:32Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -74,8 +74,6 @@
//---------------------------------------------------------
#include "MLB_Interface.h"
-#include <saga_api/datetime.h>
-
///////////////////////////////////////////////////////////
// //
diff --git a/src/modules/terrain_analysis/ta_morphometry/Makefile.am b/src/modules/terrain_analysis/ta_morphometry/Makefile.am
index de16247..01d5447 100755
--- a/src/modules/terrain_analysis/ta_morphometry/Makefile.am
+++ b/src/modules/terrain_analysis/ta_morphometry/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_morphometry.la
libta_morphometry_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_morphometry/Makefile.in b/src/modules/terrain_analysis/ta_morphometry/Makefile.in
index dc3b3ad..b810585 100644
--- a/src/modules/terrain_analysis/ta_morphometry/Makefile.in
+++ b/src/modules/terrain_analysis/ta_morphometry/Makefile.in
@@ -372,10 +372,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1619 2013-03-05 16:07:00Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_morphometry.la
libta_morphometry_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_morphometry/mass_balance_index.h b/src/modules/terrain_analysis/ta_morphometry/mass_balance_index.h
index 0d3bf13..85257e3 100755
--- a/src/modules/terrain_analysis/ta_morphometry/mass_balance_index.h
+++ b/src/modules/terrain_analysis/ta_morphometry/mass_balance_index.h
@@ -78,7 +78,7 @@ public:
CMass_Balance_Index(void);
virtual ~CMass_Balance_Index(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Indices" )); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Indices" )); }
protected:
diff --git a/src/modules/terrain_analysis/ta_morphometry/ruggedness.h b/src/modules/terrain_analysis/ta_morphometry/ruggedness.h
index 0a67663..5e52744 100755
--- a/src/modules/terrain_analysis/ta_morphometry/ruggedness.h
+++ b/src/modules/terrain_analysis/ta_morphometry/ruggedness.h
@@ -75,7 +75,7 @@ class CRuggedness_TRI : public CSG_Module_Grid
public:
CRuggedness_TRI(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Indices" )); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Indices" )); }
protected:
@@ -107,7 +107,7 @@ class CRuggedness_VRM : public CSG_Module_Grid
public:
CRuggedness_VRM(void);
-// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Indices" )); }
+// virtual CSG_String Get_MenuPath (void) { return( _TL("Indices" )); }
protected:
diff --git a/src/modules/terrain_analysis/ta_preprocessor/Makefile.am b/src/modules/terrain_analysis/ta_preprocessor/Makefile.am
index e2bf3b0..4cb8729 100755
--- a/src/modules/terrain_analysis/ta_preprocessor/Makefile.am
+++ b/src/modules/terrain_analysis/ta_preprocessor/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_preprocessor.la
libta_preprocessor_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_preprocessor/Makefile.in b/src/modules/terrain_analysis/ta_preprocessor/Makefile.in
index f97a724..e837cd3 100644
--- a/src/modules/terrain_analysis/ta_preprocessor/Makefile.in
+++ b/src/modules/terrain_analysis/ta_preprocessor/Makefile.in
@@ -366,10 +366,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_preprocessor.la
libta_preprocessor_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp b/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp
index 9e0a0a8..291ea8d 100755
--- a/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp
+++ b/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp
@@ -118,7 +118,7 @@ CPit_Eliminator::CPit_Eliminator(void)
Parameters.Add_Value(
NULL , "THRSHEIGHT" , _TL("Threshold Height"),
_TW("The parameter describes the maximum depth of a sink to be considered for removal [map units]. "
- "This allows to exclude deeper sinks from filling."),
+ "This makes it possible to exclude deeper sinks from filling."),
PARAMETER_TYPE_Double , 100
);
}
diff --git a/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp b/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp
index 9abd489..57b70ce 100755
--- a/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp
+++ b/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp
@@ -103,7 +103,7 @@ CGrid_Profile_From_Lines::CGrid_Profile_From_Lines(void)
Parameters.Add_Table_Field(
pNode , "NAME" , _TL("Name"),
- _TL("naming for splitted lines"),
+ _TL("Naming for split lines"),
true
);
diff --git a/src/modules/terrain_analysis/ta_profiles/Makefile.am b/src/modules/terrain_analysis/ta_profiles/Makefile.am
index b969415..be9e5b2 100755
--- a/src/modules/terrain_analysis/ta_profiles/Makefile.am
+++ b/src/modules/terrain_analysis/ta_profiles/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_profiles.la
libta_profiles_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_profiles/Makefile.in b/src/modules/terrain_analysis/ta_profiles/Makefile.in
index fdc2d73..834d511 100644
--- a/src/modules/terrain_analysis/ta_profiles/Makefile.in
+++ b/src/modules/terrain_analysis/ta_profiles/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_profiles.la
libta_profiles_la_SOURCES = \
diff --git a/src/modules/terrain_analysis/ta_slope_stability/Makefile.am b/src/modules/terrain_analysis/ta_slope_stability/Makefile.am
index bdfa203..caae3af 100755
--- a/src/modules/terrain_analysis/ta_slope_stability/Makefile.am
+++ b/src/modules/terrain_analysis/ta_slope_stability/Makefile.am
@@ -4,12 +4,10 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_slope_stability.la
libta_slope_stability_la_SOURCES =\
diff --git a/src/modules/terrain_analysis/ta_slope_stability/Makefile.in b/src/modules/terrain_analysis/ta_slope_stability/Makefile.in
index 45467e3..87f54eb 100644
--- a/src/modules/terrain_analysis/ta_slope_stability/Makefile.in
+++ b/src/modules/terrain_analysis/ta_slope_stability/Makefile.in
@@ -367,10 +367,9 @@ top_srcdir = @top_srcdir@
# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libta_slope_stability.la
libta_slope_stability_la_SOURCES = \
diff --git a/src/modules/tin/tin_tools/Makefile.am b/src/modules/tin/tin_tools/Makefile.am
index 51c031f..702231d 100755
--- a/src/modules/tin/tin_tools/Makefile.am
+++ b/src/modules/tin/tin_tools/Makefile.am
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-UC_DEFS = -D_SAGA_UNICODE
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libtin_tools.la
libtin_tools_la_SOURCES =\
diff --git a/src/modules/tin/tin_tools/Makefile.in b/src/modules/tin/tin_tools/Makefile.in
index 67c088a..7c6c428 100644
--- a/src/modules/tin/tin_tools/Makefile.in
+++ b/src/modules/tin/tin_tools/Makefile.in
@@ -364,13 +364,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version
pkglib_LTLIBRARIES = libtin_tools.la
libtin_tools_la_SOURCES = \
diff --git a/src/modules/tin/tin_tools/TIN_Flow_Parallel.h b/src/modules/tin/tin_tools/TIN_Flow_Parallel.h
index 322bf82..1a1950f 100755
--- a/src/modules/tin/tin_tools/TIN_Flow_Parallel.h
+++ b/src/modules/tin/tin_tools/TIN_Flow_Parallel.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_Flow_Parallel.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: TIN_Flow_Parallel.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_Flow_Parallel(void);
virtual ~CTIN_Flow_Parallel(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Terrain Analysis") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Terrain Analysis") ); }
protected:
diff --git a/src/modules/tin/tin_tools/TIN_Flow_Trace.h b/src/modules/tin/tin_tools/TIN_Flow_Trace.h
index e830636..879bd02 100755
--- a/src/modules/tin/tin_tools/TIN_Flow_Trace.h
+++ b/src/modules/tin/tin_tools/TIN_Flow_Trace.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_Flow_Trace.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: TIN_Flow_Trace.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_Flow_Trace(void);
virtual ~CTIN_Flow_Trace(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Terrain Analysis") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Terrain Analysis") ); }
protected:
diff --git a/src/modules/tin/tin_tools/TIN_From_Grid.h b/src/modules/tin/tin_tools/TIN_From_Grid.h
index 75087d0..f00f410 100755
--- a/src/modules/tin/tin_tools/TIN_From_Grid.h
+++ b/src/modules/tin/tin_tools/TIN_From_Grid.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_From_Grid.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: TIN_From_Grid.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_From_Grid(void);
virtual ~CTIN_From_Grid(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/tin/tin_tools/TIN_From_Grid_Specific_Points.h b/src/modules/tin/tin_tools/TIN_From_Grid_Specific_Points.h
index 653431e..f53b636 100755
--- a/src/modules/tin/tin_tools/TIN_From_Grid_Specific_Points.h
+++ b/src/modules/tin/tin_tools/TIN_From_Grid_Specific_Points.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_From_Grid_Specific_Points.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: TIN_From_Grid_Specific_Points.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_From_Grid_Specific_Points(void);
virtual ~CTIN_From_Grid_Specific_Points(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/tin/tin_tools/TIN_From_Shapes.h b/src/modules/tin/tin_tools/TIN_From_Shapes.h
index 46cce9c..7cc1f62 100755
--- a/src/modules/tin/tin_tools/TIN_From_Shapes.h
+++ b/src/modules/tin/tin_tools/TIN_From_Shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_From_Shapes.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: TIN_From_Shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_From_Shapes(void);
virtual ~CTIN_From_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/tin/tin_tools/TIN_Gradient.h b/src/modules/tin/tin_tools/TIN_Gradient.h
index 04c7c35..a0424d2 100755
--- a/src/modules/tin/tin_tools/TIN_Gradient.h
+++ b/src/modules/tin/tin_tools/TIN_Gradient.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_Gradient.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: TIN_Gradient.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_Gradient(void);
virtual ~CTIN_Gradient(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Terrain Analysis") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Terrain Analysis") ); }
protected:
diff --git a/src/modules/tin/tin_tools/TIN_To_Shapes.h b/src/modules/tin/tin_tools/TIN_To_Shapes.h
index 28cd44a..21ab16a 100755
--- a/src/modules/tin/tin_tools/TIN_To_Shapes.h
+++ b/src/modules/tin/tin_tools/TIN_To_Shapes.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: TIN_To_Shapes.h 1922 2014-01-09 10:28:46Z oconrad $
+ * Version $Id: TIN_To_Shapes.h 2851 2016-03-22 16:48:01Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
CTIN_To_Shapes(void);
virtual ~CTIN_To_Shapes(void);
- virtual CSG_String Get_MenuPath (void) { return( _TL("R:Conversion") ); }
+ virtual CSG_String Get_MenuPath (void) { return( _TL("Conversion") ); }
protected:
diff --git a/src/modules/tin/tin_viewer/Makefile.am b/src/modules/tin/tin_viewer/Makefile.am
index 4a6a7ff..23fd7b0 100755
--- a/src/modules/tin/tin_viewer/Makefile.am
+++ b/src/modules/tin/tin_viewer/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/modules/tin/tin_viewer/Makefile.in b/src/modules/tin/tin_viewer/Makefile.in
index 8d45528..d6771db 100644
--- a/src/modules/tin/tin_viewer/Makefile.in
+++ b/src/modules/tin/tin_viewer/Makefile.in
@@ -362,11 +362,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG) -avoid-version
diff --git a/src/saga_core/saga_api/Makefile.am b/src/saga_core/saga_api/Makefile.am
index 2682bf3..2344972 100755
--- a/src/saga_core/saga_api/Makefile.am
+++ b/src/saga_core/saga_api/Makefile.am
@@ -1,19 +1,17 @@
#
-# $Id: Makefile.am 2553 2015-08-18 12:35:01Z oconrad $
+# $Id: Makefile.am 2857 2016-03-23 14:22:48Z oconrad $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
+
if SAGA_PYTHON
SAGAPYTHONFLAGS= -D_SAGA_PYTHON
endif
-if SAGA_UNICODE
-AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` $(HARU_LIB) $(SAGAPYTHONFLAGS)
-else
-AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` $(HARU_LIB)
-endif
+
+AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags base` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
+AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs base,net,xml,html` $(HARU_LIB) $(SAGAPYTHONFLAGS)
+
libsaga_api_la_LDFLAGS =$(AM_LDFLAGS) -release $(VERSION)
lib_LTLIBRARIES = libsaga_api.la
@@ -132,11 +130,10 @@ tin.h
install-exec-hook:
-ldconfig
-if SAGA_UNICODE
-SWIGUNICODEFLAGS = -D_SWIG_WCHAR -D_SAGA_UNICODE
-endif
if SAGA_PYTHON
+SWIGUNICODEFLAGS = -D_SWIG_WCHAR -D_SAGA_UNICODE
+
_saga_api_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(SWIGUNICODEFLAGS) $(DISABLELIBHARU)
_saga_api_la_LDFLAGS = -module -release $(VERSION) $(SWIG_LIB)
nodist__saga_api_la_SOURCES = saga_api_wrap.cxx
diff --git a/src/saga_core/saga_api/Makefile.in b/src/saga_core/saga_api/Makefile.in
index e19a63f..8a531c7 100644
--- a/src/saga_core/saga_api/Makefile.in
+++ b/src/saga_core/saga_api/Makefile.in
@@ -399,14 +399,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2553 2015-08-18 12:35:01Z oconrad $
+# $Id: Makefile.am 2857 2016-03-23 14:22:48Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
@SAGA_PYTHON_TRUE at SAGAPYTHONFLAGS = -D_SAGA_PYTHON
- at SAGA_UNICODE_FALSE@AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS)
- at SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
- at SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` $(HARU_LIB)
- at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` $(HARU_LIB) $(SAGAPYTHONFLAGS)
+AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags base` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
+AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs base,net,xml,html` $(HARU_LIB) $(SAGAPYTHONFLAGS)
libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION)
lib_LTLIBRARIES = libsaga_api.la
otherincludedir = $(pkgincludedir)/saga_core/saga_api
@@ -520,7 +518,7 @@ table_dbase.h\
table_value.h\
tin.h
- at SAGA_UNICODE_TRUE@SWIGUNICODEFLAGS = -D_SWIG_WCHAR -D_SAGA_UNICODE
+ at SAGA_PYTHON_TRUE@SWIGUNICODEFLAGS = -D_SWIG_WCHAR -D_SAGA_UNICODE
@SAGA_PYTHON_TRUE at _saga_api_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(SWIGUNICODEFLAGS) $(DISABLELIBHARU)
@SAGA_PYTHON_TRUE at _saga_api_la_LDFLAGS = -module -release $(VERSION) $(SWIG_LIB)
@SAGA_PYTHON_TRUE at nodist__saga_api_la_SOURCES = saga_api_wrap.cxx
diff --git a/src/saga_core/saga_api/api_core.cpp b/src/saga_core/saga_api/api_core.cpp
index 4d94e1a..d9d5179 100755
--- a/src/saga_core/saga_api/api_core.cpp
+++ b/src/saga_core/saga_api/api_core.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: api_core.cpp 2801 2016-02-19 16:30:30Z oconrad $
+ * Version $Id: api_core.cpp 2872 2016-03-30 16:28:26Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -209,121 +209,3 @@ bool SG_DataType_Range_Check(TSG_Data_Type Type, double &Value)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-#include <time.h>
-
-//---------------------------------------------------------
-CSG_Time_Converter::CSG_Time_Converter(void)
-{
- m_sec = 0;
- m_min = 0;
- m_hour = 0;
- m_day = 0;
- m_mon = 0;
- m_year = 0;
-
- m_StrFmt = SG_TIME_STRFMT_YMD_hms;
-}
-
-//---------------------------------------------------------
-CSG_Time_Converter::CSG_Time_Converter(int Time, TSG_Time_Format Format)
-{
- Set_Time(Time, Format);
-}
-
-//---------------------------------------------------------
-bool CSG_Time_Converter::Set_Time(int Time, TSG_Time_Format Format)
-{
- switch( Format )
- {
- default:
- {
- return( false );
- }
-
- //-----------------------------------------------------
- case SG_TIME_FMT_Seconds_Unix:
- {
- time_t tUnix = Time;
- struct tm t;
-
- #ifdef _SAGA_LINUX
- t = *gmtime(&tUnix);
- #else
- gmtime_s(&t, &tUnix);
- #endif
-
- m_sec = t.tm_sec;
- m_min = t.tm_min;
- m_hour = t.tm_hour;
- m_day = t.tm_mday;
- m_mon = t.tm_mon;
- m_year = t.tm_year + 1900;
- }
- break;
-
- //-----------------------------------------------------
- case SG_TIME_FMT_Hours_AD:
- {
- long d, n;
- double h;
-
- h = 1721424.0 + (Time - 12.0) / 24.0;
- d = (long)h; // Truncate to integral day
- h = h - d + 0.5; // Fractional part of calendar day
- if( h >= 1.0 ) // Is it really the next calendar day?
- {
- h--;
- d++;
- }
-
- h = 24.0 * (h);
- m_hour = (int)h;
- h = 60.0 * (h - m_hour);
- m_min = (int)h;
- h = 60.0 * (h - m_min);
- m_sec = (int)h;
-
- d = d + 68569;
- n = 4 * d / 146097;
- d = d - (146097 * n + 3) / 4;
- m_year = 4000 * (d + 1) / 1461001;
- d = d - 1461 * m_year / 4 + 31; // 1461 = 365.25 * 4
- m_mon = 80 * d / 2447;
- m_day = d - 2447 * m_mon / 80;
- d = m_mon / 11;
- m_mon = m_mon + 2 - 12 * d;
- m_year = 100 * (n - 49) + m_year + d;
- }
- break;
- }
-
- //-----------------------------------------------------
- return( true );
-}
-
-//---------------------------------------------------------
-CSG_String CSG_Time_Converter::Get_String(void) const
-{
- CSG_String s;
-
- s.Printf(SG_T("%04d.%02d.%02d %02d:%02d:%02d"), m_year, m_mon, m_day, m_hour, m_min, m_sec);
-
- return( s );
-}
-
-//---------------------------------------------------------
-CSG_String CSG_Time_Converter::Get_String(int Time, TSG_Time_Format Format)
-{
- CSG_Time_Converter tc(Time, Format);
-
- return( tc.Get_String() );
-}
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
diff --git a/src/saga_core/saga_api/api_core.h b/src/saga_core/saga_api/api_core.h
index 956a923..c692ff3 100755
--- a/src/saga_core/saga_api/api_core.h
+++ b/src/saga_core/saga_api/api_core.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: api_core.h 2801 2016-02-19 16:30:30Z oconrad $
+ * Version $Id: api_core.h 2872 2016-03-30 16:28:26Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -1034,51 +1034,6 @@ SAGA_API_DLL_EXPORT bool SG_Set_Environment (const CSG_String &Variable, cons
///////////////////////////////////////////////////////////
// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-typedef enum ESG_Time_Format
-{
- SG_TIME_FMT_Seconds_Unix = 0,
- SG_TIME_FMT_Hours_AD
-}
-TSG_Time_Format;
-
-//---------------------------------------------------------
-typedef enum ESG_Time_String_Format
-{
- SG_TIME_STRFMT_YMD_hms = 0,
- SG_TIME_STRFMT_DMY_hms
-}
-TSG_Time_String_Format;
-
-//---------------------------------------------------------
-class SAGA_API_DLL_EXPORT CSG_Time_Converter
-{
-public:
- CSG_Time_Converter(void);
- CSG_Time_Converter(int Time, TSG_Time_Format Format);
-
- bool Set_Time (int Time, TSG_Time_Format Format);
-
- CSG_String Get_String (void) const;
-
- static CSG_String Get_String (int Time, TSG_Time_Format Format);
-
-
-public:
-
- TSG_Time_String_Format m_StrFmt;
-
- int m_sec, m_min, m_hour, m_day, m_mon, m_year;
-
-};
-
-
-///////////////////////////////////////////////////////////
-// //
// Colors //
// //
///////////////////////////////////////////////////////////
diff --git a/src/saga_core/saga_api/datetime.cpp b/src/saga_core/saga_api/datetime.cpp
index 3a90082..76d7b88 100755
--- a/src/saga_core/saga_api/datetime.cpp
+++ b/src/saga_core/saga_api/datetime.cpp
@@ -664,3 +664,121 @@ bool SG_Get_Sun_Position(const CSG_DateTime &Time, double Longitude, double Lati
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#include <time.h>
+
+//---------------------------------------------------------
+CSG_Time_Converter::CSG_Time_Converter(void)
+{
+ m_sec = 0;
+ m_min = 0;
+ m_hour = 0;
+ m_day = 0;
+ m_mon = 0;
+ m_year = 0;
+
+ m_StrFmt = SG_TIME_STRFMT_YMD_hms;
+}
+
+//---------------------------------------------------------
+CSG_Time_Converter::CSG_Time_Converter(int Time, TSG_Time_Format Format)
+{
+ Set_Time(Time, Format);
+}
+
+//---------------------------------------------------------
+bool CSG_Time_Converter::Set_Time(int Time, TSG_Time_Format Format)
+{
+ switch( Format )
+ {
+ default:
+ {
+ return( false );
+ }
+
+ //-----------------------------------------------------
+ case SG_TIME_FMT_Seconds_Unix:
+ {
+ time_t tUnix = Time;
+ struct tm t;
+
+ #ifdef _SAGA_LINUX
+ t = *gmtime(&tUnix);
+ #else
+ gmtime_s(&t, &tUnix);
+ #endif
+
+ m_sec = t.tm_sec;
+ m_min = t.tm_min;
+ m_hour = t.tm_hour;
+ m_day = t.tm_mday;
+ m_mon = t.tm_mon;
+ m_year = t.tm_year + 1900;
+ }
+ break;
+
+ //-----------------------------------------------------
+ case SG_TIME_FMT_Hours_AD:
+ {
+ long d, n;
+ double h;
+
+ h = 1721424.0 + (Time - 12.0) / 24.0;
+ d = (long)h; // Truncate to integral day
+ h = h - d + 0.5; // Fractional part of calendar day
+ if( h >= 1.0 ) // Is it really the next calendar day?
+ {
+ h--;
+ d++;
+ }
+
+ h = 24.0 * (h);
+ m_hour = (int)h;
+ h = 60.0 * (h - m_hour);
+ m_min = (int)h;
+ h = 60.0 * (h - m_min);
+ m_sec = (int)h;
+
+ d = d + 68569;
+ n = 4 * d / 146097;
+ d = d - (146097 * n + 3) / 4;
+ m_year = 4000 * (d + 1) / 1461001;
+ d = d - 1461 * m_year / 4 + 31; // 1461 = 365.25 * 4
+ m_mon = 80 * d / 2447;
+ m_day = d - 2447 * m_mon / 80;
+ d = m_mon / 11;
+ m_mon = m_mon + 2 - 12 * d;
+ m_year = 100 * (n - 49) + m_year + d;
+ }
+ break;
+ }
+
+ //-----------------------------------------------------
+ return( true );
+}
+
+//---------------------------------------------------------
+CSG_String CSG_Time_Converter::Get_String(void) const
+{
+ CSG_String s;
+
+ s.Printf(SG_T("%04d.%02d.%02d %02d:%02d:%02d"), m_year, m_mon, m_day, m_hour, m_min, m_sec);
+
+ return( s );
+}
+
+//---------------------------------------------------------
+CSG_String CSG_Time_Converter::Get_String(int Time, TSG_Time_Format Format)
+{
+ CSG_Time_Converter tc(Time, Format);
+
+ return( tc.Get_String() );
+}
+
+
+///////////////////////////////////////////////////////////
+// //
+// //
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
diff --git a/src/saga_core/saga_api/datetime.h b/src/saga_core/saga_api/datetime.h
index a572a37..0f0accc 100755
--- a/src/saga_core/saga_api/datetime.h
+++ b/src/saga_core/saga_api/datetime.h
@@ -74,8 +74,6 @@
//---------------------------------------------------------
#include "api_core.h"
-#include <limits.h>
-
///////////////////////////////////////////////////////////
// //
@@ -211,7 +209,7 @@ public:
enum Year // invalid value for the year
{
- Inv_Year = SHRT_MIN // should hold in wxDateTime_t
+ Inv_Year = -32768 // should hold in wxDateTime_t
};
enum NameFlags // flags for GetWeekDayName and GetMonthName
@@ -389,4 +387,49 @@ SAGA_API_DLL_EXPORT bool SG_Get_Sun_Position (const CSG_DateTime &Time, double
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+typedef enum ESG_Time_Format
+{
+ SG_TIME_FMT_Seconds_Unix = 0,
+ SG_TIME_FMT_Hours_AD
+}
+TSG_Time_Format;
+
+//---------------------------------------------------------
+typedef enum ESG_Time_String_Format
+{
+ SG_TIME_STRFMT_YMD_hms = 0,
+ SG_TIME_STRFMT_DMY_hms
+}
+TSG_Time_String_Format;
+
+//---------------------------------------------------------
+class SAGA_API_DLL_EXPORT CSG_Time_Converter
+{
+public:
+ CSG_Time_Converter(void);
+ CSG_Time_Converter(int Time, TSG_Time_Format Format);
+
+ bool Set_Time (int Time, TSG_Time_Format Format);
+
+ CSG_String Get_String (void) const;
+
+ static CSG_String Get_String (int Time, TSG_Time_Format Format);
+
+
+public:
+
+ TSG_Time_String_Format m_StrFmt;
+
+ int m_sec, m_min, m_hour, m_day, m_mon, m_year;
+
+};
+
+
+///////////////////////////////////////////////////////////
+// //
+// //
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
#endif // #ifndef HEADER_INCLUDED__SAGA_API__datetime_H
diff --git a/src/saga_core/saga_api/module_chain.cpp b/src/saga_core/saga_api/module_chain.cpp
index eac4137..0e2c6ab 100755
--- a/src/saga_core/saga_api/module_chain.cpp
+++ b/src/saga_core/saga_api/module_chain.cpp
@@ -73,7 +73,7 @@
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-#define GET_XML_CONTENT(md, id, def) (md(id) ? md(id)->Get_Content() : CSG_String(def))
+#define GET_XML_CONTENT(XML, ID, DEFAULT, TRANSLATE) (!XML(ID) ? CSG_String(DEFAULT) : !TRANSLATE ? XML[ID].Get_Content() : CSG_String(SG_Translate(XML[ID].Get_Content())))
#define IS_TRUE_STRING(String) (!String.CmpNoCase("true") || !String.CmpNoCase("1"))
#define IS_TRUE_PROPERTY(Item, Property) (Item.Cmp_Property(Property, "true", true) || Item.Cmp_Property(Property, "1"))
@@ -162,12 +162,12 @@ bool CSG_Module_Chain::Create(const CSG_String &File)
//-----------------------------------------------------
m_File_Name = File;
- m_ID = GET_XML_CONTENT(m_Chain, "identifier" , "");
- m_Library = GET_XML_CONTENT(m_Chain, "group" , "toolchains");
- m_Menu = GET_XML_CONTENT(m_Chain, "menu" , "");
- Set_Name (GET_XML_CONTENT(m_Chain, "name" , _TL("Not Named")));
- Set_Author (GET_XML_CONTENT(m_Chain, "author" , _TL("unknown")));
- Set_Description (GET_XML_CONTENT(m_Chain, "description", _TL("no description")));
+ m_ID = GET_XML_CONTENT(m_Chain, "identifier" , "" , false) ;
+ m_Library = GET_XML_CONTENT(m_Chain, "group" , "toolchains" , false) ;
+ m_Menu = GET_XML_CONTENT(m_Chain, "menu" , "" , true) ;
+ Set_Name (GET_XML_CONTENT(m_Chain, "name" , _TL("Not Named" ), true));
+ Set_Author (GET_XML_CONTENT(m_Chain, "author" , _TL("unknown" ), false));
+ Set_Description (GET_XML_CONTENT(m_Chain, "description", _TL("no description"), true));
CSG_String Description = Get_Description();
Description.Replace("[[", "<"); // support for xml/html tags
@@ -231,8 +231,8 @@ bool CSG_Module_Chain::Create(const CSG_String &File)
}
//-------------------------------------------------
- CSG_String Name = Parameter.Get_Content("name" );
- CSG_String Desc = Parameter.Get_Content("description");
+ CSG_String Name = SG_Translate(Parameter.Get_Content("name" ));
+ CSG_String Desc = SG_Translate(Parameter.Get_Content("description"));
CSG_Parameter *pParent = Parameters(Parameter.Get_Property("parent"));
@@ -1002,9 +1002,9 @@ CSG_Module_Chains::CSG_Module_Chains(const CSG_String &Library_Name, const CSG_S
XML.Destroy();
}
- m_Name = GET_XML_CONTENT(XML, "name" , m_Library_Name);
- m_Description = GET_XML_CONTENT(XML, "description", _TL("no description"));
- m_Menu = GET_XML_CONTENT(XML, "menu" , _TL("Tool Chains"));
+ m_Name = GET_XML_CONTENT(XML, "name" , m_Library_Name , true);
+ m_Description = GET_XML_CONTENT(XML, "description", _TL("no description"), true);
+ m_Menu = GET_XML_CONTENT(XML, "menu" , _TL("Tool Chains" ), true);
m_Description.Replace("[[", "<"); // support for xml/html tags
m_Description.Replace("]]", ">");
diff --git a/src/saga_core/saga_api/parameter.cpp b/src/saga_core/saga_api/parameter.cpp
index 6bd3750..5077c07 100755
--- a/src/saga_core/saga_api/parameter.cpp
+++ b/src/saga_core/saga_api/parameter.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: parameter.cpp 2798 2016-02-18 13:40:48Z oconrad $
+ * Version $Id: parameter.cpp 2872 2016-03-30 16:28:26Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -107,6 +107,7 @@ CSG_Parameter::CSG_Parameter(CSG_Parameters *pOwner, CSG_Parameter *pParent, con
case PARAMETER_TYPE_Int: m_pData = new CSG_Parameter_Int (this, Constraint); break;
case PARAMETER_TYPE_Double: m_pData = new CSG_Parameter_Double (this, Constraint); break;
case PARAMETER_TYPE_Degree: m_pData = new CSG_Parameter_Degree (this, Constraint); break;
+ case PARAMETER_TYPE_Date: m_pData = new CSG_Parameter_Date (this, Constraint); break;
case PARAMETER_TYPE_Range: m_pData = new CSG_Parameter_Range (this, Constraint); break;
case PARAMETER_TYPE_Choice: m_pData = new CSG_Parameter_Choice (this, Constraint); break;
@@ -291,6 +292,7 @@ bool CSG_Parameter::is_Option(void) const
case PARAMETER_TYPE_Int:
case PARAMETER_TYPE_Double:
case PARAMETER_TYPE_Degree:
+ case PARAMETER_TYPE_Date:
case PARAMETER_TYPE_Range:
case PARAMETER_TYPE_Choice:
@@ -438,6 +440,7 @@ bool CSG_Parameter::is_Value_Equal(CSG_Parameter *pParameter) const
case PARAMETER_TYPE_Choice :
case PARAMETER_TYPE_Color :
case PARAMETER_TYPE_Int : return( pParameter->asInt () == asInt () );
+ case PARAMETER_TYPE_Date :
case PARAMETER_TYPE_Degree :
case PARAMETER_TYPE_Double : return( pParameter->asDouble() == asDouble() );
@@ -950,15 +953,15 @@ bool CSG_Parameters_Grid_Target::Create(CSG_Parameters *pParameters, bool bAddDe
);
//-----------------------------------------------------
+ m_pParameters->Add_Value (pNode, m_Prefix + "USER_SIZE", _TL("Cellsize"), _TL(""), PARAMETER_TYPE_Double, 1.0, 0.0, true);
m_pParameters->Add_Value (pNode, m_Prefix + "USER_XMIN", _TL("Left" ), _TL(""), PARAMETER_TYPE_Double, 0.0);
m_pParameters->Add_Value (pNode, m_Prefix + "USER_XMAX", _TL("Right" ), _TL(""), PARAMETER_TYPE_Double, 100.0);
m_pParameters->Add_Value (pNode, m_Prefix + "USER_YMIN", _TL("Bottom" ), _TL(""), PARAMETER_TYPE_Double, 0.0);
m_pParameters->Add_Value (pNode, m_Prefix + "USER_YMAX", _TL("Top" ), _TL(""), PARAMETER_TYPE_Double, 100.0);
- m_pParameters->Add_Value (pNode, m_Prefix + "USER_SIZE", _TL("Cellsize"), _TL(""), PARAMETER_TYPE_Double, 1.0, 0.0, true);
m_pParameters->Add_Info_Value(pNode, m_Prefix + "USER_COLS", _TL("Columns" ), _TL(""), PARAMETER_TYPE_Int , 100);
m_pParameters->Add_Info_Value(pNode, m_Prefix + "USER_ROWS", _TL("Rows" ), _TL(""), PARAMETER_TYPE_Int , 100);
m_pParameters->Add_Choice (pNode, m_Prefix + "USER_FITS", _TL("Fit" ), _TL(""),
- CSG_String::Format(SG_T("%s|%s|"),
+ CSG_String::Format("%s|%s|",
_TL("nodes"),
_TL("cells")
), 0
@@ -994,11 +997,11 @@ bool CSG_Parameters_Grid_Target::On_Parameter_Changed(CSG_Parameters *pParameter
return( false );
}
+ CSG_Parameter *pSize = pParameters->Get_Parameter(m_Prefix + "USER_SIZE");
CSG_Parameter *pXMin = pParameters->Get_Parameter(m_Prefix + "USER_XMIN");
CSG_Parameter *pXMax = pParameters->Get_Parameter(m_Prefix + "USER_XMAX");
CSG_Parameter *pYMin = pParameters->Get_Parameter(m_Prefix + "USER_YMIN");
CSG_Parameter *pYMax = pParameters->Get_Parameter(m_Prefix + "USER_YMAX");
- CSG_Parameter *pSize = pParameters->Get_Parameter(m_Prefix + "USER_SIZE");
CSG_Parameter *pRows = pParameters->Get_Parameter(m_Prefix + "USER_ROWS");
CSG_Parameter *pCols = pParameters->Get_Parameter(m_Prefix + "USER_COLS");
CSG_Parameter *pFits = pParameters->Get_Parameter(m_Prefix + "USER_FITS");
@@ -1061,6 +1064,10 @@ bool CSG_Parameters_Grid_Target::On_Parameter_Changed(CSG_Parameters *pParameter
{
pSize->Set_Value(Size = r.Get_YRange() / pRows->asDouble());
}
+ else
+ {
+ return( true ); // none of the relevant parameters did change
+ }
//-----------------------------------------------------
pCols->Set_Value(1 + (int)((r.Get_XRange()) / Size));
@@ -1076,8 +1083,6 @@ bool CSG_Parameters_Grid_Target::On_Parameter_Changed(CSG_Parameters *pParameter
pYMin->Set_Value(r.Get_YMin());
pYMax->Set_Value(r.Get_YMax());
- pFits->Set_Value(m_bFitToCells);
-
return( true );
}
@@ -1094,11 +1099,11 @@ bool CSG_Parameters_Grid_Target::On_Parameters_Enable(CSG_Parameters *pParameter
return( false );
}
+ pParameters->Set_Enabled(m_Prefix + "USER_SIZE", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_XMIN", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_XMAX", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_YMIN", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_YMAX", pParameter->asInt() == 0);
- pParameters->Set_Enabled(m_Prefix + "USER_SIZE", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_ROWS", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_COLS", pParameter->asInt() == 0);
pParameters->Set_Enabled(m_Prefix + "USER_FITS", pParameter->asInt() == 0);
@@ -1110,15 +1115,14 @@ bool CSG_Parameters_Grid_Target::On_Parameters_Enable(CSG_Parameters *pParameter
//---------------------------------------------------------
/**
- * Initializes the grid system from Extent and number of rows.
- * If bFitToCells is true, the extent is deflated by half a cell size,
- * so automatically adjusting the extent based on grid nodes to
- * an extent based on the grid cells. If Rounding is greater than
- * zero it specifies the number of significant figures to which
- * the cell size is rounded and also adjuts the extent coordinates
+ * Initializes the grid system from extent and number of rows.
+ * Extent calculation is done for grid nodes and will automatically
+ * become adjusted to match the grid cells if necessary. If Rounding is
+ * greater than zero it specifies the number of significant figures to which
+ * the cell size is rounded and also adjusts the extent coordinates
* to be a multiple of cell size.
*/
-bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, const TSG_Rect &Extent, int Rows, bool bFitToCells, int Rounding)
+bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, const TSG_Rect &Extent, int Rows, int Rounding)
{
if( !SG_UI_Get_Window_Main() ) // no cancel button, so set parameters directly
{
@@ -1130,16 +1134,12 @@ bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, c
return( false );
}
- if( Rows < 1 )
+ if( Rows < 1 && (Rows = m_pParameters->Get_Parameter(m_Prefix + "USER_ROWS")->asInt()) < 1 )
{
- Rows = m_pParameters->Get_Parameter(m_Prefix + "USER_ROWS")->asInt();
-
- if( Rows < 1 )
- {
- Rows = 100;
- }
+ Rows = 100;
}
+ //-----------------------------------------------------
CSG_Rect r(Extent);
if( r.Get_XRange() == 0.0 && r.Get_YRange() == 0.0 )
@@ -1156,9 +1156,7 @@ bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, c
}
//-----------------------------------------------------
- m_bFitToCells = bFitToCells;
-
- double Size = r.Get_YRange() / ((m_bFitToCells ? 1 : 0) + Rows);
+ double Size = r.Get_YRange() / (Rows - 1);
if( Rounding > 0 )
{
@@ -1169,21 +1167,25 @@ bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, c
r.m_rect.yMax = Size * ceil (r.m_rect.yMax / Size);
}
- //-----------------------------------------------------
- int Cols = (bFitToCells ? 0 : 1) + (int)(r.Get_XRange() / Size);
+ int Cols = 1 + (int)(r.Get_XRange() / Size);
- r.m_rect.xMax = r.Get_XMin() + Cols * Size;
+ r.m_rect.xMax = r.Get_XMin() + (Cols - 1) * Size;
+
+ //-----------------------------------------------------
+ if( (m_bFitToCells = pParameters->Get_Parameter(m_Prefix + "USER_FITS")->asInt() == 1) == true )
+ {
+ r.Inflate(0.5 * Size, false);
+ }
bool bCallback = pParameters->Set_Callback(false);
- pParameters->Set_Parameter(m_Prefix + "USER_XMIN", r.Get_XMin() );
- pParameters->Set_Parameter(m_Prefix + "USER_XMAX", r.Get_XMax() );
- pParameters->Set_Parameter(m_Prefix + "USER_YMIN", r.Get_YMin() );
- pParameters->Set_Parameter(m_Prefix + "USER_YMAX", r.Get_YMax() );
- pParameters->Set_Parameter(m_Prefix + "USER_SIZE", Size );
- pParameters->Set_Parameter(m_Prefix + "USER_COLS", Cols );
- pParameters->Set_Parameter(m_Prefix + "USER_ROWS", Rows );
- pParameters->Set_Parameter(m_Prefix + "USER_FITS", m_bFitToCells);
+ pParameters->Set_Parameter(m_Prefix + "USER_SIZE", Size );
+ pParameters->Set_Parameter(m_Prefix + "USER_XMIN", r.Get_XMin());
+ pParameters->Set_Parameter(m_Prefix + "USER_XMAX", r.Get_XMax());
+ pParameters->Set_Parameter(m_Prefix + "USER_YMIN", r.Get_YMin());
+ pParameters->Set_Parameter(m_Prefix + "USER_YMAX", r.Get_YMax());
+ pParameters->Set_Parameter(m_Prefix + "USER_COLS", Cols );
+ pParameters->Set_Parameter(m_Prefix + "USER_ROWS", Rows );
pParameters->Set_Callback(bCallback);
@@ -1191,78 +1193,49 @@ bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, c
}
//---------------------------------------------------------
-bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, double xMin, double yMin, double Size, int nx, int ny, bool bFitToCells)
+/**
+ * Initializes the grid system from 'pPoints' extent and fits number of columns/rows to the average point density.
+ * Number of columns/rows can be increased if 'Scale' is greater than 1.
+*/
+bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, CSG_Shapes *pPoints, int Scale, int Rounding)
{
- if( Size <= 0.0 || nx < 1 || ny < 1 )
+ if( !pPoints || pPoints->Get_Count() <= 0 || pPoints->Get_Extent().Get_Area() <= 0.0 )
{
return( false );
}
- CSG_Rect Extent(xMin, yMin, xMin + Size * nx, yMin + Size * ny);
+ CSG_Rect r = pPoints->Get_Extent();
- if( bFitToCells )
- {
- Extent.m_rect.xMax += Size;
- Extent.m_rect.yMax += Size;
- }
+ double Size = sqrt(r.Get_Area() / pPoints->Get_Count()); // edge length of a square given as average area per point (cell size)
- return( Set_User_Defined(pParameters, Extent, ny, bFitToCells, 0) );
-}
+ int Rows = 1 + (int)(0.5 + r.Get_YRange() / Size);
-//---------------------------------------------------------
-bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, CSG_Shapes *pPoints, int Scale, bool bFitToCells, int Rounding)
-{
- if( !pPoints || pPoints->Get_Count() <= 0 || pPoints->Get_Extent().Get_Area() <= 0.0 )
+ if( Scale > 1 )
{
- return( false );
+ Rows *= Scale;
}
- double d = sqrt(pPoints->Get_Extent().Get_Area() / pPoints->Get_Count()); // edge length of a square given as average area per point (cell size)
+ r.Inflate(Size, false);
- int Rows = (int)(0.5 + pPoints->Get_Extent().Get_YRange() / d); if( Scale > 1 ) Rows *= Scale;
-
- return( Set_User_Defined(pParameters, pPoints->Get_Extent(), Rows, bFitToCells, Rounding) );
+ return( Set_User_Defined(pParameters, r, Rows, Rounding) );
}
-
-///////////////////////////////////////////////////////////
-// //
-///////////////////////////////////////////////////////////
-
//---------------------------------------------------------
-bool CSG_Parameters_Grid_Target::Cmd_Update(const TSG_Rect &Extent)
+/**
+ * Initializes the grid system from 'System', if it represents a valid grid system.
+*/
+bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, const CSG_Grid_System &System)
{
- if( m_pParameters && !SG_UI_Get_Window_Main() ) // tool is run by saga_cmd ...
- {
- if( m_pParameters->Get_Manager() == &SG_Get_Data_Manager() ) // ... but tool is not run as part of a tool chain
- {
- Set_User_Defined(m_pParameters, Extent);
-
- SG_UI_Dlg_Parameters(m_pParameters, m_pParameters->Get_Name());
-
- return( true );
- }
- }
-
- return( false );
+ return( System.is_Valid() && Set_User_Defined(pParameters, System.Get_Extent(), System.Get_NY(), 0) );
}
//---------------------------------------------------------
-bool CSG_Parameters_Grid_Target::Cmd_Update(CSG_Shapes *pPoints)
+/**
+ * Initializes the grid system from lower left cell center coordinate, cell size and number of columns and rows (nx, ny).
+*/
+bool CSG_Parameters_Grid_Target::Set_User_Defined(CSG_Parameters *pParameters, double xMin, double yMin, double Cellsize, int nx, int ny)
{
- if( m_pParameters && !SG_UI_Get_Window_Main() ) // tool is run by saga_cmd ...
- {
- if( m_pParameters->Get_Manager() == &SG_Get_Data_Manager() ) // ... but tool is not run as part of a tool chain
- {
- Set_User_Defined(m_pParameters, pPoints);
-
- SG_UI_Dlg_Parameters(m_pParameters, m_pParameters->Get_Name());
-
- return( true );
- }
- }
-
- return( false );
+ return( Set_User_Defined(pParameters, CSG_Grid_System(Cellsize, xMin, yMin, nx, ny)) );
}
diff --git a/src/saga_core/saga_api/parameter_data.cpp b/src/saga_core/saga_api/parameter_data.cpp
index dd1c708..32c40a1 100755
--- a/src/saga_core/saga_api/parameter_data.cpp
+++ b/src/saga_core/saga_api/parameter_data.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: parameter_data.cpp 2771 2016-02-05 15:24:27Z oconrad $
+ * Version $Id: parameter_data.cpp 2872 2016-03-30 16:28:26Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -96,6 +96,7 @@ CSG_String SG_Parameter_Type_Get_Name(TSG_Parameter_Type Type)
case PARAMETER_TYPE_Int: return( _TL("Integer") );
case PARAMETER_TYPE_Double: return( _TL("Floating point") );
case PARAMETER_TYPE_Degree: return( _TL("Degree") );
+ case PARAMETER_TYPE_Date: return( _TL("Date") );
case PARAMETER_TYPE_Range: return( _TL("Value range") );
case PARAMETER_TYPE_Choice: return( _TL("Choice") );
@@ -141,6 +142,7 @@ CSG_String SG_Parameter_Type_Get_Identifier(TSG_Parameter_Type Type)
case PARAMETER_TYPE_Int: return( SG_T("integer") );
case PARAMETER_TYPE_Double: return( SG_T("double") );
case PARAMETER_TYPE_Degree: return( SG_T("degree") );
+ case PARAMETER_TYPE_Date: return( SG_T("date") );
case PARAMETER_TYPE_Range: return( SG_T("range") );
case PARAMETER_TYPE_Choice: return( SG_T("choice") );
@@ -181,6 +183,7 @@ TSG_Parameter_Type SG_Parameter_Type_Get_Type(const CSG_String &Identifier)
if( !Identifier.Cmp(SG_T("integer" )) ) { return( PARAMETER_TYPE_Int ); }
if( !Identifier.Cmp(SG_T("double" )) ) { return( PARAMETER_TYPE_Double ); }
if( !Identifier.Cmp(SG_T("degree" )) ) { return( PARAMETER_TYPE_Degree ); }
+ if( !Identifier.Cmp(SG_T("date" )) ) { return( PARAMETER_TYPE_Date ); }
if( !Identifier.Cmp(SG_T("range" )) ) { return( PARAMETER_TYPE_Range ); }
if( !Identifier.Cmp(SG_T("choice" )) ) { return( PARAMETER_TYPE_Choice ); }
@@ -283,14 +286,14 @@ const SG_Char * CSG_Parameter_Data::asString(void)
}
//---------------------------------------------------------
-void CSG_Parameter_Data::Set_Default(int Value)
+void CSG_Parameter_Data::Set_Default(int Value)
{
- m_Default.Printf(SG_T("%d"), Value);
+ m_Default.Printf("%d", Value);
}
-void CSG_Parameter_Data::Set_Default(double Value)
+void CSG_Parameter_Data::Set_Default(double Value)
{
- m_Default.Printf(SG_T("%f"), Value);
+ m_Default.Printf("%f", Value);
}
void CSG_Parameter_Data::Set_Default(const CSG_String &Value)
@@ -711,6 +714,94 @@ const SG_Char * CSG_Parameter_Degree::asString(void)
///////////////////////////////////////////////////////////
// //
+// Date //
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
+CSG_Parameter_Date::CSG_Parameter_Date(CSG_Parameter *pOwner, long Constraint)
+ : CSG_Parameter_Data(pOwner, Constraint)
+{}
+
+CSG_Parameter_Date::~CSG_Parameter_Date(void)
+{}
+
+//---------------------------------------------------------
+bool CSG_Parameter_Date::Restore_Default(void)
+{
+ return( Set_Value(m_Default) );
+}
+
+//---------------------------------------------------------
+bool CSG_Parameter_Date::Set_Value(int Value)
+{
+ return( Set_Value((double)Value) );
+}
+
+//---------------------------------------------------------
+bool CSG_Parameter_Date::Set_Value(double Value)
+{
+ m_Date.Set(Value);
+
+ return( true );
+}
+
+//---------------------------------------------------------
+bool CSG_Parameter_Date::Set_Value(const CSG_String &Value)
+{
+ return( m_Date.Parse_Date(Value) );
+}
+
+//---------------------------------------------------------
+int CSG_Parameter_Date::asInt(void) const
+{
+ return( (int)asDouble() );
+}
+
+//---------------------------------------------------------
+double CSG_Parameter_Date::asDouble(void) const
+{
+ return( m_Date.Get_JDN() );
+}
+
+//---------------------------------------------------------
+const SG_Char * CSG_Parameter_Date::asString(void)
+{
+ m_String = m_Date.Format_Date();
+
+ return( m_String );
+}
+
+//---------------------------------------------------------
+void CSG_Parameter_Date::Set_Date(const CSG_DateTime &Date)
+{
+ m_Date = Date;
+}
+
+//---------------------------------------------------------
+void CSG_Parameter_Date::On_Assign(CSG_Parameter_Data *pSource)
+{
+ m_Date = ((CSG_Parameter_Date *)pSource)->m_Date;
+}
+
+//---------------------------------------------------------
+bool CSG_Parameter_Date::On_Serialize(CSG_MetaData &Entry, bool bSave)
+{
+ if( bSave )
+ {
+ Entry.Set_Content(asString());
+ }
+ else
+ {
+ Set_Value(Entry.Get_Content());
+ }
+
+ return( true );
+}
+
+
+///////////////////////////////////////////////////////////
+// //
// Range //
// //
///////////////////////////////////////////////////////////
diff --git a/src/saga_core/saga_api/parameters.cpp b/src/saga_core/saga_api/parameters.cpp
index 437e045..794d1ca 100755
--- a/src/saga_core/saga_api/parameters.cpp
+++ b/src/saga_core/saga_api/parameters.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: parameters.cpp 2798 2016-02-18 13:40:48Z oconrad $
+ * Version $Id: parameters.cpp 2872 2016-03-30 16:28:26Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -340,6 +340,11 @@ CSG_Parameter * CSG_Parameters::Add_Degree(CSG_Parameter *pParent, const CSG_Str
return( Add_Value(pParent, Identifier, Name, Description, PARAMETER_TYPE_Degree, Value, Minimum, bMinimum, Maximum, bMaximum) );
}
+CSG_Parameter * CSG_Parameters::Add_Date(CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, double Value) // Julian Day Number
+{
+ return( Add_Value(pParent, Identifier, Name, Description, PARAMETER_TYPE_Date , Value) );
+}
+
CSG_Parameter * CSG_Parameters::Add_Color (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, int Value)
{
return( Add_Value(pParent, Identifier, Name, Description, PARAMETER_TYPE_Color , Value) );
@@ -775,16 +780,16 @@ CSG_Parameter * CSG_Parameters::_Add_Value(CSG_Parameter *pParent, const CSG_Str
{
switch( Type ) // Check if Type is valid...
{
- case PARAMETER_TYPE_Bool:
- case PARAMETER_TYPE_Int:
+ case PARAMETER_TYPE_Bool :
+ case PARAMETER_TYPE_Int :
case PARAMETER_TYPE_Double:
case PARAMETER_TYPE_Degree:
- case PARAMETER_TYPE_Color:
+ case PARAMETER_TYPE_Date :
+ case PARAMETER_TYPE_Color :
break;
- default:
- Type = PARAMETER_TYPE_Double; // if not valid set Type to [double]...
- break;
+ default: // if not valid set Type to [double]...
+ Type = PARAMETER_TYPE_Double;
}
CSG_Parameter *pParameter = _Add(pParent, Identifier, Name, Description, Type, bInformation ? PARAMETER_INFORMATION : 0);
@@ -798,23 +803,31 @@ CSG_Parameter * CSG_Parameters::_Add_Value(CSG_Parameter *pParent, const CSG_Str
((CSG_Parameter_Value *)pParameter->m_pData)->Set_Minimum(Minimum, bMinimum);
((CSG_Parameter_Value *)pParameter->m_pData)->Set_Maximum(Maximum, bMaximum);
}
+ }
- if( Type == PARAMETER_TYPE_Bool
- || Type == PARAMETER_TYPE_Int
- || Type == PARAMETER_TYPE_Color )
+ bool bCallback = Set_Callback(false);
+ pParameter->Set_Value (Value);
+ Set_Callback(bCallback);
+
+ if( !bInformation )
+ {
+ switch( Type )
{
+ case PARAMETER_TYPE_Bool :
+ case PARAMETER_TYPE_Int :
+ case PARAMETER_TYPE_Color :
pParameter->Set_Default((int)Value);
- }
- else
- {
+ break;
+
+ case PARAMETER_TYPE_Date :
+ pParameter->Set_Default(pParameter->asString());
+ break;
+
+ default:
pParameter->Set_Default( Value);
}
}
- bool bCallback = Set_Callback(false);
- pParameter->Set_Value (Value);
- Set_Callback(bCallback);
-
return( pParameter );
}
diff --git a/src/saga_core/saga_api/parameters.h b/src/saga_core/saga_api/parameters.h
index dda3700..d592d34 100755
--- a/src/saga_core/saga_api/parameters.h
+++ b/src/saga_core/saga_api/parameters.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: parameters.h 2795 2016-02-17 13:04:43Z oconrad $
+ * Version $Id: parameters.h 2872 2016-03-30 16:28:26Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -79,6 +79,7 @@
#include "shapes.h"
#include "tin.h"
#include "pointcloud.h"
+#include "datetime.h"
///////////////////////////////////////////////////////////
@@ -123,6 +124,7 @@ typedef enum ESG_Parameter_Type
PARAMETER_TYPE_Int,
PARAMETER_TYPE_Double,
PARAMETER_TYPE_Degree,
+ PARAMETER_TYPE_Date,
PARAMETER_TYPE_Range,
PARAMETER_TYPE_Choice,
@@ -439,6 +441,45 @@ public:
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+class SAGA_API_DLL_EXPORT CSG_Parameter_Date : public CSG_Parameter_Data
+{
+public:
+ CSG_Parameter_Date(CSG_Parameter *pOwner, long Constraint);
+ virtual ~CSG_Parameter_Date(void);
+
+ virtual TSG_Parameter_Type Get_Type (void) const { return( PARAMETER_TYPE_Date ); }
+
+ virtual bool Set_Value (int Value);
+ virtual bool Set_Value (double Value);
+ virtual bool Set_Value (const CSG_String &Value);
+
+ virtual int asInt (void) const;
+ virtual double asDouble (void) const;
+
+ virtual const SG_Char * asString (void);
+
+ virtual bool Restore_Default (void);
+
+ void Set_Date (const CSG_DateTime &Date);
+ const CSG_DateTime & Get_Date (void) const { return( m_Date ); }
+
+
+protected:
+
+ CSG_DateTime m_Date;
+
+
+ virtual void On_Assign (CSG_Parameter_Data *pSource);
+ virtual bool On_Serialize (CSG_MetaData &Entry, bool bSave);
+
+};
+
+
+///////////////////////////////////////////////////////////
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
class SAGA_API_DLL_EXPORT CSG_Parameter_Range : public CSG_Parameter_Data
{
public:
@@ -1203,12 +1244,10 @@ public:
bool On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter);
bool On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter);
- bool Set_User_Defined (CSG_Parameters *pParameters, const TSG_Rect &Extent, int Rows = 0, bool bFitToCells = false, int Rounding = 2);
- bool Set_User_Defined (CSG_Parameters *pParameters, double xMin, double yMin, double Size, int nx, int ny, bool bFitToCells = false);
- bool Set_User_Defined (CSG_Parameters *pParameters, CSG_Shapes *pPoints, int Scale = 4 , bool bFitToCells = false, int Rounding = 2);
-
- bool Cmd_Update (const TSG_Rect &Extent);
- bool Cmd_Update (CSG_Shapes *pPoints);
+ bool Set_User_Defined (CSG_Parameters *pParameters, const TSG_Rect &Extent, int Rows = 0, int Rounding = 2);
+ bool Set_User_Defined (CSG_Parameters *pParameters, CSG_Shapes *pPoints, int Scale = 4 , int Rounding = 2);
+ bool Set_User_Defined (CSG_Parameters *pParameters, double xMin, double yMin, double Size, int nx, int ny);
+ bool Set_User_Defined (CSG_Parameters *pParameters, const CSG_Grid_System &System);
CSG_Grid_System Get_System (void);
@@ -1325,6 +1364,7 @@ public:
CSG_Parameters * asParameters (void) const { return( (CSG_Parameters *)m_pData->asPointer() ); }
CSG_Parameter_Value * asValue (void) const { return( (CSG_Parameter_Value *)m_pData ); }
+ CSG_Parameter_Date * asDate (void) const { return( (CSG_Parameter_Date *)m_pData ); }
CSG_Parameter_Choice * asChoice (void) const { return( (CSG_Parameter_Choice *)m_pData ); }
CSG_Parameter_Range * asRange (void) const { return( (CSG_Parameter_Range *)m_pData ); }
CSG_Parameter_File_Name * asFilePath (void) const { return( (CSG_Parameter_File_Name *)m_pData ); }
@@ -1450,6 +1490,7 @@ public:
CSG_Parameter * Add_Int (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, int Value = 0 , int Minimum = 0 , bool bMinimum = false, int Maximum = 0 , bool bMaximum = false);
CSG_Parameter * Add_Double (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, double Value = 0.0, double Minimum = 0.0, bool bMinimum = false, double Maximum = 0.0, bool bMaximum = false);
CSG_Parameter * Add_Degree (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, double Value = 0.0, double Minimum = 0.0, bool bMinimum = false, double Maximum = 0.0, bool bMaximum = false);
+ CSG_Parameter * Add_Date (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, double Value = 0.0); // Julian Day Number
CSG_Parameter * Add_Color (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, int Value = 0);
CSG_Parameter * Add_Range (CSG_Parameter *pParent, const CSG_String &Identifier, const CSG_String &Name, const CSG_String &Description, double Range_Min = 0.0, double Range_Max = 0.0, double Minimum = 0.0, bool bMinimum = false, double Maximum = 0.0, bool bMaximum = false);
diff --git a/src/saga_core/saga_api/saga_api.h b/src/saga_core/saga_api/saga_api.h
index bc3e14e..99228e3 100755
--- a/src/saga_core/saga_api/saga_api.h
+++ b/src/saga_core/saga_api/saga_api.h
@@ -128,8 +128,8 @@
//---------------------------------------------------------
#define SAGA_MAJOR_VERSION 2
#define SAGA_MINOR_VERSION 2
-#define SAGA_RELEASE_NUMBER 5
-#define SAGA_VERSION SG_T("2.2.5")
+#define SAGA_RELEASE_NUMBER 6
+#define SAGA_VERSION SG_T("2.2.6")
///////////////////////////////////////////////////////////
diff --git a/src/saga_core/saga_cmd/Makefile.am b/src/saga_core/saga_cmd/Makefile.am
index 72323cb..9e36715 100755
--- a/src/saga_core/saga_cmd/Makefile.am
+++ b/src/saga_core/saga_cmd/Makefile.am
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am 2048 2014-03-06 13:45:59Z manfred-e $
+# $Id: Makefile.am 2857 2016-03-23 14:22:48Z oconrad $
#
if DEBUG
DBGFLAGS = -g -DDEBUG
@@ -8,13 +8,10 @@ endif
MLIBPATH = "MODULE_LIBRARY_PATH=\"$(libdir)/saga\""
MSHAREPATH = "SHARE_PATH=\"$(prefix)/share/saga\""
BASEFLAGS = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH) -D$(MSHAREPATH)
-if SAGA_UNICODE
-AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS) -D_SAGA_UNICODE $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs` -lm
-else
-AM_CXXFLAGS = -fPIC `wx-config --unicode=no --cxxflags` $(BASEFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC `wx-config --unicode=no --libs` -lm
-endif
+
+AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags base` $(BASEFLAGS) -D_SAGA_UNICODE $(GOMPFLAGS)
+AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs base` -lm
+
bin_PROGRAMS = saga_cmd
saga_cmd_LDADD = ../saga_api/libsaga_api.la
diff --git a/src/saga_core/saga_cmd/Makefile.in b/src/saga_core/saga_cmd/Makefile.in
index ad535d9..aa232ab 100644
--- a/src/saga_core/saga_cmd/Makefile.in
+++ b/src/saga_core/saga_cmd/Makefile.in
@@ -377,16 +377,14 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2048 2014-03-06 13:45:59Z manfred-e $
+# $Id: Makefile.am 2857 2016-03-23 14:22:48Z oconrad $
#
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
MLIBPATH = "MODULE_LIBRARY_PATH=\"$(libdir)/saga\""
MSHAREPATH = "SHARE_PATH=\"$(prefix)/share/saga\""
BASEFLAGS = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH) -D$(MSHAREPATH)
- at SAGA_UNICODE_FALSE@AM_CXXFLAGS = -fPIC `wx-config --unicode=no --cxxflags` $(BASEFLAGS) $(GOMPFLAGS)
- at SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS) -D_SAGA_UNICODE $(GOMPFLAGS)
- at SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC `wx-config --unicode=no --libs` -lm
- at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs` -lm
+AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags base` $(BASEFLAGS) -D_SAGA_UNICODE $(GOMPFLAGS)
+AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs base` -lm
saga_cmd_LDADD = ../saga_api/libsaga_api.la
saga_cmd_SOURCES = \
callback.cpp\
diff --git a/src/saga_core/saga_cmd/module_library.cpp b/src/saga_core/saga_cmd/module_library.cpp
index c3e3060..5662798 100755
--- a/src/saga_core/saga_cmd/module_library.cpp
+++ b/src/saga_core/saga_cmd/module_library.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: module_library.cpp 2755 2016-01-19 15:57:08Z oconrad $
+ * Version $Id: module_library.cpp 2873 2016-03-31 09:37:32Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -61,6 +61,8 @@
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#include <wx/datetime.h>
+
#include "callback.h"
#include "module_library.h"
@@ -296,7 +298,7 @@ bool CCMD_Module::_Set_Parameters(CSG_Parameters *pParameters)
PARAMETER_DESCRIPTION_NAME|PARAMETER_DESCRIPTION_TYPE|PARAMETER_DESCRIPTION_PROPERTIES, SG_T("\n\t")
).c_str();
- Description.Replace(wxT("\xb"), wxT("")); // unicode problem: quick'n'dirty bug fix, to be replaced
+ Description.Replace("\xb", ""); // unicode problem: quick'n'dirty bug fix, to be replaced
if( pParameter->is_Input() || pParameter->is_Output() )
{
@@ -330,12 +332,16 @@ bool CCMD_Module::_Set_Parameters(CSG_Parameters *pParameters)
case PARAMETER_TYPE_Double:
case PARAMETER_TYPE_Degree:
- m_CMD.AddOption(_Get_ID(pParameter), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter), wxEmptyString, Description, wxCMD_LINE_VAL_DOUBLE, wxCMD_LINE_PARAM_OPTIONAL);
+ break;
+
+ case PARAMETER_TYPE_Date:
+ m_CMD.AddOption(_Get_ID(pParameter), wxEmptyString, Description, wxCMD_LINE_VAL_DATE , wxCMD_LINE_PARAM_OPTIONAL);
break;
case PARAMETER_TYPE_Range:
- m_CMD.AddOption(_Get_ID(pParameter, wxT("MIN")), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
- m_CMD.AddOption(_Get_ID(pParameter, wxT("MAX")), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "MIN"), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "MAX"), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
break;
case PARAMETER_TYPE_String:
@@ -351,11 +357,11 @@ bool CCMD_Module::_Set_Parameters(CSG_Parameters *pParameters)
case PARAMETER_TYPE_Grid_System:
if( pParameter->Get_Children_Count() == 0 )
{
- m_CMD.AddOption(_Get_ID(pParameter, wxT("NX")), wxEmptyString, Description, wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
- m_CMD.AddOption(_Get_ID(pParameter, wxT("NY")), wxEmptyString, Description, wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
- m_CMD.AddOption(_Get_ID(pParameter, wxT( "X")), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
- m_CMD.AddOption(_Get_ID(pParameter, wxT( "Y")), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
- m_CMD.AddOption(_Get_ID(pParameter, wxT( "D")), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "NX"), wxEmptyString, Description, wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "NY"), wxEmptyString, Description, wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "X"), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "Y"), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+ m_CMD.AddOption(_Get_ID(pParameter, "D"), wxEmptyString, Description, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
}
break;
}
@@ -476,13 +482,24 @@ bool CCMD_Module::_Get_Options(CSG_Parameters *pParameters, bool bInitialize)
}
break;
+ case PARAMETER_TYPE_Date:
+ {
+ wxDateTime Date;
+
+ if( m_CMD.Found(_Get_ID(pParameter), &Date) )
+ {
+ pParameter->Set_Value(Date.GetJDN());
+ }
+ }
+ break;
+
case PARAMETER_TYPE_Range:
- if( m_CMD.Found(_Get_ID(pParameter, wxT("MIN")), &s) && s.ToDouble(&d) )
+ if( m_CMD.Found(_Get_ID(pParameter, "MIN"), &s) && s.ToDouble(&d) )
{
pParameter->asRange()->Set_LoVal(d);
}
- if( m_CMD.Found(_Get_ID(pParameter, wxT("MAX")), &s) && s.ToDouble(&d) )
+ if( m_CMD.Found(_Get_ID(pParameter, "MAX"), &s) && s.ToDouble(&d) )
{
pParameter->asRange()->Set_HiVal(d);
}
@@ -520,9 +537,9 @@ bool CCMD_Module::_Get_Options(CSG_Parameters *pParameters, bool bInitialize)
{
if( pParameter->asFilePath()->is_Multiple() )
{
- s.Prepend(wxT("\""));
- s.Replace(wxT(";"), wxT("\" \""));
- s.Append (wxT("\""));
+ s.Prepend("\"");
+ s.Replace(";", "\" \"");
+ s.Append ("\"");
}
pParameter->Set_Value(CSG_String(&s));
@@ -543,11 +560,11 @@ bool CCMD_Module::_Get_Options(CSG_Parameters *pParameters, bool bInitialize)
long nx, ny;
double d, x, y;
- if( !m_CMD.Found(_Get_ID(pParameter, wxT("NX")), &nx)
- || !m_CMD.Found(_Get_ID(pParameter, wxT("NY")), &ny)
- || !m_CMD.Found(_Get_ID(pParameter, wxT( "X")), &s) || !s.ToDouble(&x)
- || !m_CMD.Found(_Get_ID(pParameter, wxT( "Y")), &s) || !s.ToDouble(&y)
- || !m_CMD.Found(_Get_ID(pParameter, wxT( "D")), &s) || !s.ToDouble(&d) )
+ if( !m_CMD.Found(_Get_ID(pParameter, "NX"), &nx)
+ || !m_CMD.Found(_Get_ID(pParameter, "NY"), &ny)
+ || !m_CMD.Found(_Get_ID(pParameter, "X"), &s) || !s.ToDouble(&x)
+ || !m_CMD.Found(_Get_ID(pParameter, "Y"), &s) || !s.ToDouble(&y)
+ || !m_CMD.Found(_Get_ID(pParameter, "D"), &s) || !s.ToDouble(&d) )
{
pParameter->asGrid_System()->Assign(-1, 0.0, 0.0, 0, 0);
}
diff --git a/src/saga_core/saga_gdi/Makefile.am b/src/saga_core/saga_gdi/Makefile.am
index d9eb767..1d12645 100755
--- a/src/saga_core/saga_gdi/Makefile.am
+++ b/src/saga_core/saga_gdi/Makefile.am
@@ -1,14 +1,11 @@
if DEBUG
DBGFLAGS = -g -DDEBUG
endif
-if SAGA_UNICODE
-DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
+
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-else
-DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
-DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
-endif
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG)
diff --git a/src/saga_core/saga_gdi/Makefile.in b/src/saga_core/saga_gdi/Makefile.in
index 3e98b7e..9e9aea9 100644
--- a/src/saga_core/saga_gdi/Makefile.in
+++ b/src/saga_core/saga_gdi/Makefile.in
@@ -368,11 +368,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
- at SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
- at SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
- at SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
-DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags`
+DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
+DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = $(DEP_LFLG)
diff --git a/src/saga_core/saga_gui/Makefile.am b/src/saga_core/saga_gui/Makefile.am
index c585012..bddf3a1 100755
--- a/src/saga_core/saga_gui/Makefile.am
+++ b/src/saga_core/saga_gui/Makefile.am
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am 2809 2016-02-22 11:40:22Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
INCS = -I.. -I.
if DEBUG
@@ -9,13 +9,10 @@ MLIBPATH = "MODULE_LIBRARY_PATH=\"$(libdir)/saga\""
MSHAREPATH = "SHARE_PATH=\"$(prefix)/share/saga\""
BASEFLAGS = -fPIC -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_DONOTUSE_HARU -D$(MLIBPATH) -D$(MSHAREPATH) $(DBGFLAGS) $(INCS)
-if SAGA_UNICODE
+
AM_CXXFLAGS = $(BASEFLAGS) `wx-config --unicode=yes --cxxflags` -D_SAGA_UNICODE $(GOMPFLAGS)
AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs adv,aui,base,core,html,net,propgrid,xml`
-else
-AM_CXXFLAGS = $(BASEFLAGS) `wx-config --unicode=no --cxxflags` $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC `wx-config --unicode=no --libs adv,aui,base,core,html,net,propgrid,xml`
-endif
+
bin_PROGRAMS = saga_gui
@@ -226,17 +223,28 @@ dist_applications_DATA = res/saga.desktop
pixmapdir = $(datadir)/pixmaps
dist_pixmap_DATA = res/saga.png
+ICON_SIZES = 8 16 24 32 48 64 72 80 96 128 192
+
+install-icons:
+ @for size in $(ICON_SIZES); do \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
+ $(INSTALL_DATA) res/saga_icon_$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/saga.png; \
+ done; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps; \
+ $(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
+
appdatadir = $(datadir)/appdata
dist_appdata_DATA = res/saga.appdata.xml
dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
-install-data-hook:
+install-data-hook: install-icons
cd $(DESTDIR)/$(pkgdatadir); \
mv saga_srs.txt saga_prj.srs; \
mv saga_dic.txt saga_prj.dic;
dist-hook:
- cp -Rp $(srcdir)/res/* $(distdir)/res/
+ chmod -x $(srcdir)/res/*.*
+ cp -Rp $(srcdir)/res/* $(distdir)/res/
SUBDIRS=man
diff --git a/src/saga_core/saga_gui/Makefile.in b/src/saga_core/saga_gui/Makefile.in
index 58e7f2b..1b323d0 100644
--- a/src/saga_core/saga_gui/Makefile.in
+++ b/src/saga_core/saga_gui/Makefile.in
@@ -459,17 +459,15 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-# $Id: Makefile.am 2809 2016-02-22 11:40:22Z oconrad $
+# $Id: Makefile.am 2848 2016-03-15 17:05:42Z reklov_w $
#
INCS = -I.. -I.
@DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
MLIBPATH = "MODULE_LIBRARY_PATH=\"$(libdir)/saga\""
MSHAREPATH = "SHARE_PATH=\"$(prefix)/share/saga\""
BASEFLAGS = -fPIC -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_DONOTUSE_HARU -D$(MLIBPATH) -D$(MSHAREPATH) $(DBGFLAGS) $(INCS)
- at SAGA_UNICODE_FALSE@AM_CXXFLAGS = $(BASEFLAGS) `wx-config --unicode=no --cxxflags` $(GOMPFLAGS)
- at SAGA_UNICODE_TRUE@AM_CXXFLAGS = $(BASEFLAGS) `wx-config --unicode=yes --cxxflags` -D_SAGA_UNICODE $(GOMPFLAGS)
- at SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC `wx-config --unicode=no --libs adv,aui,base,core,html,net,propgrid,xml`
- at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs adv,aui,base,core,html,net,propgrid,xml`
+AM_CXXFLAGS = $(BASEFLAGS) `wx-config --unicode=yes --cxxflags` -D_SAGA_UNICODE $(GOMPFLAGS)
+AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs adv,aui,base,core,html,net,propgrid,xml`
saga_gui_SOURCES = \
active.cpp\
active_attributes.cpp\
@@ -674,6 +672,7 @@ applicationsdir = $(datadir)/applications
dist_applications_DATA = res/saga.desktop
pixmapdir = $(datadir)/pixmaps
dist_pixmap_DATA = res/saga.png
+ICON_SIZES = 8 16 24 32 48 64 72 80 96 128 192
appdatadir = $(datadir)/appdata
dist_appdata_DATA = res/saga.appdata.xml
dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
@@ -1280,13 +1279,22 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_appdataDATA \
uninstall-dist_pkgdataDATA
-install-data-hook:
+install-icons:
+ @for size in $(ICON_SIZES); do \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
+ $(INSTALL_DATA) res/saga_icon_$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/saga.png; \
+ done; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps; \
+ $(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
+
+install-data-hook: install-icons
cd $(DESTDIR)/$(pkgdatadir); \
mv saga_srs.txt saga_prj.srs; \
mv saga_dic.txt saga_prj.dic;
dist-hook:
- cp -Rp $(srcdir)/res/* $(distdir)/res/
+ chmod -x $(srcdir)/res/*.*
+ cp -Rp $(srcdir)/res/* $(distdir)/res/
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/saga_core/saga_gui/active_history.cpp b/src/saga_core/saga_gui/active_history.cpp
index 3700f16..c23458b 100755
--- a/src/saga_core/saga_gui/active_history.cpp
+++ b/src/saga_core/saga_gui/active_history.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: active_history.cpp 2313 2014-10-30 09:42:40Z oconrad $
+ * Version $Id: active_history.cpp 2873 2016-03-31 09:37:32Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -400,6 +400,7 @@ bool CACTIVE_History::_Add_History(wxTreeItemId Parent, CSG_MetaData &Data)
case PARAMETER_TYPE_Int:
case PARAMETER_TYPE_Double:
case PARAMETER_TYPE_Degree:
+ case PARAMETER_TYPE_Date:
case PARAMETER_TYPE_Choice:
case PARAMETER_TYPE_Range:
case PARAMETER_TYPE_Table_Field:
@@ -544,6 +545,7 @@ bool CACTIVE_History::_Add_History_OLD(wxTreeItemId Parent, CSG_MetaData &Data)
case PARAMETER_TYPE_Int:
case PARAMETER_TYPE_Double:
case PARAMETER_TYPE_Degree:
+ case PARAMETER_TYPE_Date:
case PARAMETER_TYPE_Choice:
case PARAMETER_TYPE_Range:
case PARAMETER_TYPE_Table_Field:
diff --git a/src/saga_core/saga_gui/data_source_pgsql.cpp b/src/saga_core/saga_gui/data_source_pgsql.cpp
index 3bb3720..1c176b2 100755
--- a/src/saga_core/saga_gui/data_source_pgsql.cpp
+++ b/src/saga_core/saga_gui/data_source_pgsql.cpp
@@ -139,6 +139,10 @@ enum
DB_PGSQL_DB_Drop = 36
};
+//---------------------------------------------------------
+static wxString g_Username = "postgres";
+static wxString g_Password = "postgres";
+
///////////////////////////////////////////////////////////
// //
@@ -179,19 +183,17 @@ bool PGSQL_Connect (const CSG_String &Host, const CSG_String &Port, const CSG_
return( true );
}
- wxString Username = "postgres", Password = "postgres";
-
- if( !DLG_Login(Username, Password, wxString::Format("%s: %s [%s:%s]", _TL("Connect to Database"), DBName.c_str(), Host.c_str(), Port.c_str())) )
+ if( !DLG_Login(g_Username, g_Password, wxString::Format("%s: %s [%s:%s]", _TL("Connect to Database"), DBName.c_str(), Host.c_str(), Port.c_str())) )
{
return( false );
}
RUN_MODULE(DB_PGSQL_Get_Connection, false, // CGet_Connection
- SET_PARAMETER("PG_HOST", Host )
- && SET_PARAMETER("PG_PORT", Port )
- && SET_PARAMETER("PG_NAME", DBName )
- && SET_PARAMETER("PG_USER", Username)
- && SET_PARAMETER("PG_PWD" , Password)
+ SET_PARAMETER("PG_HOST", Host )
+ && SET_PARAMETER("PG_PORT", Port )
+ && SET_PARAMETER("PG_NAME", DBName )
+ && SET_PARAMETER("PG_USER", g_Username)
+ && SET_PARAMETER("PG_PWD" , g_Password)
);
return( bResult );
@@ -971,17 +973,15 @@ bool CData_Source_PgSQL::Source_Create(const wxTreeItemId &Item)
//---------------------------------------------------------
bool CData_Source_PgSQL::Source_Drop(const wxTreeItemId &Item)
{
- static wxString Username = "postgres", Password = "postgres";
-
CData_Source_PgSQL_Data *pData = Item.IsOk() ? (CData_Source_PgSQL_Data *)GetItemData(Item) : NULL; if( pData == NULL ) return( false );
- if( !DLG_Login(Username, Password, _TL("Drop Database")) )
+ if( !DLG_Login(g_Username, g_Password, _TL("Drop Database")) )
{
return( false );
}
- pData->Set_Username(Username);
- pData->Set_Password(Password);
+ pData->Set_Username(g_Username);
+ pData->Set_Password(g_Password);
if( pData->Get_Type() == TYPE_SOURCE && pData->is_Connected() )
{
@@ -993,7 +993,12 @@ bool CData_Source_PgSQL::Source_Drop(const wxTreeItemId &Item)
&& SET_PARAMETER("PG_PWD" , pData->Get_Password())
);
- return( bResult );
+ if( bResult )
+ {
+ Delete(Item);
+
+ return( true );
+ }
}
return( false );
@@ -1002,17 +1007,15 @@ bool CData_Source_PgSQL::Source_Drop(const wxTreeItemId &Item)
//---------------------------------------------------------
bool CData_Source_PgSQL::Source_Open(CData_Source_PgSQL_Data *pData, bool bDialog)
{
- static wxString Username = "postgres", Password = "postgres";
-
if( bDialog )
{
- if( !DLG_Login(Username, Password) )
+ if( !DLG_Login(g_Username, g_Password) )
{
return( false );
}
- pData->Set_Username(Username);
- pData->Set_Password(Password);
+ pData->Set_Username(g_Username);
+ pData->Set_Password(g_Password);
}
//-----------------------------------------------------
diff --git a/src/saga_core/saga_gui/info.cpp b/src/saga_core/saga_gui/info.cpp
index 63677dd..e4ead4d 100755
--- a/src/saga_core/saga_gui/info.cpp
+++ b/src/saga_core/saga_gui/info.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: info.cpp 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: info.cpp 2860 2016-03-24 10:33:43Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -138,9 +138,9 @@ CINFO::CINFO(wxWindow *pParent)
//---------------------------------------------------------
void CINFO::Add_Pages(void)
{
- AddPage(m_pGeneral , _TL("General") , false, IMG_MESSAGES);
+ AddPage(m_pGeneral , _TL("General" ), false, IMG_MESSAGES);
AddPage(m_pExecution, _TL("Execution"), false, IMG_EXECUTION);
- AddPage(m_pErrors , _TL("Errors") , false, IMG_ERROR);
+ AddPage(m_pErrors , _TL("Errors" ), false, IMG_ERROR);
}
//---------------------------------------------------------
diff --git a/src/saga_core/saga_gui/parameters_control.cpp b/src/saga_core/saga_gui/parameters_control.cpp
index 741e81b..5814b1a 100755
--- a/src/saga_core/saga_gui/parameters_control.cpp
+++ b/src/saga_core/saga_gui/parameters_control.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: parameters_control.cpp 2624 2015-09-30 15:33:53Z oconrad $
+ * Version $Id: parameters_control.cpp 2873 2016-03-31 09:37:32Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -62,6 +62,7 @@
//---------------------------------------------------------
#include <wx/propgrid/manager.h>
+#include <wx/datectrl.h>
#include <saga_api/saga_api.h>
@@ -252,12 +253,7 @@ void CParameters_Control::On_PG_Selected(wxPropertyGridEvent &event)
//---------------------------------------------------------
void CParameters_Control::On_PG_Changed(wxPropertyGridEvent &event)
{
- _Set_Parameter(event.GetPropertyName());
-
- if( event.GetProperty() )
- {
- m_pPG->SelectProperty(event.GetProperty());
- }
+ _Set_Parameter(event.GetProperty());
event.Skip();
}
@@ -590,8 +586,19 @@ wxPGProperty * CParameters_Control::_Get_Property(wxPGProperty *pParent, CSG_Par
pProperty = new CParameters_PG_Degree (Name, ID, pParameter);
break;
+ case PARAMETER_TYPE_Date:
+ pProperty = new wxDateProperty (Name, ID, pParameter->asDouble()); // from JDN
+ break;
+
case PARAMETER_TYPE_String:
- pProperty = new wxStringProperty (Name, ID, pParameter->asString());
+ if( ((CSG_Parameter_String *)pParameter->Get_Data())->is_Password() )
+ {
+ pProperty = new wxStringProperty (Name, ID, pParameter->asString());
+ }
+ else
+ {
+ pProperty = new wxLongStringProperty (Name, ID, pParameter->asString());
+ }
break;
case PARAMETER_TYPE_Color:
@@ -682,6 +689,10 @@ wxPGProperty * CParameters_Control::_Get_Property(wxPGProperty *pParent, CSG_Par
pProperty->SetAttribute(wxPG_FLOAT_PRECISION , (long)16);
break;
+ case PARAMETER_TYPE_Date:
+ pProperty->SetAttribute(wxPG_DATE_PICKER_STYLE, (long)(wxDP_DROPDOWN|wxDP_SHOWCENTURY));
+ break;
+
case PARAMETER_TYPE_String:
if( ((CSG_Parameter_String *)pParameter->Get_Data())->is_Password() )
{
@@ -759,48 +770,56 @@ bool CParameters_Control::_Get_Enabled(CSG_Parameter *pParameter)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-void CParameters_Control::_Set_Parameter(const wxString &Identifier)
+CSG_Parameter * CParameters_Control::_Get_Parameter(wxPGProperty *pProperty)
{
- wxPGProperty *pProperty = m_pPG->GetProperty(Identifier);
+ return( pProperty ? m_pParameters->Get_Parameter(pProperty->GetBaseName().wx_str()) : NULL );
+}
- if( pProperty )
+//---------------------------------------------------------
+void CParameters_Control::_Set_Parameter(wxPGProperty *pProperty)
+{
+ CSG_Parameter *pParameter = _Get_Parameter(pProperty);
+
+ if( pParameter )
{
- CSG_Parameter *pParameter = m_pParameters->Get_Parameter(
- !pProperty->IsSubProperty() ? Identifier.wx_str() : Identifier.AfterLast(wxT('.')).wx_str()
- );
+ m_bModified = true;
- if( pParameter )
+ switch( pParameter->Get_Type() )
{
- switch( pParameter->Get_Type() )
- {
- default:
- break;
+ default:
+ break;
- case PARAMETER_TYPE_String:
- case PARAMETER_TYPE_FilePath:
- pParameter->Set_Value(m_pPG->GetPropertyValueAsString(pProperty).wx_str());
- break;
+ case PARAMETER_TYPE_Date:
+ pParameter->Set_Value(((wxDateProperty *)pProperty)->GetDateValue().GetJDN());
+ break;
- case PARAMETER_TYPE_Bool:
- pParameter->Set_Value(m_pPG->GetPropertyValueAsBool (pProperty));
- break;
+ case PARAMETER_TYPE_String:
+ case PARAMETER_TYPE_FilePath:
+ pParameter->Set_Value(m_pPG->GetPropertyValueAsString(pProperty).wx_str());
+ break;
- case PARAMETER_TYPE_Int:
- pParameter->Set_Value(m_pPG->GetPropertyValueAsInt (pProperty));
- break;
+ case PARAMETER_TYPE_Bool:
+ pParameter->Set_Value(m_pPG->GetPropertyValueAsBool(pProperty));
+ break;
- case PARAMETER_TYPE_Double:
- pParameter->Set_Value(m_pPG->GetPropertyValueAsDouble (pProperty));
- break;
+ case PARAMETER_TYPE_Int:
+ pParameter->Set_Value(m_pPG->GetPropertyValueAsInt(pProperty));
+ break;
- case PARAMETER_TYPE_Color:
- pParameter->Set_Value(Get_Color_asInt(((wxColourProperty *)pProperty)->GetVal().m_colour));
- break;
- }
+ case PARAMETER_TYPE_Double:
+ pParameter->Set_Value(m_pPG->GetPropertyValueAsDouble(pProperty));
+ break;
- m_bModified = true;
+ case PARAMETER_TYPE_Color:
+ pParameter->Set_Value(Get_Color_asInt(((wxColourProperty *)pProperty)->GetVal().m_colour));
+ break;
+ }
+ if( pParameter->Get_Type() != PARAMETER_TYPE_Date )
+ {
_Update_Parameters();
+
+ m_pPG->SelectProperty(pProperty);
}
}
}
@@ -856,6 +875,17 @@ void CParameters_Control::_Update_Parameter(CSG_Parameter *pParameter)
((CParameters_PG_Degree *)pProperty)->Update();
break;
+ case PARAMETER_TYPE_Date:
+ {
+ wxDateTime Date(pParameter->asDouble());
+
+ if( ((wxDateProperty *)pProperty)->GetDateValue() != Date )
+ {
+ ((wxDateProperty *)pProperty)->SetDateValue(Date);
+ }
+ }
+ break;
+
case PARAMETER_TYPE_Choice:
case PARAMETER_TYPE_Table_Field:
case PARAMETER_TYPE_Grid_System:
diff --git a/src/saga_core/saga_gui/parameters_control.h b/src/saga_core/saga_gui/parameters_control.h
index 71da819..552a3e6 100755
--- a/src/saga_core/saga_gui/parameters_control.h
+++ b/src/saga_core/saga_gui/parameters_control.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: parameters_control.h 2075 2014-03-31 10:34:00Z oconrad $
+ * Version $Id: parameters_control.h 2873 2016-03-31 09:37:32Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -128,7 +128,8 @@ private:
void _Add_Property (class wxPGProperty *pParent, class CSG_Parameter *pParameter);
class wxPGProperty * _Get_Property (class wxPGProperty *pParent, class CSG_Parameter *pParameter);
- void _Set_Parameter (const wxString &Identifier);
+ void _Set_Parameter (wxPGProperty *pProperty);
+ class CSG_Parameter * _Get_Parameter (wxPGProperty *pProperty);
void _Update_Parameters (void);
void _Update_Parameter (class CSG_Parameter *pParameter);
void _Init_Pararameters (void);
diff --git a/src/saga_core/saga_gui/res/colours.bmp b/src/saga_core/saga_gui/res/colours.bmp
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/resource.h b/src/saga_core/saga_gui/res/resource.h
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga.appdata.xml b/src/saga_core/saga_gui/res/saga.appdata.xml
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga.bra.txt b/src/saga_core/saga_gui/res/saga.bra.txt
old mode 100755
new mode 100644
index a5d3d71..385f3de
--- a/src/saga_core/saga_gui/res/saga.bra.txt
+++ b/src/saga_core/saga_gui/res/saga.bra.txt
@@ -1,51 +1,51 @@
TEXT TRANSLATION
-" Actual Point Count:\t\t%d" ""
-" Header Point Count:\t\t%d" ""
-" +-> flagged as keypoints:\t%d" ""
-" +-> flagged as synthetic:\t%d" ""
-" +-> flagged as withheld:\t%d" ""
-" Actual number of points by return is different from header (actual, header):" ""
-" Bounding Box:\t\t\t%.2f, %.2f, %.2f, %.2f" ""
-" Classification:\t\t\t%d, %d" ""
-" File Creation Day/Year:\t\t%d/%d" ""
-" File Name:\t\t\t%s" ""
-" Flightline Edge:\t\t\t%d, %d" ""
-" Generating Software:\t\t'%s'" ""
-" Header Size:\t\t\t%d" ""
-" Header Summary" ""
-" Intensity:\t\t\t%d, %d" ""
-" Max X Y Z:\t\t\t%.6f %.6f %.6f" ""
-" Maximum Color:\t\t%d %d %d" ""
-" Min X Y Z:\t\t\t%.6f %.6f %.6f" ""
-" Minimum Color:\t\t\t%d %d %d" ""
-" Minimum and Maximum Attributes (min, max)" ""
-" Number Var. Length Records:\t%d" ""
-" Number of Point Records:\t%d" ""
-" Number of Points by Return" ""
-" Number of Points by Return:\t%d %d %d %d %d" ""
-" Number of Returns by Pulse" ""
+" Actual Point Count:\t\t%d" " Contagem de ponto real:\t\t%d"
+" Header Point Count:\t\t%d" " Contagem de ponto de cabe�alho:\t\t%d"
+" +-> flagged as keypoints:\t%d" " +-> sinalizado como pontos chave:\t%d"
+" +-> flagged as synthetic:\t%d" " +-> sinalizado como sint�tica:\t%d"
+" +-> flagged as withheld:\t%d" " +-> sinalizado como retidos:\t%d"
+" Actual number of points by return is different from header (actual, header):" " N�mero atual de pontos de retorno � diferente do cabe�alho (real, cabe�alho):"
+" Bounding Box:\t\t\t%.2f, %.2f, %.2f, %.2f" " Caixa delimitadora:\t\t\t%.2f, %.2f, %.2f, %.2f"
+" Classification:\t\t\t%d, %d" " Classifica��o:\t\t\t%d, %d"
+" File Creation Day/Year:\t\t%d/%d" " Cria��o do arquivo Dia/Ano:\t\t%d/%d"
+" File Name:\t\t\t%s" " Nome do arquivo:\t\t\t%s"
+" Flightline Edge:\t\t\t%d, %d" " Borda Flightline:\t\t\t%d, %d"
+" Generating Software:\t\t'%s'" " Gerando Software:\t\t'%s'"
+" Header Size:\t\t\t%d" " Tamanho do cabe�alho:\t\t\t%d"
+" Header Summary" " Resumo do cabe�alho"
+" Intensity:\t\t\t%d, %d" " Intensidade:\t\t\t%d, %d"
+" Max X Y Z:\t\t\t%.6f %.6f %.6f" " M�ximo X Y Z:\t\t\t%.6f %.6f %.6f"
+" Maximum Color:\t\t%d %d %d" " Cor m�xima:\t\t%d %d %d"
+" Min X Y Z:\t\t\t%.6f %.6f %.6f" " M�nimo X Y Z:\t\t\t%.6f %.6f %.6f"
+" Minimum Color:\t\t\t%d %d %d" " Cor m�nima:\t\t\t%d %d %d"
+" Minimum and Maximum Attributes (min, max)" " Atributos m�nimo e m�ximo (min, max)"
+" Number Var. Length Records:\t%d" " N�mero de vari�veis de comprimento de registro:\t%d"
+" Number of Point Records:\t%d" " N�mero de Ponto de Registros:\t%d"
+" Number of Points by Return" " N�mero de pontos para retorno"
+" Number of Points by Return:\t%d %d %d %d %d" " N�mero de pontos para retorno:\t%d %d %d %d %d"
+" Number of Returns by Pulse" " N�mero de retornos por pulso"
" Offset X Y Z:\t\t\t%.6f %.6f %.6f" ""
-" Offset to Point Data:\t\t%d" ""
-" Point Classification Histogram" ""
-" Point Classifications" ""
-" Point Data Format:\t\t%d" ""
-" Point Data Record Length:\t%d" ""
-" Point Inspection Summary" ""
-" Point Source Id:\t\t%d, %d" ""
-" Project ID/GUID:\t\t'%s'" ""
-" Reserved:\t\t\t%d" ""
-" Return Count:\t\t\t%d, %d" ""
-" Return Number:\t\t%d, %d" ""
-" Scale Factor X Y Z:\t\t%.6g %.6g %.6g" ""
-" Scan Angle Rank:\t\t%d, %d" ""
-" Scan Direction Flag:\t\t%d, %d" ""
-" Source ID:\t\t\t%d" ""
-" Spatial Reference:\t\t%s" ""
-" System Identifier:\t\t'%s'" ""
-" Time:\t\t\t\t%.6f, %.6f" ""
-" Total Points:\t%ld" ""
-" Total Pulses:\t%ld" ""
-" Version:\t\t\t%d.%d" ""
+" Offset to Point Data:\t\t%d" " Deslocamento para dados de ponto:\t\t%d"
+" Point Classification Histogram" " Classifica��o de pontos do histograma"
+" Point Classifications" " Classifica��es de pontos"
+" Point Data Format:\t\t%d" " Formato de dados de pontos:\t\t%d"
+" Point Data Record Length:\t%d" " Comprimento dos dados de pontos para registro:\t%d"
+" Point Inspection Summary" " Inspe��o de �ndice de pontos"
+" Point Source Id:\t\t%d, %d" " Id do ponto fonte::\t\t%d, %d"
+" Project ID/GUID:\t\t'%s'" " ID do projeto/GUID:\t\t'%s'"
+" Reserved:\t\t\t%d" " Reservado:\t\t\t%d"
+" Return Count:\t\t\t%d, %d" " Contagem de retornos:\t\t\t%d, %d"
+" Return Number:\t\t%d, %d" " N�mero de retorno:\t\t%d, %d"
+" Scale Factor X Y Z:\t\t%.6g %.6g %.6g" " Fator de escala X Y Z:\t\t%.6g %.6g %.6g"
+" Scan Angle Rank:\t\t%d, %d" " �ngulo de Varredura de Classifica��o:\t\t%d, %d"
+" Scan Direction Flag:\t\t%d, %d" " �ngulo de Varredura de Classifica��o:\t\t%d, %d"
+" Source ID:\t\t\t%d" " ID Fonte:\t\t\t%d"
+" Spatial Reference:\t\t%s" " Refer�ncia espacial:\t\t%s"
+" System Identifier:\t\t'%s'" " Sistema de identifica��o:\t\t'%s'"
+" Time:\t\t\t\t%.6f, %.6f" " Tempo:\t\t\t\t%.6f, %.6f"
+" Total Points:\t%ld" " Total de pontos:\t%ld"
+" Total Pulses:\t%ld" " Total de pulsos/repeti��es:\t%ld"
+" Version:\t\t\t%d.%d" " Vers�o:\t\t\t%d.%d"
"%.0f points from %d dataset(s) written to output grid %s." "%.0f de pontos %d dataset(s) escritos na grade de sa�da %s."
"%d points from %d dataset(s) written to output point cloud %s." "%d pontos de %d escritos no dataset(s) de pontos da sa�da na n�vem %s."
"%d points from %s written to output %s." "%d pontos de %s escritos na sa�da %s."
@@ -90,7 +90,7 @@ TEXT TRANSLATION
"** Maximum: %.2lf K" "** M�ximo: %.2lf K"
"** Mean (%s cloud): %.2lf K" "** M�dia (%s n�vem): %.2lf K"
"** Minimum: %.2lf K" "** M�nimo: %.2lf K"
-"** Warning : Number of events might not be representative.\nMinimum number recommended: " ""
+"** Warning : Number of events might not be representative.\nMinimum number recommended: " "** Aviso: N�mero de eventos n�o serve para representatividade.\nN�mero m�nimo recomendado: "
"** Warning : Outlet point was modified **" "** Aviso: ponto de sa�da foi modificado **"
"...anteilig aus Rasterzellen der Teileinzugegebiete" "... sub-bacias proporcionais a partir de c�lulas de um raster"
"...anteilig aus den Flussrasterzellen" "... rio a partir das c�lulas de um raster"
@@ -101,7 +101,6 @@ TEXT TRANSLATION
"0 - 1.0" "0 - 1.0"
"0 is horizontal, 90 is vertical." "0 � horizontal, 90 � vertical."
"0-50 mm/day" "0-50 mm/dia"
-"0.1" "0.1"
"01: A Simple Litter System" "01: Um sistema de marca simples"
"01: My first module" "01: Meu primeiro m�dulo"
"02: Carbon Cycle Simulation for Terrestrial Biomass" "02: Simula��o do C�clo do Carbono para a Biomassa Terrestre"
@@ -158,7 +157,6 @@ TEXT TRANSLATION
"20 seconds" "20 segundos"
"200-400 mm/day" "200-400 mm/dia"
"256x256" "256x256"
-"2nd Date (End of Range)" "2� Data (Fim da Faixa)"
"2nd Order Polynomial" "2� ordem polinominal"
"2nd Std. Parallel" "2� paralelo"
"3" "3"
@@ -211,7 +209,7 @@ TEXT TRANSLATION
"8 byte floating point number" "8 byte com n�mero de ponto flutuante"
"9 parameter 2nd order polynom (Zevenbergen & Thorne 1987)" "9 par�metro de 2� ordem polinomial (Zevenbergen & Thorne 1987)"
":-( :-( you are a loser :-( :-(" ":-( :-( voc� � um perdedor :-( :-("
-":-) :-) you are a winner :-) :-) Time:%ds\n" ""
+":-) :-) you are a winner :-) :-) Time:%ds\n" ":-) :-) Voc� � um vencedor :-) :-) Tempo:%ds\n"
"<" "<"
"<=" "<="
"<all grid systems>" "<sistema de todas as grades>"
@@ -299,20 +297,19 @@ TEXT TRANSLATION
"Absolute" "Absoluto"
"Absolute Area" "�rea absoluta"
"Absolute Height" "Altura absoluta"
-"Absolute Value" ""
+"Absolute Value" "Valor absoluto"
"Absolute Water Level" "N�vel de �gua absoluto"
"Absolute Water Levels" "N�vel de �gua absoluto"
"Absolute Weighting" "Pondera��o Absoluta"
-"Abstract" ""
+"Abstract" "Abstrato"
"Acc. Area" "Acc. �rea"
"Acceleration" "Acelera��o"
-"Acceptable Time Difference between Image and Laser Points" "Diferen�a de tempo aceit�vel entre imagem e Pontos doLaser"
"Accessing PostgreSQL databases." "Acessando bancos de dados PostgreSQL."
"Accumulated Cost" "Custo acumulado"
-"Accumulated Cost Surface" ""
-"Accumulated Material" ""
-"Accumulated Material (Left Side)" ""
-"Accumulated Material (Right Side)" ""
+"Accumulated Cost Surface" "Superf�cie de custo acumulado"
+"Accumulated Material" "Material acumulado"
+"Accumulated Material (Left Side)" "Material acumulado (Lado esquerdo)"
+"Accumulated Material (Right Side)" "Material acumulado (Lado direito)"
"Accumulated cost" "Custo acumulado"
"Accumulation Functions" "Fun��es de acumula��o"
"Accumulation Target" "Destino de acumula��o"
@@ -327,7 +324,7 @@ TEXT TRANSLATION
"Add All" "Adicionar todos"
"Add All Fields" "Adicionar todos os campos"
"Add Attribute to Clipped Points" "Adicionar atributo para os pontos cortados"
-"Add Base Map" ""
+"Add Base Map" "Adicionar mapa base"
"Add Border" "Adicionar borda"
"Add Cells" "Adicionar c�lulas"
"Add Center" "Adicionar centro"
@@ -406,10 +403,11 @@ TEXT TRANSLATION
"Allow longitudes outside -180 to 180 Range" "Permitir longitudes fora do alcance 180 a 180"
"Allow multiple observer positions." "Permitir v�rias posi��es de observa��o."
"Allows one to scale shade brightness [%]" "Permite escala de brilho de sombra [%]"
-"Allows to scale shade brightness, [percent]" "Permite escala de brilho de sombra, [porcento]"
-"Allows to write cell values from additional grids to the output" "Permite escrever valores de c�lulas de grades adicionais para a sa�da"
+"Allows one to scale shade brightness [percent]" ""
+"Allows writing cell values from additional grids to the output" ""
"Alpha" "Alfa"
"Alpha Max (Degree)" "Alfa m�ximo (Graus)"
+"Alternatives" "Alternativas"
"Altura de llama" "Altura de lhama"
"Altura de llama (m)" "Altura de lhama (m)"
"Always use cloud signature (step 14)" "Sempre use nuvem de assinaturas(passo 14)"
@@ -435,30 +433,28 @@ TEXT TRANSLATION
"Angular Step Size (Degree)" "Passo Tamanho Angular (Grau)"
"Annual" "Anual"
"Annual Course of Daily Insolation" "Curso Anual de insola��o di�ria"
+"Appearance" ""
"Append Fields from another Table" "Anexar campos de outra tabela"
"Append Rows from ..." "Acrescente linhas de ..."
+"Applies a majority filter with given search radius to the segments grid. Is skipped if set to zero." ""
"Applies also to the binary format header file." "Aplica-se tamb�m para o arquivo de cabe�alho em formato bin�rio."
"Apply" "Aplicar"
-"Apply Filter?" "Aplicar filtro?"
"Apply Move" "Aplicarmovimento"
-"Apply a filter (erosion - binary reconstruction) to the input image " "Aplicar um filtro (eros�o - reconstru��o bin�ria) para a imagem de entrada"
"Apply changes?" "Aplicar altera��es?"
"Apply offset?" "Aplicar deslocamento?"
"Apply post-processing filter to remove small holes" "Aplicar filtro de p�s-processamento para remover pequenos orif�cios"
"Approx. Terrain Slope" "Declive aproximado de terreno"
-"Approximate Coordinate" "Coordenadas aproximadas"
"Approximate Coordinates of Projection Center" "Coordenadas aproximadas do Centro de Proje��o"
"Approximate Coordinates of Target Point" "Coordenadas aproximadas do Ponto-alvo"
"Approximate Terrain Slope [%]" "Declive aproximado de terreno [%]"
"April" "Abril"
"Arc Vertex Distance [Degree]" "Dist�ncia do v�rtice do arco[Grau]"
-"ArcGIS Version" "Vers�o ArcGIS"
-"ArcSAGA Toolboxes" "ArcSAGA caixas de ferramentas"
-"Arccosine" ""
+"ArcGIS MapServer Tiles" ""
+"Arccosine" "Arccoseno"
"Arcs to polygons" "Arcos pra pol�gonos"
-"Arcsine" ""
-"Arctangent" ""
-"Arctangent of x/y" ""
+"Arcsine" "Arcoseno"
+"Arctangent" "Arcotangente"
+"Arctangent of x/y" "Arcotangente de x/y"
"Area" "�rea"
"Area +" "�rea +"
"Area -" "�rea -"
@@ -541,7 +537,7 @@ TEXT TRANSLATION
"Average With Thereshold for Grids calculates average in X and Y distances unsing only the values that differ form central pixel less than a specified threshold. It's useful to remove noise whit a known maximum reducing the loss of informations" "M�dia com limiar para grades calcula a m�dia das dist�ncias X e Y usando apenas os valores que diferem a forma do pixel central menor do que um limiar especificado. � �til para remover o ru�do de part�cula ao m�ximo conhecido, reduzindo a perda [...]
"Average slope of watercourse: %.2f m/m" "Inclina��o m�dia de curso de �gua:%.2f m/m"
"Average velocity in watercourse: %.2f m/min" "Velocidade m�dia no curso de �gua: %.2f m/min"
-"Averaged Connectivity" ""
+"Averaged Connectivity" "Conectividade m�dia"
"Averages" "M�dias"
"Avg. Curve Number" "AVG. N�mero da curva"
"Avg. Manning's N" "AVG. Tripula��o de N"
@@ -573,7 +569,7 @@ TEXT TRANSLATION
"Background Sample Density [Percent]" "Densidade de amostra do plano de fundo (porcento)"
"Backpropagation algorithm" "Algor�timo de retropropaga��o"
"Backpropagation parameters" "Par�metros de retropropaga��o"
-"Backward" "Para tr�s"
+"Backward" "Para tras"
"Backward Diagonal" "Diagonal em retrocesso"
"Backward [Page Down]" "Retrocesso [P�gina Abaixo]"
"Backward diagonal hatch" "Escotilha de Retrocesso diagonal "
@@ -588,20 +584,23 @@ TEXT TRANSLATION
"Band 7" "Banda 7"
"Band 8" "Banda 8"
"Band Name Field" "Campo do nome da banda"
+"Band Width" ""
+"Band Width for Seed Point Generation" ""
"Bands" "Bandas"
"Bandwidth (Cells)" "Largura da banda (C�lulas/pixels)"
"Bare Earth" "Terra nua"
"Barometric Pressure [mbar]" "Press�o barom�trica [mbar]"
"Bars" "Barras"
-"Base 10 Logarithm" ""
+"Base 10 Logarithm" "Logaritmo de base 10"
"Base Level" "N�vel de base"
-"Base Map" ""
+"Base Map" "Mapa base"
"Base Name" "Nome base"
"Base Probability" "Probabilidade base"
"Basic Terrain Analysis" "An�lises b�sicas de terreno"
"Basic measures for spatial point patterns." "Medidas b�sicas para padr�es de pontos espaciais."
"Basin Type (Gravelius)" "Tipo de bacia (Gravelius)"
"Basins" "Bacias"
+"Be sure to read and understand the usage agreement or terms of service before you use a base map server." ""
"Beep when finished" "Bip quando terminar"
"Begin Transaction" "Comece a Transa��o"
"Below this threshold precipitation will fall as snow" "Abaixo deste limiar a precipita��o vai cair como a neve"
@@ -616,7 +615,6 @@ TEXT TRANSLATION
"Binary Byte Order" "Ordem bin�ria de Byte"
"Binary Encoding" "Codifica��o bin�ria"
"Binary Erosion-Reconstruction" "Reconstru��o de eros�o bin�ria"
-"Binary input image for the connectivity analysis" "Imagem de entrada Bin�ria para a an�lisede conectividade"
"Binary object mask" "M�scara de objeto bin�rio"
"Birth Rate of Fishes" "Taxa de de natalidade dos Peixes"
"Birth Rate of Sharks" "Taxa de natalidade de tubar�es"
@@ -637,8 +635,8 @@ TEXT TRANSLATION
"Borders" "Bordas"
"Bottom" "Base"
"Bottom to Top" "De baixo para cima"
-"Boundaries" ""
-"Boundaries: the simple filter will only operate on grid cells which fall in the same shape" ""
+"Boundaries" "Limites"
+"Boundaries: the simple filter will only operate on grid cells which fall in the same shape" "Limites: o filtro simples funcionar� apenas em c�lulas da grades que caem no mesmo shape"
"Boundary Effect" "Efeito de contorno"
"Boundary Effect Color" "Cor do efeito de contorno"
"Bounding Box" "Caixa de entorno"
@@ -676,7 +674,7 @@ TEXT TRANSLATION
"CELLSIZE" "TAMANHO DA C�LULA"
"CENTER" "CENTRO"
"CFAC(" "CFAC("
-"CFit\n(created by SAGA Wizard)." ""
+"CFit\n(created by SAGA Wizard)." "CFit\n(criado pelo Assistente SAGA)."
"CLASS" "CLASSE"
"CLASS_ID" "CLASSE_ID"
"CLASS_NR" "CLASSE_NR"
@@ -688,12 +686,12 @@ TEXT TRANSLATION
"CRS Dictionary" "Dicion�rio CRS"
"CSV Files (*.csv)" "Arquivos CSV "
"CUMUL" "CUMUL"
-"Cache" ""
-"Cache Directory" ""
+"Cache" "Cache"
+"Cache Directory" "Diret�rio do cache"
"Cache Size" "Tamanho do cache"
"Calculate distribution quantiles. Value specifies interval (median=50, quartiles=25, deciles=10, ...). Set to zero to omit quantile calculation." "Calcule quantis de distribui��o. Valor especificado de intervalo (mediana = 50, quartis = 25, decis = 10, ...). Defina como zero para omitir o c�lculo dos quantis."
"Calculate the volume under the grid's surface. This is mainly useful for Digital Elevation Models (DEM)." "Calcule o volume sob a superf�cie da grade. Isto � �til para Modelos Digitais de Eleva��o (MDE)."
-"Calculates the gradient based on the values of each triangle's points.\n\n" ""
+"Calculates the gradient based on the values of each triangle's points.\n\n" "Calcula o gradiente com base nos valores de pontos de cada tri�ngulo.\n\n"
"Calculates weights for distance plus one, avoiding division by zero for zero distances" "Calcula pesos para a dist�ncias de mais de um, evitando a divis�o por zero para dist�ncias iguais a zero"
"Calculating Catchment Area..." "Calculando �rea de Influ�ncia ..."
"Calculating Contributing Area" "Calculando Contribui��o de �rea"
@@ -725,7 +723,7 @@ TEXT TRANSLATION
"Categorical Features" "Fei��es categorizadas"
"Categorical Grids" "Grades categorizadas"
"Categories" "Categorias"
-"Category" ""
+"Category" "Categoria"
"Cell Balance" "Saldo de c�lula"
"Cell Count" "N�mero de C�lulas"
"Cell Count (X)" "Contagem de c�lula"
@@ -816,7 +814,7 @@ TEXT TRANSLATION
"Choose Cut from ..." "Escolha Cortar a partir de ..."
"Choose Directory" "Escolha a pasta"
"Choose Time Range" "Escolha o Intervalo de tempo"
-"Choose a flow routing algorithm that shall be used for the overland flow distance calculation:\n- D8\n- MFD" ""
+"Choose a flow routing algorithm that shall be used for the overland flow distance calculation:\n- D8\n- MFD" "Escolha um algoritmo de roteamento de fluxo que deve ser utilizado para o c�lculo da dist�ncia de escoamento superficial:\n- D8\n- MFD"
"Choose a method" "Escolha o m�todo"
"Choose case: Rook's case contiguity compares only cell wich share an edge. Queen's case contiguity compares also cells which share just corners." "Escolha de caso: Rook caso de contiguidade que compara apenas a parcela prop�cia da borda de uma c�lula. Rainha do caso contiguidade compara tamb�m as c�lulas que partilham apenas cantos."
"Choose how to aggregate the values" "Escolha como os valores devem ser agregados"
@@ -848,6 +846,7 @@ TEXT TRANSLATION
"Class" "Classes"
"Class 1" "Classe 1"
"Class 2" "Classe 2"
+"Class Definition File" ""
"Class Identifier" "Identificador da classe"
"Class Name" "Nome da classe"
"Class Selection" "Sele��o da classe"
@@ -874,6 +873,7 @@ TEXT TRANSLATION
"Climate" "Clima"
"Climate Data" "Dados clim�ticos"
"Climate parameters" "Par�metros clim�ticos"
+"Climate|Tools" ""
"Climatic Precession" "Precess�o clim�tica"
"Clip Features" "Cortar fei��es"
"Clip Grid with Polygon" "Cortar grade com pol�gono"
@@ -906,7 +906,8 @@ TEXT TRANSLATION
"Cluster Analysis for Point Clouds" "An�lises de aglomerado para nuvem de pontos"
"ClusterID" "AglomeradoID"
"Clusters" "Aglomerados"
-"Clusters, which are closer than this distance to each other, are merged." ""
+"Clusters, which are closer than this distance to each other, are merged." "Agrupamentos, que est�o mais pr�ximos do que esta dist�ncia uns dos outros, s�o fundidos."
+"Coarse Resolution" ""
"Coefficient of Determination" "Coeficiente de determina��o"
"Cold Cloud" "Nuvem fria"
"Collect values" "Colete os valores"
@@ -961,8 +962,8 @@ TEXT TRANSLATION
"CompuServe Graphics Interchange" "Servidor de interc�mbio dos gr�ficos"
"CompuServe Graphics Interchange (*.gif)" "CompuServe Graphics Interchange (*.gif)"
"Computed flow directions, 0=N, 1=NE, 2=E, ... 7=NW" "Dire��es de fluxo computadorizada, 0=N, 1=NE, 2=E, ... 7=NW"
-"Concentration" ""
-"Concentration Approximation Threshold" ""
+"Concentration" "Concentra��o"
+"Concentration Approximation Threshold" "Limiar de aproxima��o de concentra��o"
"Concentration time (h)" "Tempo de concentra��o ()"
"Condition" "condi��o"
"Cone (Down)" "Cone (Baixo)"
@@ -989,6 +990,7 @@ TEXT TRANSLATION
"Connectivity [Percent]" "Conectividade (Porcentagem)"
"Constant Grid" "Grade constante"
"Constant Histogram Stretch" "Constante de Amplia��o do Histograma"
+"Constant Lapse Rate" ""
"Constant Value" "Valor constante"
"Constant Variation Range [Degree]" "Faixa de Varia��o Constante [Grau]"
"Constant Wind Direction" "Dire��o do vento constante"
@@ -1001,6 +1003,7 @@ TEXT TRANSLATION
"Contour" "Contorno"
"Contour Lines" "Linhas de contorno"
"Contour Lines from Grid" "Linha de contorno para a grade"
+"Contour Lines from Points" ""
"Contour lines equidistance [map units]." "Contorno de linhas equidistantes [unidades do mapa]"
"Contours" "Contornos"
"Contributing Area" "Contribuindo com arredores"
@@ -1009,11 +1012,12 @@ TEXT TRANSLATION
"Convergence (FD8)" "Converg�ncia (FD8)"
"Convergence Index" "�ndice de Converg�ncia"
"Convergence Index (Search Radius)" "�ndice de converg�ncia (raio de busca)"
-"Convergence factor for Multiple Flow Direction Algorithm (Freeman 1991).\nApplies also to the Multiple Triangular Flow Directon Algorithm." ""
+"Convergence factor for Multiple Flow Direction Algorithm (Freeman 1991).\nApplies also to the Multiple Triangular Flow Directon Algorithm." "Fator de converg�ncia para m�ltiplas dire��es do fluxo (Freeman 1991).\nAplicado tamb�m para Multiplas dire��es de fluxos Triangulares."
"Convergence factor for Multiple Flow Direction algorithm" "Fator de converg�ncia para o algoritmo de dire��o m�ltipla do fluxo"
"Convergence factor for Multiple m_Flow Direction Algorithm (Freeman 1991)" "Fator de converg�ncia para m�ltipla Dire��o m_Flow Algorithm (Freeman 1991)"
"Convergence factor for the \'Multiple Flow Direction\' algorithm (after Freeman 1991)" "Fator de converg�ncia para m�ltipla dire��o do fluxo (ap�s Freeman 1991)"
"Conversion" "Convers�o"
+"Conversions" "Convers�es"
"Convert Lines to Points" "Converter linhas para pontos"
"Convert Lines to Polygons" "Converter linhas para pol�gonos"
"Convert Multipoints to Points" "Converter multipontos para pontos"
@@ -1023,16 +1027,16 @@ TEXT TRANSLATION
"Convert Table to Points" "Converter tabela para pontos"
"Convert To Table" "Converter para tabela"
"Convert Vertex Type (2D/3D)" "Converter tipo de v�rtice (2D/3D)"
-"Convert a shapes layer to a TIN\n\n" ""
+"Convert a shapes layer to a TIN\n\n" "Converter uma camada de shape para TIN\n\n"
"Convert routes" "Conveter rotas"
"Convert track points" "Converter pontos de trilha"
"Convert way points" "Converter forma de pontos"
"Converted Grid" "Converter grade"
"Converting ..." "Convertendo ..."
-"Converts a TIN data set to shapes layers.\n\n" ""
+"Converts a TIN data set to shapes layers.\n\n" "Converte um dado TIM de entrada para camadas shapes.\n\n"
"Convex Hull" "Envolt�rio convexo"
"Convexity" "convexidade"
-"Conway's Game of Life" ""
+"Conway's Game of Life" "Jogo da vida de Conway"
"Coordenada X" "Coordenada X"
"Coordenada X del punto de ignici�n (s�lo si no se usa grid de puntos de ignici�n)" "Coordenada X do ponto de igni��o (apenas se n�o houver grade de ponto de flash usada)"
"Coordenada Y" "Coordenada Y"
@@ -1051,7 +1055,7 @@ TEXT TRANSLATION
"Copied Selection" "Sele��o copiada"
"Copy" "Copiar"
"Copy Attributes" "Copiar atributos"
-"Copy Grid" ""
+"Copy Grid" "Copiar grade"
"Copy Legend to Clipboard [Ctrl+L]" "Copiar legenda para a �rea de transfer�ncia [Ctrl+L]"
"Copy Legend to Clipboard..." "Copiar legenda para a �rea de transfer�ncia "
"Copy Map to Clipboard [Ctrl+C]" "Copiar mapa para a �rea de transfer�ncia[Ctrl+C]"
@@ -1065,7 +1069,6 @@ TEXT TRANSLATION
"Copy existing Attributes" "Copiar atributos existentes"
"Copy to Clipboard" "Copiar para a �rea de transfer�ncia"
"Copying original data..." "Copiar dados originais ..."
-"Copyright (c) 2007 by Thomas Schorr" "Copyright (c) 2007 by Thomas Schorr"
"Copyrights (c) 2003 by Andre Ringeler" "Copyrights (c) 2003 by Andre Ringeler"
"Copyrights (c) 2003 by Olaf Conrad" "Copyrights (c) 2003 by Olaf Conrad"
"Copyrights (c) 2003 by Volker Wichmann" "Copyrights (c) 2003 by Volker Wichmann"
@@ -1084,13 +1087,13 @@ TEXT TRANSLATION
"Correlated Points" "Pontos correlacionados"
"Correlated points with displacement and correlation information" "Pontos correlacionados com deslocamento e correla��o de informa��es"
"Correlation" "Correla��o"
-"Correlation Matrix of the Fit Parameters:\n" ""
+"Correlation Matrix of the Fit Parameters:\n" "Matriz de correla��o dos par�metros de ajuste:\n"
"Corresponds to delta_max. Must be > 1" "Corresponde � delta_max. Deve ser> 1"
"Corresponds to delta_min. Must be > 0" "Corresponde � delta_min. Deve ser> 0"
-"Cosine" ""
+"Cosine" "Coseno"
"Cosine Correction (Civco 1989)" "Cosseno de corre��o(Civco 1989)"
"Cosine Correction (Teillet et al. 1982)" "Cosseno de corre��o (Teillet et al. 1982)"
-"Cost Analysis" ""
+"Cost Analysis" "An�lise de custos"
"Could not connect to data source." "N�o foi poss�vel conectar-se a fonte de dados."
"Could not create data source." "N�o foi poss�vel criar fonte de dados."
"Could not create dataset." "N�o foi poss�vel criar dataset."
@@ -1098,7 +1101,7 @@ TEXT TRANSLATION
"Could not load project." "N�o foi poss�vel carregar projeto."
"Could not save project." "N�o foi poss�vel salvar projeto."
"Count" "Contagem"
-"Count No Data as Zero" ""
+"Count No Data as Zero" "Contagem SemDados como zero"
"Count Only Above Base Level" "Contagem Apenas Acima do N�vel de Base "
"Count Only Below Base Level" "Contagem Apenas Abaixo do n�vel de base"
"Count Points in Polygons" "Contagem de Pontos no Pol�gono"
@@ -1131,12 +1134,11 @@ TEXT TRANSLATION
"Create Virtual Point Cloud Dataset" "Criar dataset de nuvem de pontos virtual"
"Create Web Content" "Criar conte�do web"
"Create X/Y Grids" "Criar grades X/Y"
-"Create a binary mask Yes/No" "Criar uma m�scara bin�ria Sim / N�o"
"Create borders between segments as new grid." "Criar bordas entre segmentos em nova grade"
"Create index" "Criar �ndice"
"Create new Attribute" "Criar novo atributo"
"Created from file" "Criado a partir de arquivo"
-"Creates a color animation based on the values of selected grids.\n" ""
+"Creates a color animation based on the values of selected grids.\n" "Cria uma anima��o de cor com base nos valores das gradesselecionadas.\n"
"Creation Options" "Cria��o de op��es"
"Creation option(s) not supported by the driver" "Cria��o de op��o(�es) n�o suportada pelo controlador"
"Croke et al. (2005)" "Croke et al. (2005)"
@@ -1230,7 +1232,7 @@ TEXT TRANSLATION
"Database" "Base de dados"
"Database Name" "Nome da base de dados"
"Database access through the libmysql.lib interface." "Acesso ao banco de dados por meio da interface libmysql.lib."
-"Database with Coordinate Reference System (CRS) definitions. A restart of SAGA is required to have the changes take effect!" "Defini��es do banco de dados com sistema de coordenadas de refer�ncia (CRS). Um rein�cio do SAGA � necess�rio para que as altera��es tenham efeito!"
+"Database with Coordinate Reference System (CRS) definitions. You need to restart SAGA to apply the changes." ""
"Database|ODBC" "Banco de dados | ODBC"
"Database|PostgreSQL" "Banco de dados | PostgreSQL"
"Dataset creation failed" "A cria��o de conjunto de dados falhou"
@@ -1325,7 +1327,8 @@ TEXT TRANSLATION
"Desmet & Govers" "Desmet & Govers"
"Desmet & Govers 1996" "Desmet & Govers 1996"
"Destandardisation" "Padroniza��o"
-"Destinations" ""
+"Destination Points" ""
+"Destinations" "Destinos"
"Destriped Grid" "Grade fatiado"
"Destriping" "Fatiamento"
"Destriping with Mask" "Fatiamento com m�scara"
@@ -1347,11 +1350,10 @@ TEXT TRANSLATION
"Diameter plant elements" "Elementos de di�metro de plantas"
"Dictionary Files (*.dic)" "Arquivos de dicion�rio (*.dic)"
"Dictionary Files (*.lng)" "Arquivos de dicion�rio (*.lng)"
-"Dictionary for Proj.4/OGC WKT translations. A restart of SAGA is required to have the changes take effect!" "Dicion�rio de tradu��es Proj.4/OGC WKT. Um rein�cio do SAGA � necess�rio para que as altera��es tenham efeito!"
+"Dictionary for Proj.4/OGC WKT translations. You need to restart SAGA to apply the changes." ""
"Dictionary for translations from built-in (English) to local language (editable text table). You need to restart SAGA to apply the changes." "Dicion�rio de tradu��es embutidas (em Ingl�s) para a linguagem local (tabela de texto edit�vel). Voc� precisa reiniciar o SAGA para aplicar as altera��es."
"Difference" "Diferen�a"
"Difference (A - B)" "Diferen�a (A - B)"
-"Difference Input - Reconstruction" "Diferen�a de entrada - Reconstru��o"
"Difference Vegetation Index" "ndice de Diferen�a de Vegeta��o "
"Difference from Arithmetic Mean" "Diferen�a da M�dia Aritm�tica"
"Difference from Mean Value" "Diferen�a de Valor M�dio"
@@ -1384,7 +1386,7 @@ TEXT TRANSLATION
"Direction Difference" "Diferen�a de dire��o"
"Direction [Degree]" "Dire��o [grau]"
"Direction into which the wind blows, starting with 0 for North and increasing clockwise." "Dire��o em que o vento sopra, come�ando com 0 para o Norte e crescente no sentido hor�rio."
-"Direction of Maximum Cost" ""
+"Direction of Maximum Cost" "Dire��o de custo m�ximo"
"Direction of Minimum Standard Deviation" "Dire��o de Desvio Padr�o M�nimo"
"Direction of Plane [Degree]" "Dire��o de Plano [Grau]"
"Direction of the light source, measured in degree clockwise from the north direction." "Dire��o da fonte de luz, medida em graus no sentido hor�rio a partir da dire��o norte."
@@ -1439,9 +1441,6 @@ TEXT TRANSLATION
"Do you really want to delete this raster band" "Voc� realmente quer apagar esta banda raster"
"Do you want to delete the selection?" "Voc� deseja apagar a sele��o?"
"Do you want to exit SAGA?" "Voc� deseja sair do SAGA?"
-"Do you wish to estimate Principal Point Offsets?" "Voc� deseja estimar deslocamento do ponto principal?"
-"Do you wish to provide the Radial Distortion Parameters?" "Voc� deseja fornecer Par�metros de distor��o radial?"
-"Do you wish to provide the time stamp of Image?" "Voc� deseja fornecer a data e hora da imagem?"
"Dominance" "Domin�ncia"
"Dot And Dash" "Ponto e tra�o"
"Dot and dash style" "Estilo do ponto e tra�o"
@@ -1478,6 +1477,7 @@ TEXT TRANSLATION
"Duration of Insolation" "Dura��o da insola��o"
"Dust [ppm]" "Poeira [ppm]"
"Dust factor: 100 ppm (standard)" "Fator de poeira: 100 ppm (standard)"
+"Dynamics" "Din�micos"
"Dynamische Flaechenwassernutzung und Abflussreduktion" "Uso da terra din�mico e redu��o de escoamento da �gua"
"Dynamische Flaechenwassernutzung..." "Uso da �gua de superficies din�micas ..."
"EDGES" "BORDAS"
@@ -1544,11 +1544,9 @@ TEXT TRANSLATION
"Ellipsoid Definition" "Defini��o de elipsoide"
"Ellipsoid Height [m]" "Altura do elipsoide [m]"
"Ellipsoids" "Elipsoides"
-"Enable local disk cache. Allows for offline operation." ""
+"Enable local disk cache. Allows for offline operation." "Ativar cache de disco local. Permite a opera��o offline."
"Encountered invalid path description in *.spcvf file!" "A inscri��o do caminho encontrado no arquivo *.spcvf� inv�lida!"
"Encountered invalid path description in *.spcvf_tile_info file!" "A inscri��o do caminho encontrado no arquivo *.spcvf_tile_info � inv�lida!"
-"End Latitude" "Latitude final"
-"End Longitude" "Longitude final"
"Enforce True Color" "Impor cor verdadeira"
"Enhanced Vegetation Index" " �ndice de Vegeta��o Aprimorado"
"Entropy" "Entropia"
@@ -1577,7 +1575,6 @@ TEXT TRANSLATION
"Error parsing field type: can't convert to number" "Erro de tipo de campo de an�lise: n�o pode converter-se ao n�mero"
"Error: Continue anyway ?" "Erro: Continuar mesmo assim?"
"Errors" "Erros"
-"Estimate Principal Point Offsets?" "Estimar ponto de compensa��es principal ?"
"Estimated Noise (absolute)" "Ru�do estimado (absoluto)"
"Estimated Noise (relative)" "Ru�do estimado (relativo)"
"Estimated noise in units of input data" "Ru�do estimado em unidades de dados de entrada"
@@ -1609,10 +1606,10 @@ TEXT TRANSLATION
"Expand" "Expandir"
"Expand Options" "Expandir op��es"
"Expand and Shrink" "Expandir e encolher"
-"Expansion Degree" "Grau de Expans�o"
"Exponent" "Expoente"
"Exponent for distance weighting (0.0-4.0)" "Expoente de pondera��o de dist�ncia (0,0-4,0)"
-"Exponential" ""
+"Exponential" "Exponencial"
+"Export" "Exportar"
"Export Atlas Boundary File" "Exportar arquivo de limite de Atlas"
"Export ESRI Arc/Info Grid" "Exportar grade ESRI Arc/Info"
"Export GPX" "Exportar GPX"
@@ -1651,7 +1648,7 @@ TEXT TRANSLATION
"Exterior Orientation Parameters" "Par�metros de orienta��o exterior"
"Extreme" "Extremo"
"Eye Distance" "Dist�ncia de perspectiva"
-"Eye Distance [Degree]" "Ver dist�ncia [Grau]"
+"Eye Distance [Degree]" "Dist�ncia de perspectiva [Grau]"
"F-statistic" "F-statistica"
"FACE_A" "FACE_A"
"FACE_B" "FACE_B"
@@ -1672,7 +1669,7 @@ TEXT TRANSLATION
"False Northing [m]" "Falso leste"
"Fast Representativeness" "Representatividade r�pida"
"Feature" "Fei��o"
-"Feature Importances" ""
+"Feature Importances" "Fei��es importantes"
"Feature Probabilities" "Probabilidades de fei��es"
"Feature Selection" "Sele��o de fei��es"
"Features" "Fei��es"
@@ -1683,7 +1680,7 @@ TEXT TRANSLATION
"Feigenbaum's Bifurcation" "Bifurca��o de Feigenbaum"
"Ferhat Bing�l (c) 2009" "Ferhat Bing�l (c) 2009"
"Field" "Campo"
-"Field %d: Name=\" ""
+"Field %d: Name=\" "Campo %d: Nome=\"
"Field (ID)" "Campo (ID)"
"Field (Name)" "Campo (Nme)"
"Field Capacity [mm]" "Capacidade do campo [mm]"
@@ -1722,7 +1719,7 @@ TEXT TRANSLATION
"File does not exist:" "Arquivo inexistente:"
"File error" "Erro no arquivo"
"File path" "Caminho do arquivo"
-"File signature is not 'LASF'!" "Assinatura de arquivo n�o � "
+"File signature is not 'LASF'!" "Assinatura de arquivo n�o � 'LASF'!"
"File with Coefficients" "Arquivo com Coeficientes"
"Filename" "Nome do arquivo"
"Filepath" "Caminho do arquivo"
@@ -1755,8 +1752,6 @@ TEXT TRANSLATION
"Filter Clumps" "Filtro aglomerado"
"Filter Criterion" "Crit�rio do filtro"
"Filter Matrix" "Matriz do filtro"
-"Filter Size (Radius)" "Tamanho do filtro (Raios)"
-"Filter size (radius in grid cells)" "Tamanho do filtro (raios nas c�lulas da grade)"
"Filtered" "Filtrado"
"Filtered DTM" "DTM filtrado"
"Filtered Grid" "Grade filtrada"
@@ -1778,7 +1773,7 @@ TEXT TRANSLATION
"Fire Spreading Analysis" "An�lise de espalhamento do fogo"
"First Class" "Primeira classe"
"First Day" "Primeiro dia"
-"First Derivative is singular! Probably the shape containes consecutive identical points.\n\n" ""
+"First Derivative is singular! Probably the shape containes consecutive identical points.\n\n" "Primeira derivada � singular! Provavelmente, a forma � de contentores de pontos id�nticos consecutivos.\n\n"
"First input grid" "Primeira grade de entrada"
"Fit" "Ajustar"
"Fit Color Palette to Grid Values" "Ajustar a paleta de cores para caber nos valores da grade"
@@ -1835,6 +1830,7 @@ TEXT TRANSLATION
"Flow Directions" "Dire��es de fluxo"
"Flow Distance" "Dist�ncia de fluxo"
"Flow Distances" "Dist�ncias de fluxo"
+"Flow Distribution" ""
"Flow Line Curvature" "Linha de curvatura de fluxo"
"Flow Lines" "Linhas de fluxo"
"Flow Path Length" "Comprimento de linha de fluxo"
@@ -1851,9 +1847,7 @@ TEXT TRANSLATION
"Flux" "Fluxo"
"Flux out of each cell, i.e. everything accumulated so far." "Fluxo de cada c�lula, ou seja, tudo acumulado at� o momento."
"Flying Height" "Altura do v�o"
-"Focal Length (mm)" "Dist�ncia Focal (mm)"
"Focal Length [mm]" "Dist�ncia Focal [mm]"
-"Focal Length in mm" "Dist�ncia focal em mm"
"Folder" "Pasta"
"Folder for PDF Files" "Pasta para arquivos PDF"
"Font" "Fonte"
@@ -1881,6 +1875,7 @@ TEXT TRANSLATION
"Fragmentation" "Fragmenta��o"
"Fragmentation (Alternative)" "Fragmenta��o (alternativa)"
"Fragmentation (Standard)" "Fragmenta��o (Padr�o)"
+"Fragmentation Analysis" "An�lise de Fragmenta��o"
"Fragmentation Classes from Density and Connectivity" "Classes de fragmenta��o para densidade e conectividade"
"Fragmentation Index" "�ndice de fragmenta��o"
"Frame" "Moldura"
@@ -1896,7 +1891,7 @@ TEXT TRANSLATION
"Function Fit" "Ajuste de fun��o"
"Function Fitting Range" "Ajustar fun��o de faixa (Range)"
"Function Parameters" "Par�metros da Fun��o"
-"Function Plotter" ""
+"Function Plotter" "Fun��o plotadora"
"Function failed because no attributes are available" "A fun��o falhou porque h� atributos que n�o est�o dispon�veis"
"Fuzzified" "Fuzificado"
"Fuzzified Grid" "Grade fuzificado"
@@ -1922,7 +1917,6 @@ TEXT TRANSLATION
"GREEN_BLUE" "GREEN_BLUE"
"GREEN_GREY_BLUE" "GREEN_GREY_BLUE"
"GREEN_RED_BLUE" "GREEN_RED_BLUE"
-"GRIB Files" "Arquivos GRIB"
"GRID" "GRADE"
"GStat Files (*.gstat)" "Arquivos GStat (*.gstat)"
"GStat shapes format export." "Exportar em formato de shapes GStat"
@@ -1947,6 +1941,7 @@ TEXT TRANSLATION
"Garden|Introducing Module Programming" "Horta|Apresentando Programa��o do M�dulo"
"Garden|Recreations|Fractals" "Horta|Recrea��es|Fractais"
"Garden|Recreations|Games" "Horta|Recrea��es|Jogos"
+"Garden|Tool Chain Examples" ""
"Garden|Web Service Data Access" "Horta|Acesso a dados de servi�o Web"
"Gauges" "Medidores"
"Gaussian" "De Gauss"
@@ -1960,6 +1955,7 @@ TEXT TRANSLATION
"General Curvature" "Curvatura geral"
"General Settings" "Configura��es gerais"
"Generalisation" "Generaliza��o"
+"Generalization" ""
"Generalized Surface" "Superf�cie generalizada"
"Generate Shapes" "Gerar shapes"
"Generated Shapefile." "Arquivos de shapes gerado"
@@ -1967,7 +1963,7 @@ TEXT TRANSLATION
"GeoTIFF (*.tif)" "GeoTIFF (*.tif)"
"GeoTIFF Files" "Arquivos GeoTIFF"
"GeoTRANS" "GeoTRANS"
-"GeoTRANS engine initializing error!\n\nPlease check your data path settings!" ""
+"GeoTRANS engine initializing error!\n\nPlease check your data path settings!" "Erro ao inicializar mecanismo de GeoTRANS!\n\nPor favor verifique suas configura��es de caminho de dados!"
"GeoTrans (Grid)" "GeoTrans (Grade)"
"GeoTrans (Shapes)" "GeoTrans (Shapes)"
"Geocentric Coordinate System" "Sistema de coordenadas geoc�ntricas"
@@ -1991,14 +1987,19 @@ TEXT TRANSLATION
"Get Independent Variable from ..." "Obter vari�vel independente para ..."
"Get Shapes Extents" "Obter extens�o das formas"
"Get Subset from Virtual Point Cloud" "Obter subconjunto da nuvem virtual de pontos"
-"Get table from MySQL server.\n" ""
-"Get the current cell's column/row index" ""
-"Get the x/y coordinates for the current cell" ""
-"Gini Decrease" ""
+"Get table from MySQL server.\n" "Obter a tabela do servidor MySQL.\n"
+"Get the current cell's column/row index" "Obter �ndice da c�lula atual que est� na coluna/linha"
+"Get the x/y coordinates for the current cell" "Obter as coordenadas x/y para a c�lula atual"
+"Gini Decrease" "Diminuir Gini"
"Global Irradiation" "Irradia��o global"
"Global Moran's I for Grids" "Global Moran's I para grades"
"Globe Viewer for Grids" "Visualizador do globo para grades"
"Gnomonic" "Gnom�nico"
+"Google Hybrid" ""
+"Google Map" ""
+"Google Satellite" ""
+"Google Terrain" ""
+"Google Terrain, Streets and Water" ""
"Gpx2shp path" "Caminho Gpx2shp "
"Gradient" "Gradiente"
"Gradient Calculation" "C�lculo de gradiente"
@@ -2015,7 +2016,7 @@ TEXT TRANSLATION
"Graduated Colors" "Cores graduadas"
"Graduated Colours" "Cores graduadas"
"Graticule" "Grat�cula"
-"Gray Scale Image" ""
+"Gray Scale Image" "Escala de imagens de cinza"
"Great Elliptic" "Grande el�ptica"
"Greater than" "Maior que"
"Green" "Verde"
@@ -2030,7 +2031,7 @@ TEXT TRANSLATION
"Grid Cell Index" "�ndice c�lulas de grade"
"Grid Difference" "Diferen�a de grade"
"Grid Division" "Divis�o de grade"
-"Grid Generation" ""
+"Grid Generation" "Gera��o de grade"
"Grid List" "Lista de grade"
"Grid Manager" "Gerenciador de grade"
"Grid Masking" "Mascara de grade"
@@ -2069,7 +2070,6 @@ TEXT TRANSLATION
"Grid system" "Sistema de grade"
"Grid to TIN" "Grade para TIN"
"Grid to TIN (Surface Specific Points)" "Grade para TIN (superf�cie de pontos espec�ficos)"
-"Grid to be filtered" "Grade a ser filtrado"
"Grid to filter" "Grade para filtrar"
"Grid to reclassify" "Grade para reclassificar"
"Grid value equals low value" "O valor da grade � igual ao valor abaixo"
@@ -2081,6 +2081,7 @@ TEXT TRANSLATION
"Grid(s)" "Grade(s)"
"Grid(s) to fit extent to" "Grade(s) para ajuste da extens�o"
"Gridding" "Grindagem"
+"Gridding of Points" ""
"Grids" "Grades"
"Grids Product" "Produtos de grades"
"Grids Sum" "Soma de grades"
@@ -2091,6 +2092,7 @@ TEXT TRANSLATION
"Grids used to delineate the UCUs. Coding: NoData / categorical values." "Grades usadas para delineamento de UCUs. Coding: SemDados / valores de categorias."
"Grids with continuous data, statistics are calculated for each grid. Coding: NoData / continuous values." "Grades com dados cont�nuos, as estat�sticas s�o calculadas para cada raster. Codifica��o: SemDados / valores cont�nuos."
"Grid|Analysis" "Grade|An�lises"
+"Grid|Analysis|Travel Time Analysis" ""
"Grid|Calculus" "Grade|C�lculos"
"Grid|Export" "Grade|Exportar"
"Grid|Filter" "Grade|Filtro"
@@ -2129,6 +2131,7 @@ TEXT TRANSLATION
"Herbaceous Fuel Moisture" "Umidade doCombust�vel Herb�ceo"
"High Pass" "Passagem alta"
"High Pass Filter" "Filtro de passagem alta"
+"High Resolution" ""
"High Resolution Grid System" "Sistema de grade de alta resolu��o"
"High Ridges" "Cumes elevados"
"High Value" "Valor elevado"
@@ -2174,6 +2177,8 @@ TEXT TRANSLATION
"Humus to Charcoal" "Humus de carv�o"
"Hydrology" "Hidrologia"
"Hydrology: IHACRES" "Hidrologia: IHACRES"
+"Hydrology|Flow Accumulation" ""
+"Hydrology|Topographic Indices" ""
"Hypsometric Curve" "Curva Hipsom�trico"
"Hypsometry" "Hipsometria"
"I am a module library template." "Eu sou um modelo de biblioteca de m�dulo.s"
@@ -2202,8 +2207,8 @@ TEXT TRANSLATION
"IHS Sharpening" "Afina��o de IHS"
"IHS to RGB" "IHS para RGB"
"IMCORR - Feature Tracking" "IMCORR - Rastreamento de fei��o"
-"ISODATA Cluster Statistics" ""
-"ISODATA Clustering for Grids" ""
+"ISODATA Cluster Statistics" "Estat�sticas de cluster ISODATA"
+"ISODATA Clustering for Grids" "Clusteriza��o ISODATA para grades"
"Ice" "Gelo"
"Identifier" "Identificador"
"Identity" "Identidade"
@@ -2216,7 +2221,7 @@ TEXT TRANSLATION
"If false, the training algorithm normalizes each output feature independently, by transforming it to the certain range depending on the used activation function." "Se falso, o algoritmo de treinamento normaliza cada fei�ao de sa�da de forma independente, transformando-a ao certo intervalo, dependendo da fun��o de ativa��o utilizada."
"If not set points will be removed from the input data set." "Se n�o setar pontos de ajuste, ser� removido a partir do conjunto de dados de entrada."
"If not set property attributes will be added to the orignal layer." "Se n�o definir os atributos de propriedade ser� adicionado � camada original."
-"If not specified the cache will be created in the current user's temporary directory." ""
+"If not specified the cache will be created in the current user's temporary directory." "Se n�o for especificado, o cache ser� criado no diret�rio tempor�rio do usu�rio atual."
"If set, output is given about the number of fields a flow path visits downhill. For D8 only." "Se definido, a sa�da � dada sobre o n�mero de campos de uma via de fluxo visitada de declive. Somente para D8."
"If table exists..." "Se a tabela existe ..."
"Ignition Points" "Pontos de igni��o "
@@ -2237,6 +2242,7 @@ TEXT TRANSLATION
"Image Properties" "Propriedades da Imagem"
"Image Resolution" "Resolu��o da imagem"
"Image Rotation [Degree]" "Rota��o de Imagem [Grau]"
+"Image Sharpening" "Afina��o de imagem"
"Image acquisition date (yyyy-mm-dd)" "Data de aquisi��o da imagem (aaaa-mm-dd)"
"Image creation date (yyyy-mm-dd)" "Data de cria��o da imagem (aaaa-mm-dd)"
"Image processing tools." "Ferramentas de processamento de imagem."
@@ -2245,6 +2251,7 @@ TEXT TRANSLATION
"Imagery|Classification" "Imagens|Classifica��o"
"Imagery|Photogrammetry" "Imagens|Fotogrametria"
"Imagery|Segmentation" "Imagens|Segmenta��o"
+"Imagery|Tools" ""
"Imagery|ViGrA" "Imagens|ViGrA"
"Images" "Imagens"
"Images|*.bmp;*.jpg;*.png;*.tif|HTML Files|*.htm|All Files|*.*" "Imagens|*.bmp;*.jpg;*.png;*.tif|HTML Files|*.htm|Todos os arquivos | *.*"
@@ -2261,7 +2268,6 @@ TEXT TRANSLATION
"Import Extents" "Extens�es de importa��o"
"Import Filter" "Importar filtro"
"Import GPX" "Importar GPX"
-"Import GRIB2 record" "Importar recorde de GRIB2"
"Import GStat Shapes" "Importar Shapes GSTAT "
"Import Grid from Table" "Importar grade a partir de tabela"
"Import Grid from XYZ" "Importar grade a partir de XYZ"
@@ -2270,7 +2276,6 @@ TEXT TRANSLATION
"Import LAS Files" "Importar arquivos LAS"
"Import MOLA Grid (MEGDR)" "Importar grade MOLA (MEGDR)"
"Import NetCDF" "Importar NetCDF"
-"Import Open Street Map Image" ""
"Import Point Cloud from Shape File" "Importar nuvem de pontos a partir de arquivo shape"
"Import Point Cloud from Text File" "Importar nuvem de pontos a partir de arquivo de texto"
"Import Raster" "Importar raster"
@@ -2285,6 +2290,7 @@ TEXT TRANSLATION
"Import Stereo Lithography File (STL)" "Importar arquivo de litografia estereof�nico (STL)"
"Import Surfer Blanking Files" "Importar arquivos de feixe de navega��o suspensa"
"Import Surfer Grid" "Importar grade de navega��o"
+"Import TMS Image" ""
"Import Table" "Importar tabela"
"Import Table from SQL Query" "Importar tabela a partir de SQL Query"
"Import Tables" "Importar tabelas"
@@ -2312,11 +2318,12 @@ TEXT TRANSLATION
"Include diagonal neighbour relations" "Incluir as rela��es de vizinhan�a diagonais"
"Increase Diagram Size" "Aumentar tamanho do diagrama"
"Increase Exaggeration [F2]" "Aumentar Exagero [F2]"
-"Increase Eye Distance" "Aumentar dist�ncia de Vis�o"
+"Increase Eye Distance" "Aumentar dist�ncia de vis�o"
"Increase Legend Size" "Aumentar tamanho da legenda"
"Increase Perspectivic Distance [F6]" "Aumentar dist�ncia de perspectiva [F6]"
"Increase Size Scaling Factor [F8]" "Aumentar tamanho do fator de escala [F8]"
"Increase Size [F6]" "Aumentar tamanho [F6]"
+"Increase band width to get less seed points." ""
"Increase factor" "Aumenta o fator"
"Increase factor n_plus. Must be > 1." "Aumente fator n_plus. Deve ser> 1."
"Independent Variable (per Grid and Cell)" "Vari�vel independente (para grade e celula)"
@@ -2329,9 +2336,9 @@ TEXT TRANSLATION
"Informe" "Informe"
"Init Fast Representativeness" "Iniciar representatividade r�pida"
"Init Generalisation" "Iniciar generaliza��o"
-"Initial Litter Storage [g/m\xb2]" ""
+"Initial Litter Storage [g/m\xb2]" "Armazenamento inicial de lixo [g/m\xb2]"
"Initial Nitrogen Content [kg/ha]" "Teor de nitrog�nio inicial [kg/ha]"
-"Initial Number of Clusters" ""
+"Initial Number of Clusters" "N�mero inicial de clusters"
"Initial Number of Distance Classes" "N�mero inicial de classes de dist�ncia"
"Initial Number of Fishes [%]" "N�mero inicial de Peixes [%]"
"Initial Number of Sharks [%]" "N�mero inicial de tubar�es [%]"
@@ -2349,10 +2356,9 @@ TEXT TRANSLATION
"Initiation Grid" "Grade de inicializa��o"
"Initiation Threshold" "Inicia��o Threshold"
"Initiation Type" "Tipo de Inicia��o"
-"Inlet Concentration" ""
+"Inlet Concentration" "Inlet Concentra��o"
"Inner Buffer" "Inner Tamp�o"
"Input" "Entrada"
-"Input Binary Grid" "Grade de entrada bin�ria"
"Input Features" "Caracter�sticas de entrada"
"Input File List" "Input File List"
"Input File's NoData Value" "NoData valor de entrada do Arquivo"
@@ -2363,14 +2369,13 @@ TEXT TRANSLATION
"Input Grid 2" "Grade de entrada 2"
"Input Grids" "Grades de entrada"
"Input Specification" "Especifica��o de entrada"
-"Input Type of Destinations" ""
+"Input Type of Destinations" "Tipo de destino de entrada"
"Input data for the trained network." "Os dados de entrada para a rede treinada."
"Input data to train the network." "Os dados de entrada para treinar a rede."
"Input file" "Arquivo de entrada"
"Input file list could not be opened!" "Lista de arquivo de entrada n�o p�de ser aberto!"
-"Input for Mean over Catchment" ""
+"Input for Mean over Catchment" "Capta��o pela m�dia sobre a entrada"
"Input for module calculations." "De entrada para os c�lculos do m�dulo."
-"Input for the morphological reconstruction" "Entrada para a reconstru��o morfol�gica"
"Input format" "Formato de entrada"
"Input grid" "Grade de entrada"
"Input grids to train the network." "Grades de entrada para treinar a rede."
@@ -2410,6 +2415,7 @@ TEXT TRANSLATION
"Interpolation" "Interpola��o"
"Interpolation Scale" "Escala de interpola��o"
"Interpolation Steps" "Passos de Interpola��o"
+"Interpolation from Points" "Iinterpola��o de Pontos"
"Intersect" "Intersec��o"
"Intersection" "Interse��o"
"Interval" "Intervalo"
@@ -2429,16 +2435,16 @@ TEXT TRANSLATION
"Inverse Distance Offset" "Dist�ncia inversa de deslocamento"
"Inverse Distance Weighted" " Dist�ncia inversa ponderada"
"Inverse Distance Weighting Power" "Dist�ncia inversa de pondera��o"
-"Inverse Grid" ""
+"Inverse Grid" "Grade inversa"
"Inverse Principle Components Rotation" "Princ�pio inverso de rota��o de componentes"
"Inverse transformation not available for selected projection type." "A transforma��o inversa n�o est� dispon�vel para o tipo de proje��o selecionada."
"Invert" "Inverter"
"Invert Data/No-Data" "Inverter dados/sem-dados"
-"Invert Grid" ""
+"Invert Grid" "Grade invertida"
"Invert Selection" "Inverter sele��o"
"Invert Selection of Shapes Layer" "Inverter sele��o de camada shape"
"Invert selection." "Inverter sele��o."
-"Inverted" ""
+"Inverted" "Invertido"
"Is the subbasin upstream (no external inflow)" "� a sub-bacia a montante (sem fluxo externo)"
"Isochrones Constant Speed" "Velocidade is�crona constante"
"Isochrones Variable Speed" "Velocidade is�crona vari�vel"
@@ -2448,7 +2454,6 @@ TEXT TRANSLATION
"Iterative Minimum Distance (Forgy 1965)" "Dist�ncia m�nima de interativa (Forgy 1965)"
"JPEG - JFIF Compliant" "Compat�vel com JPEG - JFIF"
"JPEG - JFIF Compliant (*.jpg, *.jif, *.jpeg)" "Compat�vel com JPEG - JFIF (*.jpg, *.jif, *.jpeg)"
-"JPG Files" "Arquivos JPG"
"Ja, Abfluss manuell vorgeben: res. Abfluss = Speicherinhalt * q + a" "Sim, especificar manualmente o escoamento: res. Dreno = conte�do da mem�ria * q + a"
"Ja, TestRoutine1 fuer Flusseinzugsgebiet bis zu der HG-Rasterzelle" "Sim, TestRoutine1 para a bacia do rio at� a c�lula HG-grid"
"Ja, TestRoutine1 nur fuer Teileinzugsgbiet der HG-Rasterzelle" "Sim, somente para Teileinzugsgbiet TestRoutine1 a c�lula do HG-grid"
@@ -2470,11 +2475,8 @@ TEXT TRANSLATION
"Junction" "Jun��o"
"Junctions" "Jun��es"
"June" "junho"
-"K Factor" ""
-"K-Means Clustering for Grids" ""
-"K1" "K1"
-"K2" "K2"
-"K3" "K3"
+"K Factor" "Fator K"
+"K-Means Clustering for Grids" "Clusteriza��o de grades por M�dias-K"
"KE" "KE"
"KML files (*.kml)" "Arquivos KML (*.kml)"
"KML/KMZ File" "Arquivo KML/KMZ"
@@ -2509,6 +2511,8 @@ TEXT TRANSLATION
"LAS Info" "Informa��es de LAS"
"LAS header exception: %s" "Exce��o de cabe�alho LAS: %s"
"LAS reader exception: %s" "Exce��o de leitura de LAS: %s"
+"LCZC" ""
+"LCZC (Filtered)" ""
"LFAC(" "LFAC("
"LP, Saturated lateral permeability of the soil [m/day]" "LP, permeabilidade laterais saturada do solo [m/dia]"
"LS" "LS"
@@ -2527,6 +2531,9 @@ TEXT TRANSLATION
"Lake Flood" "Inunda��o de lago"
"Lambert Conformal Conic (1 parallel)" "Conformacional c�nico de Lambert(1 paralelo)"
"Lambert Conformal Conic (2 parallel)" "Conformacional c�nico de Lambert(2 paralelo)"
+"Land Cover" ""
+"Land Cover ID" ""
+"Land Cover Scenario Offset" ""
"Land Cover Weights" "Pesos de cobertura da terra"
"Land Surface Temperature" "Temperatura de Superf�cie"
"Land Surface Temperature [Deg.Celsius]" "Temperatura de Superf�cie [Grau.Celsius]"
@@ -2557,11 +2564,12 @@ TEXT TRANSLATION
"Laplace Filter" "Filtro de Laplace"
"Laplacian Filter" "Filtro Laplaciano"
"Laplacian Filter Kernel" "Filtro Laplaciano de N�cleo"
+"Lapse Rate Based Temperature Downscaling" ""
+"Lapse Rates" ""
"Last Day" "Ultimo dia"
"Lat" "Lat"
"Lat. of True Scale" "Lat. escala verdadeira"
"Latitude" "Latitude"
-"Latitude / Longitude Increment" "Incremento de Latitude/Longitude"
"Latitude 1" "Latitude 1"
"Latitude 2" "Latitude 2"
"Latitude 3" "Latitude 3"
@@ -2571,7 +2579,7 @@ TEXT TRANSLATION
"Latitude [Degree]" "Latitude [Grau]"
"Latitude/Longitude Graticule" "Grat�cula da Latitude/Longitude"
"Latitudinal Statistics" "Estat�sticas latitudinais"
-"Layer" ""
+"Layer" "Camada"
"Layer A" "Camada A"
"Layer B" "Camada B"
"Layer of extreme value" "Valor extremo de camada"
@@ -2583,7 +2591,7 @@ TEXT TRANSLATION
"Leafs" "Folhas"
"Least Cost Path" "Caminho de menor custo"
"Least Cost Paths" "Caminhos de menor custo"
-"Least cost path profile lines" ""
+"Least cost path profile lines" "Linha de perfil de caminho de menor custo"
"Least cost path profile points" "Pontos de perfil de caminho de menor custo"
"Leaves" "Folhas"
"Leaves to Litter" "Deixa para ninhada"
@@ -2602,7 +2610,7 @@ TEXT TRANSLATION
"Legend: Save" "Legenda: Salvar"
"Legend: Zoom" "Legenda: Zoom"
"Length" "Comprimento"
-"Length of the Gaussian window:\t %d" ""
+"Length of the Gaussian window:\t %d" "Comprimento da janela de Gauss:\t %d"
"Less than" "Menor que"
"Let pixel stay unclassified, if maximum likelihood probability value is less than threshold." "Permitir p�xels n�o classificados, se o valor m�ximo da probabilidade � menor que o limite de probabilidade."
"Let pixel stay unclassified, if minimum euclidian or mahalanobis distance is greater than threshold." "Permitir p�xels n�o classificados, se a dist�ncia m�nima for maior do que o limite euclidiano ou Mahalanobis. "
@@ -2612,7 +2620,7 @@ TEXT TRANSLATION
"Level Heights" "Alturas de n�vel"
"Level of Detail" "N�vel de detalhe"
"Level of Generalisation" "N�vel de generaliza��o"
-"Libraries" ""
+"Libraries" "Bibliotecas"
"Library" "Biblioteca"
"Life" "Vida"
"Life Cycle" "Ciclo da vida"
@@ -2661,7 +2669,7 @@ TEXT TRANSLATION
"List of Shapes Layers" "Lista de camadas shapes"
"Listing" "Listagem"
"Litter to Humus" "Ninhada de h�mus"
-"Litterfall Rate [g/m\xb2/a]" ""
+"Litterfall Rate [g/m\xb2/a]" "Taxa de serapinheira [g/m\xb2/a]"
"Little Endian (Intel)" "Little Endian (Intel)"
"Load" "Carregar"
"Load Colors" "Carregar cores"
@@ -2694,7 +2702,8 @@ TEXT TRANSLATION
"Loam" "Barro"
"Loamy Sand" "Areia argilosa"
"Local Cartesian" "Cartesiano local"
-"Local Cost" ""
+"Local Climate Zone Classification" ""
+"Local Cost" "Custo local"
"Local Curvature" "Curvatura local"
"Local Downslope Curvature" "Local curva descendente Curvatura"
"Local Maxima" "M�xima local"
@@ -2734,13 +2743,14 @@ TEXT TRANSLATION
"Look Up Section" "Consultar na se��o"
"Look up table (Points)" "Olhe para cima de mesa (Pontos)"
"Look-up Table" "Tabela de pesquisa"
+"Look-up table for classification of travel time zones." ""
"LookUp Table" "Tabela de pesquisa"
"Lookup Table" "Tabela de pesquisa"
-"Lookup table used in method \" ""
-"Lookup table used in method \" ""
+"Lookup table used in method \" "Tabela de pesquisa usado no m�todo \"
+"Lookup table used in method \" "Tabela de pesquisa usado no m�todo \"
"Lookup table." "Tabela de pesquisa."
"Loop" "La�o"
-"Loss through Negative Weights" ""
+"Loss through Negative Weights" "Perda atrav�s de pesos negativos"
"Lotsa" "Lotsa"
"Low Pass" "Passagem baixa"
"Low Pass Filter" "Filtro de passagem baixa"
@@ -2791,7 +2801,8 @@ TEXT TRANSLATION
"Main layer. The output layer will have the same fields in the attribute table as this layer." "Camada principal. A camada de sa�da ter� os mesmos campos na tabela de atributos que esta camada."
"Majority" "Maioria"
"Majority Filter" "Filtro de maioria"
-"Make sure that the files\n" ""
+"Majority Filter Radius" ""
+"Make sure that the files\n" "Certifique-se que dos arquivos\n"
"Manager" "Gerenciador"
"Mandelbrot" "Mandelbrot"
"Mandelbrot Set" "Mandelbrot Set"
@@ -2803,7 +2814,7 @@ TEXT TRANSLATION
"Manning-Strickler Coefficient" "Coeficiente de Manning-Strickler"
"Manning-Strickler coefficient for flow travel time estimation (reciprocal of Manning's Roughness Coefficient)" "Coeficiente de Manning-Strickler para a estimativa de fluxo de tempo de viagem (rec�proco de rugosidade Coeficiente de Manning)"
"Map" "Mapa"
-"Map Drape Resampling" ""
+"Map Drape Resampling" "Reamostragem de cortina de mapa"
"Map Draping" "Flutua��o do mapa"
"Map Draping Interpolation" "Interpolar flutua��o do mapa"
"Map Extent" "Extens�o do mapa"
@@ -2817,7 +2828,7 @@ TEXT TRANSLATION
"Map Width [Pixels]" "Largura do mapa [Pixels]"
"Map Window Arrangement" "Arranjo da janela do mapa"
"Map/Table Size Ratio [%]" "Tamanho da raz�o do mapa/tabela [%]"
-"MapQuest" ""
+"MapQuest" "MapQuest"
"Maps" "Mapas"
"March" "Mar�o"
"Mark Highest Neighbour" "Marcar maior vizinhan�a"
@@ -2831,8 +2842,8 @@ TEXT TRANSLATION
"Massivity Coefficient" "Coeficiente de massividade"
"Match" "Combinar"
"Match Fields by Name" "Combinar campos por nome"
-"Material for Accumulation" ""
-"Matrix signular\n" ""
+"Material for Accumulation" "Acumula��o de material"
+"Matrix signular\n" "Matriz signular\n"
"Max" "Max"
"Max Iterations" "Intera��es m�ximas"
"Max Lamda" "Lamda m�xima"
@@ -2857,14 +2868,15 @@ TEXT TRANSLATION
"Maximum Entropy" "Entropia M�xima"
"Maximum Entropy Classifcation" "Classifica��o de m�xima entropia"
"Maximum Entropy Presence Prediction" "Previs�o m�xima de presen�a de entropia"
+"Maximum Expansion Distance" ""
"Maximum Flow Distance" "Dist�ncia de fluxo m�ximo"
"Maximum Height" "Altura m�xima"
"Maximum Iterations" "Intera��es m�ximas"
"Maximum Level" "N�vel m�ximo"
"Maximum Likelihood" "Probabilidade m�xima"
"Maximum Membership" "Composi��o m�xima"
-"Maximum Number of Clusters" ""
-"Maximum Number of Iterations" ""
+"Maximum Number of Clusters" "N�mero m�nimo de clusters"
+"Maximum Number of Iterations" "N�mero m�ximo de intera��es"
"Maximum Number of Points" "N�mero m�ximo de pontos"
"Maximum Overestimation of ExcessRain [%]" "Superestima��o m�xima de excesso de chuva [%]"
"Maximum Points" "Pontos m�ximo"
@@ -2873,7 +2885,7 @@ TEXT TRANSLATION
"Maximum Search Radius" "Busca por raio m�ximo"
"Maximum Search Radius (cells)" "Busca por raio m�ximo (c�lulas)"
"Maximum Selection" "Sele��o M�xima"
-"Maximum Standard Deviation within a Cluster" ""
+"Maximum Standard Deviation within a Cluster" "Desvio padr�o m�ximo dentro de um cluster"
"Maximum Sum of overestimated ExcessRain to total ExcessRain in [%]" "Soma m�xima de superestimado excesso de chuvas totais em [%]"
"Maximum Temperature" "Temperatura m�xima"
"Maximum Time Span (Seconds)" "Intervalo m�ximo de tempo (segundos)"
@@ -2977,7 +2989,7 @@ TEXT TRANSLATION
"Minimum Distance" "Dist�ncia M�nima"
"Minimum Distance Analysis" "An�lise Dist�ncia M�nima"
"Minimum Exaggeration [%]" "Exagero m�nimo [%]"
-"Minimum Gradient" ""
+"Minimum Gradient" "Gradiente m�nimo"
"Minimum Height" "Altura m�nima"
"Minimum Magnitude" "Magnitude M�nima"
"Minimum Nash-Sutcliffe Efficiency" "M�nimo de Efici�ncia de Nash-Sutcliffe"
@@ -2986,7 +2998,7 @@ TEXT TRANSLATION
"Minimum Node Split Size" "N� m�nimo de Split Size"
"Minimum Number of Dark Object Cells" "N�mero M�nimo de Objeto celas escuras"
"Minimum Number of Points" "N�mero m�nimo de pontos"
-"Minimum Number of Samples in a Cluster" ""
+"Minimum Number of Samples in a Cluster" "N�mero m�nimo de amostras em um cluster"
"Minimum Probability" "Probabilidade m�nimo"
"Minimum Redundancy Feature Selection" "Sele��o de recursos de redund�ncia m�nimo"
"Minimum Resolution (Degree)" "Resolu��o M�nima (Grau)"
@@ -3019,11 +3031,12 @@ TEXT TRANSLATION
"Minnaert Correction with Slope (Law & Nichol 2004)" "Corre��o Minnaert com Slope (Law & Nichol 2004)"
"Minnaert Correction with Slope (Riano et al. 2003)" "Corre��o Minnaert com Slope (Riano et al. 2003)"
"Mirror" "Espelhar"
-"Mirror Grid" ""
+"Mirror Grid" "Grade espelhada"
"Mirror Horizontally" "Espelhar horizontalmente"
"Mirror Vertically" "Espelhar verticalmente"
-"Mirrored horizontally" ""
-"Mirrored vertically" ""
+"Mirrored horizontally" "Espelhamento horizontal"
+"Mirrored vertically" "Espelhamento vertical"
+"Miscellaneous" "Diversos"
"Missing Value" "Valor em falta"
"Mixed Flow Threshold (ha)" "Limite de fluxo misto (ha)"
"Mode" "Modo"
@@ -3058,7 +3071,7 @@ TEXT TRANSLATION
"Monthly Global by Latitude" "Mensal global por Latitude"
"Moore" "Moore"
"Moore & Nieber 1989" "Moore & Nieber 1989"
-"Moore (8)" ""
+"Moore (8)" "Moore (8)"
"Moore et al. 1991" "Moore et al. 1991"
"Moran's I" "I de Moran"
"Morphological Filter" "Filtro morfol�gica"
@@ -3129,7 +3142,7 @@ TEXT TRANSLATION
"NV, Number of plant elements per unit area [number/unit area] at the ground surface" "NV, N�mero de elementos da planta por unidade de �rea [n�mero de �rea/unidade] na superf�cie do solo"
"NX" "NX"
"NY" "NY"
-"N\xc3\xbamero of Monte-Carlo events" ""
+"N\xc3\xbamero of Monte-Carlo events" "N�mero de eventos Monte-Carlo"
"Name" "Nome"
"Name Field" "Nome do campo"
"Name by..." "Nome por ..."
@@ -3137,7 +3150,8 @@ TEXT TRANSLATION
"Name des Evaluierungspunktes 2" "Nome dos pontos de avalia��o 2"
"Name des Evaluierungspunktes 3" "Nome dos pontos de avalia��o 3"
"Name of Landsat metadata file (.met or MTL.txt)" "Nome do arquivo de metadados Landsat (.met ou MTL.txt)"
-"Natural Logarithm" ""
+"Naming for split lines" ""
+"Natural Logarithm" "Logaritmo natural"
"Natural Neighbour" "Vizinho natural"
"Navaladi, Schoeller, Conrad (c) 2009" "Navaladi, Schoeller, Conrad (c) 2009"
"Near Infrared (TM 4)" "Infravermelho Pr�ximo (TM 4)"
@@ -3154,7 +3168,7 @@ TEXT TRANSLATION
"NetCDF Files (*.nc)" "Arquivos NetCDF (* .nc)"
"Network topology" "Topologia de rede"
"Neumann" "Neumann"
-"Neumann (4)" ""
+"Neumann (4)" "Neumann (4)"
"Neumann: the four horizontally and vertically neighboured cells; Moore: all eight adjacent cells" "Neumann: as quatro c�lulas horizontal e vertical vizinhas; Moore: todas as oito c�lulas adjacentes"
"Neural Networks (OpenCV)" "Redes Neurais (OpenCV)"
"New" "Novo"
@@ -3253,7 +3267,7 @@ TEXT TRANSLATION
"Number of Columns" "Numero de colunas"
"Number of Components" "N�mero de componentes"
"Number of Data Cells" "N�mero de c�lulas de dados"
-"Number of Data Sets" ""
+"Number of Data Sets" "N�mero de conjuntos de dados"
"Number of Different Classes" "N�mero de classes diferentes"
"Number of Directions" "N�mero de dire��es"
"Number of Distance Classes" "N�mero de classes de dist�ncia"
@@ -3268,7 +3282,7 @@ TEXT TRANSLATION
"Number of Iterations" "N�mero de itera��es"
"Number of Iterations for Normal Updating" "N�mero de itera��es para atualiza��o normal"
"Number of Iterations for Vertex Updating" "N�mero de itera��es para Atualiza��o Vertex"
-"Number of Maps" ""
+"Number of Maps" "N�mero de mapas"
"Number of No-Data Cells" "N�mero de c�lulas SemDados"
"Number of Numeric Value Classes" "N�mero de classes de valor num�rico"
"Number of Pairs" "N�mero de pares"
@@ -3284,10 +3298,10 @@ TEXT TRANSLATION
"Number of Simulations" "N�mero de simula��es"
"Number of Simulations for Calibration" "N�mero de simula��es para calibra��o"
"Number of Steps" "N�mero de passos"
+"Number of Terrain Classes" ""
"Number of Values" "N�mero de valores"
"Number of Variables" "N�mero de vari�veis"
"Number of Vertices" "N�mero de v�rtices"
-"Number of added tools" "N�mero de ferramentas adicionadas"
"Number of additional attributes to import." "N�mero de atributos adicionais para importar."
"Number of arguments for attribute fields (%d), names (%d) and types (%d) do not match!" "N�mero de argumentos para campos de atributo (%d), nomes (%d) e tipos (%d) n�o combinam!"
"Number of attribute fields: %d" "N�mero de campos de atributo:%d"
@@ -3340,8 +3354,10 @@ TEXT TRANSLATION
"OUTPUT" "SA�DA"
"OUTPUT certainty" "Seguran�a de SA�DA"
"OUTPUT classes" "Classes de SA�DA"
+"Object Based Image Segmentation" ""
"Object Grid" "Grade de objeto"
"Objective Function" "Fun��o objetiva"
+"Objects" ""
"Objects removed from input grid" "Removedor de objetos da grade de entrada"
"Oblique Mercator" "Mercator obliquo"
"Obliquity" "Obliquidade"
@@ -3361,7 +3377,6 @@ TEXT TRANSLATION
"Old Style Namings" "Nomea��o antiga de estilo"
"Old Version" "Vers�o antiga"
"Olkin & Pratt" "Olkin & Pratt"
-"Omega" "�mega"
"Omega [degree]" "Omega [grau]"
"One Point Cloud per Polygon" "Uma nuvem de pontos por Poligono"
"One or several input point cloud datasets to cut." "Um ou v�rios conjuntos de dados de entrada de nuvem de pontos para cortar."
@@ -3376,7 +3391,7 @@ TEXT TRANSLATION
"Open Database Connection" "Abrir concex�o do banco de dados"
"Open Project" "Abrir projeto"
"Open Slopes" "Encostas abertas"
-"Open Street Map" ""
+"Open Street Map" "Abrir endere�o de mapa"
"Open as data set" "Abrir como conjunto de dados"
"Open with external application" "Abrir com aplica��o externa"
"OpenCV" "OpenCV"
@@ -3387,7 +3402,7 @@ TEXT TRANSLATION
"Operator Type" "Tipo de operador"
"Operator scale" "Escala do operador"
"Opposite Neighbours" "Vizinhos opostos"
-"Optimised" ""
+"Optimised" "Otimizado"
"Optional Output Filepath" "Caminho do arquivo da sa�da opcional"
"Optional Target Grids" "Grades alvos opcionais"
"Optional Tile Info Filename" "Nome do arquivo opcional de informa��o do ladrilho"
@@ -3395,7 +3410,7 @@ TEXT TRANSLATION
"Optional integer vector indicating the samples (rows of inputs and outputs) that are taken into account." "Vetor inteiro opcional indicando as amostras (linhas de entradas e sa�das) que s�o levados em conta."
"Optional output polygon shapefile" "Sa�da opcional de pol�gono shapefile"
"Options" "Op��es"
-"Options:\n - Less than\n - Equals\n - Greater than\nControls under which condition a channel is initiated." ""
+"Options:\n - Less than\n - Equals\n - Greater than\nControls under which condition a channel is initiated." "Op��es:\n - Menos de\n - Igual\n - Mais de\nControles em que condi��es um canal for iniciada."
"Order" "Ordenar"
"Order by" "Ordenar por"
"Order by..." "Ordenar por..."
@@ -3417,7 +3432,7 @@ TEXT TRANSLATION
"Orthographic" "Ortogr�fico"
"Ouput" "Sa�da"
"Outlet" "Sa�da"
-"Outlet Concentration" ""
+"Outlet Concentration" "Concentra��o de sa�da"
"Outlet Hydrographs" "Hidrograma de sa�da"
"Outlet X" "Sa�da X"
"Outlet Y" "Sa�da Y"
@@ -3464,6 +3479,7 @@ TEXT TRANSLATION
"Overlap [map units]" "Sobreposi��o [mapa de unidades]"
"Overlapping Areas" "�reas sobrepostas"
"Overlapping Cells" "C�lulas que se sobrep�em"
+"Overlay" "Sobreposi��o"
"Overlay Image" "Imagem sobreposta"
"Override" "Sobrepor"
"Overview" "Vis�o geral"
@@ -3479,7 +3495,6 @@ TEXT TRANSLATION
"PDF Docs" "Documentos PDF"
"PDF Documents" "Documentos PDF"
"PDF File" "Arquivo PDF"
-"PDF Files" "Arquivos PDF"
"PDF Files (*.pdf)|*.pdf|All Files|*.*" "Arquivos PDF (*.pdf)|*.pdf|All Files|*.*"
"PERCENTILE" "PERCENTIL"
"PERIMETER" "PER�METRO"
@@ -3488,7 +3503,6 @@ TEXT TRANSLATION
"PFAC(" "PFAC("
"PH, plant height [m], representing the effective height from which raindrops fall from the crop or vegetation" "PH, altura das plantas [m], o que representa a altura efetiva em que a chuva cai a partir da cultura ou vegeta��o"
"PI, permanent interception expressed as the proportion [between 0-1] of rainfall" "PI, intercepta��o permanente expressa como a propor��o [entre 0-1] de chuvas"
-"PNG Files" "Arquivos PNG"
"PRECISION" "PRECIS�O"
"PREDICTED" "PREVIS�VEL"
"PT_ID" "PT_ID"
@@ -3558,7 +3572,7 @@ TEXT TRANSLATION
"Permament Interception" "Intercep��o permamente"
"Permanent Wilting Point [mm]" "Ponto de murchamento permanente [mm]"
"Permeability" "Permeabilidade"
-"Permutation Importance" ""
+"Permutation Importance" "Import�ncia de permuta��o"
"Perpendicular Vegetation Index (Perry and Lautenschlager, 1984)" "�ndice de Vegeta��o Perpendicular (Perry e Lautenschlager, 1984)"
"Perpendicular Vegetation Index (Qi, et al., 1994)" "Perpendicular �ndice de Vegeta��o (Qi, et al., 1994)"
"Perpendicular Vegetation Index (Richardson and Wiegand, 1977)" "�ndice de Vegeta��o Perpendicular (Richardson e Wiegand, 1977)"
@@ -3571,9 +3585,6 @@ TEXT TRANSLATION
"Photogrammetry" "Fotogrametria"
"Photogrammetry tools." "Ferramentas de fotogrametria."
"Pit" "Cova ou po�o"
-"Pixel Centers?" "Centros de pixel?"
-"Pixel Width (um)" "Largura de pixel (um)"
-"Pixel Width in micro meters" "Largura Pixel em micro metros"
"Plain" "Plan�cie"
"Plains" "Plan�cie"
"Plan Curvature" "Plano de curvatura"
@@ -3607,7 +3618,7 @@ TEXT TRANSLATION
"Please stop tool execution before exiting SAGA." "Por favor, pare a execu��o da ferramenta antes de sair do SAGA."
"Plot Holes" "Buracos na trama"
"Point" "Ponto"
-"Point Cloud" "Nuvem de pontos"
+"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"
"Point Cloud Cutter" "Cortador de Nuvem de pontos"
@@ -3687,11 +3698,13 @@ TEXT TRANSLATION
"Portable Network Graphics" "Portable Network Graphics"
"Portable Network Graphics (*.png)" "Portable Network Graphics (*.png)"
"Position" "Posi��o"
+"Position Index Radius" ""
"Position as Geographic Coordinates" "Posi��o em Coordenadas Geogr�ficas"
"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"
"PostGIS extension added" "Extens�o PostGIS acrescentada"
"PostGIS extension missing or too old" "Extens�o PostGIS ausente ou muito velha"
@@ -3722,6 +3735,7 @@ TEXT TRANSLATION
"Precipitation [mm]" "Precipita��o [mm]"
"Precise Datum Conversion" "Precise Datum Convers�o"
"Precise Tracing" "Rastreamento preciso"
+"Precision" ""
"Precisions" "Precis�es"
"Predefined Datum" "Predefinido Datum"
"Predefined Ellipsoids" "Predefinidos Elips�ides"
@@ -3743,21 +3757,15 @@ TEXT TRANSLATION
"Presence Prediction" "Predi��o de presen�a"
"Presence Probability" "Probabilidade de presen�a"
"Preservation" "Preserva��o"
-"Preserve 1px border Yes/No" "Preservar fronteira 1px Sim/N�o"
"Preserve Data Type" "Preservar tipo de dados"
"Preset Selection" "Sele��o predefinida"
"Presets" "Predefini��es"
-"Prevent Negative Flow Accumulation" ""
+"Prevent Negative Flow Accumulation" "Prevenir acumula��o de fluxo negativo"
"Previous" "Anterior"
"Primary Key" "Chave prim�ria"
"Primary Name" "Nome prim�rio"
"Primary key)" "Chave prim�ria)"
"Principal Components" "Componentes principais"
-"Principal Point Offset in X" "Deslocamento em X do ponto principal"
-"Principal Point Offset in X (pixels)" "Deslocamento em X (pixels) do ponto principal"
-"Principal Point Offset in X (pixles)" "Deslocamento em X (pixles) do ponto principal"
-"Principal Point Offset in Y" "Deslocamento em Y do ponto principal"
-"Principal Point Offset in Y (pixels)" "Deslocamento em Y (pixels) do ponto principal"
"Principle Components" "Componentes principais"
"Principle Components Analysis" "An�lise de componentes principais"
"Principle Components Based Image Sharpening" "Afina��o de imagem com base em componentes principais"
@@ -3788,7 +3796,7 @@ TEXT TRANSLATION
"Profile Distance" "Perfil de dist�ncia"
"Profile Length" "Perfil de comprimento"
"Profile Line" "Linha de perfil"
-"Profile Lines" ""
+"Profile Lines" "Linhas de perfil"
"Profile Points" "Pontos de perfil"
"Profile Samples" "Amostras de perfil"
"Profile [%s]" "Perfil [%s]"
@@ -3808,25 +3816,19 @@ TEXT TRANSLATION
"Projected Coordinate Systems" "Sistemas de Coordenadas Projetadas"
"Projected Height" "Altura projetada"
"Projection" "Proje��o"
-"Projection Centre" "Centro de proje��o"
-"Projection Centre - X" "Centro de Proje��o - X"
-"Projection Centre - Y" "Centro de proje��o - Y"
-"Projection Centre - Z" "Centro de proje��o - Z"
"Projection Parameters" "Par�metros de proje��o"
"Projection Settings" "Configura��es de proje��o"
"Projection Type" "Tipo de proje��o"
"Projection routines make use of the Proj.4 Cartographic Projections library." "Rotinas de proje��o para uso da biblioteca de Proje��es Cartogr�ficas Proj.4."
-"Projection_GeoTRANS_Datum_3.dat,\n" ""
-"Projection_GeoTRANS_Datum_7.dat,\n\n" ""
-"Projection_GeoTRANS_Ellipsoid.dat,\n" ""
-"Projection_GeoTRANS_Geoid_EGM96.dat,\n" ""
+"Projection_GeoTRANS_Datum_3.dat,\n" "Projection_GeoTRANS_Datum_3.dat,\n"
+"Projection_GeoTRANS_Datum_7.dat,\n\n" "Projection_GeoTRANS_Datum_7.dat,\n\n"
+"Projection_GeoTRANS_Ellipsoid.dat,\n" "Projection_GeoTRANS_Ellipsoid.dat,\n"
+"Projection_GeoTRANS_Geoid_EGM96.dat,\n" "Projection_GeoTRANS_Geoid_EGM96.dat,\n"
"Projections" "Proje��es"
"Projection|Georeferencing" "Proje��o|Georreferenciamento"
"Propability" "Probabilidade"
"Properties" "Propriedades"
"Protection Index" "�ndice de prote��o"
-"Provide Radial Distortion Parameters?" "Fornecer par�metros de distor��o radial?"
-"Provide Time stamp of Image?" "Fornecer tempo de cria��o da imagem?"
"Proximity" "Proximidade"
"Proximity Grid" "Grade de proximidade"
"Punktuelle Rasterzellenmanipulation" "Punktuelle Rasterzellenmanipulation"
@@ -3857,33 +3859,7 @@ TEXT TRANSLATION
"R,G,B to SAGA RGB" "R,G,B para SAGA RGB"
"R,G,B value range" "intervalo de valores R,G,B"
"R2" "R2"
-"R:Alternatives" "R:Alternativas"
-"R:Classification" "R:Classifica��o"
-"R:Conversion" "R:Convers�o"
-"R:Conversions" "R:Convers�es"
-"R:Dynamics" "R:Din�micos"
-"R:Export" "R:Exportar"
-"R:Fragmentation Analysis" "R:An�lise de Fragmenta��o"
-"R:Grid Generation" "R:Gera��o de grade"
-"R:Grid Values" "R:Valores de grade"
-"R:Image Sharpening" "R:Afina��o de imagem"
-"R:Import" "R:Importar"
-"R:Indices" "R:�ndices"
-"R:Interpolation from Points" "R:Iinterpola��o de Pontos"
-"R:Landsat" "R:Landsat"
-"R:Miscellaneous" "R:Diversos"
-"R:Overlay" "R:Sobreposi��o"
-"R:Point Cloud" "R:Nuvem de Pontos"
-"R:Principle Components" "R:Componentes Principais"
-"R:Shapes" "R:Shapes"
-"R:Soil Analysis" "R:An�lise do Solo"
-"R:Spatial Extent" "R:Extens�o espacial"
-"R:Spline Interpolation" "R:interpola��o Spline"
-"R:Table" "R:Tabela"
-"R:Terrain Analysis" "R:An�lise de terreno"
-"R:Tools" "R:Ferramentas"
-"R:Topographic Indices" "R:�ndices topogr�ficos"
-"R:Vectorization" "R:Vetorisa��o"
+"R:Import" ""
"RAINBOW" "ARCO IRIS"
"RANGE" "ALCANCE"
"RED_BLUE" "RED_BLUE"
@@ -3929,14 +3905,16 @@ TEXT TRANSLATION
"Random Forest Classification (ViGrA)" "Classifica��o aleat�ria de floresta (ViGrA)"
"Random Forest Options" "Op��es aleat�rias de floresta"
"Random Forest Presence Prediction (ViGrA)" "Predi��o aleat�ria de floresta (VIGrA)"
+"Random Forest Tree Count" ""
"Random Terrain" "Terreno aleat�rio"
-"Random number, Gaussian distribution with mean x and standard deviation y" ""
-"Random number, uniform distribution with minimum x and maximum y" ""
+"Random number, Gaussian distribution with mean x and standard deviation y" "N�mero aleat�rio, distribui��o de Gauss com m�dias x e desvio padr�o y"
+"Random number, uniform distribution with minimum x and maximum y" "N�mero aleat�rio, distribui��o uniforme com um m�nimo x e m�xima y"
"Range" "Alcance"
"Range of R,G,B values in LAS file." "Faixa de valores R,G,Bem arquivo LAS."
"Rank" "Rank"
"Rank Filter" "Filtro de Rank"
"Rank [Percent]" "Rank [por cento]"
+"Raster" ""
"Raster Band Deletion" "Exclus�o de Banda Raster"
"Raster Band Identifier" "Identificador de Banda Raster"
"Raster Catalogue" "Cat�logo raster"
@@ -4013,14 +3991,13 @@ TEXT TRANSLATION
"Relative from cell value" "Valor da c�lula relativo"
"Relative heights calculation..." "C�lculo de alturas relativas..."
"Relaxation" "Relaxamento"
+"Relief Segmentation" ""
"Reload" "Recarregar"
"Reload tool chain" "Recarregar cadeia de ferramentas"
"Remove" "Remover"
-"Remove Border Regions?" "Retirar as regi�es fronteiri�as?"
"Remove Duplicate Points" "Remover pontos duplicados"
"Remove Overlap from Virtual Point Cloud Tiles" "Remover sobreposi��o de mosaicos de nuvem virtual de pontos"
"Remove every i-th point." "Remova todos os pontos i-th."
-"Remove regions which have contact with (are adjacent to) the image borders?" "Remover regi�es em contato(s�o adjacentes a) as fronteiras de imagem?"
"Removed Objects" "Objetos retirados"
"Removing ambiguous pixels..." "Removendo pixels amb�guos ..."
"Rename" "Renomear"
@@ -4041,6 +4018,7 @@ TEXT TRANSLATION
"Representativeness (Grid)" "Representatividade (grade)"
"Resampling" "Reamostragem"
"Resampling Filter" "Filtro de reamostragem"
+"Resampling method used when projection is needed" ""
"Rescale Range" "Redimensionar Alcance (Range)"
"Rescale Values (0-255)" "Re-escalar valores (0-255)"
"Rescale to 0 - 1" "Redimensionar para 0-1"
@@ -4054,6 +4032,10 @@ TEXT TRANSLATION
"Residuals" "Residuais"
"Resilent propagation (RPROP)" "Propaga��o resiliente (RPROP)"
"Resolution" "Resolu��o"
+"Resolution [d]" ""
+"Resolution [h]" ""
+"Restart SAGA to apply the changes" ""
+"Restart now ?" ""
"Restore" "Restaurar"
"Restore Model from File" "Restaurar Modelo de Arquivo"
"Result" "Resultado"
@@ -4066,16 +4048,16 @@ TEXT TRANSLATION
"Resulting Point Cloud." "Nuvem de pontos resultante."
"Resulting Value" "Valor resultante"
"Results" "Resultados"
-"Returns the floating point remainder of x/y" ""
-"Returns the integer part of floating point value x" ""
-"Returns the value of Pi" ""
-"Returns true (1), if at least one of both x and y is true (i.e. not 0)" ""
-"Returns true (1), if both x and y are true (i.e. not 0)" ""
-"Returns true (1), if x equals y, else false (0)" ""
-"Returns true (1), if x is greater than y, else false (0)" ""
-"Returns true (1), if x is less than y, else false (0)" ""
-"Returns x raised to the power of y" ""
-"Returns x, if condition c is true (i.e. not 0), else y" ""
+"Returns the floating point remainder of x/y" "Retorna o resto de ponto flutuante de x/y"
+"Returns the integer part of floating point value x" "Retorna a parte inteira de um valor em ponto flutuante x"
+"Returns the value of Pi" "Retorna o valor de Pi"
+"Returns true (1), if at least one of both x and y is true (i.e. not 0)" "Retorna verdadeiro (1), se, pelo menos, um de x e y � verdadeiro (isto �, n�o 0)"
+"Returns true (1), if both x and y are true (i.e. not 0)" "Retorna verdadeiro (1), se ambos x e y s�o verdadeiros (isto �, n�o 0)"
+"Returns true (1), if x equals y, else false (0)" "Retorna verdadeiro (1), se x � igual a y, outra coisa retorna falso (0)"
+"Returns true (1), if x is greater than y, else false (0)" "Retorna verdadeiro (1), se x for maior do que y, o resto retorna falso (0)"
+"Returns true (1), if x is less than y, else false (0)" "Retorna verdadeiro (1), se x � menor que y, outra coisa retorna falso (0)"
+"Returns x raised to the power of y" "Retorna x elevado � pot�ncia de y"
+"Returns x, if condition c is true (i.e. not 0), else y" "Retorna x, se a condi��o c � verdadeira (isto �, n�o 0), outra coisa retorna y"
"Revert Palette" "Reverter Paleta"
"Rf" "Rf"
"Rho 8" "Rho 8"
@@ -4094,6 +4076,7 @@ TEXT TRANSLATION
"River Mouths" "Foz do rio"
"Rn, number of rain days in timespan [-]" "Rn, n�mero de dias de chuva no per�odo de tempo [-]"
"Road Width" "Largura de Estrada"
+"Roads" ""
"Roll Left [F4]" "Rolar a Esquerda [F4]"
"Roll Right[F3]" "Rolar a direita [F3]"
"Rook" "Torre"
@@ -4106,7 +4089,6 @@ TEXT TRANSLATION
"Rotate Y" "Girar Y"
"Rotate Z" "Girar Z"
"Rotation" "Rota��o"
-"Rotation Angle" "�ngulo de rota��o"
"Rotation X" "Rota��o X"
"Rotation Y" "Rota��o Y"
"Rotation Z" "Rota��o Z"
@@ -4144,7 +4126,7 @@ TEXT TRANSLATION
"SAGA User Group Associaton (c) 2008" "SAGA User Group Associaton (c) 2008"
"SAGA Wetness Index" "�ndice de umidade SAGA"
"SAGA: Print Map" "SAGA: Imprimir Mapa"
-"SAGA\nSystem for Automated Geoscientific Analyses\nVersion 2.0" ""
+"SAGA\nSystem for Automated Geoscientific Analyses\nVersion 2.0" "SAGA\nSystem for Automated Geoscientific Analyses\nVersion 2.0"
"SECTIONS" "SE��ES"
"SHALSTAB" "SHALSTAB"
"SIZE" "TAMANHO"
@@ -4203,6 +4185,8 @@ TEXT TRANSLATION
"Save Headline" "Salvar t�tulo"
"Save History as Model" "Salvar hist�rico como modelo"
"Save KML file" "Salvar arquivo KML"
+"Save LCZC (Filtered) as..." ""
+"Save LCZC as..." ""
"Save Map as Image..." "Salvar mapa como imagem ..."
"Save Map to KMZ" "Salvar Mapa para KMZ"
"Save Modified Data" "Salvar dados modificados"
@@ -4258,7 +4242,7 @@ TEXT TRANSLATION
"Scale factors" "Fatores de escala"
"Scaling" "Escalamento / Dimensionamento"
"Scaling Factor for Attribute Value" "Fator de escala para o valor do atributo"
-"Scatterplot" "Dispers�o"
+"Scatterplot" "Dimens�o"
"Score" "Ponto"
"Screen" "Tela"
"Search Chip Size (Cells)" "Pesquisa de tamanho de chip (C�lulas)"
@@ -4361,7 +4345,7 @@ TEXT TRANSLATION
"Separator (other)" "Separador (outro)"
"Seperate Beruecksichtigung und Berechnung ueber Hauptgerinnerasterzellen - neben den normalen Gerinnerasterzellen." "Separe Beruecksichtigung und Berechnung ueber Hauptgerinnerasterzellen - neben den normalen Gerinnerasterzellen."
"September" "setembro"
-"Sequencer" "Sequ�ncia"
+"Sequencer" "Sequenciador"
"Sequencer Positions" "Posi��es de sequ�ncia"
"Server" "Servidor"
"Server Connection" "Conex�o do Servidor"
@@ -4387,7 +4371,7 @@ TEXT TRANSLATION
"Shall execution be stopped?" "A execu��o deve ser interrompido?"
"Shape" "Shape"
"Shape Index" "�ndice de shape"
-"Shape Layers" ""
+"Shape Layers" "Camada shape"
"Shape Parameter for Elevation Percentile" "Shape de par�metros para percentil de eleva��o"
"Shape Parameter for Slope" "Par�metros de declive do shape"
"Shape Type" "Tipo de shape"
@@ -4431,12 +4415,10 @@ TEXT TRANSLATION
"Shift X" "Deslocamento X"
"Shift Y" "Deslocamento Y"
"Shift Z" "Deslocamento Z"
-"Shift value" "Valor de deslocamento"
"Short Dashed" "Tracejado curto"
"Short Field Names" "Nomes curtos de campo"
"Short Wave Radiation [kW/m2]" "Ondas curtas de radia��o [kW/m2]"
"Short dashed style" "Estilo curto frustrados"
-"Should the output shapes contain the centers of the border pixels instead of the corners?" "Os shapes de sa�da devem conter os centros dos pixels como fronteira, em vez dos cantos?"
"Shoulder Hollow" "Cavidade ressaltada"
"Shoulder Slope" "Declive ressaltado"
"Shoulder Spur" "Espor�o ressaltado"
@@ -4477,8 +4459,10 @@ TEXT TRANSLATION
"Shrinking" "Escolhendo"
"Sibson" "Sibson"
"Side Slope" "Lado de declive"
+"Sieve and Clump" ""
"Sieved Classes" "Classes peneiradas"
"Sieving Classes" "Classes de peneiramento"
+"Sieving Threshold" ""
"Sigma" "Sigma"
"Sigmoid" "Sigm�ide"
"Significance Level" "N�vel de signific�ncia"
@@ -4491,7 +4475,7 @@ TEXT TRANSLATION
"Similarity Threshold" "Limiar de similaridade"
"Simple" "Simples"
"Simple Filter" "Filtro simples"
-"Simple Filter within shapes" ""
+"Simple Filter within shapes" "Filtro simples contendo shapes"
"Simple Kriging" "Krigagem simples"
"Simple, flow path and swath profiles." "Simpes, caminho de fluxo e perfis de faixa."
"Simplified Lines" "Linhas simplificadas"
@@ -4515,7 +4499,7 @@ TEXT TRANSLATION
"Simulation|Hydrology|IHACRES" "Simula��o|Hidrologia|IHACRES"
"Simulation|Hydrology|RivFlow" "Simula��o|Hidrologia|Fluxo de rio"
"Simulation|Quantitative Modeling of Earth Surface Processes" "Simula��o|Modelagem quantitativa dos processos de superf�cie da terra"
-"Sine" ""
+"Sine" "Seno"
"Single Cell" "C�lula �nica"
"Single Colour" "Cor �nica"
"Single Flow Direction" "Dire��o de fluxo �nico"
@@ -4586,6 +4570,7 @@ TEXT TRANSLATION
"Soil" "Solo"
"Soil Adjusted Vegetation Index" "�ndice de ajuste de vegeta��o do solo"
"Soil Adjustment Factor" "Fator de Ajuste do solo"
+"Soil Analysis" "An�lise do Solo"
"Soil Moisture" "Umidade do solo"
"Soil Moisture Content" "Conteudo de mistura do solo"
"Soil Moisture Deficit" "Deficit de umidade do solo"
@@ -4604,7 +4589,7 @@ TEXT TRANSLATION
"Soil moisture index threshold (l), upper bound" "Limiar do �ndice de umidade do solo (l), limite superior"
"Soil moisture storage capacity" "Capacidade de armazenamento de humidade do solo"
"Soil parameters" "Par�metros do solo"
-"Solar Constant [W / m\xb2]" ""
+"Solar Constant [W / m\xb2]" "Constante solar [W / m\xb2]"
"Solar Height" "Altura solar"
"Solar Position" "Posi��o solar"
"Solar Radiance" "Radi�ncia solar"
@@ -4638,6 +4623,7 @@ TEXT TRANSLATION
"South []" "Sul []"
"South-North" "Sul-Norte"
"Spacecraft Sensor" "Sensor da nave espacial"
+"Spatial Extent" "Extens�o espacial"
"Spatial Point Pattern Analysis" "An�lise de padr�es de ponto espacial"
"Spatial Reference" "Refer�ncia Espacial"
"Spatial Reference System Files (*.srs)" "Sistema de arquivos de refer�ncia espacial (*.srs)"
@@ -4667,7 +4653,9 @@ TEXT TRANSLATION
"Spline" "Estriamento"
"Spline Interpolation" "interpola��o estriada"
"Spline sensitivity, reduce to get smoother results, recommended: 80 < Tolerance < 200" "Sensibilidade estriada, reduzir para obter resultados mais suaves, recomendada: 80 < Toler�ncia < 200"
+"Split" ""
"Split Channels" "Canais divididos"
+"Split Clusters" ""
"Split Features" "Fei��es de divis�o"
"Split Lines at Points" "Linhas divididas em pontos"
"Split Lines with Lines" "Linhas de divis�o com linhas"
@@ -4679,11 +4667,10 @@ TEXT TRANSLATION
"Split Shapes Layer Randomly" "Dividir camada Shapes aleatoriamente"
"Split Table/Shapes by Attribute" "Dividir tabela/shapes por atributo"
"Split with Line" "Dividir com a linha"
-"Splitted" "Dividido"
"Spring" "Primavera"
"Spur" "Espor�o"
"Square" "Quadrado"
-"Square Root" ""
+"Square Root" "Raiz quadrada"
"Squared Correlation Coefficient" "Coeficiente de correla��o ao quadrado"
"Squared Eccentricity (es)" "Excentricidade quadrada (es)"
"Squares" "Quadrados"
@@ -4703,9 +4690,6 @@ TEXT TRANSLATION
"Standardised Grid" "Grade padronizada"
"Standardize" "Estandardizar"
"Standardized Height" "Altura padronizada "
-"Start Degree" "Grau inicial"
-"Start Latitude" "Latitude Inicial"
-"Start Longitude" "Longitude inicial"
"Start Size" "Tamanho inicial"
"Start Value" "Valor inicial"
"Start Values" "Valores iniciais"
@@ -4774,7 +4758,7 @@ TEXT TRANSLATION
"Summary" "Resumo"
"Summary Table" "Tabela resumo"
"Summary table." "Tabela de resumo."
-"Summary:\n" ""
+"Summary:\n" "Resumo:\n"
"Summary_" "Resumo_"
"Sun's height above horizon in degree" "Altura do sol acima do horizonte em grau"
"Sunrise" "Nascer do sol"
@@ -4786,14 +4770,14 @@ TEXT TRANSLATION
"Supervised Classification for Tables" "Classifica��o supervisionada para tabelas"
"Support Vector Machine" "Suporte para m�quina vetorial"
"Surface" "Superf�cie"
-"Surface Approximation Threshold" ""
+"Surface Approximation Threshold" "Limiar de aproxima��o da superf�cie"
"Surface Area" "�rea da superf�cie"
"Surface Specific Points" "Pontos espec�ficos da superf�cie"
-"Surface and Gradient" ""
+"Surface and Gradient" "Superf�cie e Gradiente"
"Surface hydraulic conductivity [m/h]" "Condutividade hidr�ulica da superf�cie [m / h]"
"Surface roughness" "Rigidez da superf�cie"
"Surface used to derive the LDD network, e.g. a DTM." "Superf�cie utilizada para obter a rede LDD, por exemplo, uma DTM."
-"Surface, Gradient and Concentration" ""
+"Surface, Gradient and Concentration" "Surface, Gradiente e Concentra��o"
"Surfer Blanking Files (*.bln)" "Arquivos de branqueamento de surfer (*.bln)"
"Surfer Blanking Files (*.bln)|*.bln|All Files|*.*" "Arquivos de branqueamento de surfer (*.bln)|*.bln|Todos os arquivos|*.*"
"Surfer Grid (*.grd)|*.grd|All Files|*.*" "Grade de surfista (*.grd)|*.grd|Todos os arquivos|*.*"
@@ -4810,7 +4794,7 @@ TEXT TRANSLATION
"Symmetrical Difference" "Diferen�a sim�trica"
"Synchronise Map Extents" "Sincronizar extens�es de mapa"
"Synchronize Map Extents" "Sincronizar extens�es de mapa"
-"Syntax error at position #%d: \n%s\n" ""
+"Syntax error at position #%d: \n%s\n" "Erro de sintaxe na posi��o #%d: \n%s\n"
"Synthesized Grid" "Grade sintetizada"
"T Curvature" "Curvatura T"
"T Slope" "Declive T"
@@ -4869,7 +4853,7 @@ TEXT TRANSLATION
"Tagged Image File Format" "Formato de arquivo de imagem alvo"
"Tagged Image File Format (*.tif, *.tiff)" "Formato de arquivo de imagem alvo (* .tif, * .tiff)"
"Take Formula" "Tirar formula"
-"Tangent" ""
+"Tangent" "Tangente"
"Tangential Curvature" "Curvatura tangencial"
"Target" "Alvo"
"Target Area" "�rea-alvo"
@@ -4883,7 +4867,7 @@ TEXT TRANSLATION
"Target Grid" "Grade alvo"
"Target Grid System" "Sistema de grade alvo"
"Target Grid Type" "Tipo de grade alvo"
-"Target Map" ""
+"Target Map" "Mapa alvo"
"Target Parameter List Initialisation Error" "Erro na inicializa��o da lista de par�metros alvo"
"Target Parameters" "Par�metros alvo"
"Target Projection" "Proje��o alvo"
@@ -4909,6 +4893,7 @@ TEXT TRANSLATION
"Temperature Threshold for Rainfall (lower bound)" "Limite de temperatura para precipita��o (limite inferior)"
"Temperature Threshold for Rainfall (upper bound)" "Limite de temperatura para precipita��o (limite superior)"
"Temperature at Reference Station [Deg.Celsius]" "Temperatura na esta��o de refer�ncia [grau.Celsius]"
+"Temperature at Sea Level" ""
"Template Menu|Template Sub Menu" "Menu de modelo|Modelo de Sub-menu"
"Templates" "Modelos"
"Temporary files" "Arquivos tempor�rios"
@@ -4918,7 +4903,7 @@ TEXT TRANSLATION
"Termination criteria of the training algorithm. You can specify the maximum number of iterations." "Crit�rios de termina��o do algoritmo de treinamento. Voc� pode especificar o n�mero m�ximo de itera��es."
"Terrain" "Terreno"
"Terrain Analysis" "An�lise de terreno"
-"Terrain Analysis: Compound Analyses.\nThis library depends on the following SAGA module libraries:\n- ta_channels\n- ta_flow\n- ta_indices\n- ta_lighting\n- ta_morphometry\n- ta_preproc\n" ""
+"Terrain Analysis: Compound Analyses.\nThis library depends on the following SAGA module libraries:\n- ta_channels\n- ta_flow\n- ta_indices\n- ta_lighting\n- ta_morphometry\n- ta_preproc\n" "An�lise de terreno: An�lises compostas.\nEsta biblioteca depende das seguintes bibliotecas m�dulo SAGA:\n- ta_channels\n- ta_flow\n- ta_indices\n- ta_lighting\n- ta_morphometry\n- ta_preproc\n"
"Terrain Analysis|Channels" "An�lise de terreno|Canais"
"Terrain Analysis|Hydrology" "An�lise de terreno|Hidrologia"
"Terrain Analysis|Lighting" "An�lise de terreno|Ilumina��o"
@@ -4926,6 +4911,8 @@ TEXT TRANSLATION
"Terrain Analysis|Preprocessing" "An�lise de terreno|Pr�-processamento"
"Terrain Analysis|Profiles" "An�lise de terreno|Perfis"
"Terrain Analysis|Slope Stability" "An�lise de terreno|Estabilidade de taludes"
+"Terrain Classification" ""
+"Terrain Clustering" ""
"Terrain Map View" "Visualizar mapa de terreno"
"Terrain Path Cross Sections" "Se��es de cruzamento de caminhos no terreno"
"Terrain Ruggedness Index (TRI)" "�ndice de robustez do terreno (TRI)"
@@ -4952,7 +4939,7 @@ TEXT TRANSLATION
"The GDAL datatype of the created dataset." "Tipo de dados GDAL do conjunto de dados criado."
"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 GeoTRANS engine could not be initialized !!\n\n" "O motor Geotrans n�o p�de ser inicializado !!\n\n"
"The LAS output file." "O arquivo de sa�da LAS."
"The SAGA grids to be exported." "Grade SAGA a ser exportada."
"The angle between the surface and the incoming light beams, measured in radians." "�ngulo entre a superf�cie e os feixes de luz de entrada, medido em radianos."
@@ -4977,8 +4964,8 @@ TEXT TRANSLATION
"The column holding the Z-coordinate." "Coluna prendendo a coordenada z."
"The converted shapefile." "Shapefile convertido."
"The cutted output point cloud dataset(s)." "Conjunto de dados da nuvem de pontos cortados de sa�da"
-"The datatype to use for each field, separated by semicolon, e.g. \" ""
-"The decimal precision to use for each field, separated by semicolon, e.g. \" ""
+"The datatype to use for each field, separated by semicolon, e.g. \" "Tipo de dados a ser usado para cada campo, separados por ponto e v�rgula, por exemplo, \"
+"The decimal precision to use for each field, separated by semicolon, e.g. \" "A precis�o decimal para usar para cada campo, separados por ponto e v�rgula, por exemplo, \"
"The delay after the start of rainfall, before the discharge starts to rise." "Atraso ap�s o in�cio das chuvas, antes da descarga come�a a subir."
"The difference of positive and negative openness." "Diferen�a de abertura positiva e negativa."
"The field with B values (0-255)" "Campo com valores B (0-255)"
@@ -5011,13 +4998,13 @@ TEXT TRANSLATION
"The length of the Gaussian window is too small, please provide a larger sigma." "O comprimento da janela Gaussian � muito pequeno, por favor fornecer um sigma maior."
"The merged point cloud." "Nuvem de pontos resultante da fus�o."
"The method used to identify surface specific points." "M�todo utilizado para identificar pontos espec�ficos da superf�cie."
-"The name to use for each field, separated by semicolon, e.g. \" ""
+"The name to use for each field, separated by semicolon, e.g. \" "Nome a ser usado para cada campo, separados por ponto e v�rgula, por exemplo, \"
"The number of days to model." "N�mero de dias para modelar."
"The number of smoothing iterations [-]." "N�mero de itera��es de suaviza��o [-]."
"The number of supplied grids exceeds the number of variables in formula." "O n�mero de grades fornecidas excede o n�mero de vari�veis ??na f�rmula."
"The number of supplied grids is less than the number of variables in formula." "O n�mero de grades fornecidas � menos do que o n�mero de vari�veis ??na f�rmula."
-"The numbers (starting from 1) of the fields to export, separated by semicolon, e.g. \" ""
-"The numbers (starting from 1) of the fields to import, separated by semicolon, e.g. \" ""
+"The numbers (starting from 1) of the fields to export, separated by semicolon, e.g. \" "Os n�meros (a partir de 1) dos campos para exportar, separados por ponto e v�rgula, por exemplo, \"
+"The numbers (starting from 1) of the fields to import, separated by semicolon, e.g. \" "Os n�meros (a partir de 1) dos campos para importar, separados por ponto e v�rgula, por exemplo, \"
"The output grid(s)" "Grade(s) de sa�da"
"The output grids, one grid for each table column." "Grades de sa�da, um gradepara cada coluna da tabela."
"The output point cloud" "Nuvem de pontos de sa�da"
@@ -5038,7 +5025,7 @@ TEXT TRANSLATION
"The smoothing preservation factor [-]." "Factor de preserva��o de alisamento [-]."
"The start value to use for the identifier." "Valor inicial a ser usado para o identificador."
"The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." "Tabela com os valores (num�ricos) de dados para cada classe. O m�dulo cria uma grade para cada coluna da tabela (al�m da ID)."
-"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "O fator exagero de terreno permite aumentar os contrastes de sombra em �reas planas."
+"The terrain exaggeration factor allows one to increase the shading contrasts in flat areas." ""
"The transmittance of the atmosphere, usually between 60 and 80 percent." "Transmit�ncia da atmosfera, geralmente entre 60 e 80 por cento."
"The transparency of the shade [%]" "Transpar�ncia da sombra[%]"
"The unobstructed hemisphere given as percentage." "Hemisf�rio desobstru�do dado em percentagem."
@@ -5053,7 +5040,7 @@ TEXT TRANSLATION
"Theme Field" "Campo do tema"
"There are less predictor variables then dependent ones." "H� menos vari�veis ??de previs�o, em seguida, as dependentes."
"There is no grid to request." "N�o h� nenhuma grade de solicita��o."
-"There was a problem printing.\nPerhaps your current printer is not set correctly?" ""
+"There was a problem printing.\nPerhaps your current printer is not set correctly?" "Houve um problema de impress�o.\nTalvez a sua impressora atual n�o est� definida corretamente?"
"Thermal" "Termal"
"These are the probabilities for the winner classes given by the neural network." "Estas s�o as probabilidades para as classes ganhadoras dadas pela rede neural."
"These are the winner class vectors." "Estes s�o os vetores da classe ganhadora."
@@ -5067,7 +5054,6 @@ TEXT TRANSLATION
"This Is Not A Caption!" "Este n�o � um subt�tulo!"
"This grid indicates the cells you want calculate the average." "Esta grade indica as c�lulas que deseja calcular a m�dia."
"This grid is used to select cells." "Esta grade � usada para selecionar c�lulas."
-"This is a Test!!!" "Isso � um teste!!!"
"This is a floating point value parameter with double precision (8 bytes)." "Este � um par�metro de valor de ponto flutuante com precis�o dupla (8 bytes)."
"This is not a text!" "Este n�o � um texto!"
"This is the alpha parameter value for the sigmoid function." "Este � o valor do par�metro alfa para a fun��o sigm�ide."
@@ -5081,10 +5067,10 @@ TEXT TRANSLATION
"This section contains all parameters used by the RPROP algorithm." "Esta se��o cont�m todos os par�metros utilizados pelo algoritmo Rprop."
"This section contains all parameters used by the backpropagation algorithm." "Esta se��o cont�m todos os par�metros utilizados pelo algoritmo de retropropaga��o."
"This shapes layer will contain the resulting channel network in vector format (lines)." "Esta camada shape conter� a rede de canais, resultando no formato de vetor (linhas)."
+"This table supplies average travel times through a cell (in seconds) for each land cover type" ""
"This value is ignored if set to zero." "Esse valor � ignorado se definido como zero."
"This will contain your output data of type grid." "Este ir� conter os dados do tipo grade de sa�da."
"This will contain your output data of type shapes." "Este ir� conter os dados do tipo shapes de sa�da."
-"Thomas Schorr (c) 2007" "Thomas Schorr (c) 2007"
"Threshold" "Limiar"
"Threshold (Grid Units)" "Limiar (Unidades da grade)"
"Threshold (Init.)" "Limiar (Inteiro)."
@@ -5125,15 +5111,12 @@ TEXT TRANSLATION
"Time" "Tempo"
"Time Delay (Rain-Runoff)" "Tempo de atraso (Escoamento da chuva)"
"Time Delay after Start of Rainfall (INTEGER)" "Tempo de atraso ap�s o in�cio das chuvas (inteiro)"
-"Time Difference between Image & Points" "Diferen�a de tempo entre Imagem & Pontos"
"Time Field" "Campo de tempo"
"Time Interval [a]" "Intervalo de tempo [a]"
"Time Out [min]" "Tempo esgotado [min]"
"Time Out(h)" "Tempo esgotado (h)"
"Time Period" "Per�odo de tempo"
"Time Range" "Intervalo de tempo"
-"Time Resolution [d]: Range of Days" "Resolu��o de tempo [d]: Intervalo de dias"
-"Time Resolution [h]: Day" "Resolu��o de tempo [h]: Dia"
"Time Span" "Intervalo de tempo"
"Time Span Aggregation" "Intervalo de tempo de agrega��o"
"Time Span [a]" "Intervalo de tempo [a]"
@@ -5147,7 +5130,6 @@ TEXT TRANSLATION
"Time of Concentration [min]" "Tempo de concentra��o [min]"
"Time of Concentration [min] used to estimate flow speed." "Tempo de concentra��o [min] usado para estimar a velocidade do fluxo."
"Time span used for the calculation of daily radiation sums." "Intervalo de tempo utilizado para o c�lculo dos montantes de radia��o di�rias."
-"Time stamp of Image" "Tempo de Imagem"
"Time step exceeds duration" "Passo de tempo excede a dura��o"
"Time step size for a day's calculation given in hours." "Tamanho do passo de tempo para o c�lculo de um dia dado em horas."
"Time step size for a range of days calculation given in days." "Tamanho do passo de tempo para uma gama de c�lculo de dias dado em dias."
@@ -5159,6 +5141,7 @@ TEXT TRANSLATION
"Tolerance (Degree)" "Toler�ncia (Grau)"
"Tolerance [Degree]" "Toler�ncia [Grau]"
"Tool" "Ferramenta"
+"Tool Bar Button Size" ""
"Tool Chain" "Cadeia de ferramentas"
"Tool Chain with Header" "Cadeia de ferramentas com cabe�alho"
"Tool Chains" "Cadeias de ferramentas"
@@ -5168,9 +5151,9 @@ TEXT TRANSLATION
"Tool Library" "Biblioteca de ferramenta"
"Tool Manager" "Gerenciador de ferramentas"
"Tool Set" "Conjunto de ferramentas"
+"Tool bar button sizes. You need to restart SAGA to apply the changes." ""
"Tool execution failed" "A execu��o da ferramenta falhou"
"Tool execution succeeded" "A execu��o da ferramenta foi bem sucedida"
-"Toolbox Naming" "Nomeclatura da caixa de ferramentas"
"Tools" "Ferramentas"
"Tools for (grid based) digital terrain analysis." "Ferramentas para an�lise digital do terreno (baseado em grade)."
"Tools for GPS data handling." "Ferramentas para manipula��o de dados de GPS."
@@ -5201,10 +5184,12 @@ TEXT TRANSLATION
"Top of Atmosphere Reflectance" "In�cio da reflect�ncia da atmosfera"
"Top to Bottom" "De cima para baixo"
"Topographic Correction" "Corre��o topogr�fica"
+"Topographic Indices" "�ndices topogr�ficos"
"Topographic Openness" "Abertura topogr�fica"
"Topographic Position Index" "�ndice de posi��o topogr�fica"
"Topographic Position Index (TPI)" "�ndice de posi��o topogr�ica (TPI)"
"Topographic Wetness Index" "Indice de umidade topogr�fico"
+"Topographic Wetness Index (One Step)" ""
"Topographic Wetness Index (TWI)" "�ndice de umidade topogr�fica (TWI)"
"Topography" "Topografia"
"Topograpic Wetness Index Calculation" "C�lculo de indice de umidade topogr�fica"
@@ -5243,7 +5228,6 @@ TEXT TRANSLATION
"Transformed Soil Adjusted Vegetation Index (Baret et al. 1989)" "�ndice ajustado de transforma��o do solo para vegeta��o (Baret et al. 1989)"
"Transformed Vegetation Index" "�ndice de vegeta��o transformado"
"Transitional" "Transit�rio"
-"Translatable Elements" "Elementos traduz�veis"
"Translation" "Tradu��o"
"Translation X" "Tradu��o X"
"Translation Y" "Tradu��o Y"
@@ -5265,6 +5249,11 @@ TEXT TRANSLATION
"Transversal radius" "Raio transversal"
"Transverse Cylindrical Equal Area" "�rea transversal cil�ndrica"
"Transverse Mercator" "Transversa de Mercator"
+"Travel Time" ""
+"Travel Time Analysis" ""
+"Travel Time Calculation" ""
+"Travel Time Zones Classification" ""
+"Travel Times" ""
"Tree" "�rvore"
"Tree Count" "�rvore de contagem"
"Trend" "Tend�ncia"
@@ -5288,7 +5277,7 @@ TEXT TRANSLATION
"Type of Slope" "Tipo de declive"
"Type of distance calculation" "Tipo de c�lculo de dist�ncia"
"Type of smoothing" "Tipo de suaviza��o"
-"Type=\" ""
+"Type=\" "Tipo=\"
"U-shaped Valleys" "Vales em shape de U"
"UNRECOGNISED COMMAND ID" "COMANDO DE ID N�O RECONHECIDO"
"USGS SRTM Grids (*.hgt)|*.hgt|All Files|*.*" "Grades USGS SRTM (*.hgt)|*.hgt|Todos os arquivos|*.*"
@@ -5320,7 +5309,7 @@ TEXT TRANSLATION
"Unit Name" "Nome da unidade"
"Units" "Unidades"
"Units for output radiation values." "Unidades para valores de radia��o de sa�da."
-"Units of Direction" ""
+"Units of Direction" "Unidades de dire��o"
"Universal Kriging" "Kringagem universal"
"Universal Transvers Mercator (UTM)" "Transverso Universal de Mercator (UTM)"
"Unknown" "Desconhecido"
@@ -5331,13 +5320,13 @@ TEXT TRANSLATION
"Unreferenced Grids" "Grades n�o referenciadas"
"Unsaturated zone time delay per unit storage deficit [h]" "Zona insaturada de tempo de atraso por d�ficit de armazenagem de unidade [h]"
"Unsorted tool chains" "Cadeias de ferramentas n�o triadas"
-"Unsupervised" ""
+"Unsupervised" "Sem supervis�o"
"Up" "Para cima"
"Up [-]" "Acima [-]"
"Up [Home]" "Acima [Home]"
"Up/Down" "Acima/Abaixo"
"Update" "Atualizar"
-"Update Colors from Features" ""
+"Update Colors from Features" "Cores de atualiza��o de fei��es"
"Update Data" "Atualizar dados"
"Update Raster SRID" "Atualizar raster SRID"
"Update Shapes SRID" "Atualizar shapes SRID"
@@ -5359,6 +5348,8 @@ TEXT TRANSLATION
"Upslope Basins" "Bacias aplainadas"
"Upslope Curvature" "Curvatura aplainada"
"Upslope Flow Width" "Largura de fluxo aplainado"
+"Upslope Height" ""
+"Upslope Height, Slope, Aspect" ""
"Upslope Length Factor" "Fator de comprimento aplainado"
"Upslope Slope" "Inclina��o de aclive"
"Upslope Weighting" "Pondera��o de aclive "
@@ -5368,7 +5359,7 @@ TEXT TRANSLATION
"Use Confidence Interval" "Usar Intervalo de confian�a"
"Use Flow Threshold" "Usar limiar de fluxo"
"Use Label as Identifier" "Usar etiqueta como identificador"
-"Use Multiple Cores" ""
+"Use Multiple Cores" "Utilize m�ltiplos n�cleos"
"Use NoData" "Usar SemDados"
"Use Offset" "Usar deslocamento"
"Use Pyramids" "Usar pir�mides"
@@ -5380,7 +5371,7 @@ TEXT TRANSLATION
"Use only features selected by the minimum Redundancy Maximum Relevance (mRMR) algorithm" "Usar somente recursos selecionados pela redund�ncia da relev�ncia m�xima (mrmr) do algoritmo m�nimo"
"Use only seed cells as starting points." "Usar pilhas de sementes apenas como pontos de partida."
"Use sky view factor based on local slope (after Oke 1988), if no sky viev factor grid is given." "Fator de vista. Usar c�u baseado no declive local (ap�s Oke 1988), se nenhum fator de visualiza��o do c�u for dado."
-"Use the first three features in list to obtain blue, green, red components for class colour in look-up table." ""
+"Use the first three features in list to obtain blue, green, red components for class colour in look-up table." "Use as tr�s primeiras caracter�sticas na lista para obter, componentes verde, azul, vermelho para a cor da classe na tabela visualizada."
"Use the stipple bitmap" "Usar o bitmap de granito"
"Use the user dashes" "Usar os tra�os de usu�rios"
"Use this option to reclassify No-Data values independently of the method settings." "Usar esta op��o para reclassificar valores SemDadosindependentemente das configura��es de m�todo."
@@ -5473,6 +5464,7 @@ TEXT TRANSLATION
"Vector Terrain Ruggedness (VRM)" "Vetor Robustez de terreno (VRM)"
"Vectorised class as..." "Classe vetorizada como ..."
"Vectorising Grid Classes" "Classes de vetoriza��o da grade"
+"Vectorization" "Vetorisa��o"
"Vegetation" "Vegeta��o"
"Vegetation Index (Distance Based)" "�ndice de vegeta��o (Baseado na dist�ncia)"
"Vegetation Index (Slope Based)" "�ndice de vegeta��o (Based na inclina��o)"
@@ -5682,10 +5674,10 @@ TEXT TRANSLATION
"You can specify the number of layers in the network (including input and output layer)." "Voc� pode especificar o n�mero de camadas na rede (incluindo a camada de entrada e sa�da)."
"You can specify the number of neurons in each layer of the network." "Voc� pode especificar o n�mero de neur�nios de cada camada na rede."
"You canceled printing" "Voc� cancelou a impress�o"
-"You must specify a reclass table with a minimium (field 1), a maximum (field 2) and a code value (field 3)!\n" ""
-"You must specify a reclass table with a minimium of one record!\n" ""
+"You must specify a reclass table with a minimium (field 1), a maximum (field 2) and a code value (field 3)!\n" "Voc� apenas especifica uma tabela de reclassifica��o dom o m�nimo (campo 1), um m�ximo (campo 2) e um valor de c�digo (campo 3)!\n"
+"You must specify a reclass table with a minimium of one record!\n" "Voc� apenas especifica uma tabela de reclassifica��o para cada um m�nimo de um registro!\n"
"You must specify at least one attribute to drop!" "Voc� apenas especifica o ultimo atributo para corte!"
-"You need to specify a operation control grid as input!\n" ""
+"You need to specify a operation control grid as input!\n" "Voc� apenas especifica uma opera��o de controle de grade de entrada!\n"
"Z" "Z"
"Z Attribute" "Atributo Z"
"Z Axis" "Z Axis"
@@ -5725,36 +5717,23 @@ TEXT TRANSLATION
"Zsoft Paintbrush" "Pincel Zsoft "
"Zsoft Paintbrush (*.pcx)" "Pincel Zsoft(*.pcx)"
"Zuckerrueben" "Cultura de beterraba"
-"[CAP] Save to PDF" "[PAC] Salvar em PDF"
"[ERR] Could not save PDF file." "[ERR] N�o foi poss�vel salvar o arquivo PDF."
-"[FLD] Attribute" "[FLD] Atributo"
-"[FLD] Grid" "[FLD] Grade"
-"[FLD] Icon" "[FLD] �cone"
"[FLD] Index Layer" "[FLD] �ndice da camada"
-"[FLD] PDF Document" "[FLD] Documento PDF"
-"[FLD] Paper Format" "[FLD] Formato da folha"
-"[FLD] Round Scale" "[FLD] Escala Redonda"
"[FLD] SVG File" "[FLD] Arquivo SVG "
-"[FLD] Shapes" "[FLD] Shapes"
-"[FLD] Title" "[FLD] T�tulo"
"[MSG] Save as Interactive SVG" "[MSG] Salvar como arquivo Interativo SVG"
-"[MSG] Save to PDF" "[MSG] Salvar em PDF"
-"[MSG] failed" "[MSG] falhou"
-"[MSG] okay" "[MSG] ok"
"[deprecated] Point Cloud Viewer" "[obsoleta] Visualizador de nuvem de pontos"
"[deprecated] TIN Viewer" "[obsoleta] Visualizador TIN "
"[not set]|" "[n�o definida] |"
-"\n** Error : Invalid parameters **\n" ""
-"\nError: Please verify your xMin, yMin, xMax, yMax settings!\n" ""
-"\nError: the method Extent by Grid(s) requires grid(s) as input!\n" ""
-"\nError: the method Extent by Shape(s) requires shape(s) as input!\n" ""
+"\n** Error : Invalid parameters **\n" "\n** Erro: par�metros inv�lidos **\n"
+"\nError: Please verify your xMin, yMin, xMax, yMax settings!\n" "\nErro: Por favor, verifique as configura��es do seu xMin, yMin, xMax, yMax!\n"
+"\nError: the method Extent by Grid(s) requires grid(s) as input!\n" "\nErro: o m�todo de extens�o para grade(s) exige grade(s) como entrada!\n"
+"\nError: the method Extent by Shape(s) requires shape(s) as input!\n" "\nErro: o m�todo de extens�o para shape(s) exige shape(s) como entrada!\n"
"\nNumber of Clusters" ""
"\nNumber of Variables" ""
-"\nRMS of Residuals (stdfit):\t%f\n" ""
+"\nRMS of Residuals (stdfit):\t%f\n" "\nRMS Residuais (stdfit):\t%f\n"
"\nValue of Target Function" ""
-"\n\n ** Error : Could not close PDF engine ** \n\n" ""
-"\n\n ** Error : Could not save PDF file ** \n\n" ""
-"_TL" "_TL"
+"\n\n ** Error : Could not close PDF engine ** \n\n" "\n\n ** Erro: N�o foi poss�vel fechar motor PDF ** \n\n"
+"\n\n ** Error : Could not save PDF file ** \n\n" "\n\n ** Erro: N�o foi poss�vel salvar o arquivo PDF ** \n\n"
"a * b" "a * b"
"a + b * (1 - exp(-(x / c)^2))" "a + b * (1 - exp(-(x / c)^2))"
"a + b * (1 - exp(-x / c))" "a + b * (1 - exp(-x / c))"
@@ -5808,7 +5787,7 @@ TEXT TRANSLATION
"apply linear flow routing (D8) to all cells, having a flow accumulation greater than the specified threshold" "aplicar fluxo linear de encaminhamento (D8) para todas as c�lulas, com uma acumula��o de fluxo maior que o limite especificado"
"approximating points..." "Pontos de aproxima��o ..."
"are completely within" "est�o completamente dentro"
-"are in the specified directory.\n" ""
+"are in the specified directory.\n" "st�o no diret�rio especificado.\n"
"area" "�rea"
"arrow" "seta"
"arrow (centered to cell)" "seta (centralizado para celular)"
@@ -5822,12 +5801,14 @@ TEXT TRANSLATION
"attribute contains search expression" "o atributo cont�m a express�o de busca"
"attribute is contained in search expression" "o atributo est� contido na express�o de busca"
"attribute is identical with search expression" "o atributo � id�ntico a express�o de pesquisa"
+"attribute specifying road's type with regard to travel time" ""
"attribute to be searched; if not set all attributes will be searched" "o atributo a ser pesquisado; se n�o definir todos os atributos ser�o procurados"
-"attributes must be more than 1" ""
-"author " ""
+"attribute to become interpolated" ""
+"attributes must be more than 1" "atributos devem ser superior a 1"
+"author " "autor "
"automatically" "automaticamente"
"average" "m�dia"
-"average distance that a cell's accumulated flow travelled" ""
+"average distance that a cell's accumulated flow travelled" "Dist�ncia m�dia que o fluxo acumulado de uma c�lula percorrida"
"average size of the area covered by each category that occurs within search area" "tamanho m�dio da �rea coberta por cada categoria que ocorre dentro da �rea de busca"
"average value" "valor m�dio"
"avoids precision problems when source and target crs use different geodedtic datums." "evita problemas de precis�o quando a origem e de destino crs usar diferentes pontos de refer�ncia geodedtic."
@@ -5857,7 +5838,7 @@ TEXT TRANSLATION
"blending distance given in map units" "dist�ncia de mistura dada em unidades do mapa"
"blue channel color" "cor do canal azul "
"bm" "bm"
-"both" ""
+"both" "ambos"
"bottom" "inferior"
"bottom / left" "inferior / esquerdo"
"bottom left" "inferior esquerdo"
@@ -5867,8 +5848,8 @@ TEXT TRANSLATION
"bottom-right" "inferior direito"
"bright - dark" "claro - escuro"
"built-in" "constru�das em"
-"by area size" ""
-"by number of cells" ""
+"by area size" "por tamanho da �rea"
+"by number of cells" "por n�mero de c�lulas"
"c, Percentage clays [%]" "c, argilas percentuais [%]"
"cache memory size in MB" "tamanho do cache de mem�ria em MB"
"calculate averages" "calcular m�dias"
@@ -5883,11 +5864,11 @@ TEXT TRANSLATION
"catchment slope" "inclina��o de capta��o"
"catchment specific parameter for sediment delivery ratio calculation" "par�metro espec�fico para capta��o de sedimentos c�lculo da taxa de entrega"
"categorical" "categ�rico"
-"category and library name" "nome da categoria e biblioteca"
"cell" "c�lula"
"cell area" "�rea celular"
+"cell size of target grid" ""
"cells" "c�lulas"
-"cells in process" ""
+"cells in process" "C�lulas no processo"
"cellsize and lower left center coordinates" "tamano da c�lula e coordenadas menores do centro-esquerda"
"cellsize and lower left corner coordinates" "tamanho da c�lula ecoordenadas canto inferior esquerdo"
"cellsize and upper left center coordinates" "tamanho da c�lula e cotas do centro superior esquerdo"
@@ -5924,7 +5905,6 @@ TEXT TRANSLATION
"coef0" "coef0"
"coef0 in kernel function" "coef0 em fun��o do kernel"
"collecting background data" "coleta de dados de fundo"
-"collecting elements" "coleta de elementos"
"collecting presence data" "coletando dados de presen�a"
"color" "cor"
"colors" "cores"
@@ -5942,6 +5922,7 @@ TEXT TRANSLATION
"confirm with options" "confirmar com op��es"
"constant direction into the wind blows, given as degree" "dire��o constante em que o vento sopra, dado em grau"
"constant histogram stretch for all time steps" "trecho do histograma constante para todas as etapas de tempo"
+"constant lapse rate in degree of temperature per 100 meter. used if no lapse rate grid is specified." ""
"constant latitude" "latitude constante"
"contain the centeroid of" "conter o centeroide de"
"continue" "continuar"
@@ -5975,7 +5956,7 @@ TEXT TRANSLATION
"could not create index: insufficient memory" "n�o foi poss�vel criar �ndice: Mem�ria insuficiente"
"could not create new PostgreSQL database" "n�o conseguiu criar um novo banco de dados PostgreSQL"
"could not create table" "n�o foi poss�vel criar tabela"
-"could not create target grid" ""
+"could not create target grid" "N�o foi poss�vel criar grade-alvo"
"could not create weights grid" "n�o conseguiu criar pesos de grade"
"could not disconnect ODBC source" "n�o pode desligar a fonte ODBC"
"could not disconnect PostgreSQL source" "n�o foi poss�vel desligar a fonte PostgreSQL"
@@ -6080,7 +6061,7 @@ TEXT TRANSLATION
"dissolved inner rings" "an�is internos dissolvidos"
"distance" "dist�ncia"
"distance weighted average catchment slope" "inclina��o de dist�ncia m�dia ponderada de capta��o "
-"distance weighted average of the number of different categories for distance classes" ""
+"distance weighted average of the number of different categories for distance classes" "diferentes categorias para as classes de dist�ncia"
"do not confirm" "n�o confirmam"
"do not join" "n�o aderir"
"do not show" "n�o mostrar"
@@ -6102,7 +6083,7 @@ TEXT TRANSLATION
"edge detection" "detec��o de bordas"
"edge of flight line flag" "bandeira da linha de v�o de borda"
"effective flow length" "comprimento eficaz de fluxo"
-"effective friction = stated friction ^f , where f = cos(DifAngle)^k." ""
+"effective friction = stated friction ^f , where f = cos(DifAngle)^k." "fric��o efetiva = fric��o estabelecida ^f , ondef = cos(DifAngle)^k."
"eight-neihbourhood" "oito vizinhos"
"eight-neihbourhood (distance based weighting)" "oito vizinhos (pondera��o com base na dist�ncia)"
"elevation" "eleva��o"
@@ -6152,7 +6133,7 @@ TEXT TRANSLATION
"failed to load georeference for KML ground overlay" "Falha ao carregar georreferenciamento para KML de superposi��o de solo"
"failed to load or parse xml file" "Falha ao carregar ou analisar arquivo xml"
"failed to project target grid" "n�o conseguiu projetar grade alvo"
-"failed to retrieve map image data" ""
+"failed to retrieve map image data" "n�o foi poss�vel recuperar dados de imagem do mapa"
"failed to set radius" "Falha ao definir raio"
"failed: could not find a suitable import driver" "falhou: n�o foi poss�vel encontrar um controlador de importa��o adequado"
"fat" "gordo/expesso"
@@ -6248,7 +6229,7 @@ TEXT TRANSLATION
"highest z" "maior z"
"histogram match" "combinar histograma"
"horizontal" "horizontal"
-"horizontally" ""
+"horizontally" "horizontal"
"hours" "horas"
"how to request values if step size is more than one cell" "Como se pedir valores de tamanho de passo para mais do que uma c�lula"
"if empty shapes layers's name is used as table name" "se o nome de shapes vazios das camadas � usado como nome de tabela"
@@ -6269,6 +6250,7 @@ TEXT TRANSLATION
"include range" "incluir alcance"
"incompatible file." "arquivo incompat�vel."
"incompatible items have been removed from input list" "itens incompat�veis foram removidos da lista de entrada"
+"increase band width to get less seed points" ""
"index" "�ndice"
"index creation failed" "a cria��o do �ndice falhou"
"index creation stopped by user" "a cria��o do �ndice foi parada pelo usu�rio"
@@ -6288,7 +6270,7 @@ TEXT TRANSLATION
"insufficient training samples" "amostras de treinamento insuficientes"
"intensity" "intensidade"
"interactive" "interativo"
-"internal data type" ""
+"internal data type" "Tipo de dados interno"
"interpolating" "interpolando"
"interpolation method to use if grid needs to be aligned to coordinate system" "m�todo de interpola��o para usar se a grade precisa ser alinhada com o sistema de coordenadas"
"intersect" "interceptar"
@@ -6352,6 +6334,7 @@ TEXT TRANSLATION
"kmz file" "arquivo KMZ"
"kmz, kml and image files" "kmz, kml e arquivos de imagem"
"label minima" "etiqueta m�nima"
+"lapse rates in degree of temperature per 100 meter" ""
"last" "�ltimo"
"last point" "�ltimo ponto"
"last state" "�ltimo estado"
@@ -6368,13 +6351,12 @@ TEXT TRANSLATION
"level" "n�vel"
"level 1" "n�vel 1"
"level 2" "n�vel 2"
-"library " ""
-"library file name" "Nome do arquivo de biblioteca"
+"library " "biblioteca "
"library name" "nome da biblioteca"
"library path" "caminho da biblioteca"
"line simplification can only be applied to lines and polygons" "a linha de simplifica��o s� pode ser aplicada a linhas e pol�gonos"
"linear" "linear"
-"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)" "linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)"
"lines" "linhas"
"lines with same attribute value(s)" "linhas com o mesmo valor(s) do atributo"
"list order" "ordem de apresenta��o"
@@ -6386,8 +6368,8 @@ TEXT TRANSLATION
"loading band" "banda de carregamento"
"loading building parts" "partes de constru��o de carregamento"
"loading failed" "o carregamento falhou"
-"loading spatial reference system database" ""
-"loading translation dictionary" ""
+"loading spatial reference system database" "carregando banco de dados do sistema de refer�ncia espacial"
+"loading translation dictionary" "carregando dicion�rio de tradu��o"
"local" "local"
"local maximum search distance given in map units" "dist�ncia de pesquisa m�xima local dada em unidades do mapa"
"local slope" "declives locais"
@@ -6430,8 +6412,8 @@ TEXT TRANSLATION
"maximum difference between original and median filtered elevation (3x3 moving window) that still is recognized flat" "m�xima diferen�a entre eleva��o original e mediana filtrada (janela 3x3 m�vel) que ainda � reconhecida plana"
"maximum distance for variogram estimation" "dist�ncia m�xima para a estimativa de variograma"
"maximum number of calculated first components; set to zero to get all" "n�mero m�ximo de componentes calculados primeiros; definido como zero para obter todas"
-"maximum number of clusters must be more than 2 and less than number of samples" ""
-"maximum number of initial cluster centers must be more or equal to 0 and less than number of clusters" ""
+"maximum number of clusters must be more than 2 and less than number of samples" "n�mero m�ximo de clusters deve ser mais do que 2 e menor do que o n�mero de amostras"
+"maximum number of initial cluster centers must be more or equal to 0 and less than number of clusters" "n�mero m�ximo de centros do conjunto inicial deve ser maior ou igual a 0 e menor do que o n�mero de clusters"
"maximum number of iterations, ignored if set to zero (default)" "n�mero m�ximo de itera��es, ignorado se definido como zero (padr�o)"
"maximum number of nearest points" "n�mero m�ximo de pontos mais pr�ximos"
"maximum slope (Travis et al. 1975)" "inclina��o m�xima (Travis et al. 1975)"
@@ -6483,7 +6465,6 @@ TEXT TRANSLATION
"n" "n"
"n-fold cross validation: n must > 1" "valida��o cruzada n-fold: n preciso > 1"
"name" "nome"
-"naming for splitted lines" "nomea��o para linhas parceladas"
"nearest neighbour" "vizinho mais pr�ximo"
"needs at least two attributes in selection" "precisa de pelo menos dois atributos na sele��o"
"nein" "nein"
@@ -6506,7 +6487,7 @@ TEXT TRANSLATION
"no data values" "n�o h� valores de dados"
"no database connection" "nenhuma conex�o de banco de dados"
"no description" "Nenhuma descri��o"
-"no destination points in grid area." ""
+"no destination points in grid area." "h� pontos de destino na �rea da grade."
"no distance weighting" "nenhuma dist�ncia de pondera��o"
"no edges found" "sem arestas encontradas"
"no features in input list" "n�o h� fei��es na lista de entrada"
@@ -6598,6 +6579,7 @@ TEXT TRANSLATION
"number of cells" "n�mero de c�lulas"
"number of cells in S-N direction" "n�mero de c�lulas em direc��o S-N"
"number of cells in W-E direction" "n�mero de c�lulas em dire��o W-E"
+"number of clusters" ""
"number of different categories (unique values) within search area" "n�mero de diferente de categorias (valores originais) dentro da �rea de pesquisa"
"number of dropped observations" "o n�mero de observa��es arriou"
"number of dropped shapes" "n�mero de formas caiu"
@@ -6611,10 +6593,8 @@ TEXT TRANSLATION
"number of processed sinks" "n�mero de skins processados"
"number of replacements" "n�mero de substitui��es"
"number of returns of given pulse" "n�mero de retornos de impulso dado"
-"number of scanned files" "n�mero de arquivos digitalizados"
"number of subsamples for k-fold cross validation" "n�mero de subamostras para a valida��o cruzada k-fold"
"number of the return" "n�mero do retorno"
-"number of translatable elements" "n�mero de elementos traduz�veis"
"object" "objeto"
"objects" "objetos"
"offset in minutes relative to 00:00 (midnight)" "deslocamento em minutos em rela��o � 00:00 (meia-noite)"
@@ -6698,14 +6678,15 @@ TEXT TRANSLATION
"polar coordinates given in degree" "coordenadas polares dadas em graus"
"polygon" "pol�gono"
"polygon conversion" "convers�o de pol�gonos"
-"polygon wise (cell area weighted)" ""
-"polygon wise (cell area)" ""
-"polygon wise (cell centers)" ""
+"polygon wise (cell area weighted)" "pol�gono sagaz (�rea celular ponderada)"
+"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"
"polylines" "polilinhas"
"polynomial" "polinomial"
"polynomial trend" "tend�ncia polinomial"
"polynomial trend (coefficient interpolation)" "tend�ncia polinomial (coeficiente de interpola��o)"
+"position index radius in map units" ""
"post-processing..." "p�s-processamento..."
"power of distance" "inicializa��o de dist�ncia"
"prediction" "predi��o"
@@ -6713,7 +6694,7 @@ TEXT TRANSLATION
"press any key" "aperte qualquer tecla"
"processed DEM" "MDE processado"
"processing" "processamento"
-"processors " ""
+"processors " "processadores"
"projection initialization failed" "inicializa��o proje��o falhou"
"projection initialization failure" "Falha de inicializa��o de proje��o"
"proportional" "proporcional"
@@ -6764,10 +6745,10 @@ TEXT TRANSLATION
"replacements" "substitui��es"
"resampling" "reamostragem"
"resampling cell size is too large" "o tamanho da c�lula de reamostragem � demasiado grande"
-"resampling method used when projection is needed" ""
"rescale to 0 - 255" "redimensionar para 0 - 255"
"resolution" "resolu��o"
"resolution has to be greater than zero" "a resolu��o tem de ser maior que zero"
+"resolution measured in screen pixels" ""
"restore from file" "restaurar a partir do arquivo"
"restore model from file" "modelo de restaura��o de arquivo"
"restricts extrapolation by assigning minimal allowed weight for a vertex (normally \" ""
@@ -6792,7 +6773,7 @@ TEXT TRANSLATION
"same as input grid" "mesma grade de entrada"
"same as original" "mesmo que o original"
"same as predictors" "mesmo que os preditores"
-"samples must be more than 1" ""
+"samples must be more than 1" "as amostras devem ser superior a 1"
"sand content given as percentage" "teor de areia dado em percentagem"
"save output to file instead of memory" "salvar a sa�da para o arquivo em vez da mem�ria"
"save point added" "salvar ponto adicionado"
@@ -6801,7 +6782,6 @@ TEXT TRANSLATION
"scale line" "linha de escala"
"scale to size range" "escala a faixa de tamanho"
"scan angle" "�ngulo de leitura"
-"scanning" "digitaliza��o"
"search distance is less than half of grid cell size" "a pesquisa de dist�ncia � menor do que metade do tamanho da c�lula da grade"
"seconds" "segundos"
"sectors" "setores"
@@ -6843,7 +6823,7 @@ TEXT TRANSLATION
"signed 4 byte integer" "assinado inteiro de 4 byte"
"signed 8 byte integer" "assinado inteiro de 8 bytes"
"silt content given as percentage" "silte dado em porcentagem"
-"simple and fast" ""
+"simple and fast" "simples e r�pido"
"simple line" "linha simples"
"simple planar surface" "superf�cie simples plana"
"simply decrease cell's value by epsilon" "diminuir o valor da c�lula por epsilon simples"
@@ -6915,6 +6895,7 @@ TEXT TRANSLATION
"theta" "theta"
"thick" "espesso"
"thin" "fino"
+"this is the internal grid cell size determining the precision of contours" ""
"this operation requires locations to be of type polygon" "Esta opera��o requer locais para ser do tipo pol�gono"
"this operation requires selectable shapes to be of type polygon" "Esta opera��o requer shapes selecion�veis ??para ser do tipo pol�gono"
"threshold slope" "limite de inclina��o"
@@ -6924,7 +6905,7 @@ TEXT TRANSLATION
"too many constants" "muitas constantes"
"too many input variables" "muitas vari�veis ??de entrada"
"too many parameters" "muitos par�metros"
-"tool " ""
+"tool " "ferramenta"
"tool execution failed" "a execu��o da ferramenta falhou"
"tool initialization failed" "a inicializa��o da ferramenta falhou"
"tool needs graphical user interface" "a ferramenta precisa de interface gr�fica do usu�rio"
@@ -6961,7 +6942,7 @@ TEXT TRANSLATION
"unknown" "desconhecido"
"unknown error: execution" "erro desconhecido: execu��o"
"unknown error: user break" "erro desconhecido: ruptura de usu�rio"
-"unknown errror parsing formula" ""
+"unknown errror parsing formula" "A an�lise da f�rmula apresentou erro desconhecido"
"unknown parameter" "par�metro desconhecido"
"unknown projection" "proje��o desconhecida"
"unkown" "desconhecido"
@@ -7001,7 +6982,7 @@ TEXT TRANSLATION
"variance-covariance matrix" "matriz de vari�ncia-covari�ncia"
"variogram model" "modelo de variograma"
"vertical" "vertical"
-"vertically" ""
+"vertically" "verticalmente"
"w" "w"
"warning" "aviso"
"warning, input uses less than 4 bytes per value" "aviso, use menos de 4 bytes de entrada para cada valor"
@@ -7009,8 +6990,8 @@ TEXT TRANSLATION
"warning: number of Eigen vectors and components differs." "aviso: o n�mero de vetores Eigen e componentes difere."
"warning: number of component grids and components differs." "aviso: o n�mero de grades de componentes e componentes difere."
"weighting factor for slope in index calculation" "fator de pondera��o para o c�lculo de �ndices em declive"
-"when using weights without support for negative flow: output of the absolute amount of negative flow that occured" ""
-"when using weights: do not transport negative flow, set it to zero instead; useful e.g. when accumulating measures of water balance." ""
+"when using weights without support for negative flow: output of the absolute amount of negative flow that occured" "quando utilizar pesos sem suporte para fluxo negativo: sa�da da quantidade absoluta de fluxo negativo que ocorre"
+"when using weights: do not transport negative flow, set it to zero instead; useful e.g. when accumulating measures of water balance." "quando se utiliza pesos: n�o transportam fluxo negativo, configur�-lo para zero em vez; por exemplo �til ao acumular medidas de balan�o h�drico."
"whether to train a SVC or SVR model for probability estimates" "estimativas de probabilidade para para treinar um modelo SVC ou SVR"
"whether to use the shrinking heuristics" "se pretende utilizar a heur�stica encolhendo"
"white - cyan" "branco - ciano"
diff --git a/src/saga_core/saga_gui/res/saga.desktop b/src/saga_core/saga_gui/res/saga.desktop
old mode 100755
new mode 100644
index ccdab8c..6727515
--- a/src/saga_core/saga_gui/res/saga.desktop
+++ b/src/saga_core/saga_gui/res/saga.desktop
@@ -5,4 +5,5 @@ Comment=Geodata Processing and Analysis
Type=Application
Exec=saga_gui
Icon=saga
-Categories=Science;Education;Geography;
\ No newline at end of file
+Categories=Science;Education;Geography;
+Keywords=gis;spatial;geospatial;
diff --git a/src/saga_core/saga_gui/res/saga.ger.txt b/src/saga_core/saga_gui/res/saga.ger.txt
old mode 100755
new mode 100644
index aabe138..a8fddcd
--- a/src/saga_core/saga_gui/res/saga.ger.txt
+++ b/src/saga_core/saga_gui/res/saga.ger.txt
@@ -101,7 +101,6 @@ TEXT TRANSLATION
"0 - 1.0" ""
"0 is horizontal, 90 is vertical." "0 ist horizontal, 90 ist vertikal"
"0-50 mm/day" ""
-"0.1" ""
"01: A Simple Litter System" "01: Ein einfaches M�llsystem"
"01: My first module" "01: Mein erstes Modul"
"02: Carbon Cycle Simulation for Terrestrial Biomass" ""
@@ -158,7 +157,6 @@ TEXT TRANSLATION
"20 seconds" "20 Sekunden"
"200-400 mm/day" ""
"256x256" ""
-"2nd Date (End of Range)" ""
"2nd Order Polynomial" ""
"2nd Std. Parallel" ""
"3" ""
@@ -306,7 +304,6 @@ TEXT TRANSLATION
"Abstract" ""
"Acc. Area" "abgesch�tzte Fl�che"
"Acceleration" "Beschleunigung"
-"Acceptable Time Difference between Image and Laser Points" ""
"Accessing PostgreSQL databases." ""
"Accumulated Cost" "Akkumulierte Kosten"
"Accumulated Cost Surface" ""
@@ -406,10 +403,11 @@ TEXT TRANSLATION
"Allow longitudes outside -180 to 180 Range" "Ber�cksichtige L�ngen au�erhalb -180 bis 180 Bereich"
"Allow multiple observer positions." ""
"Allows one to scale shade brightness [%]" ""
-"Allows to scale shade brightness, [percent]" ""
-"Allows to write cell values from additional grids to the output" "Ber�cksichtige Zellwerte zus�tzlicher Rasterdateien bei der Ausgabe"
+"Allows one to scale shade brightness [percent]" ""
+"Allows writing cell values from additional grids to the output" ""
"Alpha" ""
"Alpha Max (Degree)" "Alpha Max (Grad)"
+"Alternatives" ""
"Altura de llama" ""
"Altura de llama (m)" ""
"Always use cloud signature (step 14)" ""
@@ -435,25 +433,23 @@ TEXT TRANSLATION
"Angular Step Size (Degree)" ""
"Annual" ""
"Annual Course of Daily Insolation" ""
+"Appearance" ""
"Append Fields from another Table" ""
"Append Rows from ..." ""
+"Applies a majority filter with given search radius to the segments grid. Is skipped if set to zero." ""
"Applies also to the binary format header file." "Anwendbar ebenfalls f�r die bin�re Formatkopfdatei"
"Apply" "Anwenden"
-"Apply Filter?" ""
"Apply Move" "Wende Bewegung an"
-"Apply a filter (erosion - binary reconstruction) to the input image " ""
"Apply changes?" "�nderungen anwenden?"
"Apply offset?" "Versatz zuf�gen?"
"Apply post-processing filter to remove small holes" ""
"Approx. Terrain Slope" "ungef�hre Gel�ndeneigung"
-"Approximate Coordinate" ""
"Approximate Coordinates of Projection Center" ""
"Approximate Coordinates of Target Point" ""
"Approximate Terrain Slope [%]" "ungef�hre Gel�ndeneigung [%]"
"April" "April"
"Arc Vertex Distance [Degree]" ""
-"ArcGIS Version" ""
-"ArcSAGA Toolboxes" ""
+"ArcGIS MapServer Tiles" ""
"Arccosine" ""
"Arcs to polygons" "Kreissegmente zu Polygonen"
"Arcsine" ""
@@ -588,6 +584,8 @@ TEXT TRANSLATION
"Band 7" ""
"Band 8" ""
"Band Name Field" ""
+"Band Width" ""
+"Band Width for Seed Point Generation" ""
"Bands" "Banden"
"Bandwidth (Cells)" "Bandbreite (Zellen)"
"Bare Earth" "kahle Erde"
@@ -602,6 +600,7 @@ TEXT TRANSLATION
"Basic measures for spatial point patterns." "wesentliche Ma�einheiten f�r r�umliche Punktmuster"
"Basin Type (Gravelius)" "Becken Typ (Gravelius)"
"Basins" "Becken"
+"Be sure to read and understand the usage agreement or terms of service before you use a base map server." ""
"Beep when finished" ""
"Begin Transaction" ""
"Below this threshold precipitation will fall as snow" "Unterhalb dieses Schwellenwertes f�llt Niederschlag als Schnee"
@@ -616,7 +615,6 @@ TEXT TRANSLATION
"Binary Byte Order" "Bin�rer Byte-Befehl"
"Binary Encoding" "bin�res Verschl�sseln"
"Binary Erosion-Reconstruction" ""
-"Binary input image for the connectivity analysis" ""
"Binary object mask" ""
"Birth Rate of Fishes" "Geburtsrate von Fischen"
"Birth Rate of Sharks" "Geburtsrate von Haien"
@@ -848,6 +846,7 @@ TEXT TRANSLATION
"Class" "Klasse"
"Class 1" "Klasse 1"
"Class 2" "Klasse 2"
+"Class Definition File" ""
"Class Identifier" "Klassenidentifizierer"
"Class Name" ""
"Class Selection" "Klassenauswahl"
@@ -874,6 +873,7 @@ TEXT TRANSLATION
"Climate" "Klima"
"Climate Data" "Klimadaten"
"Climate parameters" "Klima Parameter"
+"Climate|Tools" ""
"Climatic Precession" ""
"Clip Features" ""
"Clip Grid with Polygon" "Schneide Rasterdaten mit Polygon zu"
@@ -907,6 +907,7 @@ TEXT TRANSLATION
"ClusterID" "Cluster ID"
"Clusters" "Cluster"
"Clusters, which are closer than this distance to each other, are merged." ""
+"Coarse Resolution" ""
"Coefficient of Determination" "Bestimmtheitsma�"
"Cold Cloud" ""
"Collect values" "Sammele Werte"
@@ -989,6 +990,7 @@ TEXT TRANSLATION
"Connectivity [Percent]" "Konnektivit�t [Prozent]"
"Constant Grid" ""
"Constant Histogram Stretch" ""
+"Constant Lapse Rate" ""
"Constant Value" ""
"Constant Variation Range [Degree]" "konstanter Streubereich [Grad]"
"Constant Wind Direction" ""
@@ -1001,6 +1003,7 @@ TEXT TRANSLATION
"Contour" ""
"Contour Lines" "Isolinien"
"Contour Lines from Grid" "Isolinien von Rasterdaten"
+"Contour Lines from Points" ""
"Contour lines equidistance [map units]." ""
"Contours" ""
"Contributing Area" ""
@@ -1014,6 +1017,7 @@ TEXT TRANSLATION
"Convergence factor for Multiple m_Flow Direction Algorithm (Freeman 1991)" ""
"Convergence factor for the \'Multiple Flow Direction\' algorithm (after Freeman 1991)" "Ann�herungsfaktor f�r den \'Multiplen Flie�richtungs\'algorithmus (nach Freeman 1991)"
"Conversion" "Umwandlung"
+"Conversions" ""
"Convert Lines to Points" "Wandle Linien in Punkte um"
"Convert Lines to Polygons" "Linien zu Polygonen umwandeln"
"Convert Multipoints to Points" ""
@@ -1065,7 +1069,6 @@ TEXT TRANSLATION
"Copy existing Attributes" ""
"Copy to Clipboard" ""
"Copying original data..." "Kopiere Originaldaten?"
-"Copyright (c) 2007 by Thomas Schorr" ""
"Copyrights (c) 2003 by Andre Ringeler" ""
"Copyrights (c) 2003 by Olaf Conrad" ""
"Copyrights (c) 2003 by Volker Wichmann" ""
@@ -1131,7 +1134,6 @@ TEXT TRANSLATION
"Create Virtual Point Cloud Dataset" ""
"Create Web Content" "Erzeuge Web-Inhalt"
"Create X/Y Grids" "Erzeuge X/Y-Raster"
-"Create a binary mask Yes/No" ""
"Create borders between segments as new grid." "Erzeuge Grenzen zwischen Segmenten als neues Raster."
"Create index" "Index erstellen"
"Create new Attribute" "Erzeuge neues Attribut"
@@ -1230,7 +1232,7 @@ TEXT TRANSLATION
"Database" "Datenbank"
"Database Name" ""
"Database access through the libmysql.lib interface." "Datenbank-Zugriff durch das libmysql.lib Interface."
-"Database with Coordinate Reference System (CRS) definitions. A restart of SAGA is required to have the changes take effect!" ""
+"Database with Coordinate Reference System (CRS) definitions. You need to restart SAGA to apply the changes." ""
"Database|ODBC" ""
"Database|PostgreSQL" ""
"Dataset creation failed" ""
@@ -1325,6 +1327,7 @@ TEXT TRANSLATION
"Desmet & Govers" ""
"Desmet & Govers 1996" ""
"Destandardisation" "Destandardisation"
+"Destination Points" ""
"Destinations" ""
"Destriped Grid" "Gestreiftes Raster"
"Destriping" ""
@@ -1347,11 +1350,10 @@ TEXT TRANSLATION
"Diameter plant elements" ""
"Dictionary Files (*.dic)" "W�rterbuch Dateien (*.dic)"
"Dictionary Files (*.lng)" "Sprachdateien (*.lng)"
-"Dictionary for Proj.4/OGC WKT translations. A restart of SAGA is required to have the changes take effect!" ""
+"Dictionary for Proj.4/OGC WKT translations. You need to restart SAGA to apply the changes." ""
"Dictionary for translations from built-in (English) to local language (editable text table). You need to restart SAGA to apply the changes." ""
"Difference" "Differenz"
"Difference (A - B)" "Differenz (A-B)"
-"Difference Input - Reconstruction" ""
"Difference Vegetation Index" ""
"Difference from Arithmetic Mean" "Differenz vom arithmetrischen Mittel"
"Difference from Mean Value" "Differenz vom Mittelwert"
@@ -1439,9 +1441,6 @@ TEXT TRANSLATION
"Do you really want to delete this raster band" ""
"Do you want to delete the selection?" "Soll die Auswahl entfernt werden?"
"Do you want to exit SAGA?" "Wollen Sie SAGA beenden?"
-"Do you wish to estimate Principal Point Offsets?" ""
-"Do you wish to provide the Radial Distortion Parameters?" ""
-"Do you wish to provide the time stamp of Image?" ""
"Dominance" "Dominanz"
"Dot And Dash" ""
"Dot and dash style" "Punkt-Strich-Stil"
@@ -1478,6 +1477,7 @@ TEXT TRANSLATION
"Duration of Insolation" "Dauer der Sonneneinstrahlung"
"Dust [ppm]" "Staub [ppm]"
"Dust factor: 100 ppm (standard)" "Staubfaktor: 100 ppm (standard)"
+"Dynamics" ""
"Dynamische Flaechenwassernutzung und Abflussreduktion" ""
"Dynamische Flaechenwassernutzung..." ""
"EDGES" "KANTEN"
@@ -1547,8 +1547,6 @@ TEXT TRANSLATION
"Enable local disk cache. Allows for offline operation." ""
"Encountered invalid path description in *.spcvf file!" ""
"Encountered invalid path description in *.spcvf_tile_info file!" ""
-"End Latitude" ""
-"End Longitude" ""
"Enforce True Color" "Erzwinge Echtfarben"
"Enhanced Vegetation Index" ""
"Entropy" ""
@@ -1577,7 +1575,6 @@ TEXT TRANSLATION
"Error parsing field type: can't convert to number" ""
"Error: Continue anyway ?" "Fehler: Trotzdem fortfahren?"
"Errors" "Fehler"
-"Estimate Principal Point Offsets?" ""
"Estimated Noise (absolute)" "abgesch�tztes Rauschen (absolut) "
"Estimated Noise (relative)" "abgesch�tztes Rauschen (relativ) "
"Estimated noise in units of input data" "abgesch�tztes Rauschen in Einheiten der Eingabedaten"
@@ -1609,10 +1606,10 @@ TEXT TRANSLATION
"Expand" "Erweitern"
"Expand Options" ""
"Expand and Shrink" ""
-"Expansion Degree" ""
"Exponent" "Exponent"
"Exponent for distance weighting (0.0-4.0)" "Exponent f�r Distanzgewichtung"
"Exponential" ""
+"Export" ""
"Export Atlas Boundary File" "Export Atlas Boundary Datei"
"Export ESRI Arc/Info Grid" "Export ESRI Arc/Info Rasterdaten"
"Export GPX" "Export GPX"
@@ -1755,8 +1752,6 @@ TEXT TRANSLATION
"Filter Clumps" "Filter Klumpen"
"Filter Criterion" "Filterkriterium"
"Filter Matrix" "Filter Matrix"
-"Filter Size (Radius)" ""
-"Filter size (radius in grid cells)" ""
"Filtered" "Gefiltert"
"Filtered DTM" "Gefiltertes DGM"
"Filtered Grid" "Gefiltertes Raster"
@@ -1835,6 +1830,7 @@ TEXT TRANSLATION
"Flow Directions" "Str�mung Richtungen"
"Flow Distance" "Flie�entfernung"
"Flow Distances" "Flie�entfernungen"
+"Flow Distribution" ""
"Flow Line Curvature" ""
"Flow Lines" "Str�mung Linien"
"Flow Path Length" "Str�mung Bahnl�ngen"
@@ -1851,9 +1847,7 @@ TEXT TRANSLATION
"Flux" ""
"Flux out of each cell, i.e. everything accumulated so far." ""
"Flying Height" ""
-"Focal Length (mm)" ""
"Focal Length [mm]" ""
-"Focal Length in mm" ""
"Folder" "Ordner"
"Folder for PDF Files" "Ordner f�r PDF-Dateien"
"Font" ""
@@ -1881,6 +1875,7 @@ TEXT TRANSLATION
"Fragmentation" "Fragmentierung"
"Fragmentation (Alternative)" "Fragmentierung (Alternative)"
"Fragmentation (Standard)" "Fragmentierung (Standard)"
+"Fragmentation Analysis" ""
"Fragmentation Classes from Density and Connectivity" "Fragmentierungsklassen aus Dichte und Konnektivit�t"
"Fragmentation Index" "Fragmentierungsindex"
"Frame" "Rahmen"
@@ -1922,7 +1917,6 @@ TEXT TRANSLATION
"GREEN_BLUE" "GR�N_BLAU"
"GREEN_GREY_BLUE" "GR�N_GRAU_BLAU"
"GREEN_RED_BLUE" "GR�N_ROT_BLAU"
-"GRIB Files" ""
"GRID" "RASTER"
"GStat Files (*.gstat)" "GStat Dateien (*.gstat)"
"GStat shapes format export." "GStat Vektorformat Export."
@@ -1947,6 +1941,7 @@ TEXT TRANSLATION
"Garden|Introducing Module Programming" "Testversionen|Einf�hrung in die Modulprogrammierung"
"Garden|Recreations|Fractals" "Testversionen|Erholung|Fraktale"
"Garden|Recreations|Games" "Testversionen|Erholung|Spiele"
+"Garden|Tool Chain Examples" ""
"Garden|Web Service Data Access" "Testversionen|Web Service Datenzugriff"
"Gauges" "Ma�e"
"Gaussian" "Gau�sche"
@@ -1960,6 +1955,7 @@ TEXT TRANSLATION
"General Curvature" ""
"General Settings" "Allgemeine Einstellungen"
"Generalisation" "Generalisierung"
+"Generalization" ""
"Generalized Surface" ""
"Generate Shapes" "Erzeuge Vektoren"
"Generated Shapefile." "Erzeuge Vektordatei."
@@ -1999,6 +1995,11 @@ TEXT TRANSLATION
"Global Moran's I for Grids" "Globales Moran�s I f�r Raster"
"Globe Viewer for Grids" ""
"Gnomonic" "Gnomonisch"
+"Google Hybrid" ""
+"Google Map" ""
+"Google Satellite" ""
+"Google Terrain" ""
+"Google Terrain, Streets and Water" ""
"Gpx2shp path" "Gpx2shp Pfad"
"Gradient" "Gradient"
"Gradient Calculation" "Gradientkalkulation"
@@ -2069,7 +2070,6 @@ TEXT TRANSLATION
"Grid system" "Rastersystem"
"Grid to TIN" "Raster zu TIN"
"Grid to TIN (Surface Specific Points)" "Raster zu TIN (Oberfl�chenspezifische Punkte)"
-"Grid to be filtered" ""
"Grid to filter" "zu filterndes Raster"
"Grid to reclassify" "neueinzuteilendes Raster"
"Grid value equals low value" "Rasterwert ist gleich zu niedrigem Wert"
@@ -2081,6 +2081,7 @@ TEXT TRANSLATION
"Grid(s)" "Raster"
"Grid(s) to fit extent to" "Raster, das die Abmessung bestimmt"
"Gridding" ""
+"Gridding of Points" ""
"Grids" "Raster"
"Grids Product" "Raster Produkt"
"Grids Sum" "Raster Summe"
@@ -2091,6 +2092,7 @@ TEXT TRANSLATION
"Grids used to delineate the UCUs. Coding: NoData / categorical values." ""
"Grids with continuous data, statistics are calculated for each grid. Coding: NoData / continuous values." ""
"Grid|Analysis" "Raster|Auswertung"
+"Grid|Analysis|Travel Time Analysis" ""
"Grid|Calculus" "Raster|Berechnung"
"Grid|Export" ""
"Grid|Filter" "Raster|Filter"
@@ -2129,6 +2131,7 @@ TEXT TRANSLATION
"Herbaceous Fuel Moisture" "krautige Brennstofffeuchte"
"High Pass" "Hochpass"
"High Pass Filter" "Hochpassfilter"
+"High Resolution" ""
"High Resolution Grid System" "Hochaufgel�stes Rastersystem"
"High Ridges" ""
"High Value" "Gro�er Wert"
@@ -2174,6 +2177,8 @@ TEXT TRANSLATION
"Humus to Charcoal" "Humus zu Kohle"
"Hydrology" ""
"Hydrology: IHACRES" ""
+"Hydrology|Flow Accumulation" ""
+"Hydrology|Topographic Indices" ""
"Hypsometric Curve" "Hypsometriekurve"
"Hypsometry" "Hypsometrie"
"I am a module library template." "Ich bin eine Vorlage f�r die Modulbibliothek."
@@ -2237,6 +2242,7 @@ TEXT TRANSLATION
"Image Properties" ""
"Image Resolution" ""
"Image Rotation [Degree]" "Bild Drehung [Grad]"
+"Image Sharpening" ""
"Image acquisition date (yyyy-mm-dd)" ""
"Image creation date (yyyy-mm-dd)" ""
"Image processing tools." "Bildbearbeitungswerkzeuge."
@@ -2245,6 +2251,7 @@ TEXT TRANSLATION
"Imagery|Classification" "Symbolik|Klassifikation"
"Imagery|Photogrammetry" ""
"Imagery|Segmentation" "Bildverarbeitung|Segmentierung"
+"Imagery|Tools" ""
"Imagery|ViGrA" "Bildverarbeitung|ViGrA"
"Images" ""
"Images|*.bmp;*.jpg;*.png;*.tif|HTML Files|*.htm|All Files|*.*" "Bilder|*.bmp;*.jpg;*.png;*.tif|HTML Dateien|*.htm|Alle Dateien|*.*"
@@ -2261,7 +2268,6 @@ TEXT TRANSLATION
"Import Extents" ""
"Import Filter" "Import Filter"
"Import GPX" "Import GPX"
-"Import GRIB2 record" "Import GRIB2 Datensatz"
"Import GStat Shapes" "Import GStat Vektoren"
"Import Grid from Table" "Import Raster von Tabelle"
"Import Grid from XYZ" "Import Raster von XYZ"
@@ -2270,7 +2276,6 @@ TEXT TRANSLATION
"Import LAS Files" "Import LAS Dateien"
"Import MOLA Grid (MEGDR)" "Import MOLA Raster (MEGDR)"
"Import NetCDF" ""
-"Import Open Street Map Image" ""
"Import Point Cloud from Shape File" ""
"Import Point Cloud from Text File" "Import Punktwolken von Textdateien"
"Import Raster" ""
@@ -2285,6 +2290,7 @@ TEXT TRANSLATION
"Import Stereo Lithography File (STL)" "Import Stereo Lithography Dateien (STL)"
"Import Surfer Blanking Files" "Import Surfer Blanking Dateien"
"Import Surfer Grid" "Import Surfer Rasterdateien"
+"Import TMS Image" ""
"Import Table" ""
"Import Table from SQL Query" ""
"Import Tables" "Import Tabelle"
@@ -2317,6 +2323,7 @@ TEXT TRANSLATION
"Increase Perspectivic Distance [F6]" ""
"Increase Size Scaling Factor [F8]" ""
"Increase Size [F6]" ""
+"Increase band width to get less seed points." ""
"Increase factor" ""
"Increase factor n_plus. Must be > 1." ""
"Independent Variable (per Grid and Cell)" "Unabh�ngige Variable (f�r Raster und Zelle)"
@@ -2352,7 +2359,6 @@ TEXT TRANSLATION
"Inlet Concentration" ""
"Inner Buffer" ""
"Input" "Eingabe"
-"Input Binary Grid" ""
"Input Features" ""
"Input File List" ""
"Input File's NoData Value" "Eingabedatei�s NoData-Wert"
@@ -2370,7 +2376,6 @@ TEXT TRANSLATION
"Input file list could not be opened!" ""
"Input for Mean over Catchment" ""
"Input for module calculations." "Eingabe f�r Modulberechnungen."
-"Input for the morphological reconstruction" ""
"Input format" "Eingabeformat"
"Input grid" "Eingaberaster"
"Input grids to train the network." ""
@@ -2410,6 +2415,7 @@ TEXT TRANSLATION
"Interpolation" "Interpolation"
"Interpolation Scale" ""
"Interpolation Steps" "Interpolationsschritte"
+"Interpolation from Points" ""
"Intersect" ""
"Intersection" "Schnittfl�che"
"Interval" "Intervall"
@@ -2448,7 +2454,6 @@ TEXT TRANSLATION
"Iterative Minimum Distance (Forgy 1965)" "Iterative Minimalentfernung (Forgy 1965)"
"JPEG - JFIF Compliant" "JPEG - JFIF konform"
"JPEG - JFIF Compliant (*.jpg, *.jif, *.jpeg)" "JPEG - JFIF konform (*.jpg, *.jif, *.jpeg)"
-"JPG Files" "JPG Dateien"
"Ja, Abfluss manuell vorgeben: res. Abfluss = Speicherinhalt * q + a" ""
"Ja, TestRoutine1 fuer Flusseinzugsgebiet bis zu der HG-Rasterzelle" ""
"Ja, TestRoutine1 nur fuer Teileinzugsgbiet der HG-Rasterzelle" ""
@@ -2472,9 +2477,6 @@ TEXT TRANSLATION
"June" "Juni"
"K Factor" ""
"K-Means Clustering for Grids" ""
-"K1" ""
-"K2" ""
-"K3" ""
"KE" ""
"KML files (*.kml)" ""
"KML/KMZ File" ""
@@ -2509,6 +2511,8 @@ TEXT TRANSLATION
"LAS Info" "LAS Info"
"LAS header exception: %s" ""
"LAS reader exception: %s" ""
+"LCZC" ""
+"LCZC (Filtered)" ""
"LFAC(" "LFAC("
"LP, Saturated lateral permeability of the soil [m/day]" ""
"LS" ""
@@ -2527,6 +2531,9 @@ TEXT TRANSLATION
"Lake Flood" "See Hochwasser"
"Lambert Conformal Conic (1 parallel)" "Lambert konformer Kegel (1 parallel)"
"Lambert Conformal Conic (2 parallel)" "Lambert konformer Kegel (1 parallel)"
+"Land Cover" ""
+"Land Cover ID" ""
+"Land Cover Scenario Offset" ""
"Land Cover Weights" ""
"Land Surface Temperature" "Bodenoberfl�chentemperatur"
"Land Surface Temperature [Deg.Celsius]" "Bodenoberfl�chentemperatur (Grad Celsius)"
@@ -2557,11 +2564,12 @@ TEXT TRANSLATION
"Laplace Filter" "Laplace Filter"
"Laplacian Filter" "Laplace Filter"
"Laplacian Filter Kernel" ""
+"Lapse Rate Based Temperature Downscaling" ""
+"Lapse Rates" ""
"Last Day" "Letzter Tag"
"Lat" ""
"Lat. of True Scale" "Breitengrad des genauen Massstabs"
"Latitude" "Breitengrad"
-"Latitude / Longitude Increment" ""
"Latitude 1" "Breitengrad 1"
"Latitude 2" "Breitengrad 2"
"Latitude 3" "Breitengrad 3"
@@ -2694,6 +2702,7 @@ TEXT TRANSLATION
"Loam" "Lehm"
"Loamy Sand" "lehmiger Sand"
"Local Cartesian" "�rtlich Kartesisch"
+"Local Climate Zone Classification" ""
"Local Cost" ""
"Local Curvature" ""
"Local Downslope Curvature" ""
@@ -2734,6 +2743,7 @@ TEXT TRANSLATION
"Look Up Section" ""
"Look up table (Points)" "Nachschlagetabelle (Punkte)"
"Look-up Table" "Nachschlagetabelle"
+"Look-up table for classification of travel time zones." ""
"LookUp Table" "Nachschlagetabelle"
"Lookup Table" "Nachschlagetabelle"
"Lookup table used in method \" "Nachschlagetabelle benutzt bei der Methode \"
@@ -2791,6 +2801,7 @@ TEXT TRANSLATION
"Main layer. The output layer will have the same fields in the attribute table as this layer." ""
"Majority" "Mehrheit"
"Majority Filter" "Mehrheit Filter"
+"Majority Filter Radius" ""
"Make sure that the files\n" "Stelle sicher dass die Dateien\n"
"Manager" ""
"Mandelbrot" "Mandelbrot"
@@ -2857,6 +2868,7 @@ TEXT TRANSLATION
"Maximum Entropy" ""
"Maximum Entropy Classifcation" ""
"Maximum Entropy Presence Prediction" ""
+"Maximum Expansion Distance" ""
"Maximum Flow Distance" "Maximale Flie�entfernung"
"Maximum Height" ""
"Maximum Iterations" "Maximale Iterationen"
@@ -3024,6 +3036,7 @@ TEXT TRANSLATION
"Mirror Vertically" ""
"Mirrored horizontally" ""
"Mirrored vertically" ""
+"Miscellaneous" ""
"Missing Value" ""
"Mixed Flow Threshold (ha)" "Gemischter Str�mungsschwellenwert (ha)"
"Mode" ""
@@ -3137,6 +3150,7 @@ TEXT TRANSLATION
"Name des Evaluierungspunktes 2" ""
"Name des Evaluierungspunktes 3" ""
"Name of Landsat metadata file (.met or MTL.txt)" ""
+"Naming for split lines" ""
"Natural Logarithm" ""
"Natural Neighbour" "Nat�rliche Nachbarn-Methode"
"Navaladi, Schoeller, Conrad (c) 2009" ""
@@ -3284,10 +3298,10 @@ TEXT TRANSLATION
"Number of Simulations" "Anzahl der Simulationen"
"Number of Simulations for Calibration" "Anzahl der Simulationen f�r die Kalibrierung"
"Number of Steps" "Anzahl der Schritte"
+"Number of Terrain Classes" ""
"Number of Values" "Anzahl der Werte"
"Number of Variables" "Anzahl der Variablen"
"Number of Vertices" ""
-"Number of added tools" ""
"Number of additional attributes to import." "Anzahl der zus�tzlichen Attribute die zu importieren sind."
"Number of arguments for attribute fields (%d), names (%d) and types (%d) do not match!" ""
"Number of attribute fields: %d" ""
@@ -3340,8 +3354,10 @@ TEXT TRANSLATION
"OUTPUT" ""
"OUTPUT certainty" ""
"OUTPUT classes" ""
+"Object Based Image Segmentation" ""
"Object Grid" ""
"Objective Function" "Objektive Funktion"
+"Objects" ""
"Objects removed from input grid" "Objekte die aus dem Eingaberaster entfernt wurden"
"Oblique Mercator" "schiefer Merkator"
"Obliquity" ""
@@ -3361,7 +3377,6 @@ TEXT TRANSLATION
"Old Style Namings" ""
"Old Version" "Alte version"
"Olkin & Pratt" ""
-"Omega" ""
"Omega [degree]" ""
"One Point Cloud per Polygon" ""
"One or several input point cloud datasets to cut." ""
@@ -3464,6 +3479,7 @@ TEXT TRANSLATION
"Overlap [map units]" ""
"Overlapping Areas" ""
"Overlapping Cells" "�berlappende Zellen"
+"Overlay" ""
"Overlay Image" "Overlaybild"
"Override" "�bergehen"
"Overview" "�berblick"
@@ -3479,7 +3495,6 @@ TEXT TRANSLATION
"PDF Docs" "PDF Dokumente"
"PDF Documents" "PDF Dokumente"
"PDF File" "PDF Dateien"
-"PDF Files" "PDF Dateien"
"PDF Files (*.pdf)|*.pdf|All Files|*.*" "PDF Dateien (*.pdf)|*.pdf|Alle Dateien|*.*"
"PERCENTILE" "PERCENTILE"
"PERIMETER" "UMFANG"
@@ -3488,7 +3503,6 @@ TEXT TRANSLATION
"PFAC(" ""
"PH, plant height [m], representing the effective height from which raindrops fall from the crop or vegetation" ""
"PI, permanent interception expressed as the proportion [between 0-1] of rainfall" ""
-"PNG Files" "PNG Dateien"
"PRECISION" ""
"PREDICTED" ""
"PT_ID" ""
@@ -3571,9 +3585,6 @@ TEXT TRANSLATION
"Photogrammetry" ""
"Photogrammetry tools." "Photogrammetrie Werkzeuge"
"Pit" ""
-"Pixel Centers?" ""
-"Pixel Width (um)" ""
-"Pixel Width in micro meters" ""
"Plain" ""
"Plains" ""
"Plan Curvature" "geplante Kurvatur"
@@ -3687,11 +3698,13 @@ TEXT TRANSLATION
"Portable Network Graphics" "Portable Network Grafik"
"Portable Network Graphics (*.png)" "Portable Network Grafik (*.png)"
"Position" "Position"
+"Position Index Radius" ""
"Position as Geographic Coordinates" ""
"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" ""
"PostGIS extension missing or too old" ""
@@ -3722,6 +3735,7 @@ TEXT TRANSLATION
"Precipitation [mm]" "Niederschlag [mm]"
"Precise Datum Conversion" ""
"Precise Tracing" "genaue Spurverfolgung"
+"Precision" ""
"Precisions" ""
"Predefined Datum" "Vordefiniertes Datum"
"Predefined Ellipsoids" "Vordefinierte Ellipsoide"
@@ -3743,7 +3757,6 @@ TEXT TRANSLATION
"Presence Prediction" ""
"Presence Probability" ""
"Preservation" ""
-"Preserve 1px border Yes/No" ""
"Preserve Data Type" "Erhalte Datentyp"
"Preset Selection" ""
"Presets" ""
@@ -3753,11 +3766,6 @@ TEXT TRANSLATION
"Primary Name" "Prim�rer Name"
"Primary key)" "Prim�rer Schl�ssel)"
"Principal Components" "Grunds�tzliche Komponenten"
-"Principal Point Offset in X" ""
-"Principal Point Offset in X (pixels)" ""
-"Principal Point Offset in X (pixles)" ""
-"Principal Point Offset in Y" ""
-"Principal Point Offset in Y (pixels)" ""
"Principle Components" "Grunds�tzliche Komponenten"
"Principle Components Analysis" "Grunds�tzliche Komponentenanalyse"
"Principle Components Based Image Sharpening" ""
@@ -3808,10 +3816,6 @@ TEXT TRANSLATION
"Projected Coordinate Systems" "Projezierte Koordinatensysteme"
"Projected Height" "Projezierte H�he"
"Projection" "Projektion"
-"Projection Centre" ""
-"Projection Centre - X" ""
-"Projection Centre - Y" ""
-"Projection Centre - Z" ""
"Projection Parameters" "Projektion Parameter"
"Projection Settings" "Projektion Einstellungen"
"Projection Type" "Projektion Typ"
@@ -3825,8 +3829,6 @@ TEXT TRANSLATION
"Propability" ""
"Properties" ""
"Protection Index" "Schutz Index"
-"Provide Radial Distortion Parameters?" ""
-"Provide Time stamp of Image?" ""
"Proximity" "N�he"
"Proximity Grid" "N�he Raster"
"Punktuelle Rasterzellenmanipulation" ""
@@ -3857,33 +3859,7 @@ TEXT TRANSLATION
"R,G,B to SAGA RGB" ""
"R,G,B value range" "R,G,B Wertebereich"
"R2" "Bestimmtheitsma�"
-"R:Alternatives" "R:Alternativen"
-"R:Classification" "R:Klassifizierung"
-"R:Conversion" "R:Umwandlung"
-"R:Conversions" "R:Umwandlungen"
-"R:Dynamics" ""
-"R:Export" "R:Export"
-"R:Fragmentation Analysis" "R:Fragmentierungsanalyse"
-"R:Grid Generation" "R:Raster Erstellung"
-"R:Grid Values" "Rasterwerte"
-"R:Image Sharpening" ""
"R:Import" "R:Import"
-"R:Indices" "R:Indizes"
-"R:Interpolation from Points" "R:Interpolation von Punkten"
-"R:Landsat" ""
-"R:Miscellaneous" ""
-"R:Overlay" ""
-"R:Point Cloud" ""
-"R:Principle Components" ""
-"R:Shapes" "Vektoren"
-"R:Soil Analysis" "R:Bodenauswertung"
-"R:Spatial Extent" ""
-"R:Spline Interpolation" "R:Spline Interpolation"
-"R:Table" "R:Tabelle"
-"R:Terrain Analysis" "R:Reliefanalyse"
-"R:Tools" "R:Werkzeuge"
-"R:Topographic Indices" ""
-"R:Vectorization" "Vektorisierung"
"RAINBOW" "REGENBOGEN"
"RANGE" "BEREICH"
"RED_BLUE" "ROT_BLAU"
@@ -3929,6 +3905,7 @@ TEXT TRANSLATION
"Random Forest Classification (ViGrA)" ""
"Random Forest Options" ""
"Random Forest Presence Prediction (ViGrA)" ""
+"Random Forest Tree Count" ""
"Random Terrain" ""
"Random number, Gaussian distribution with mean x and standard deviation y" ""
"Random number, uniform distribution with minimum x and maximum y" ""
@@ -3937,6 +3914,7 @@ TEXT TRANSLATION
"Rank" "Rankzahl"
"Rank Filter" "Rangzahlfilter"
"Rank [Percent]" "Rangzahl [%]"
+"Raster" ""
"Raster Band Deletion" ""
"Raster Band Identifier" ""
"Raster Catalogue" ""
@@ -4013,14 +3991,13 @@ TEXT TRANSLATION
"Relative from cell value" "Relativ vom Zellwert"
"Relative heights calculation..." "Relative H�hen Berechnung..."
"Relaxation" "Entspannung"
+"Relief Segmentation" ""
"Reload" ""
"Reload tool chain" ""
"Remove" ""
-"Remove Border Regions?" ""
"Remove Duplicate Points" "Entferne doppelte Punkte"
"Remove Overlap from Virtual Point Cloud Tiles" ""
"Remove every i-th point." "Entferne jeden i-ten Punkt"
-"Remove regions which have contact with (are adjacent to) the image borders?" ""
"Removed Objects" "entfernte Objekte"
"Removing ambiguous pixels..." ""
"Rename" ""
@@ -4041,6 +4018,7 @@ TEXT TRANSLATION
"Representativeness (Grid)" "Repr�sentativit�t (Raster)"
"Resampling" "Neuberechnung"
"Resampling Filter" ""
+"Resampling method used when projection is needed" ""
"Rescale Range" "Bereich Massstabs�nderung"
"Rescale Values (0-255)" "Massstabs�nderung Werte (0-255)"
"Rescale to 0 - 1" "Massstabs�nderung von 0 - 1"
@@ -4054,6 +4032,10 @@ TEXT TRANSLATION
"Residuals" "R�ckst�nde"
"Resilent propagation (RPROP)" ""
"Resolution" "Aufl�sung"
+"Resolution [d]" ""
+"Resolution [h]" ""
+"Restart SAGA to apply the changes" ""
+"Restart now ?" ""
"Restore" ""
"Restore Model from File" ""
"Result" "Ergebnis"
@@ -4094,6 +4076,7 @@ TEXT TRANSLATION
"River Mouths" "Flussm�ndungen"
"Rn, number of rain days in timespan [-]" ""
"Road Width" "Strassenbreite"
+"Roads" ""
"Roll Left [F4]" ""
"Roll Right[F3]" ""
"Rook" "Saatkr�he"
@@ -4106,7 +4089,6 @@ TEXT TRANSLATION
"Rotate Y" ""
"Rotate Z" ""
"Rotation" "Drehung"
-"Rotation Angle" ""
"Rotation X" "Drehung X"
"Rotation Y" "Drehung Y"
"Rotation Z" "Drehung Z"
@@ -4203,6 +4185,8 @@ TEXT TRANSLATION
"Save Headline" "Speichere Kopfzeile"
"Save History as Model" ""
"Save KML file" ""
+"Save LCZC (Filtered) as..." ""
+"Save LCZC as..." ""
"Save Map as Image..." "Karte als Bild speichern..."
"Save Map to KMZ" ""
"Save Modified Data" ""
@@ -4431,12 +4415,10 @@ TEXT TRANSLATION
"Shift X" ""
"Shift Y" ""
"Shift Z" ""
-"Shift value" ""
"Short Dashed" ""
"Short Field Names" "kurze Feldnamen"
"Short Wave Radiation [kW/m2]" "Kurzwellenstrahlung [kW/m�]"
"Short dashed style" "gestrichelt (kurz)"
-"Should the output shapes contain the centers of the border pixels instead of the corners?" ""
"Shoulder Hollow" ""
"Shoulder Slope" ""
"Shoulder Spur" ""
@@ -4477,8 +4459,10 @@ TEXT TRANSLATION
"Shrinking" ""
"Sibson" ""
"Side Slope" "Hangkante"
+"Sieve and Clump" ""
"Sieved Classes" ""
"Sieving Classes" ""
+"Sieving Threshold" ""
"Sigma" ""
"Sigmoid" ""
"Significance Level" ""
@@ -4586,6 +4570,7 @@ TEXT TRANSLATION
"Soil" ""
"Soil Adjusted Vegetation Index" ""
"Soil Adjustment Factor" ""
+"Soil Analysis" ""
"Soil Moisture" "Bodenfeuchte"
"Soil Moisture Content" "Bodenfeuchte Gehalt"
"Soil Moisture Deficit" "Bodenfeuchte Defizit"
@@ -4638,6 +4623,7 @@ TEXT TRANSLATION
"South []" "S�d []"
"South-North" "S�d-Nord"
"Spacecraft Sensor" ""
+"Spatial Extent" ""
"Spatial Point Pattern Analysis" "r�umliche Punktmusteranalyse"
"Spatial Reference" ""
"Spatial Reference System Files (*.srs)" "r�umliche Referenzsystem Dateien (*.srs)"
@@ -4667,7 +4653,9 @@ TEXT TRANSLATION
"Spline" ""
"Spline Interpolation" ""
"Spline sensitivity, reduce to get smoother results, recommended: 80 < Tolerance < 200" "Splinesensitivit�t, verkleinere f�r glattere Ergebnisse, empfohlen: 80 < Toleranz < 200"
+"Split" ""
"Split Channels" "Trenne Kan�le"
+"Split Clusters" ""
"Split Features" ""
"Split Lines at Points" ""
"Split Lines with Lines" ""
@@ -4679,7 +4667,6 @@ TEXT TRANSLATION
"Split Shapes Layer Randomly" "Vektorebene zuf�llig aufteilen"
"Split Table/Shapes by Attribute" "Teile Tabelle/Vektoren durch Attribut"
"Split with Line" ""
-"Splitted" ""
"Spring" ""
"Spur" ""
"Square" "Rechteck"
@@ -4703,9 +4690,6 @@ TEXT TRANSLATION
"Standardised Grid" "Standardisiertes Raster"
"Standardize" ""
"Standardized Height" "Standarisierte H�he"
-"Start Degree" ""
-"Start Latitude" ""
-"Start Longitude" ""
"Start Size" ""
"Start Value" "Startwert"
"Start Values" "Startwerte"
@@ -4909,6 +4893,7 @@ TEXT TRANSLATION
"Temperature Threshold for Rainfall (lower bound)" "Temperatur Schwellenwert f�r Regenf�lle (untere Grenze)"
"Temperature Threshold for Rainfall (upper bound)" "Temperatur Schwellenwert f�r Regenf�lle (obere Grenze)"
"Temperature at Reference Station [Deg.Celsius]" "Temperatur an Referenzstation [Grad.Celsius]"
+"Temperature at Sea Level" ""
"Template Menu|Template Sub Menu" "Vorlagenmenu|Vorlagen Untermen�"
"Templates" ""
"Temporary files" "tempor�re Dateien"
@@ -4926,6 +4911,8 @@ TEXT TRANSLATION
"Terrain Analysis|Preprocessing" "Reliefanalyse|Pr�prozessierung"
"Terrain Analysis|Profiles" "Reliefanalyse|Profile"
"Terrain Analysis|Slope Stability" ""
+"Terrain Classification" ""
+"Terrain Clustering" ""
"Terrain Map View" ""
"Terrain Path Cross Sections" "Relief Pfad Querprofile"
"Terrain Ruggedness Index (TRI)" "Relief Rauheitsindex (TRI)"
@@ -5038,7 +5025,7 @@ TEXT TRANSLATION
"The smoothing preservation factor [-]." ""
"The start value to use for the identifier." ""
"The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." ""
-"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "Der Relief�berh�hungsfaktor erlaubt das Anheben der Schattenkontraste in flachen Fl�chen."
+"The terrain exaggeration factor allows one to increase the shading contrasts in flat areas." ""
"The transmittance of the atmosphere, usually between 60 and 80 percent." "Der Durchl�ssigkeitswert der Atmosph�re, gew�hnlich zwischen 60 und 80 Prozent."
"The transparency of the shade [%]" ""
"The unobstructed hemisphere given as percentage." "Die unversperrte Hemisph�re beschrieben in Prozent."
@@ -5067,7 +5054,6 @@ TEXT TRANSLATION
"This Is Not A Caption!" ""
"This grid indicates the cells you want calculate the average." "Dieses Raster zeigt die Zellen an mit denen der Durchschnitt berechnet wird."
"This grid is used to select cells." "Dieses Raster wird benutzt um Zellen auszuw�hlen."
-"This is a Test!!!" "Dieses ist ein Test!!"
"This is a floating point value parameter with double precision (8 bytes)." "Dieses ist ein Flie�kommawert mit doppelter Genauigkeit (8 bytes)."
"This is not a text!" "Dieses ist kein Text!"
"This is the alpha parameter value for the sigmoid function." ""
@@ -5081,10 +5067,10 @@ TEXT TRANSLATION
"This section contains all parameters used by the RPROP algorithm." ""
"This section contains all parameters used by the backpropagation algorithm." ""
"This shapes layer will contain the resulting channel network in vector format (lines)." "Diese Vektorebene enth�lt das resultierende Gew�ssernetz im Vektorformat (Linien)."
+"This table supplies average travel times through a cell (in seconds) for each land cover type" ""
"This value is ignored if set to zero." "Dieser Wert wird ignoriert wenn er auf Null gesetzt wird."
"This will contain your output data of type grid." "Dieses wird Deine Ausgabedaten vom Typ Rasterdaten enthalten."
"This will contain your output data of type shapes." "Dieses wird Deine Ausgabedaten vom Typ Vektordaten enthalten."
-"Thomas Schorr (c) 2007" ""
"Threshold" "Schwellenwert"
"Threshold (Grid Units)" "Schwellenwert (Rastereinheiten)"
"Threshold (Init.)" "Schwellenwert (Init.)"
@@ -5125,15 +5111,12 @@ TEXT TRANSLATION
"Time" "Zeit"
"Time Delay (Rain-Runoff)" "Zeitverz�gerung (Regenabfluss)"
"Time Delay after Start of Rainfall (INTEGER)" "Zeitverz�gerung nach dem Start des Regenniederschlags (GANZZAHL)"
-"Time Difference between Image & Points" ""
"Time Field" ""
"Time Interval [a]" "Zeitintervall [a]"
"Time Out [min]" ""
"Time Out(h)" "Unterbrechung (h)"
"Time Period" "Zeit Periode"
"Time Range" "Zeit Bereich"
-"Time Resolution [d]: Range of Days" "Zeitaufl�sung [d]: Bereich der Tage"
-"Time Resolution [h]: Day" "Zeitaufl�sung [h]: Tag"
"Time Span" "Zeitspanne"
"Time Span Aggregation" ""
"Time Span [a]" "Zeitspanne [a]"
@@ -5147,7 +5130,6 @@ TEXT TRANSLATION
"Time of Concentration [min]" ""
"Time of Concentration [min] used to estimate flow speed." ""
"Time span used for the calculation of daily radiation sums." "Zeitspanne die f�r die Berechnung der t�glichen Strahlungssummen benutzt wird."
-"Time stamp of Image" ""
"Time step exceeds duration" ""
"Time step size for a day's calculation given in hours." "Zeitschrittgr��e f�r eine Tagesberechnung gegeben in Stunden."
"Time step size for a range of days calculation given in days." "Zeitschrittgr��e f�r eine Berechnung eines Bereichs von Tagen gegeben in Tagen."
@@ -5159,6 +5141,7 @@ TEXT TRANSLATION
"Tolerance (Degree)" "Toleranz (Grad)"
"Tolerance [Degree]" "Toleranz [Grad]"
"Tool" "Werkzeug"
+"Tool Bar Button Size" ""
"Tool Chain" ""
"Tool Chain with Header" ""
"Tool Chains" ""
@@ -5168,9 +5151,9 @@ TEXT TRANSLATION
"Tool Library" "Werkzeugbibliothek"
"Tool Manager" "Werkzeugverwaltung"
"Tool Set" ""
+"Tool bar button sizes. You need to restart SAGA to apply the changes." ""
"Tool execution failed" "Werkzeugausf�hrung schlug fehl"
"Tool execution succeeded" "Werkzeugausf�hrung war erfolgreich"
-"Toolbox Naming" ""
"Tools" "Werkzeuge"
"Tools for (grid based) digital terrain analysis." "Werkzeuge f�r (rasterbasierte) digitale Reliefanalysen."
"Tools for GPS data handling." ""
@@ -5201,10 +5184,12 @@ TEXT TRANSLATION
"Top of Atmosphere Reflectance" ""
"Top to Bottom" "Von Oben bis Unten"
"Topographic Correction" "topographische Korrektur"
+"Topographic Indices" ""
"Topographic Openness" ""
"Topographic Position Index" ""
"Topographic Position Index (TPI)" ""
"Topographic Wetness Index" "topographischer Feuchtigkeitsindex"
+"Topographic Wetness Index (One Step)" ""
"Topographic Wetness Index (TWI)" ""
"Topography" ""
"Topograpic Wetness Index Calculation" ""
@@ -5243,7 +5228,6 @@ TEXT TRANSLATION
"Transformed Soil Adjusted Vegetation Index (Baret et al. 1989)" ""
"Transformed Vegetation Index" "Umgewandelter Vegetationsindex"
"Transitional" "vor�bergehend"
-"Translatable Elements" ""
"Translation" "Verschiebung"
"Translation X" "Verschiebung X"
"Translation Y" "Verschiebung Y"
@@ -5265,6 +5249,11 @@ TEXT TRANSLATION
"Transversal radius" "Transversal Radius"
"Transverse Cylindrical Equal Area" "Transvers Zylindrisch fl�chentreu"
"Transverse Mercator" "Transvers Merkator"
+"Travel Time" ""
+"Travel Time Analysis" ""
+"Travel Time Calculation" ""
+"Travel Time Zones Classification" ""
+"Travel Times" ""
"Tree" "Baum"
"Tree Count" ""
"Trend" "Trend"
@@ -5359,6 +5348,8 @@ TEXT TRANSLATION
"Upslope Basins" "ansteigende Becken"
"Upslope Curvature" ""
"Upslope Flow Width" ""
+"Upslope Height" ""
+"Upslope Height, Slope, Aspect" ""
"Upslope Length Factor" ""
"Upslope Slope" ""
"Upslope Weighting" ""
@@ -5473,6 +5464,7 @@ TEXT TRANSLATION
"Vector Terrain Ruggedness (VRM)" "Vektor Terrain Rauigkeit (VRM)"
"Vectorised class as..." "Vektorisierte Klasse als.."
"Vectorising Grid Classes" "Rasterklassen vektorisieren"
+"Vectorization" ""
"Vegetation" ""
"Vegetation Index (Distance Based)" "Vegetationsindex (Entfernungsbasiert)"
"Vegetation Index (Slope Based)" ""
@@ -5725,22 +5717,10 @@ TEXT TRANSLATION
"Zsoft Paintbrush" ""
"Zsoft Paintbrush (*.pcx)" ""
"Zuckerrueben" "Zuckerrueben"
-"[CAP] Save to PDF" "Als PDF speichern"
"[ERR] Could not save PDF file." "PDF-Datei konnte nicht gespeichert werden."
-"[FLD] Attribute" "Attribute"
-"[FLD] Grid" "Raster"
-"[FLD] Icon" "Piktogramm"
"[FLD] Index Layer" "Index Schicht"
-"[FLD] PDF Document" "PDF Dokument"
-"[FLD] Paper Format" "Papierformat"
-"[FLD] Round Scale" "Gerundeter Massstab"
"[FLD] SVG File" "SVG Datei"
-"[FLD] Shapes" "Vektordaten"
-"[FLD] Title" "Titel"
"[MSG] Save as Interactive SVG" "Speichere als interaktive SVG"
-"[MSG] Save to PDF" "Als PDF speichern"
-"[MSG] failed" "fehlgeschlagen"
-"[MSG] okay" "erfolgreich"
"[deprecated] Point Cloud Viewer" ""
"[deprecated] TIN Viewer" ""
"[not set]|" "[nichts ausgew�hlt]|"
@@ -5754,7 +5734,6 @@ TEXT TRANSLATION
"\nValue of Target Function" "\nWert der Zielfunktion"
"\n\n ** Error : Could not close PDF engine ** \n\n" "\n\n **Fehler: Konnte PDF-Modul nicht beenden **\n\n"
"\n\n ** Error : Could not save PDF file ** \n\n" "\n\n **Fehler: Konnte PDF-Datei nicht speichern **\n\n"
-"_TL" ""
"a * b" ""
"a + b * (1 - exp(-(x / c)^2))" ""
"a + b * (1 - exp(-x / c))" ""
@@ -5822,7 +5801,9 @@ TEXT TRANSLATION
"attribute contains search expression" "Attribute enthalten Suchausdruck"
"attribute is contained in search expression" "Attribut ist im Suchausdruck enthalten"
"attribute is identical with search expression" "Attribut ist identisch mit dem Suchausdruck"
+"attribute specifying road's type with regard to travel time" ""
"attribute to be searched; if not set all attributes will be searched" "zu durchsuchende Attribute; wenn nichts eingetragen wird, werden alle Attribute durchsucht"
+"attribute to become interpolated" ""
"attributes must be more than 1" ""
"author " "Autor"
"automatically" ""
@@ -5883,9 +5864,9 @@ TEXT TRANSLATION
"catchment slope" ""
"catchment specific parameter for sediment delivery ratio calculation" ""
"categorical" ""
-"category and library name" ""
"cell" "Zelle"
"cell area" "Zellfl�che"
+"cell size of target grid" ""
"cells" "Zellen"
"cells in process" ""
"cellsize and lower left center coordinates" ""
@@ -5924,7 +5905,6 @@ TEXT TRANSLATION
"coef0" ""
"coef0 in kernel function" ""
"collecting background data" ""
-"collecting elements" ""
"collecting presence data" ""
"color" "Farbe"
"colors" "Farben"
@@ -5942,6 +5922,7 @@ TEXT TRANSLATION
"confirm with options" "Best�tige mit Optionen"
"constant direction into the wind blows, given as degree" ""
"constant histogram stretch for all time steps" ""
+"constant lapse rate in degree of temperature per 100 meter. used if no lapse rate grid is specified." ""
"constant latitude" ""
"contain the centeroid of" "enth�lt den Schwerpunkt von "
"continue" "fortsetzen"
@@ -6269,6 +6250,7 @@ TEXT TRANSLATION
"include range" "Schlie�e Bereich ein"
"incompatible file." "inkompatible Datei."
"incompatible items have been removed from input list" ""
+"increase band width to get less seed points" ""
"index" ""
"index creation failed" ""
"index creation stopped by user" ""
@@ -6352,6 +6334,7 @@ TEXT TRANSLATION
"kmz file" ""
"kmz, kml and image files" ""
"label minima" "Bezeichnungsminima"
+"lapse rates in degree of temperature per 100 meter" ""
"last" "zu Letzt"
"last point" "letzter Punkt"
"last state" ""
@@ -6369,7 +6352,6 @@ TEXT TRANSLATION
"level 1" "Level 1"
"level 2" "Level 2"
"library " ""
-"library file name" ""
"library name" "Bibliotheksname"
"library path" "Bibliothekspfad"
"line simplification can only be applied to lines and polygons" "Linienvereinfachung kann nur mit Linien oder Polygonen genutzt werden"
@@ -6483,7 +6465,6 @@ TEXT TRANSLATION
"n" ""
"n-fold cross validation: n must > 1" ""
"name" "Name"
-"naming for splitted lines" "Namensgebung f�r getrennte Linien"
"nearest neighbour" ""
"needs at least two attributes in selection" ""
"nein" ""
@@ -6598,6 +6579,7 @@ TEXT TRANSLATION
"number of cells" ""
"number of cells in S-N direction" "Anzahl der Zellen in S-N-Richtung"
"number of cells in W-E direction" "Anzahl der Zellen in W-E-Richtung"
+"number of clusters" ""
"number of different categories (unique values) within search area" ""
"number of dropped observations" ""
"number of dropped shapes" "Nummer der abgeworfenen Vektoren"
@@ -6611,10 +6593,8 @@ TEXT TRANSLATION
"number of processed sinks" "Anzahl der berechneten Senken"
"number of replacements" ""
"number of returns of given pulse" "Anzahl der Antworten auf gegebene Pulse"
-"number of scanned files" ""
"number of subsamples for k-fold cross validation" ""
"number of the return" "Anzahl der Antworten"
-"number of translatable elements" ""
"object" ""
"objects" ""
"offset in minutes relative to 00:00 (midnight)" ""
@@ -6706,6 +6686,7 @@ TEXT TRANSLATION
"polynomial" ""
"polynomial trend" ""
"polynomial trend (coefficient interpolation)" ""
+"position index radius in map units" ""
"post-processing..." ""
"power of distance" "power of distance"
"prediction" ""
@@ -6764,10 +6745,10 @@ TEXT TRANSLATION
"replacements" "Austausch"
"resampling" "Neuberechnung"
"resampling cell size is too large" ""
-"resampling method used when projection is needed" ""
"rescale to 0 - 255" ""
"resolution" "Aufl�sung"
"resolution has to be greater than zero" "Die Aufl�sung muss gr��er als null sein"
+"resolution measured in screen pixels" ""
"restore from file" ""
"restore model from file" ""
"restricts extrapolation by assigning minimal allowed weight for a vertex (normally \" ""
@@ -6801,7 +6782,6 @@ TEXT TRANSLATION
"scale line" ""
"scale to size range" ""
"scan angle" "Scanwinkel"
-"scanning" ""
"search distance is less than half of grid cell size" "Die Suchentfernung ist kleiner als die H�lfte einer Rasterzellengr��e"
"seconds" "Sekunden"
"sectors" "Sektoren"
@@ -6915,6 +6895,7 @@ TEXT TRANSLATION
"theta" "theata"
"thick" "dick"
"thin" "d�nn"
+"this is the internal grid cell size determining the precision of contours" ""
"this operation requires locations to be of type polygon" "diese Operation ben�tigt Standorte vom Typ Polygon"
"this operation requires selectable shapes to be of type polygon" "diese Operation ben�tigt ausw�hlbare Vektoren vom Typ Polygon"
"threshold slope" "Schwellenwert Neigung"
diff --git a/src/saga_core/saga_gui/res/saga.ico b/src/saga_core/saga_gui/res/saga.ico
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga.lng.txt b/src/saga_core/saga_gui/res/saga.lng.txt
old mode 100755
new mode 100644
index c841dd7..35e63b6
--- a/src/saga_core/saga_gui/res/saga.lng.txt
+++ b/src/saga_core/saga_gui/res/saga.lng.txt
@@ -101,7 +101,6 @@ TEXT TRANSLATION
"0 - 1.0" ""
"0 is horizontal, 90 is vertical." ""
"0-50 mm/day" ""
-"0.1" ""
"01: A Simple Litter System" ""
"01: My first module" ""
"02: Carbon Cycle Simulation for Terrestrial Biomass" ""
@@ -158,7 +157,6 @@ TEXT TRANSLATION
"20 seconds" ""
"200-400 mm/day" ""
"256x256" ""
-"2nd Date (End of Range)" ""
"2nd Order Polynomial" ""
"2nd Std. Parallel" ""
"3" ""
@@ -306,7 +304,6 @@ TEXT TRANSLATION
"Abstract" ""
"Acc. Area" ""
"Acceleration" ""
-"Acceptable Time Difference between Image and Laser Points" ""
"Accessing PostgreSQL databases." ""
"Accumulated Cost" ""
"Accumulated Cost Surface" ""
@@ -406,10 +403,11 @@ TEXT TRANSLATION
"Allow longitudes outside -180 to 180 Range" ""
"Allow multiple observer positions." ""
"Allows one to scale shade brightness [%]" ""
-"Allows to scale shade brightness, [percent]" ""
-"Allows to write cell values from additional grids to the output" ""
+"Allows one to scale shade brightness [percent]" ""
+"Allows writing cell values from additional grids to the output" ""
"Alpha" ""
"Alpha Max (Degree)" ""
+"Alternatives" ""
"Altura de llama" ""
"Altura de llama (m)" ""
"Always use cloud signature (step 14)" ""
@@ -435,25 +433,23 @@ TEXT TRANSLATION
"Angular Step Size (Degree)" ""
"Annual" ""
"Annual Course of Daily Insolation" ""
+"Appearance" ""
"Append Fields from another Table" ""
"Append Rows from ..." ""
+"Applies a majority filter with given search radius to the segments grid. Is skipped if set to zero." ""
"Applies also to the binary format header file." ""
"Apply" ""
-"Apply Filter?" ""
"Apply Move" ""
-"Apply a filter (erosion - binary reconstruction) to the input image " ""
"Apply changes?" ""
"Apply offset?" ""
"Apply post-processing filter to remove small holes" ""
"Approx. Terrain Slope" ""
-"Approximate Coordinate" ""
"Approximate Coordinates of Projection Center" ""
"Approximate Coordinates of Target Point" ""
"Approximate Terrain Slope [%]" ""
"April" ""
"Arc Vertex Distance [Degree]" ""
-"ArcGIS Version" ""
-"ArcSAGA Toolboxes" ""
+"ArcGIS MapServer Tiles" ""
"Arccosine" ""
"Arcs to polygons" ""
"Arcsine" ""
@@ -588,6 +584,8 @@ TEXT TRANSLATION
"Band 7" ""
"Band 8" ""
"Band Name Field" ""
+"Band Width" ""
+"Band Width for Seed Point Generation" ""
"Bands" ""
"Bandwidth (Cells)" ""
"Bare Earth" ""
@@ -602,6 +600,7 @@ TEXT TRANSLATION
"Basic measures for spatial point patterns." ""
"Basin Type (Gravelius)" ""
"Basins" ""
+"Be sure to read and understand the usage agreement or terms of service before you use a base map server." ""
"Beep when finished" ""
"Begin Transaction" ""
"Below this threshold precipitation will fall as snow" ""
@@ -616,7 +615,6 @@ TEXT TRANSLATION
"Binary Byte Order" ""
"Binary Encoding" ""
"Binary Erosion-Reconstruction" ""
-"Binary input image for the connectivity analysis" ""
"Binary object mask" ""
"Birth Rate of Fishes" ""
"Birth Rate of Sharks" ""
@@ -848,6 +846,7 @@ TEXT TRANSLATION
"Class" ""
"Class 1" ""
"Class 2" ""
+"Class Definition File" ""
"Class Identifier" ""
"Class Name" ""
"Class Selection" ""
@@ -874,6 +873,7 @@ TEXT TRANSLATION
"Climate" ""
"Climate Data" ""
"Climate parameters" ""
+"Climate|Tools" ""
"Climatic Precession" ""
"Clip Features" ""
"Clip Grid with Polygon" ""
@@ -907,6 +907,7 @@ TEXT TRANSLATION
"ClusterID" ""
"Clusters" ""
"Clusters, which are closer than this distance to each other, are merged." ""
+"Coarse Resolution" ""
"Coefficient of Determination" ""
"Cold Cloud" ""
"Collect values" ""
@@ -989,6 +990,7 @@ TEXT TRANSLATION
"Connectivity [Percent]" ""
"Constant Grid" ""
"Constant Histogram Stretch" ""
+"Constant Lapse Rate" ""
"Constant Value" ""
"Constant Variation Range [Degree]" ""
"Constant Wind Direction" ""
@@ -1001,6 +1003,7 @@ TEXT TRANSLATION
"Contour" ""
"Contour Lines" ""
"Contour Lines from Grid" ""
+"Contour Lines from Points" ""
"Contour lines equidistance [map units]." ""
"Contours" ""
"Contributing Area" ""
@@ -1014,6 +1017,7 @@ TEXT TRANSLATION
"Convergence factor for Multiple m_Flow Direction Algorithm (Freeman 1991)" ""
"Convergence factor for the \'Multiple Flow Direction\' algorithm (after Freeman 1991)" ""
"Conversion" ""
+"Conversions" ""
"Convert Lines to Points" ""
"Convert Lines to Polygons" ""
"Convert Multipoints to Points" ""
@@ -1065,7 +1069,6 @@ TEXT TRANSLATION
"Copy existing Attributes" ""
"Copy to Clipboard" ""
"Copying original data..." ""
-"Copyright (c) 2007 by Thomas Schorr" ""
"Copyrights (c) 2003 by Andre Ringeler" ""
"Copyrights (c) 2003 by Olaf Conrad" ""
"Copyrights (c) 2003 by Volker Wichmann" ""
@@ -1131,7 +1134,6 @@ TEXT TRANSLATION
"Create Virtual Point Cloud Dataset" ""
"Create Web Content" ""
"Create X/Y Grids" ""
-"Create a binary mask Yes/No" ""
"Create borders between segments as new grid." ""
"Create index" ""
"Create new Attribute" ""
@@ -1230,7 +1232,7 @@ TEXT TRANSLATION
"Database" ""
"Database Name" ""
"Database access through the libmysql.lib interface." ""
-"Database with Coordinate Reference System (CRS) definitions. A restart of SAGA is required to have the changes take effect!" ""
+"Database with Coordinate Reference System (CRS) definitions. You need to restart SAGA to apply the changes." ""
"Database|ODBC" ""
"Database|PostgreSQL" ""
"Dataset creation failed" ""
@@ -1325,6 +1327,7 @@ TEXT TRANSLATION
"Desmet & Govers" ""
"Desmet & Govers 1996" ""
"Destandardisation" ""
+"Destination Points" ""
"Destinations" ""
"Destriped Grid" ""
"Destriping" ""
@@ -1347,11 +1350,10 @@ TEXT TRANSLATION
"Diameter plant elements" ""
"Dictionary Files (*.dic)" ""
"Dictionary Files (*.lng)" ""
-"Dictionary for Proj.4/OGC WKT translations. A restart of SAGA is required to have the changes take effect!" ""
+"Dictionary for Proj.4/OGC WKT translations. You need to restart SAGA to apply the changes." ""
"Dictionary for translations from built-in (English) to local language (editable text table). You need to restart SAGA to apply the changes." ""
"Difference" ""
"Difference (A - B)" ""
-"Difference Input - Reconstruction" ""
"Difference Vegetation Index" ""
"Difference from Arithmetic Mean" ""
"Difference from Mean Value" ""
@@ -1439,9 +1441,6 @@ TEXT TRANSLATION
"Do you really want to delete this raster band" ""
"Do you want to delete the selection?" ""
"Do you want to exit SAGA?" ""
-"Do you wish to estimate Principal Point Offsets?" ""
-"Do you wish to provide the Radial Distortion Parameters?" ""
-"Do you wish to provide the time stamp of Image?" ""
"Dominance" ""
"Dot And Dash" ""
"Dot and dash style" ""
@@ -1478,6 +1477,7 @@ TEXT TRANSLATION
"Duration of Insolation" ""
"Dust [ppm]" ""
"Dust factor: 100 ppm (standard)" ""
+"Dynamics" ""
"Dynamische Flaechenwassernutzung und Abflussreduktion" ""
"Dynamische Flaechenwassernutzung..." ""
"EDGES" ""
@@ -1547,8 +1547,6 @@ TEXT TRANSLATION
"Enable local disk cache. Allows for offline operation." ""
"Encountered invalid path description in *.spcvf file!" ""
"Encountered invalid path description in *.spcvf_tile_info file!" ""
-"End Latitude" ""
-"End Longitude" ""
"Enforce True Color" ""
"Enhanced Vegetation Index" ""
"Entropy" ""
@@ -1577,7 +1575,6 @@ TEXT TRANSLATION
"Error parsing field type: can't convert to number" ""
"Error: Continue anyway ?" ""
"Errors" ""
-"Estimate Principal Point Offsets?" ""
"Estimated Noise (absolute)" ""
"Estimated Noise (relative)" ""
"Estimated noise in units of input data" ""
@@ -1609,10 +1606,10 @@ TEXT TRANSLATION
"Expand" ""
"Expand Options" ""
"Expand and Shrink" ""
-"Expansion Degree" ""
"Exponent" ""
"Exponent for distance weighting (0.0-4.0)" ""
"Exponential" ""
+"Export" ""
"Export Atlas Boundary File" ""
"Export ESRI Arc/Info Grid" ""
"Export GPX" ""
@@ -1755,8 +1752,6 @@ TEXT TRANSLATION
"Filter Clumps" ""
"Filter Criterion" ""
"Filter Matrix" ""
-"Filter Size (Radius)" ""
-"Filter size (radius in grid cells)" ""
"Filtered" ""
"Filtered DTM" ""
"Filtered Grid" ""
@@ -1835,6 +1830,7 @@ TEXT TRANSLATION
"Flow Directions" ""
"Flow Distance" ""
"Flow Distances" ""
+"Flow Distribution" ""
"Flow Line Curvature" ""
"Flow Lines" ""
"Flow Path Length" ""
@@ -1851,9 +1847,7 @@ TEXT TRANSLATION
"Flux" ""
"Flux out of each cell, i.e. everything accumulated so far." ""
"Flying Height" ""
-"Focal Length (mm)" ""
"Focal Length [mm]" ""
-"Focal Length in mm" ""
"Folder" ""
"Folder for PDF Files" ""
"Font" ""
@@ -1881,6 +1875,7 @@ TEXT TRANSLATION
"Fragmentation" ""
"Fragmentation (Alternative)" ""
"Fragmentation (Standard)" ""
+"Fragmentation Analysis" ""
"Fragmentation Classes from Density and Connectivity" ""
"Fragmentation Index" ""
"Frame" ""
@@ -1922,7 +1917,6 @@ TEXT TRANSLATION
"GREEN_BLUE" ""
"GREEN_GREY_BLUE" ""
"GREEN_RED_BLUE" ""
-"GRIB Files" ""
"GRID" ""
"GStat Files (*.gstat)" ""
"GStat shapes format export." ""
@@ -1947,6 +1941,7 @@ TEXT TRANSLATION
"Garden|Introducing Module Programming" ""
"Garden|Recreations|Fractals" ""
"Garden|Recreations|Games" ""
+"Garden|Tool Chain Examples" ""
"Garden|Web Service Data Access" ""
"Gauges" ""
"Gaussian" ""
@@ -1960,6 +1955,7 @@ TEXT TRANSLATION
"General Curvature" ""
"General Settings" ""
"Generalisation" ""
+"Generalization" ""
"Generalized Surface" ""
"Generate Shapes" ""
"Generated Shapefile." ""
@@ -1999,6 +1995,11 @@ TEXT TRANSLATION
"Global Moran's I for Grids" ""
"Globe Viewer for Grids" ""
"Gnomonic" ""
+"Google Hybrid" ""
+"Google Map" ""
+"Google Satellite" ""
+"Google Terrain" ""
+"Google Terrain, Streets and Water" ""
"Gpx2shp path" ""
"Gradient" ""
"Gradient Calculation" ""
@@ -2069,7 +2070,6 @@ TEXT TRANSLATION
"Grid system" ""
"Grid to TIN" ""
"Grid to TIN (Surface Specific Points)" ""
-"Grid to be filtered" ""
"Grid to filter" ""
"Grid to reclassify" ""
"Grid value equals low value" ""
@@ -2081,6 +2081,7 @@ TEXT TRANSLATION
"Grid(s)" ""
"Grid(s) to fit extent to" ""
"Gridding" ""
+"Gridding of Points" ""
"Grids" ""
"Grids Product" ""
"Grids Sum" ""
@@ -2091,6 +2092,7 @@ TEXT TRANSLATION
"Grids used to delineate the UCUs. Coding: NoData / categorical values." ""
"Grids with continuous data, statistics are calculated for each grid. Coding: NoData / continuous values." ""
"Grid|Analysis" ""
+"Grid|Analysis|Travel Time Analysis" ""
"Grid|Calculus" ""
"Grid|Export" ""
"Grid|Filter" ""
@@ -2129,6 +2131,7 @@ TEXT TRANSLATION
"Herbaceous Fuel Moisture" ""
"High Pass" ""
"High Pass Filter" ""
+"High Resolution" ""
"High Resolution Grid System" ""
"High Ridges" ""
"High Value" ""
@@ -2174,6 +2177,8 @@ TEXT TRANSLATION
"Humus to Charcoal" ""
"Hydrology" ""
"Hydrology: IHACRES" ""
+"Hydrology|Flow Accumulation" ""
+"Hydrology|Topographic Indices" ""
"Hypsometric Curve" ""
"Hypsometry" ""
"I am a module library template." ""
@@ -2237,6 +2242,7 @@ TEXT TRANSLATION
"Image Properties" ""
"Image Resolution" ""
"Image Rotation [Degree]" ""
+"Image Sharpening" ""
"Image acquisition date (yyyy-mm-dd)" ""
"Image creation date (yyyy-mm-dd)" ""
"Image processing tools." ""
@@ -2245,6 +2251,7 @@ TEXT TRANSLATION
"Imagery|Classification" ""
"Imagery|Photogrammetry" ""
"Imagery|Segmentation" ""
+"Imagery|Tools" ""
"Imagery|ViGrA" ""
"Images" ""
"Images|*.bmp;*.jpg;*.png;*.tif|HTML Files|*.htm|All Files|*.*" ""
@@ -2261,7 +2268,6 @@ TEXT TRANSLATION
"Import Extents" ""
"Import Filter" ""
"Import GPX" ""
-"Import GRIB2 record" ""
"Import GStat Shapes" ""
"Import Grid from Table" ""
"Import Grid from XYZ" ""
@@ -2270,7 +2276,6 @@ TEXT TRANSLATION
"Import LAS Files" ""
"Import MOLA Grid (MEGDR)" ""
"Import NetCDF" ""
-"Import Open Street Map Image" ""
"Import Point Cloud from Shape File" ""
"Import Point Cloud from Text File" ""
"Import Raster" ""
@@ -2285,6 +2290,7 @@ TEXT TRANSLATION
"Import Stereo Lithography File (STL)" ""
"Import Surfer Blanking Files" ""
"Import Surfer Grid" ""
+"Import TMS Image" ""
"Import Table" ""
"Import Table from SQL Query" ""
"Import Tables" ""
@@ -2317,6 +2323,7 @@ TEXT TRANSLATION
"Increase Perspectivic Distance [F6]" ""
"Increase Size Scaling Factor [F8]" ""
"Increase Size [F6]" ""
+"Increase band width to get less seed points." ""
"Increase factor" ""
"Increase factor n_plus. Must be > 1." ""
"Independent Variable (per Grid and Cell)" ""
@@ -2352,7 +2359,6 @@ TEXT TRANSLATION
"Inlet Concentration" ""
"Inner Buffer" ""
"Input" ""
-"Input Binary Grid" ""
"Input Features" ""
"Input File List" ""
"Input File's NoData Value" ""
@@ -2370,7 +2376,6 @@ TEXT TRANSLATION
"Input file list could not be opened!" ""
"Input for Mean over Catchment" ""
"Input for module calculations." ""
-"Input for the morphological reconstruction" ""
"Input format" ""
"Input grid" ""
"Input grids to train the network." ""
@@ -2410,6 +2415,7 @@ TEXT TRANSLATION
"Interpolation" ""
"Interpolation Scale" ""
"Interpolation Steps" ""
+"Interpolation from Points" ""
"Intersect" ""
"Intersection" ""
"Interval" ""
@@ -2448,7 +2454,6 @@ TEXT TRANSLATION
"Iterative Minimum Distance (Forgy 1965)" ""
"JPEG - JFIF Compliant" ""
"JPEG - JFIF Compliant (*.jpg, *.jif, *.jpeg)" ""
-"JPG Files" ""
"Ja, Abfluss manuell vorgeben: res. Abfluss = Speicherinhalt * q + a" ""
"Ja, TestRoutine1 fuer Flusseinzugsgebiet bis zu der HG-Rasterzelle" ""
"Ja, TestRoutine1 nur fuer Teileinzugsgbiet der HG-Rasterzelle" ""
@@ -2472,9 +2477,6 @@ TEXT TRANSLATION
"June" ""
"K Factor" ""
"K-Means Clustering for Grids" ""
-"K1" ""
-"K2" ""
-"K3" ""
"KE" ""
"KML files (*.kml)" ""
"KML/KMZ File" ""
@@ -2509,6 +2511,8 @@ TEXT TRANSLATION
"LAS Info" ""
"LAS header exception: %s" ""
"LAS reader exception: %s" ""
+"LCZC" ""
+"LCZC (Filtered)" ""
"LFAC(" ""
"LP, Saturated lateral permeability of the soil [m/day]" ""
"LS" ""
@@ -2527,6 +2531,9 @@ TEXT TRANSLATION
"Lake Flood" ""
"Lambert Conformal Conic (1 parallel)" ""
"Lambert Conformal Conic (2 parallel)" ""
+"Land Cover" ""
+"Land Cover ID" ""
+"Land Cover Scenario Offset" ""
"Land Cover Weights" ""
"Land Surface Temperature" ""
"Land Surface Temperature [Deg.Celsius]" ""
@@ -2557,11 +2564,12 @@ TEXT TRANSLATION
"Laplace Filter" ""
"Laplacian Filter" ""
"Laplacian Filter Kernel" ""
+"Lapse Rate Based Temperature Downscaling" ""
+"Lapse Rates" ""
"Last Day" ""
"Lat" ""
"Lat. of True Scale" ""
"Latitude" ""
-"Latitude / Longitude Increment" ""
"Latitude 1" ""
"Latitude 2" ""
"Latitude 3" ""
@@ -2694,6 +2702,7 @@ TEXT TRANSLATION
"Loam" ""
"Loamy Sand" ""
"Local Cartesian" ""
+"Local Climate Zone Classification" ""
"Local Cost" ""
"Local Curvature" ""
"Local Downslope Curvature" ""
@@ -2734,6 +2743,7 @@ TEXT TRANSLATION
"Look Up Section" ""
"Look up table (Points)" ""
"Look-up Table" ""
+"Look-up table for classification of travel time zones." ""
"LookUp Table" ""
"Lookup Table" ""
"Lookup table used in method \"table\"" ""
@@ -2791,6 +2801,7 @@ TEXT TRANSLATION
"Main layer. The output layer will have the same fields in the attribute table as this layer." ""
"Majority" ""
"Majority Filter" ""
+"Majority Filter Radius" ""
"Make sure that the files\n" ""
"Manager" ""
"Mandelbrot" ""
@@ -2857,6 +2868,7 @@ TEXT TRANSLATION
"Maximum Entropy" ""
"Maximum Entropy Classifcation" ""
"Maximum Entropy Presence Prediction" ""
+"Maximum Expansion Distance" ""
"Maximum Flow Distance" ""
"Maximum Height" ""
"Maximum Iterations" ""
@@ -3024,6 +3036,7 @@ TEXT TRANSLATION
"Mirror Vertically" ""
"Mirrored horizontally" ""
"Mirrored vertically" ""
+"Miscellaneous" ""
"Missing Value" ""
"Mixed Flow Threshold (ha)" ""
"Mode" ""
@@ -3137,6 +3150,7 @@ TEXT TRANSLATION
"Name des Evaluierungspunktes 2" ""
"Name des Evaluierungspunktes 3" ""
"Name of Landsat metadata file (.met or MTL.txt)" ""
+"Naming for split lines" ""
"Natural Logarithm" ""
"Natural Neighbour" ""
"Navaladi, Schoeller, Conrad (c) 2009" ""
@@ -3284,10 +3298,10 @@ TEXT TRANSLATION
"Number of Simulations" ""
"Number of Simulations for Calibration" ""
"Number of Steps" ""
+"Number of Terrain Classes" ""
"Number of Values" ""
"Number of Variables" ""
"Number of Vertices" ""
-"Number of added tools" ""
"Number of additional attributes to import." ""
"Number of arguments for attribute fields (%d), names (%d) and types (%d) do not match!" ""
"Number of attribute fields: %d" ""
@@ -3340,8 +3354,10 @@ TEXT TRANSLATION
"OUTPUT" ""
"OUTPUT certainty" ""
"OUTPUT classes" ""
+"Object Based Image Segmentation" ""
"Object Grid" ""
"Objective Function" ""
+"Objects" ""
"Objects removed from input grid" ""
"Oblique Mercator" ""
"Obliquity" ""
@@ -3361,7 +3377,6 @@ TEXT TRANSLATION
"Old Style Namings" ""
"Old Version" ""
"Olkin & Pratt" ""
-"Omega" ""
"Omega [degree]" ""
"One Point Cloud per Polygon" ""
"One or several input point cloud datasets to cut." ""
@@ -3464,6 +3479,7 @@ TEXT TRANSLATION
"Overlap [map units]" ""
"Overlapping Areas" ""
"Overlapping Cells" ""
+"Overlay" ""
"Overlay Image" ""
"Override" ""
"Overview" ""
@@ -3479,7 +3495,6 @@ TEXT TRANSLATION
"PDF Docs" ""
"PDF Documents" ""
"PDF File" ""
-"PDF Files" ""
"PDF Files (*.pdf)|*.pdf|All Files|*.*" ""
"PERCENTILE" ""
"PERIMETER" ""
@@ -3488,7 +3503,6 @@ TEXT TRANSLATION
"PFAC(" ""
"PH, plant height [m], representing the effective height from which raindrops fall from the crop or vegetation" ""
"PI, permanent interception expressed as the proportion [between 0-1] of rainfall" ""
-"PNG Files" ""
"PRECISION" ""
"PREDICTED" ""
"PT_ID" ""
@@ -3571,9 +3585,6 @@ TEXT TRANSLATION
"Photogrammetry" ""
"Photogrammetry tools." ""
"Pit" ""
-"Pixel Centers?" ""
-"Pixel Width (um)" ""
-"Pixel Width in micro meters" ""
"Plain" ""
"Plains" ""
"Plan Curvature" ""
@@ -3687,11 +3698,13 @@ TEXT TRANSLATION
"Portable Network Graphics" ""
"Portable Network Graphics (*.png)" ""
"Position" ""
+"Position Index Radius" ""
"Position as Geographic Coordinates" ""
"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" ""
"PostGIS extension missing or too old" ""
@@ -3722,6 +3735,7 @@ TEXT TRANSLATION
"Precipitation [mm]" ""
"Precise Datum Conversion" ""
"Precise Tracing" ""
+"Precision" ""
"Precisions" ""
"Predefined Datum" ""
"Predefined Ellipsoids" ""
@@ -3743,7 +3757,6 @@ TEXT TRANSLATION
"Presence Prediction" ""
"Presence Probability" ""
"Preservation" ""
-"Preserve 1px border Yes/No" ""
"Preserve Data Type" ""
"Preset Selection" ""
"Presets" ""
@@ -3753,11 +3766,6 @@ TEXT TRANSLATION
"Primary Name" ""
"Primary key)" ""
"Principal Components" ""
-"Principal Point Offset in X" ""
-"Principal Point Offset in X (pixels)" ""
-"Principal Point Offset in X (pixles)" ""
-"Principal Point Offset in Y" ""
-"Principal Point Offset in Y (pixels)" ""
"Principle Components" ""
"Principle Components Analysis" ""
"Principle Components Based Image Sharpening" ""
@@ -3808,10 +3816,6 @@ TEXT TRANSLATION
"Projected Coordinate Systems" ""
"Projected Height" ""
"Projection" ""
-"Projection Centre" ""
-"Projection Centre - X" ""
-"Projection Centre - Y" ""
-"Projection Centre - Z" ""
"Projection Parameters" ""
"Projection Settings" ""
"Projection Type" ""
@@ -3825,8 +3829,6 @@ TEXT TRANSLATION
"Propability" ""
"Properties" ""
"Protection Index" ""
-"Provide Radial Distortion Parameters?" ""
-"Provide Time stamp of Image?" ""
"Proximity" ""
"Proximity Grid" ""
"Punktuelle Rasterzellenmanipulation" ""
@@ -3857,33 +3859,7 @@ TEXT TRANSLATION
"R,G,B to SAGA RGB" ""
"R,G,B value range" ""
"R2" ""
-"R:Alternatives" ""
-"R:Classification" ""
-"R:Conversion" ""
-"R:Conversions" ""
-"R:Dynamics" ""
-"R:Export" ""
-"R:Fragmentation Analysis" ""
-"R:Grid Generation" ""
-"R:Grid Values" ""
-"R:Image Sharpening" ""
"R:Import" ""
-"R:Indices" ""
-"R:Interpolation from Points" ""
-"R:Landsat" ""
-"R:Miscellaneous" ""
-"R:Overlay" ""
-"R:Point Cloud" ""
-"R:Principle Components" ""
-"R:Shapes" ""
-"R:Soil Analysis" ""
-"R:Spatial Extent" ""
-"R:Spline Interpolation" ""
-"R:Table" ""
-"R:Terrain Analysis" ""
-"R:Tools" ""
-"R:Topographic Indices" ""
-"R:Vectorization" ""
"RAINBOW" ""
"RANGE" ""
"RED_BLUE" ""
@@ -3929,6 +3905,7 @@ TEXT TRANSLATION
"Random Forest Classification (ViGrA)" ""
"Random Forest Options" ""
"Random Forest Presence Prediction (ViGrA)" ""
+"Random Forest Tree Count" ""
"Random Terrain" ""
"Random number, Gaussian distribution with mean x and standard deviation y" ""
"Random number, uniform distribution with minimum x and maximum y" ""
@@ -3937,6 +3914,7 @@ TEXT TRANSLATION
"Rank" ""
"Rank Filter" ""
"Rank [Percent]" ""
+"Raster" ""
"Raster Band Deletion" ""
"Raster Band Identifier" ""
"Raster Catalogue" ""
@@ -4013,14 +3991,13 @@ TEXT TRANSLATION
"Relative from cell value" ""
"Relative heights calculation..." ""
"Relaxation" ""
+"Relief Segmentation" ""
"Reload" ""
"Reload tool chain" ""
"Remove" ""
-"Remove Border Regions?" ""
"Remove Duplicate Points" ""
"Remove Overlap from Virtual Point Cloud Tiles" ""
"Remove every i-th point." ""
-"Remove regions which have contact with (are adjacent to) the image borders?" ""
"Removed Objects" ""
"Removing ambiguous pixels..." ""
"Rename" ""
@@ -4041,6 +4018,7 @@ TEXT TRANSLATION
"Representativeness (Grid)" ""
"Resampling" ""
"Resampling Filter" ""
+"Resampling method used when projection is needed" ""
"Rescale Range" ""
"Rescale Values (0-255)" ""
"Rescale to 0 - 1" ""
@@ -4054,6 +4032,10 @@ TEXT TRANSLATION
"Residuals" ""
"Resilent propagation (RPROP)" ""
"Resolution" ""
+"Resolution [d]" ""
+"Resolution [h]" ""
+"Restart SAGA to apply the changes" ""
+"Restart now ?" ""
"Restore" ""
"Restore Model from File" ""
"Result" ""
@@ -4094,6 +4076,7 @@ TEXT TRANSLATION
"River Mouths" ""
"Rn, number of rain days in timespan [-]" ""
"Road Width" ""
+"Roads" ""
"Roll Left [F4]" ""
"Roll Right[F3]" ""
"Rook" ""
@@ -4106,7 +4089,6 @@ TEXT TRANSLATION
"Rotate Y" ""
"Rotate Z" ""
"Rotation" ""
-"Rotation Angle" ""
"Rotation X" ""
"Rotation Y" ""
"Rotation Z" ""
@@ -4203,6 +4185,8 @@ TEXT TRANSLATION
"Save Headline" ""
"Save History as Model" ""
"Save KML file" ""
+"Save LCZC (Filtered) as..." ""
+"Save LCZC as..." ""
"Save Map as Image..." ""
"Save Map to KMZ" ""
"Save Modified Data" ""
@@ -4431,12 +4415,10 @@ TEXT TRANSLATION
"Shift X" ""
"Shift Y" ""
"Shift Z" ""
-"Shift value" ""
"Short Dashed" ""
"Short Field Names" ""
"Short Wave Radiation [kW/m2]" ""
"Short dashed style" ""
-"Should the output shapes contain the centers of the border pixels instead of the corners?" ""
"Shoulder Hollow" ""
"Shoulder Slope" ""
"Shoulder Spur" ""
@@ -4477,8 +4459,10 @@ TEXT TRANSLATION
"Shrinking" ""
"Sibson" ""
"Side Slope" ""
+"Sieve and Clump" ""
"Sieved Classes" ""
"Sieving Classes" ""
+"Sieving Threshold" ""
"Sigma" ""
"Sigmoid" ""
"Significance Level" ""
@@ -4586,6 +4570,7 @@ TEXT TRANSLATION
"Soil" ""
"Soil Adjusted Vegetation Index" ""
"Soil Adjustment Factor" ""
+"Soil Analysis" ""
"Soil Moisture" ""
"Soil Moisture Content" ""
"Soil Moisture Deficit" ""
@@ -4638,6 +4623,7 @@ TEXT TRANSLATION
"South []" ""
"South-North" ""
"Spacecraft Sensor" ""
+"Spatial Extent" ""
"Spatial Point Pattern Analysis" ""
"Spatial Reference" ""
"Spatial Reference System Files (*.srs)" ""
@@ -4667,7 +4653,9 @@ TEXT TRANSLATION
"Spline" ""
"Spline Interpolation" ""
"Spline sensitivity, reduce to get smoother results, recommended: 80 < Tolerance < 200" ""
+"Split" ""
"Split Channels" ""
+"Split Clusters" ""
"Split Features" ""
"Split Lines at Points" ""
"Split Lines with Lines" ""
@@ -4679,7 +4667,6 @@ TEXT TRANSLATION
"Split Shapes Layer Randomly" ""
"Split Table/Shapes by Attribute" ""
"Split with Line" ""
-"Splitted" ""
"Spring" ""
"Spur" ""
"Square" ""
@@ -4703,9 +4690,6 @@ TEXT TRANSLATION
"Standardised Grid" ""
"Standardize" ""
"Standardized Height" ""
-"Start Degree" ""
-"Start Latitude" ""
-"Start Longitude" ""
"Start Size" ""
"Start Value" ""
"Start Values" ""
@@ -4909,6 +4893,7 @@ TEXT TRANSLATION
"Temperature Threshold for Rainfall (lower bound)" ""
"Temperature Threshold for Rainfall (upper bound)" ""
"Temperature at Reference Station [Deg.Celsius]" ""
+"Temperature at Sea Level" ""
"Template Menu|Template Sub Menu" ""
"Templates" ""
"Temporary files" ""
@@ -4926,6 +4911,8 @@ TEXT TRANSLATION
"Terrain Analysis|Preprocessing" ""
"Terrain Analysis|Profiles" ""
"Terrain Analysis|Slope Stability" ""
+"Terrain Classification" ""
+"Terrain Clustering" ""
"Terrain Map View" ""
"Terrain Path Cross Sections" ""
"Terrain Ruggedness Index (TRI)" ""
@@ -5038,7 +5025,7 @@ TEXT TRANSLATION
"The smoothing preservation factor [-]." ""
"The start value to use for the identifier." ""
"The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." ""
-"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." ""
+"The terrain exaggeration factor allows one to increase the shading contrasts in flat areas." ""
"The transmittance of the atmosphere, usually between 60 and 80 percent." ""
"The transparency of the shade [%]" ""
"The unobstructed hemisphere given as percentage." ""
@@ -5067,7 +5054,6 @@ TEXT TRANSLATION
"This Is Not A Caption!" ""
"This grid indicates the cells you want calculate the average." ""
"This grid is used to select cells." ""
-"This is a Test!!!" ""
"This is a floating point value parameter with double precision (8 bytes)." ""
"This is not a text!" ""
"This is the alpha parameter value for the sigmoid function." ""
@@ -5081,10 +5067,10 @@ TEXT TRANSLATION
"This section contains all parameters used by the RPROP algorithm." ""
"This section contains all parameters used by the backpropagation algorithm." ""
"This shapes layer will contain the resulting channel network in vector format (lines)." ""
+"This table supplies average travel times through a cell (in seconds) for each land cover type" ""
"This value is ignored if set to zero." ""
"This will contain your output data of type grid." ""
"This will contain your output data of type shapes." ""
-"Thomas Schorr (c) 2007" ""
"Threshold" ""
"Threshold (Grid Units)" ""
"Threshold (Init.)" ""
@@ -5125,15 +5111,12 @@ TEXT TRANSLATION
"Time" ""
"Time Delay (Rain-Runoff)" ""
"Time Delay after Start of Rainfall (INTEGER)" ""
-"Time Difference between Image & Points" ""
"Time Field" ""
"Time Interval [a]" ""
"Time Out [min]" ""
"Time Out(h)" ""
"Time Period" ""
"Time Range" ""
-"Time Resolution [d]: Range of Days" ""
-"Time Resolution [h]: Day" ""
"Time Span" ""
"Time Span Aggregation" ""
"Time Span [a]" ""
@@ -5147,7 +5130,6 @@ TEXT TRANSLATION
"Time of Concentration [min]" ""
"Time of Concentration [min] used to estimate flow speed." ""
"Time span used for the calculation of daily radiation sums." ""
-"Time stamp of Image" ""
"Time step exceeds duration" ""
"Time step size for a day's calculation given in hours." ""
"Time step size for a range of days calculation given in days." ""
@@ -5159,6 +5141,7 @@ TEXT TRANSLATION
"Tolerance (Degree)" ""
"Tolerance [Degree]" ""
"Tool" ""
+"Tool Bar Button Size" ""
"Tool Chain" ""
"Tool Chain with Header" ""
"Tool Chains" ""
@@ -5168,9 +5151,9 @@ TEXT TRANSLATION
"Tool Library" ""
"Tool Manager" ""
"Tool Set" ""
+"Tool bar button sizes. You need to restart SAGA to apply the changes." ""
"Tool execution failed" ""
"Tool execution succeeded" ""
-"Toolbox Naming" ""
"Tools" ""
"Tools for (grid based) digital terrain analysis." ""
"Tools for GPS data handling." ""
@@ -5201,10 +5184,12 @@ TEXT TRANSLATION
"Top of Atmosphere Reflectance" ""
"Top to Bottom" ""
"Topographic Correction" ""
+"Topographic Indices" ""
"Topographic Openness" ""
"Topographic Position Index" ""
"Topographic Position Index (TPI)" ""
"Topographic Wetness Index" ""
+"Topographic Wetness Index (One Step)" ""
"Topographic Wetness Index (TWI)" ""
"Topography" ""
"Topograpic Wetness Index Calculation" ""
@@ -5243,7 +5228,6 @@ TEXT TRANSLATION
"Transformed Soil Adjusted Vegetation Index (Baret et al. 1989)" ""
"Transformed Vegetation Index" ""
"Transitional" ""
-"Translatable Elements" ""
"Translation" ""
"Translation X" ""
"Translation Y" ""
@@ -5265,6 +5249,11 @@ TEXT TRANSLATION
"Transversal radius" ""
"Transverse Cylindrical Equal Area" ""
"Transverse Mercator" ""
+"Travel Time" ""
+"Travel Time Analysis" ""
+"Travel Time Calculation" ""
+"Travel Time Zones Classification" ""
+"Travel Times" ""
"Tree" ""
"Tree Count" ""
"Trend" ""
@@ -5359,6 +5348,8 @@ TEXT TRANSLATION
"Upslope Basins" ""
"Upslope Curvature" ""
"Upslope Flow Width" ""
+"Upslope Height" ""
+"Upslope Height, Slope, Aspect" ""
"Upslope Length Factor" ""
"Upslope Slope" ""
"Upslope Weighting" ""
@@ -5473,6 +5464,7 @@ TEXT TRANSLATION
"Vector Terrain Ruggedness (VRM)" ""
"Vectorised class as..." ""
"Vectorising Grid Classes" ""
+"Vectorization" ""
"Vegetation" ""
"Vegetation Index (Distance Based)" ""
"Vegetation Index (Slope Based)" ""
@@ -5725,22 +5717,10 @@ TEXT TRANSLATION
"Zsoft Paintbrush" ""
"Zsoft Paintbrush (*.pcx)" ""
"Zuckerrueben" ""
-"[CAP] Save to PDF" ""
"[ERR] Could not save PDF file." ""
-"[FLD] Attribute" ""
-"[FLD] Grid" ""
-"[FLD] Icon" ""
"[FLD] Index Layer" ""
-"[FLD] PDF Document" ""
-"[FLD] Paper Format" ""
-"[FLD] Round Scale" ""
"[FLD] SVG File" ""
-"[FLD] Shapes" ""
-"[FLD] Title" ""
"[MSG] Save as Interactive SVG" ""
-"[MSG] Save to PDF" ""
-"[MSG] failed" ""
-"[MSG] okay" ""
"[deprecated] Point Cloud Viewer" ""
"[deprecated] TIN Viewer" ""
"[not set]|" ""
@@ -5754,7 +5734,6 @@ TEXT TRANSLATION
"\nValue of Target Function" ""
"\n\n ** Error : Could not close PDF engine ** \n\n" ""
"\n\n ** Error : Could not save PDF file ** \n\n" ""
-"_TL" ""
"a * b" ""
"a + b * (1 - exp(-(x / c)^2))" ""
"a + b * (1 - exp(-x / c))" ""
@@ -5822,7 +5801,9 @@ TEXT TRANSLATION
"attribute contains search expression" ""
"attribute is contained in search expression" ""
"attribute is identical with search expression" ""
+"attribute specifying road's type with regard to travel time" ""
"attribute to be searched; if not set all attributes will be searched" ""
+"attribute to become interpolated" ""
"attributes must be more than 1" ""
"author " ""
"automatically" ""
@@ -5883,9 +5864,9 @@ TEXT TRANSLATION
"catchment slope" ""
"catchment specific parameter for sediment delivery ratio calculation" ""
"categorical" ""
-"category and library name" ""
"cell" ""
"cell area" ""
+"cell size of target grid" ""
"cells" ""
"cells in process" ""
"cellsize and lower left center coordinates" ""
@@ -5924,7 +5905,6 @@ TEXT TRANSLATION
"coef0" ""
"coef0 in kernel function" ""
"collecting background data" ""
-"collecting elements" ""
"collecting presence data" ""
"color" ""
"colors" ""
@@ -5942,6 +5922,7 @@ TEXT TRANSLATION
"confirm with options" ""
"constant direction into the wind blows, given as degree" ""
"constant histogram stretch for all time steps" ""
+"constant lapse rate in degree of temperature per 100 meter. used if no lapse rate grid is specified." ""
"constant latitude" ""
"contain the centeroid of" ""
"continue" ""
@@ -6269,6 +6250,7 @@ TEXT TRANSLATION
"include range" ""
"incompatible file." ""
"incompatible items have been removed from input list" ""
+"increase band width to get less seed points" ""
"index" ""
"index creation failed" ""
"index creation stopped by user" ""
@@ -6352,6 +6334,7 @@ TEXT TRANSLATION
"kmz file" ""
"kmz, kml and image files" ""
"label minima" ""
+"lapse rates in degree of temperature per 100 meter" ""
"last" ""
"last point" ""
"last state" ""
@@ -6369,7 +6352,6 @@ TEXT TRANSLATION
"level 1" ""
"level 2" ""
"library " ""
-"library file name" ""
"library name" ""
"library path" ""
"line simplification can only be applied to lines and polygons" ""
@@ -6483,7 +6465,6 @@ TEXT TRANSLATION
"n" ""
"n-fold cross validation: n must > 1" ""
"name" ""
-"naming for splitted lines" ""
"nearest neighbour" ""
"needs at least two attributes in selection" ""
"nein" ""
@@ -6598,6 +6579,7 @@ TEXT TRANSLATION
"number of cells" ""
"number of cells in S-N direction" ""
"number of cells in W-E direction" ""
+"number of clusters" ""
"number of different categories (unique values) within search area" ""
"number of dropped observations" ""
"number of dropped shapes" ""
@@ -6611,10 +6593,8 @@ TEXT TRANSLATION
"number of processed sinks" ""
"number of replacements" ""
"number of returns of given pulse" ""
-"number of scanned files" ""
"number of subsamples for k-fold cross validation" ""
"number of the return" ""
-"number of translatable elements" ""
"object" ""
"objects" ""
"offset in minutes relative to 00:00 (midnight)" ""
@@ -6706,6 +6686,7 @@ TEXT TRANSLATION
"polynomial" ""
"polynomial trend" ""
"polynomial trend (coefficient interpolation)" ""
+"position index radius in map units" ""
"post-processing..." ""
"power of distance" ""
"prediction" ""
@@ -6764,10 +6745,10 @@ TEXT TRANSLATION
"replacements" ""
"resampling" ""
"resampling cell size is too large" ""
-"resampling method used when projection is needed" ""
"rescale to 0 - 255" ""
"resolution" ""
"resolution has to be greater than zero" ""
+"resolution measured in screen pixels" ""
"restore from file" ""
"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)" ""
@@ -6801,7 +6782,6 @@ TEXT TRANSLATION
"scale line" ""
"scale to size range" ""
"scan angle" ""
-"scanning" ""
"search distance is less than half of grid cell size" ""
"seconds" ""
"sectors" ""
@@ -6915,6 +6895,7 @@ TEXT TRANSLATION
"theta" ""
"thick" ""
"thin" ""
+"this is the internal grid cell size determining the precision of contours" ""
"this operation requires locations to be of type polygon" ""
"this operation requires selectable shapes to be of type polygon" ""
"threshold slope" ""
diff --git a/src/saga_core/saga_gui/res/saga.png b/src/saga_core/saga_gui/res/saga.png
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga_dic.txt b/src/saga_core/saga_gui/res/saga_dic.txt
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga_gui.rc b/src/saga_core/saga_gui/res/saga_gui.rc
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga_icon_128.png b/src/saga_core/saga_gui/res/saga_icon_128.png
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga_icon_16.png b/src/saga_core/saga_gui/res/saga_icon_16.png
new file mode 100644
index 0000000..ebd60fc
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_16.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_192.png b/src/saga_core/saga_gui/res/saga_icon_192.png
new file mode 100644
index 0000000..f011d57
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_192.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_24.png b/src/saga_core/saga_gui/res/saga_icon_24.png
new file mode 100644
index 0000000..25acfed
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_24.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_32.png b/src/saga_core/saga_gui/res/saga_icon_32.png
new file mode 100644
index 0000000..361d629
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_32.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_48.png b/src/saga_core/saga_gui/res/saga_icon_48.png
new file mode 100644
index 0000000..236b3d0
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_48.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_64.png b/src/saga_core/saga_gui/res/saga_icon_64.png
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga_icon_72.png b/src/saga_core/saga_gui/res/saga_icon_72.png
new file mode 100644
index 0000000..c4c50d7
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_72.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_8.png b/src/saga_core/saga_gui/res/saga_icon_8.png
new file mode 100644
index 0000000..fa98d7a
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_8.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_80.png b/src/saga_core/saga_gui/res/saga_icon_80.png
new file mode 100644
index 0000000..7a23ebe
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_80.png differ
diff --git a/src/saga_core/saga_gui/res/saga_icon_96.png b/src/saga_core/saga_gui/res/saga_icon_96.png
new file mode 100644
index 0000000..59c6209
Binary files /dev/null and b/src/saga_core/saga_gui/res/saga_icon_96.png differ
diff --git a/src/saga_core/saga_gui/res/saga_srs.txt b/src/saga_core/saga_gui/res/saga_srs.txt
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/saga_tip.txt b/src/saga_core/saga_gui/res/saga_tip.txt
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/tool_menus.xml b/src/saga_core/saga_gui/res/tool_menus.xml
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res/tool_menus_example.xml b/src/saga_core/saga_gui/res/tool_menus_example.xml
old mode 100755
new mode 100644
diff --git a/src/saga_core/saga_gui/res_images.cpp b/src/saga_core/saga_gui/res_images.cpp
index ab3abb0..d6c6238 100755
--- a/src/saga_core/saga_gui/res_images.cpp
+++ b/src/saga_core/saga_gui/res_images.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: res_images.cpp 2793 2016-02-16 16:51:24Z oconrad $
+ * Version $Id: res_images.cpp 2859 2016-03-23 17:56:31Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -373,6 +373,11 @@ wxImage IMG_Get_Image(int ID_IMG, int size)
return( IMG_Get_Image(ID_IMG).Rescale(size, size) );
}
+wxImage IMG_Get_Image(int ID_IMG, wxSize size)
+{
+ return( IMG_Get_Image(ID_IMG).Rescale(size.GetWidth(), size.GetHeight()) );
+}
+
//---------------------------------------------------------
wxBitmap IMG_Get_Bitmap(int ID_IMG)
{
@@ -384,6 +389,11 @@ wxBitmap IMG_Get_Bitmap(int ID_IMG, int size)
return( wxBitmap(IMG_Get_Image(ID_IMG, size)) );
}
+wxBitmap IMG_Get_Bitmap(int ID_IMG, wxSize size)
+{
+ return( wxBitmap(IMG_Get_Image(ID_IMG, size)) );
+}
+
//---------------------------------------------------------
wxIcon IMG_Get_Icon(int ID_IMG)
{
diff --git a/src/saga_core/saga_gui/res_images.h b/src/saga_core/saga_gui/res_images.h
index cf3447b..baa8d44 100755
--- a/src/saga_core/saga_gui/res_images.h
+++ b/src/saga_core/saga_gui/res_images.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: res_images.h 2793 2016-02-16 16:51:24Z oconrad $
+ * Version $Id: res_images.h 2859 2016-03-23 17:56:31Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -240,9 +240,11 @@ enum ID_IMAGES
//---------------------------------------------------------
wxImage IMG_Get_Image (int ID_IMG);
-wxImage IMG_Get_Image (int ID_IMG, int size);
+wxImage IMG_Get_Image (int ID_IMG, int size);
+wxImage IMG_Get_Image (int ID_IMG, wxSize size);
wxBitmap IMG_Get_Bitmap (int ID_IMG);
-wxBitmap IMG_Get_Bitmap (int ID_IMG, int size);
+wxBitmap IMG_Get_Bitmap (int ID_IMG, int size);
+wxBitmap IMG_Get_Bitmap (int ID_IMG, wxSize size);
wxIcon IMG_Get_Icon (int ID_IMG);
wxCursor IMG_Get_Cursor (int ID_IMG);
diff --git a/src/saga_core/saga_gui/saga_frame.cpp b/src/saga_core/saga_gui/saga_frame.cpp
index c810032..b30dd75 100755
--- a/src/saga_core/saga_gui/saga_frame.cpp
+++ b/src/saga_core/saga_gui/saga_frame.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: saga_frame.cpp 2724 2015-12-11 10:24:35Z oconrad $
+ * Version $Id: saga_frame.cpp 2865 2016-03-29 14:31:27Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -190,7 +190,7 @@ CSAGA_Frame *g_pSAGA_Frame = NULL;
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-BEGIN_EVENT_TABLE(CSAGA_Frame, wxMDIParentFrame)
+BEGIN_EVENT_TABLE(CSAGA_Frame, MDI_ParentFrame)
EVT_CLOSE (CSAGA_Frame::On_Close)
EVT_SIZE (CSAGA_Frame::On_Size)
@@ -243,8 +243,15 @@ END_EVENT_TABLE()
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#ifdef MDI_TABBED
+#define MDI_PARENT_FRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxFRAME_NO_WINDOW_MENU
+#else
+#define MDI_PARENT_FRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxFRAME_NO_WINDOW_MENU|wxHSCROLL|wxVSCROLL
+#endif
+
+//---------------------------------------------------------
CSAGA_Frame::CSAGA_Frame(void)
- : wxMDIParentFrame(NULL, ID_WND_MAIN, SAGA_CAPTION, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxHSCROLL|wxVSCROLL|wxFRAME_NO_WINDOW_MENU)
+ : MDI_ParentFrame(NULL, ID_WND_MAIN, SAGA_CAPTION, wxDefaultPosition, wxDefaultSize, MDI_PARENT_FRAME_STYLE)
{
//-----------------------------------------------------
g_pSAGA_Frame = this;
@@ -291,25 +298,15 @@ CSAGA_Frame::CSAGA_Frame(void)
// m_pLayout->SetFlags(m_pLayout->GetFlags() ^ wxAUI_MGR_ALLOW_ACTIVE_PANE);
//-----------------------------------------------------
- _Bar_Add(m_pINFO = new CINFO (this), 0, 0); m_pINFO ->Add_Pages();
- _Bar_Add(m_pWKSP = new CWKSP (this), 2, 1); m_pWKSP ->Add_Pages();
- _Bar_Add(m_pData_Source = new CData_Source(this), 2, 1); m_pData_Source ->Add_Pages();
- _Bar_Add(m_pActive = new CACTIVE (this), 2, 0); m_pActive ->Add_Pages();
+ _Bar_Add(m_pINFO = new CINFO (this), 0, 0); m_pINFO ->Add_Pages();
+ _Bar_Add(m_pWKSP = new CWKSP (this), 2, 1); m_pWKSP ->Add_Pages();
+ _Bar_Add(m_pData_Source = new CData_Source(this), 2, 1); m_pData_Source->Add_Pages();
+ _Bar_Add(m_pActive = new CACTIVE (this), 2, 0); m_pActive ->Add_Pages();
//-----------------------------------------------------
_Create_MenuBar();
//-----------------------------------------------------
- m_pTB_Main = _Create_ToolBar();
- m_pTB_Map = CVIEW_Map ::_Create_ToolBar();
- m_pTB_Map_3D = CVIEW_Map_3D ::_Create_ToolBar();
- m_pTB_Layout = CVIEW_Layout ::_Create_ToolBar();
- m_pTB_Table = CVIEW_Table ::_Create_ToolBar();
- m_pTB_Diagram = CVIEW_Table_Diagram ::_Create_ToolBar();
- m_pTB_Histogram = CVIEW_Histogram ::_Create_ToolBar();
- m_pTB_ScatterPlot = CVIEW_ScatterPlot ::_Create_ToolBar();
-
- //-----------------------------------------------------
m_pLayout->GetPane(GetClientWindow()).Show().Center();
wxString s;
@@ -319,6 +316,16 @@ CSAGA_Frame::CSAGA_Frame(void)
m_pLayout->LoadPerspective(s);
}
+ //-----------------------------------------------------
+ m_pTB_Main = _Create_ToolBar();
+ m_pTB_Map = CVIEW_Map ::_Create_ToolBar();
+ m_pTB_Map_3D = CVIEW_Map_3D ::_Create_ToolBar();
+ m_pTB_Layout = CVIEW_Layout ::_Create_ToolBar();
+ m_pTB_Table = CVIEW_Table ::_Create_ToolBar();
+ m_pTB_Diagram = CVIEW_Table_Diagram::_Create_ToolBar();
+ m_pTB_Histogram = CVIEW_Histogram ::_Create_ToolBar();
+ m_pTB_ScatterPlot = CVIEW_ScatterPlot ::_Create_ToolBar();
+
_Bar_Show(m_pTB_Main, true);
m_pLayout->Update();
@@ -585,10 +592,7 @@ void CSAGA_Frame::On_Frame_Close_UI(wxUpdateUIEvent &event)
//---------------------------------------------------------
void CSAGA_Frame::On_Frame_Close_All(wxCommandEvent &WXUNUSED(event))
{
- while( GetActiveChild() != NULL )
- {
- delete(GetActiveChild());
- }
+ Close_Children();
}
void CSAGA_Frame::On_Frame_Close_All_UI(wxUpdateUIEvent &event)
@@ -679,7 +683,7 @@ void CSAGA_Frame::On_Command_Module_UI(wxUpdateUIEvent &event)
//---------------------------------------------------------
void CSAGA_Frame::On_Command_Child(wxCommandEvent &event)
{
- wxMDIChildFrame *pChild;
+ MDI_ChildFrame *pChild;
if( (pChild = GetActiveChild()) != NULL )
{
@@ -879,6 +883,42 @@ wxWindow * CSAGA_Frame::Top_Window_Get(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+void CSAGA_Frame::Close_Children(void)
+{
+ while( GetActiveChild() != NULL )
+ {
+ delete(GetActiveChild());
+ }
+}
+
+//---------------------------------------------------------
+void CSAGA_Frame::Tile(wxOrientation orient)
+{
+#ifdef MDI_TABBED
+ // nop yet
+#else
+ int n = 0;
+
+ for(wxWindowList::const_iterator Child=GetChildren().begin(); Child!=GetChildren().end(); Child++)
+ {
+ if( wxDynamicCast(*Child, wxMDIChildFrame) )
+ {
+ n++;
+ }
+ }
+
+ if( n == 1 && GetActiveChild() )
+ {
+ GetActiveChild()->Maximize();
+ }
+ else
+ {
+ MDI_ParentFrame::Tile(orient);
+ }
+#endif
+}
+
+//---------------------------------------------------------
void CSAGA_Frame::On_Child_Activates(int View_ID)
{
wxString Title;
@@ -1009,23 +1049,22 @@ void CSAGA_Frame::_Bar_Add(wxWindow *pWindow, int Position, int Row)
{
wxAuiPaneInfo Pane;
- Pane.Name (pWindow->GetName());
- Pane.Caption (pWindow->GetName());
- Pane.MinSize (100, 100);
- Pane.BestSize (400, 400);
- Pane.FloatingSize (400, 400);
- Pane.Position (0);
- Pane.Layer (Row);
- Pane.Row (Row);
+ Pane.Name (wxString::Format("PANE_%d", pWindow->GetId()));
+ Pane.Caption (pWindow->GetName());
+ Pane.MinSize (100, 100);
+ Pane.BestSize (400, 400);
+ Pane.FloatingSize(400, 400);
+ Pane.Position (0);
+ Pane.Layer (Row);
+ Pane.Row (Row);
switch( Position )
{
- default:
- case 0: Pane.Bottom(); break;
- case 1: Pane.Right (); break;
- case 2: Pane.Left (); break;
- case 3: Pane.Top (); break;
- case 4: Pane.Center(); break;
+ default: Pane.Bottom(); break;
+ case 1: Pane.Right (); break;
+ case 2: Pane.Left (); break;
+ case 3: Pane.Top (); break;
+ case 4: Pane.Center(); break;
}
m_pLayout->AddPane(pWindow, Pane);
@@ -1068,14 +1107,13 @@ void CSAGA_Frame::_Bar_Show(wxWindow *pWindow, bool bShow)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-#define TOOLBAR_SIZE_IMG 16
-
-//---------------------------------------------------------
wxToolBarBase * CSAGA_Frame::TB_Create(int ID)
{
+ int Size = g_pModules->Get_Parameter("LOOK_TB_SIZE")->asInt();
+
wxToolBar *pToolBar = new wxToolBar(this, ID, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_FLAT|wxTB_NODIVIDER);
- pToolBar->SetToolBitmapSize(wxSize(TOOLBAR_SIZE_IMG, TOOLBAR_SIZE_IMG));
+ pToolBar->SetToolBitmapSize(wxSize(Size, Size));
return( pToolBar );
}
@@ -1086,14 +1124,14 @@ void CSAGA_Frame::TB_Add(wxToolBarBase *pToolBar, const wxString &Name)
pToolBar->Realize();
m_pLayout->AddPane(pToolBar, wxAuiPaneInfo()
- .Name (Name)
- .Caption (Name)
- .ToolbarPane ()
- .Top ()
- .LeftDockable (false)
- .RightDockable (false)
- .Hide ()
- .BestSize (pToolBar->GetBestSize())
+ .Name (wxString::Format("PANE_%d", pToolBar->GetId()))
+ .Caption (Name)
+ .ToolbarPane ()
+ .Top ()
+ .LeftDockable (false)
+ .RightDockable(false)
+ .Hide ()
+ .BestSize (pToolBar->GetBestSize())
);
}
@@ -1101,9 +1139,9 @@ void CSAGA_Frame::TB_Add(wxToolBarBase *pToolBar, const wxString &Name)
void CSAGA_Frame::TB_Add_Item(wxToolBarBase *pToolBar, bool bCheck, int Cmd_ID)
{
if( bCheck )
- ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), TOOLBAR_SIZE_IMG), CMD_Get_Help(Cmd_ID), wxITEM_CHECK);
+ ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID), wxITEM_CHECK);
else
- ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), TOOLBAR_SIZE_IMG), CMD_Get_Help(Cmd_ID));
+ ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID));
}
//---------------------------------------------------------
diff --git a/src/saga_core/saga_gui/saga_frame.h b/src/saga_core/saga_gui/saga_frame.h
index 35a58cf..af51603 100755
--- a/src/saga_core/saga_gui/saga_frame.h
+++ b/src/saga_core/saga_gui/saga_frame.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: saga_frame.h 1921 2014-01-09 10:24:11Z oconrad $
+ * Version $Id: saga_frame.h 2865 2016-03-29 14:31:27Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -72,7 +72,13 @@
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#ifdef MDI_TABBED
+#include <wx/aui/tabmdi.h>
+#define MDI_ParentFrame wxAuiMDIParentFrame
+#else
#include <wx/mdi.h>
+#define MDI_ParentFrame wxMDIParentFrame
+#endif
//---------------------------------------------------------
class CSAGA_Frame_Layout;
@@ -85,7 +91,7 @@ class CSAGA_Frame_Layout;
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-class CSAGA_Frame : public wxMDIParentFrame
+class CSAGA_Frame : public MDI_ParentFrame
{
public:
@@ -158,6 +164,10 @@ public:
wxWindow * Top_Window_Get (void);
//-----------------------------------------------------
+ virtual void Tile (wxOrientation orient = wxHORIZONTAL);
+
+ void Close_Children (void);
+
void On_Child_Activates (int View_ID);
void Set_Pane_Caption (wxWindow *pWindow, const wxString &Caption);
diff --git a/src/saga_core/saga_gui/view_base.cpp b/src/saga_core/saga_gui/view_base.cpp
index 5fabd27..4968c2a 100755
--- a/src/saga_core/saga_gui/view_base.cpp
+++ b/src/saga_core/saga_gui/view_base.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_base.cpp 2066 2014-03-24 08:55:13Z oconrad $
+ * Version $Id: view_base.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -87,10 +87,10 @@
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-IMPLEMENT_CLASS(CVIEW_Base, wxMDIChildFrame);
+IMPLEMENT_CLASS(CVIEW_Base, MDI_ChildFrame);
//---------------------------------------------------------
-BEGIN_EVENT_TABLE(CVIEW_Base, wxMDIChildFrame)
+BEGIN_EVENT_TABLE(CVIEW_Base, MDI_ChildFrame)
EVT_SIZE (CVIEW_Base::On_Size)
EVT_ACTIVATE (CVIEW_Base::On_Activate)
END_EVENT_TABLE()
@@ -104,7 +104,7 @@ END_EVENT_TABLE()
//---------------------------------------------------------
CVIEW_Base::CVIEW_Base(class CWKSP_Base_Item *pOwner, int View_ID, wxString Caption, int Icon_ID, bool bShow)
- : wxMDIChildFrame(g_pSAGA_Frame, -1, Caption, MDI_Get_Def_Position(), MDI_Get_Def_Size(), wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
+ : MDI_ChildFrame(g_pSAGA_Frame, -1, Caption, MDI_Get_Def_Position(), MDI_Get_Def_Size(), wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
{
m_pOwner = pOwner;
m_View_ID = View_ID;
@@ -112,7 +112,9 @@ CVIEW_Base::CVIEW_Base(class CWKSP_Base_Item *pOwner, int View_ID, wxString Capt
m_Size_Min.x = 0;
m_Size_Min.y = 0;
+#ifndef MDI_TABBED
SetStatusBarPane(-1);
+#endif
SetIcon(IMG_Get_Icon(Icon_ID));
@@ -166,7 +168,9 @@ void CVIEW_Base::Do_Show(void)
break;
}
+#ifndef MDI_TABBED
Show();
+#endif
Activate();
}
diff --git a/src/saga_core/saga_gui/view_base.h b/src/saga_core/saga_gui/view_base.h
index a131e57..933efe0 100755
--- a/src/saga_core/saga_gui/view_base.h
+++ b/src/saga_core/saga_gui/view_base.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_base.h 2061 2014-03-20 11:48:01Z oconrad $
+ * Version $Id: view_base.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -72,7 +72,15 @@
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+#ifdef MDI_TABBED
+#include <wx/aui/tabmdi.h>
+#define MDI_ChildFrame wxAuiMDIChildFrame
+#else
#include <wx/mdi.h>
+#define MDI_ChildFrame wxMDIChildFrame
+#endif
+
+//---------------------------------------------------------
#include <wx/menu.h>
@@ -83,7 +91,7 @@
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-class CVIEW_Base : public wxMDIChildFrame
+class CVIEW_Base : public MDI_ChildFrame
{
public:
CVIEW_Base(class CWKSP_Base_Item *pOwner, int View_ID, wxString Caption, int Icon_ID, bool bShow = true);
diff --git a/src/saga_core/saga_gui/view_histogram.cpp b/src/saga_core/saga_gui/view_histogram.cpp
index 83b1e24..dcf8cc4 100755
--- a/src/saga_core/saga_gui/view_histogram.cpp
+++ b/src/saga_core/saga_gui/view_histogram.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_histogram.cpp 2549 2015-08-13 13:10:34Z oconrad $
+ * Version $Id: view_histogram.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -489,6 +489,8 @@ IMPLEMENT_CLASS(CVIEW_Histogram, CVIEW_Base);
//---------------------------------------------------------
BEGIN_EVENT_TABLE(CVIEW_Histogram, CVIEW_Base)
+ EVT_SIZE (CVIEW_Histogram::On_Size)
+
EVT_MENU (ID_CMD_HISTOGRAM_CUMULATIVE , CVIEW_Histogram::On_Cumulative)
EVT_UPDATE_UI (ID_CMD_HISTOGRAM_CUMULATIVE , CVIEW_Histogram::On_Cumulative_UI)
EVT_MENU (ID_CMD_HISTOGRAM_AS_TABLE , CVIEW_Histogram::On_AsTable)
@@ -505,6 +507,7 @@ CVIEW_Histogram::CVIEW_Histogram(CWKSP_Layer *pLayer)
: CVIEW_Base(pLayer, ID_VIEW_HISTOGRAM, pLayer->Get_Name(), ID_IMG_WND_HISTOGRAM)
{
m_pControl = new CVIEW_Histogram_Control(this, pLayer);
+ m_pControl->SetSize(GetClientSize());
}
@@ -556,6 +559,17 @@ void CVIEW_Histogram::Do_Update(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+void CVIEW_Histogram::On_Size(wxSizeEvent &event)
+{
+ m_pControl->SetSize(GetClientSize());
+}
+
+
+///////////////////////////////////////////////////////////
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
void CVIEW_Histogram::On_Command_UI(wxUpdateUIEvent &event)
{
switch( event.GetId() )
diff --git a/src/saga_core/saga_gui/view_histogram.h b/src/saga_core/saga_gui/view_histogram.h
index a55254a..7c346d6 100755
--- a/src/saga_core/saga_gui/view_histogram.h
+++ b/src/saga_core/saga_gui/view_histogram.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_histogram.h 2272 2014-10-02 15:41:39Z oconrad $
+ * Version $Id: view_histogram.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -99,6 +99,7 @@ private:
class CVIEW_Histogram_Control *m_pControl;
+ void On_Size (wxSizeEvent &event);
void On_Cumulative (wxCommandEvent &event);
void On_Cumulative_UI (wxUpdateUIEvent &event);
diff --git a/src/saga_core/saga_gui/view_layout.cpp b/src/saga_core/saga_gui/view_layout.cpp
index d24cc09..43289b9 100755
--- a/src/saga_core/saga_gui/view_layout.cpp
+++ b/src/saga_core/saga_gui/view_layout.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_layout.cpp 2061 2014-03-20 11:48:01Z oconrad $
+ * Version $Id: view_layout.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -121,6 +121,7 @@ CVIEW_Layout::CVIEW_Layout(CVIEW_Layout_Info *pInfo)
m_pRuler_Y = new CVIEW_Ruler(this, RULER_VERTICAL |RULER_EDGE_SUNKEN);
m_pControl = new CVIEW_Layout_Control(this);
+ m_pControl->SetSize(GetClientSize());
Do_Show();
}
diff --git a/src/saga_core/saga_gui/view_map_3d.cpp b/src/saga_core/saga_gui/view_map_3d.cpp
index bd539b7..2676945 100755
--- a/src/saga_core/saga_gui/view_map_3d.cpp
+++ b/src/saga_core/saga_gui/view_map_3d.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_map_3d.cpp 2684 2015-11-06 14:38:52Z oconrad $
+ * Version $Id: view_map_3d.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -127,6 +127,7 @@ CVIEW_Map_3D::CVIEW_Map_3D(CWKSP_Map *pMap)
CreateStatusBar(MAP3D_STATUSBAR_COUNT);
m_pPanel = new CView_Map_3DPanel(this, pMap);
+ m_pPanel->SetSize(GetClientSize());
//-----------------------------------------------------
Parameters_Create();
diff --git a/src/saga_core/saga_gui/view_table.cpp b/src/saga_core/saga_gui/view_table.cpp
index 4e5ae44..570606a 100755
--- a/src/saga_core/saga_gui/view_table.cpp
+++ b/src/saga_core/saga_gui/view_table.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_table.cpp 2698 2015-11-24 13:45:01Z oconrad $
+ * Version $Id: view_table.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -86,6 +86,8 @@ IMPLEMENT_CLASS(CVIEW_Table, CVIEW_Base);
//---------------------------------------------------------
BEGIN_EVENT_TABLE(CVIEW_Table, CVIEW_Base)
+ EVT_SIZE (CVIEW_Table::On_Size)
+
EVT_MENU_RANGE (ID_CMD_TABLE_FIRST, ID_CMD_TABLE_LAST, CVIEW_Table::On_Command)
EVT_UPDATE_UI_RANGE (ID_CMD_TABLE_FIRST, ID_CMD_TABLE_LAST, CVIEW_Table::On_Command_UI)
END_EVENT_TABLE()
@@ -93,8 +95,6 @@ END_EVENT_TABLE()
///////////////////////////////////////////////////////////
// //
-// //
-// //
///////////////////////////////////////////////////////////
//---------------------------------------------------------
@@ -102,6 +102,7 @@ CVIEW_Table::CVIEW_Table(CWKSP_Table *pTable)
: CVIEW_Base(pTable, ID_VIEW_TABLE, pTable->Get_Name(), ID_IMG_WND_TABLE, false)
{
m_pControl = new CVIEW_Table_Control(this, pTable->Get_Table(), 0);
+ m_pControl->SetSize(GetClientSize());
Do_Show();
}
@@ -109,8 +110,6 @@ CVIEW_Table::CVIEW_Table(CWKSP_Table *pTable)
///////////////////////////////////////////////////////////
// //
-// //
-// //
///////////////////////////////////////////////////////////
//---------------------------------------------------------
@@ -150,7 +149,16 @@ wxToolBarBase * CVIEW_Table::_Create_ToolBar(void)
///////////////////////////////////////////////////////////
// //
-// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
+void CVIEW_Table::On_Size(wxSizeEvent &event)
+{
+ m_pControl->SetSize(GetClientSize());
+}
+
+
+///////////////////////////////////////////////////////////
// //
///////////////////////////////////////////////////////////
@@ -169,8 +177,6 @@ void CVIEW_Table::Update_Selection(void)
///////////////////////////////////////////////////////////
// //
-// //
-// //
///////////////////////////////////////////////////////////
//---------------------------------------------------------
diff --git a/src/saga_core/saga_gui/view_table.h b/src/saga_core/saga_gui/view_table.h
index cd2e270..7ed518b 100755
--- a/src/saga_core/saga_gui/view_table.h
+++ b/src/saga_core/saga_gui/view_table.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_table.h 2698 2015-11-24 13:45:01Z oconrad $
+ * Version $Id: view_table.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -100,6 +100,8 @@ private:
class CVIEW_Table_Control *m_pControl;
+ void On_Size (wxSizeEvent &event);
+
void On_Command (wxCommandEvent &event);
void On_Command_UI (wxUpdateUIEvent &event);
diff --git a/src/saga_core/saga_gui/view_table_diagram.cpp b/src/saga_core/saga_gui/view_table_diagram.cpp
index b8f8d3b..3429d4b 100755
--- a/src/saga_core/saga_gui/view_table_diagram.cpp
+++ b/src/saga_core/saga_gui/view_table_diagram.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_table_diagram.cpp 2061 2014-03-20 11:48:01Z oconrad $
+ * Version $Id: view_table_diagram.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -983,14 +983,15 @@ IMPLEMENT_CLASS(CVIEW_Table_Diagram, CVIEW_Base);
//---------------------------------------------------------
BEGIN_EVENT_TABLE(CVIEW_Table_Diagram, CVIEW_Base)
+ EVT_SIZE (CVIEW_Table_Diagram::On_Size)
+ EVT_KEY_DOWN (CVIEW_Table_Diagram::On_Key_Down)
+
EVT_MENU (ID_CMD_DIAGRAM_PARAMETERS , CVIEW_Table_Diagram::On_Parameters)
EVT_MENU (ID_CMD_DIAGRAM_SIZE_FIT , CVIEW_Table_Diagram::On_Size_Fit)
EVT_MENU (ID_CMD_DIAGRAM_SIZE_INC , CVIEW_Table_Diagram::On_Size_Inc)
EVT_MENU (ID_CMD_DIAGRAM_SIZE_DEC , CVIEW_Table_Diagram::On_Size_Dec)
EVT_MENU (ID_CMD_MAPS_SAVE_TO_CLIPBOARD , CVIEW_Table_Diagram::On_SaveToClipboard)
-
- EVT_KEY_DOWN (CVIEW_Table_Diagram::On_Key_Down)
END_EVENT_TABLE()
@@ -1005,6 +1006,7 @@ CVIEW_Table_Diagram::CVIEW_Table_Diagram(CWKSP_Table *pTable)
SYS_Set_Color_BG_Window(this);
m_pControl = new CVIEW_Table_Diagram_Control(this, pTable);
+ m_pControl->SetSize(GetClientSize());
if( m_pControl->Set_Parameters() )
{
@@ -1069,33 +1071,9 @@ void CVIEW_Table_Diagram::Do_Update(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-void CVIEW_Table_Diagram::On_Parameters(wxCommandEvent &event)
+void CVIEW_Table_Diagram::On_Size(wxSizeEvent &event)
{
- m_pControl->Set_Parameters();
-}
-
-//---------------------------------------------------------
-void CVIEW_Table_Diagram::On_Size_Fit(wxCommandEvent &event)
-{
- m_pControl->Fit_Size();
-}
-
-//---------------------------------------------------------
-void CVIEW_Table_Diagram::On_Size_Inc(wxCommandEvent &event)
-{
- m_pControl->Inc_Size();
-}
-
-//---------------------------------------------------------
-void CVIEW_Table_Diagram::On_Size_Dec(wxCommandEvent &event)
-{
- m_pControl->Dec_Size();
-}
-
-//---------------------------------------------------------
-void CVIEW_Table_Diagram::On_SaveToClipboard(wxCommandEvent &event)
-{
- m_pControl->SaveToClipboard();
+ m_pControl->SetSize(GetClientSize());
}
//---------------------------------------------------------
@@ -1128,6 +1106,41 @@ void CVIEW_Table_Diagram::On_Key_Down(wxKeyEvent &event)
///////////////////////////////////////////////////////////
// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
+void CVIEW_Table_Diagram::On_Parameters(wxCommandEvent &event)
+{
+ m_pControl->Set_Parameters();
+}
+
+//---------------------------------------------------------
+void CVIEW_Table_Diagram::On_Size_Fit(wxCommandEvent &event)
+{
+ m_pControl->Fit_Size();
+}
+
+//---------------------------------------------------------
+void CVIEW_Table_Diagram::On_Size_Inc(wxCommandEvent &event)
+{
+ m_pControl->Inc_Size();
+}
+
+//---------------------------------------------------------
+void CVIEW_Table_Diagram::On_Size_Dec(wxCommandEvent &event)
+{
+ m_pControl->Dec_Size();
+}
+
+//---------------------------------------------------------
+void CVIEW_Table_Diagram::On_SaveToClipboard(wxCommandEvent &event)
+{
+ m_pControl->SaveToClipboard();
+}
+
+
+///////////////////////////////////////////////////////////
+// //
// //
// //
///////////////////////////////////////////////////////////
diff --git a/src/saga_core/saga_gui/view_table_diagram.h b/src/saga_core/saga_gui/view_table_diagram.h
index db15764..ced5d6a 100755
--- a/src/saga_core/saga_gui/view_table_diagram.h
+++ b/src/saga_core/saga_gui/view_table_diagram.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: view_table_diagram.h 2061 2014-03-20 11:48:01Z oconrad $
+ * Version $Id: view_table_diagram.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -98,6 +98,8 @@ private:
class CVIEW_Table_Diagram_Control *m_pControl;
+ void On_Size (wxSizeEvent &event);
+
void On_Parameters (wxCommandEvent &event);
void On_Size_Fit (wxCommandEvent &event);
void On_Size_Inc (wxCommandEvent &event);
diff --git a/src/saga_core/saga_gui/wksp_base_item.h b/src/saga_core/saga_gui/wksp_base_item.h
index 2dd48a3..6fc5898 100755
--- a/src/saga_core/saga_gui/wksp_base_item.h
+++ b/src/saga_core/saga_gui/wksp_base_item.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_base_item.h 2792 2016-02-16 16:50:35Z oconrad $
+ * Version $Id: wksp_base_item.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -77,6 +77,8 @@
#include <saga_api/saga_api.h>
+#include "view_base.h"
+
///////////////////////////////////////////////////////////
// //
diff --git a/src/saga_core/saga_gui/wksp_data_control.cpp b/src/saga_core/saga_gui/wksp_data_control.cpp
index cba4c93..4bf16c2 100755
--- a/src/saga_core/saga_gui/wksp_data_control.cpp
+++ b/src/saga_core/saga_gui/wksp_data_control.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_data_control.cpp 2833 2016-02-26 12:30:52Z oconrad $
+ * Version $Id: wksp_data_control.cpp 2870 2016-03-30 11:30:54Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -373,7 +373,7 @@ bool CWKSP_Data_Control::_Del_Active(bool bSilent)
return( true );
}
- if( !bSilent && !DLG_Message_Confirm(ID_DLG_DELETE) && !g_pData->Save_Modified_Sel() )
+ if( !bSilent && (!DLG_Message_Confirm(ID_DLG_DELETE) || !g_pData->Save_Modified_Sel()) )
{
return( false );
}
diff --git a/src/saga_core/saga_gui/wksp_data_item.cpp b/src/saga_core/saga_gui/wksp_data_item.cpp
index ba314ca..b967332 100755
--- a/src/saga_core/saga_gui/wksp_data_item.cpp
+++ b/src/saga_core/saga_gui/wksp_data_item.cpp
@@ -387,7 +387,7 @@ bool CWKSP_Data_Item::Add_ScatterPlot(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-bool CWKSP_Data_Item::View_Opened(wxMDIChildFrame *pView)
+bool CWKSP_Data_Item::View_Opened(MDI_ChildFrame *pView)
{
if( m_Views.Index(pView) == wxNOT_FOUND ) // only add once
{
@@ -400,7 +400,7 @@ bool CWKSP_Data_Item::View_Opened(wxMDIChildFrame *pView)
}
//---------------------------------------------------------
-bool CWKSP_Data_Item::View_Closes(wxMDIChildFrame *pView)
+bool CWKSP_Data_Item::View_Closes(MDI_ChildFrame *pView)
{
if( m_Views.Index(pView) != wxNOT_FOUND )
{
diff --git a/src/saga_core/saga_gui/wksp_data_item.h b/src/saga_core/saga_gui/wksp_data_item.h
index 88d5f15..b76eb3e 100755
--- a/src/saga_core/saga_gui/wksp_data_item.h
+++ b/src/saga_core/saga_gui/wksp_data_item.h
@@ -109,8 +109,8 @@ public:
virtual bool Show (int Flags = 0) = 0;
virtual bool Update (CWKSP_Data_Item *pChanged) { return( pChanged == this ); }
- virtual bool View_Opened (class wxMDIChildFrame *pView);
- virtual bool View_Closes (class wxMDIChildFrame *pView);
+ virtual bool View_Opened (class MDI_ChildFrame *pView);
+ virtual bool View_Closes (class MDI_ChildFrame *pView);
virtual bool Update_Views (bool bAll = true);
diff --git a/src/saga_core/saga_gui/wksp_data_manager.cpp b/src/saga_core/saga_gui/wksp_data_manager.cpp
index e5d4ae6..df88605 100755
--- a/src/saga_core/saga_gui/wksp_data_manager.cpp
+++ b/src/saga_core/saga_gui/wksp_data_manager.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_data_manager.cpp 2800 2016-02-18 17:06:22Z oconrad $
+ * Version $Id: wksp_data_manager.cpp 2865 2016-03-29 14:31:27Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -69,6 +69,7 @@
#include <saga_api/saga_api.h>
#include "saga.h"
+#include "saga_frame.h"
#include "res_commands.h"
#include "res_dialogs.h"
@@ -1085,6 +1086,9 @@ bool CWKSP_Data_Manager::Close(bool bSilent)
m_pProject->Clr_File_Name();
g_pACTIVE->Get_Parameters()->Restore_Parameters();
+
+ g_pSAGA_Frame->Close_Children();
+
g_pMaps->Close(true);
return( g_pData_Ctrl->Close(true) );
diff --git a/src/saga_core/saga_gui/wksp_layer.cpp b/src/saga_core/saga_gui/wksp_layer.cpp
index c01ae17..e47233f 100755
--- a/src/saga_core/saga_gui/wksp_layer.cpp
+++ b/src/saga_core/saga_gui/wksp_layer.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_layer.cpp 2796 2016-02-17 17:49:32Z oconrad $
+ * Version $Id: wksp_layer.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -705,7 +705,7 @@ void CWKSP_Layer::On_Update_Views(bool bAll)
}
//---------------------------------------------------------
-bool CWKSP_Layer::View_Closes(wxMDIChildFrame *pView)
+bool CWKSP_Layer::View_Closes(MDI_ChildFrame *pView)
{
if( pView == m_pHistogram )
{
diff --git a/src/saga_core/saga_gui/wksp_layer.h b/src/saga_core/saga_gui/wksp_layer.h
index 278eebc..49650bb 100755
--- a/src/saga_core/saga_gui/wksp_layer.h
+++ b/src/saga_core/saga_gui/wksp_layer.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_layer.h 2548 2015-08-13 13:07:55Z oconrad $
+ * Version $Id: wksp_layer.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -115,7 +115,7 @@ public:
virtual bool Show (class CWKSP_Map *pMap);
virtual bool Show (int Flags = 0);
virtual bool Update (CWKSP_Layer *pChanged);
- virtual bool View_Closes (class wxMDIChildFrame *pView);
+ virtual bool View_Closes (class MDI_ChildFrame *pView);
virtual bool asImage (CSG_Grid *pImage) { return( false ); }
diff --git a/src/saga_core/saga_gui/wksp_map.cpp b/src/saga_core/saga_gui/wksp_map.cpp
index fbf1bec..cdecad8 100755
--- a/src/saga_core/saga_gui/wksp_map.cpp
+++ b/src/saga_core/saga_gui/wksp_map.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_map.cpp 2793 2016-02-16 16:51:24Z oconrad $
+ * Version $Id: wksp_map.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -1120,7 +1120,7 @@ void CWKSP_Map::Set_Projection(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-bool CWKSP_Map::View_Opened(wxMDIChildFrame *pView)
+bool CWKSP_Map::View_Opened(MDI_ChildFrame *pView)
{
if( wxDynamicCast(pView, CVIEW_Map ) != NULL ) { m_pView = (CVIEW_Map *)pView; return( true ); }
if( wxDynamicCast(pView, CVIEW_Map_3D) != NULL ) { m_pView_3D = (CVIEW_Map_3D *)pView; return( true ); }
@@ -1130,7 +1130,7 @@ bool CWKSP_Map::View_Opened(wxMDIChildFrame *pView)
}
//---------------------------------------------------------
-void CWKSP_Map::View_Closes(wxMDIChildFrame *pView)
+void CWKSP_Map::View_Closes(MDI_ChildFrame *pView)
{
if( pView == m_pView ) m_pView = NULL;
if( pView == m_pView_3D ) m_pView_3D = NULL;
diff --git a/src/saga_core/saga_gui/wksp_map.h b/src/saga_core/saga_gui/wksp_map.h
index 5955521..6cd3a0c 100755
--- a/src/saga_core/saga_gui/wksp_map.h
+++ b/src/saga_core/saga_gui/wksp_map.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_map.h 2793 2016-02-16 16:51:24Z oconrad $
+ * Version $Id: wksp_map.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -161,8 +161,8 @@ public:
class CWKSP_Map_BaseMap * Add_BaseMap (CSG_MetaData *pEntry = NULL);
class CWKSP_Base_Item * Add_Copy (CWKSP_Base_Item *pItem);
- bool View_Opened (class wxMDIChildFrame *pView);
- void View_Closes (class wxMDIChildFrame *pView);
+ bool View_Opened (class MDI_ChildFrame *pView);
+ void View_Closes (class MDI_ChildFrame *pView);
void View_Refresh (bool bMapOnly);
class CVIEW_Map * View_Get (void) { return( m_pView ); }
void View_Show (bool bShow);
diff --git a/src/saga_core/saga_gui/wksp_map_basemap.cpp b/src/saga_core/saga_gui/wksp_map_basemap.cpp
index fed8d1d..1420984 100755
--- a/src/saga_core/saga_gui/wksp_map_basemap.cpp
+++ b/src/saga_core/saga_gui/wksp_map_basemap.cpp
@@ -99,15 +99,28 @@ CWKSP_Map_BaseMap::CWKSP_Map_BaseMap(CSG_MetaData *pEntry)
_TL("Base Map")
);
- m_Parameters.Add_Choice(
+ pNode_1 = m_Parameters.Add_Choice(
pNode , "SERVER" , _TL("Server"),
_TL(""),
- CSG_String::Format("%s|%s|",
+ CSG_String::Format("%s|%s|%s|%s|%s|%s|%s|%s|%s|",
_TL("Open Street Map"),
- _TL("MapQuest")
+ _TL("MapQuest"),
+ _TL("Google Map"),
+ _TL("Google Satellite"),
+ _TL("Google Hybrid"),
+ _TL("Google Terrain"),
+ _TL("Google Terrain, Streets and Water"),
+ _TL("ArcGIS MapServer Tiles"),
+ _TL("user defined")
), 0
);
+ m_Parameters.Add_String(
+ pNode_1 , "SERVER_USER" , _TL("Server"),
+ _TL(""),
+ "tile.openstreetmap.org/${z}/${x}/${y}.png"
+ );
+
//-----------------------------------------------------
pNode_1 = m_Parameters.Add_Value(
pNode , "SHOW_ALWAYS" , _TL("Show at all scales"),
@@ -124,16 +137,22 @@ CWKSP_Map_BaseMap::CWKSP_Map_BaseMap(CSG_MetaData *pEntry)
//-----------------------------------------------------
pNode = m_Parameters.Add_Node(NULL, "NODE_DISPLAY" ,_TL("Display") , _TL(""));
- m_Parameters.Add_Value(
+ m_Parameters.Add_Double(
pNode , "TRANSPARENCY", _TL("Transparency [%]"),
_TL(""),
- PARAMETER_TYPE_Double, 0.0, 0.0, true, 100.0, true
+ 0.0, 0.0, true, 100.0, true
);
- m_Parameters.Add_Value(
+ m_Parameters.Add_Bool(
pNode , "GRAYSCALE" , _TL("Gray Scale Image"),
_TL(""),
- PARAMETER_TYPE_Bool, false
+ false
+ );
+
+ m_Parameters.Add_Double(
+ pNode , "RESOLUTION" , _TL("Resolution"),
+ _TL("resolution measured in screen pixels"),
+ 1.0, 1.0, true
);
//-----------------------------------------------------
@@ -198,6 +217,16 @@ wxString CWKSP_Map_BaseMap::Get_Description(void)
s += wxT("</table>");
//-----------------------------------------------------
+ s += "<hr>";
+ s += _TL("Be sure to read and understand the usage agreement or terms of service before you use a base map server.");
+ s += "<ul>";
+ s += "<li><a href=\"www.openstreetmap.org\">Open Street Map</a></li>";
+ s += "<li><a href=\"open.mapquest.co.uk\">MapQuest</a></li>";
+ s += "<li><a href=\"maps.google.com/intl/en/help/terms_maps.html\">Google Maps</a></li>";
+ s += "<li><a href=\"services.arcgisonline.com\">ArcGIS MapServer</a></li>";
+ s += "</ul>";
+
+ //-----------------------------------------------------
return( s );
}
@@ -297,9 +326,9 @@ int CWKSP_Map_BaseMap::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Par
{
if( Flags & PARAMETER_CHECK_ENABLE )
{
- if( !SG_STR_CMP(pParameter->Get_Identifier(), "INTERVAL") )
+ if( !SG_STR_CMP(pParameter->Get_Identifier(), "SERVER") )
{
- pParameters->Set_Enabled("FIXED", pParameter->asInt() == 0);
+ pParameters->Set_Enabled("SERVER_USER", pParameter->asInt() >= 8); // user defined
}
}
@@ -334,16 +363,35 @@ bool CWKSP_Map_BaseMap::Set_BaseMap(const CSG_Grid_System &System)
SG_UI_Progress_Lock(true);
m_BaseMap.Create(System, SG_DATATYPE_Int);
- m_BaseMap.Get_Projection() = Get_Map()->Get_Projection();
+
+ CSG_Grid *pBaseMap, BaseMap;
+
+ if( m_Parameters("RESOLUTION")->asDouble() > 1.0 )
+ {
+ BaseMap.Create(CSG_Grid_System(m_Parameters("RESOLUTION")->asDouble() * System.Get_Cellsize(), System.Get_Extent(true)), SG_DATATYPE_Int);
+
+ pBaseMap = &BaseMap;
+ }
+ else
+ {
+ pBaseMap = &m_BaseMap;
+ }
+
+ pBaseMap->Get_Projection() = Get_Map()->Get_Projection();
pModule->Settings_Push();
- if( pModule->Set_Parameter("TARGET" , &m_BaseMap)
- && pModule->Set_Parameter("TARGET_MAP", &m_BaseMap)
- && pModule->Set_Parameter("SERVER" , m_Parameters("SERVER" ))
- && pModule->Set_Parameter("GRAYSCALE" , m_Parameters("GRAYSCALE"))
+ if( pModule->Set_Parameter("TARGET" , pBaseMap)
+ && pModule->Set_Parameter("TARGET_MAP" , pBaseMap)
+ && pModule->Set_Parameter("SERVER" , m_Parameters("SERVER" ))
+ && pModule->Set_Parameter("SERVER_USER", m_Parameters("SERVER_USER"))
+ && pModule->Set_Parameter("GRAYSCALE" , m_Parameters("GRAYSCALE" ))
&& pModule->On_Before_Execution() && pModule->Execute() )
{
+ if( &m_BaseMap != pBaseMap )
+ {
+ m_BaseMap.Assign(pBaseMap, GRID_RESAMPLING_NearestNeighbour);
+ }
}
else
{
diff --git a/src/saga_core/saga_gui/wksp_module_manager.cpp b/src/saga_core/saga_gui/wksp_module_manager.cpp
index 5416f25..3fa4d24 100755
--- a/src/saga_core/saga_gui/wksp_module_manager.cpp
+++ b/src/saga_core/saga_gui/wksp_module_manager.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_module_manager.cpp 2821 2016-02-24 09:21:06Z oconrad $
+ * Version $Id: wksp_module_manager.cpp 2860 2016-03-24 10:33:43Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -66,6 +66,7 @@
#include <saga_api/saga_api.h>
#include "saga.h"
+#include "saga_frame.h"
#include "res_commands.h"
#include "res_dialogs.h"
@@ -78,6 +79,8 @@
#include "wksp_module_menu.h"
#include "wksp_module.h"
+#include "wksp_data_manager.h"
+
///////////////////////////////////////////////////////////
// //
@@ -109,7 +112,7 @@ CWKSP_Module_Manager::CWKSP_Module_Manager(void)
m_Parameters.Add_Choice(
pNode , "START_LOGO" , _TL("Show Logo at Start Up"),
_TL(""),
- CSG_String::Format(SG_T("%s|%s|%s|%s|"),
+ CSG_String::Format("%s|%s|%s|%s|",
_TL("do not show"),
_TL("only during start up phase"),
_TL("20 seconds"),
@@ -151,7 +154,7 @@ CWKSP_Module_Manager::CWKSP_Module_Manager(void)
m_Parameters.Add_Choice(
pNode , "HELP_SOURCE" , _TL("Tool Description Source"),
_TL(""),
- CSG_String::Format(SG_T("%s|%s|"),
+ CSG_String::Format("%s|%s|",
_TL("built-in"),
_TL("online")
), 0
@@ -169,7 +172,7 @@ CWKSP_Module_Manager::CWKSP_Module_Manager(void)
m_Parameters.Add_FilePath(
pNode , "LNG_FILE_DIC" , _TL("Language Translations"),
_TL("Dictionary for translations from built-in (English) to local language (editable text table). You need to restart SAGA to apply the changes."),
- CSG_String::Format(SG_T("%s|*.lng|%s|*.txt|%s|*.*"),
+ CSG_String::Format("%s|*.lng|%s|*.txt|%s|*.*",
_TL("Dictionary Files (*.lng)"),
_TL("Text Table (*.txt)"),
_TL("All Files")
@@ -178,8 +181,8 @@ CWKSP_Module_Manager::CWKSP_Module_Manager(void)
m_Parameters.Add_FilePath(
pNode , "CRS_FILE_SRS" , _TL("CRS Database"),
- _TL("Database with Coordinate Reference System (CRS) definitions. A restart of SAGA is required to have the changes take effect!"),
- CSG_String::Format(SG_T("%s|*.srs|%s|*.*"),
+ _TL("Database with Coordinate Reference System (CRS) definitions. You need to restart SAGA to apply the changes."),
+ CSG_String::Format("%s|*.srs|%s|*.*",
_TL("Spatial Reference System Files (*.srs)"),
_TL("All Files")
)
@@ -187,8 +190,8 @@ CWKSP_Module_Manager::CWKSP_Module_Manager(void)
m_Parameters.Add_FilePath(
pNode , "CRS_FILE_DIC" , _TL("CRS Dictionary"),
- _TL("Dictionary for Proj.4/OGC WKT translations. A restart of SAGA is required to have the changes take effect!"),
- CSG_String::Format(SG_T("%s|*.dic|%s|*.*"),
+ _TL("Dictionary for Proj.4/OGC WKT translations. You need to restart SAGA to apply the changes."),
+ CSG_String::Format("%s|*.dic|%s|*.*",
_TL("Dictionary Files (*.dic)"),
_TL("All Files")
)
@@ -197,11 +200,20 @@ CWKSP_Module_Manager::CWKSP_Module_Manager(void)
m_Parameters.Add_FilePath(
pNode , "TOOL_MENUS" , _TL("User defined tool menus"),
_TL("User defined tool menus."),
- CSG_String::Format(SG_T("%s|*.xml|%s|*.*"),
+ CSG_String::Format("%s|*.xml|%s|*.*",
_TL("XML Files (*.xml)"),
_TL("All Files")
)
);
+
+ //-----------------------------------------------------
+ pNode = m_Parameters.Add_Node(NULL, "NODE_LOOK", _TL("Appearance"), _TL(""));
+
+ m_Parameters.Add_Int(
+ pNode , "LOOK_TB_SIZE" , _TL("Tool Bar Button Size"),
+ _TL("Tool bar button sizes. You need to restart SAGA to apply the changes."),
+ 16, 16, true
+ );
}
//---------------------------------------------------------
@@ -308,6 +320,66 @@ bool CWKSP_Module_Manager::Finalise(void)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
+int CWKSP_Module_Manager::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter, int Flags)
+{
+ //-----------------------------------------------------
+ if( Flags & PARAMETER_CHECK_VALUES )
+ {
+ if( g_pSAGA_Frame && g_pData )
+ {
+ if( !SG_STR_CMP(pParameter->Get_Identifier(), "LNG_OLDSTYLE")
+ || !SG_STR_CMP(pParameter->Get_Identifier(), "LNG_FILE_DIC")
+ || !SG_STR_CMP(pParameter->Get_Identifier(), "CRS_FILE_SRS")
+ || !SG_STR_CMP(pParameter->Get_Identifier(), "CRS_FILE_DIC")
+ || !SG_STR_CMP(pParameter->Get_Identifier(), "LOOK_TB_SIZE") )
+ {
+ if( DLG_Message_Confirm(_TL("Restart now ?"), _TL("Restart SAGA to apply the changes")) && g_pData->Close(true) )
+ {
+ m_Parameters.Assign_Values(pParameters);
+
+ g_pSAGA_Frame->Close(true);
+ }
+ }
+ }
+ }
+
+ //-----------------------------------------------------
+ return( CWKSP_Base_Manager::On_Parameter_Changed(pParameters, pParameter, Flags) );
+}
+
+//---------------------------------------------------------
+void CWKSP_Module_Manager::Parameters_Changed(void)
+{
+ CWKSP_Base_Item::Parameters_Changed();
+
+ if( m_Parameters("SAVE_CONFIG")->asBool() == false )
+ {
+ CONFIG_Write("/MODULES", &m_Parameters);
+ }
+
+ CONFIG_Do_Save(m_Parameters("SAVE_CONFIG")->asBool());
+
+ g_pSAGA->Process_Set_Frequency(m_Parameters("PROCESS_UPDATE")->asInt());
+
+#ifdef _OPENMP
+ SG_OMP_Set_Max_Num_Threads(m_Parameters("OMP_THREADS_MAX")->asInt());
+#endif
+
+ m_pMenu_Modules->Update();
+}
+
+//---------------------------------------------------------
+bool CWKSP_Module_Manager::Do_Beep(void)
+{
+ return( m_Parameters("BEEP")->asBool() );
+}
+
+
+///////////////////////////////////////////////////////////
+// //
+///////////////////////////////////////////////////////////
+
+//---------------------------------------------------------
wxString CWKSP_Module_Manager::Get_Name(void)
{
return( _TL("Tool Libraries") );
@@ -445,38 +517,6 @@ void CWKSP_Module_Manager::On_Execute_UI(wxUpdateUIEvent &event)
///////////////////////////////////////////////////////////
//---------------------------------------------------------
-void CWKSP_Module_Manager::Parameters_Changed(void)
-{
- CWKSP_Base_Item::Parameters_Changed();
-
- if( m_Parameters("SAVE_CONFIG")->asBool() == false )
- {
- CONFIG_Write("/MODULES", &m_Parameters);
- }
-
- CONFIG_Do_Save(m_Parameters("SAVE_CONFIG")->asBool());
-
- g_pSAGA->Process_Set_Frequency(m_Parameters("PROCESS_UPDATE")->asInt());
-
-#ifdef _OPENMP
- SG_OMP_Set_Max_Num_Threads(m_Parameters("OMP_THREADS_MAX")->asInt());
-#endif
-
- m_pMenu_Modules->Update();
-}
-
-//---------------------------------------------------------
-bool CWKSP_Module_Manager::Do_Beep(void)
-{
- return( m_Parameters("BEEP")->asBool() );
-}
-
-
-///////////////////////////////////////////////////////////
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
CWKSP_Module_Group * CWKSP_Module_Manager::Get_Group(const wxString &Group)
{
for(int i=0; i<Get_Count(); i++)
diff --git a/src/saga_core/saga_gui/wksp_module_manager.h b/src/saga_core/saga_gui/wksp_module_manager.h
index 5de1dd2..fea9068 100755
--- a/src/saga_core/saga_gui/wksp_module_manager.h
+++ b/src/saga_core/saga_gui/wksp_module_manager.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_module_manager.h 2275 2014-10-02 15:48:59Z oconrad $
+ * Version $Id: wksp_module_manager.h 2860 2016-03-24 10:33:43Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -103,6 +103,7 @@ public:
virtual bool On_Command (int Cmd_ID);
virtual bool On_Command_UI (wxUpdateUIEvent &event);
+ virtual int On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter, int Flags);
virtual void Parameters_Changed (void);
void On_Execute (wxCommandEvent &event);
diff --git a/src/saga_core/saga_gui/wksp_table.cpp b/src/saga_core/saga_gui/wksp_table.cpp
index bca93ac..4db2014 100755
--- a/src/saga_core/saga_gui/wksp_table.cpp
+++ b/src/saga_core/saga_gui/wksp_table.cpp
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_table.cpp 2772 2016-02-05 15:25:43Z oconrad $
+ * Version $Id: wksp_table.cpp 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -301,7 +301,7 @@ bool CWKSP_Table::Show(int Flags)
}
//---------------------------------------------------------
-bool CWKSP_Table::View_Closes(wxMDIChildFrame *pView)
+bool CWKSP_Table::View_Closes(MDI_ChildFrame *pView)
{
if( pView == m_pView ) m_pView = NULL;
if( pView == m_pDiagram ) m_pDiagram = NULL;
diff --git a/src/saga_core/saga_gui/wksp_table.h b/src/saga_core/saga_gui/wksp_table.h
index 679211f..2bd3940 100755
--- a/src/saga_core/saga_gui/wksp_table.h
+++ b/src/saga_core/saga_gui/wksp_table.h
@@ -1,5 +1,5 @@
/**********************************************************
- * Version $Id: wksp_table.h 2061 2014-03-20 11:48:01Z oconrad $
+ * Version $Id: wksp_table.h 2858 2016-03-23 16:05:24Z oconrad $
*********************************************************/
///////////////////////////////////////////////////////////
@@ -108,7 +108,7 @@ public:
void Toggle_Diagram (void);
virtual bool Show (int Flags = 0);
- virtual bool View_Closes (class wxMDIChildFrame *pView);
+ virtual bool View_Closes (class MDI_ChildFrame *pView);
private:
diff --git a/src/scripting/helper/make_saga_release.bat b/src/scripting/helper/make_saga_release.bat
index 832353b..09fec26 100755
--- a/src/scripting/helper/make_saga_release.bat
+++ b/src/scripting/helper/make_saga_release.bat
@@ -3,7 +3,7 @@
REM ___________________________________
SET SAGA_VER_MAJOR=2
SET SAGA_VER_MINOR=2
-SET SAGA_VER_RELEASE=5
+SET SAGA_VER_RELEASE=6
SET SAGA_VERSION=saga_%SAGA_VER_MAJOR%.%SAGA_VER_MINOR%.%SAGA_VER_RELEASE%
SET SVN__VERSION=%SAGA_VER_MAJOR%-%SAGA_VER_MINOR%-%SAGA_VER_RELEASE%
diff --git a/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py b/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
index ec674ba..04710d2 100755
--- a/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
+++ b/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
@@ -10,8 +10,8 @@
# purpose:
# generate a simple text-based description of the saga_cmd parameter
# interface of a SAGA binary installation.
-# this allows to detect changes in the parameter interface of different
-# SAGA versions.
+# this allows one to detect changes in the parameter interface of
+# different SAGA versions.
#
# usage:
# in order to run this script, you have to edit the "environment.py"
diff --git a/src/scripting/python/helpers/saga_cmd_param_interface/tools.py b/src/scripting/python/helpers/saga_cmd_param_interface/tools.py
index 20c5bc1..38956f9 100755
--- a/src/scripting/python/helpers/saga_cmd_param_interface/tools.py
+++ b/src/scripting/python/helpers/saga_cmd_param_interface/tools.py
@@ -647,7 +647,7 @@ tools = [
['grid_tools', 34, 'Invert Grid'],
['grid_tools', 35, 'Mirror Grid'],
['imagery_classification', 7, 'ISODATA Clustering for Grids'],
-['io_gdal', 9, 'Import Open Street Map Image'],
+['io_gdal', 9, 'Import TMS Image'],
['sim_hydrology', 5, 'Surface and Gradient'],
['sim_hydrology', 6, 'Concentration'],
['sim_hydrology', 7, 'Surface, Gradient and Concentration']
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git
More information about the Pkg-grass-devel
mailing list