[Git][debian-gis-team/saga][master] 4 commits: New upstream version 9.4.1+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon Jun 10 19:41:08 BST 2024
Bas Couwenberg pushed to branch master at Debian GIS Project / saga
Commits:
0e070ad0 by Bas Couwenberg at 2024-06-10T20:24:55+02:00
New upstream version 9.4.1+dfsg
- - - - -
49c4cdf5 by Bas Couwenberg at 2024-06-10T20:25:10+02:00
Update upstream source from tag 'upstream/9.4.1+dfsg'
Update to upstream version '9.4.1+dfsg'
with Debian dir e284ecdb7943c184a8d9c84e01e024d659dcb76a
- - - - -
2e73a820 by Bas Couwenberg at 2024-06-10T20:25:57+02:00
New upstream release.
- - - - -
3ba64c50 by Bas Couwenberg at 2024-06-10T20:26:32+02:00
Set distribution to unstable.
- - - - -
16 changed files:
- debian/changelog
- saga-gis/src/accessories/helper/doxygen_saga_api_chm
- saga-gis/src/accessories/helper/doxygen_saga_api_html
- saga-gis/src/accessories/helper/make_saga_release.bat
- saga-gis/src/accessories/helper/saga_setup_x64.iss
- saga-gis/src/accessories/python/tools/climate_tools.py
- saga-gis/src/accessories/python/tools/ta_lighting.py
- saga-gis/src/saga_core/saga_api/api_core.h
- saga-gis/src/saga_core/saga_api/api_file.cpp
- saga-gis/src/saga_core/saga_api/saga_api.h
- saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1
- saga-gis/src/saga_core/saga_cmd/tool.cpp
- saga-gis/src/saga_core/saga_gui/man/saga_gui.1
- saga-gis/src/saga_core/saga_gui/view_table_control.cpp
- saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.cpp
- saga-gis/version.cmake
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+saga (9.4.1+dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 10 Jun 2024 20:26:20 +0200
+
saga (9.4.0+dfsg-1) unstable; urgency=medium
* Team upload.
=====================================
saga-gis/src/accessories/helper/doxygen_saga_api_chm
=====================================
@@ -38,7 +38,7 @@ PROJECT_NAME = "SAGA API"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-#PROJECT_NUMBER = v9.4.0 # omit patch number
+#PROJECT_NUMBER = v9.4.1 # omit patch number
PROJECT_NUMBER = v9.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
@@ -59,7 +59,7 @@ PROJECT_LOGO = ../../../saga_core/saga_gui/res/saga_icon_64.png
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = saga-9.4.0_api_doc
+OUTPUT_DIRECTORY = saga-9.4.1_api_doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -1372,7 +1372,7 @@ GENERATE_HTMLHELP = YES
# written to the html output directory.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-CHM_FILE = ../../saga-9.4.0_api.chm
+CHM_FILE = ../../saga-9.4.1_api.chm
# The HHC_LOCATION tag can be used to specify the location (absolute path
# including file name) of the HTML help compiler (hhc.exe). If non-empty,
=====================================
saga-gis/src/accessories/helper/doxygen_saga_api_html
=====================================
@@ -38,7 +38,7 @@ PROJECT_NAME = "SAGA API"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-#PROJECT_NUMBER = v9.4.0 # omit patch number
+#PROJECT_NUMBER = v9.4.1 # omit patch number
PROJECT_NUMBER = v9.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
@@ -59,7 +59,7 @@ PROJECT_LOGO = ../../../saga_core/saga_gui/res/saga_icon_64.png
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = saga-9.4.0_api_doc
+OUTPUT_DIRECTORY = saga-9.4.1_api_doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -1372,7 +1372,7 @@ GENERATE_HTMLHELP = NO
# written to the html output directory.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-CHM_FILE = ../../saga-9.4.0_api.chm
+CHM_FILE = ../../saga-9.4.1_api.chm
# The HHC_LOCATION tag can be used to specify the location (absolute path
# including file name) of the HTML help compiler (hhc.exe). If non-empty,
=====================================
saga-gis/src/accessories/helper/make_saga_release.bat
=====================================
@@ -30,15 +30,15 @@ REM ___________________________________
REM Version
SET SAGA_VERSION=9.4
-SET SAGA_RELEASE=9.4.0
-SET SAGA_VERSION_NEXT=9.5
-SET SAGA_RELEASE_NEXT=9.5.0
+SET SAGA_RELEASE=9.4.1
+SET SAGA_VERSION_NEXT=9.4
+SET SAGA_RELEASE_NEXT=9.4.2
SET SAGA_RELEASE_NAME=saga-%SAGA_RELEASE%
REM !!! For all bug-fix-releases !!!
REM Don't forget to activate the variable
REM - SWITCH_TO_BRANCH -
-REM SET SWITCH_TO_BRANCH=saga-%SAGA_VERSION%
+SET SWITCH_TO_BRANCH=saga-%SAGA_VERSION%
REM ___________________________________
=====================================
saga-gis/src/accessories/helper/saga_setup_x64.iss
=====================================
@@ -1,5 +1,5 @@
-; To build installer (for example, saga-9.4.0_setup.exe).
-; - Unzip the SAGA binary files in their own folder (for example, saga-9.4.0.zip).
+; To build installer (for example, saga-9.4.1_setup.exe).
+; - Unzip the SAGA binary files in their own folder (for example, saga-9.4.1.zip).
; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.).
; - Open saga.iss in Inno Setup.
; - Choose Build | Compile.
@@ -7,7 +7,7 @@
[Setup]
AppName=SAGA - System for Automated Geoscientific Analyses
-AppVerName=SAGA 9.4.0
+AppVerName=SAGA 9.4.1
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64
@@ -22,9 +22,9 @@ Compression=lzma
SolidCompression=yes
OutputDir=.
-OutputBaseFilename=saga-9.4.0_x64_setup
+OutputBaseFilename=saga-9.4.1_x64_setup
-VersionInfoVersion=9.4.0.0
+VersionInfoVersion=9.4.1.0
VersionInfoCompany=SAGA User Group Association
VersionInfoCopyright=(c) 2005-2023 by O. Conrad
VersionInfoDescription=SAGA single-file installer
@@ -51,5 +51,5 @@ Name: "{commondesktop}\SAGA"; Filename: "{app}\saga_gui.exe"; WorkingDir: "{app}
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\saga_gui.exe"; Flags: uninsdeletekey
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}"
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.4.0"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.4.0"; ValueType: string; ValueName: "Version"; ValueData: "9.4.0.0"
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.4.1"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.4.1"; ValueType: string; ValueName: "Version"; ValueData: "9.4.1.0"
=====================================
saga-gis/src/accessories/python/tools/climate_tools.py
=====================================
@@ -617,8 +617,8 @@ def Evapotranspiration_Grid(T=None, T_MIN=None, T_MAX=None, RH=None, SR=None, WS
- SR_EST [`boolean`] : Estimate Solar Radiation. Default: 0 Estimate solar radiation from date, latitudinal position and sunshine duration as percentage of its potential maximum.
- SUNSHINE [`floating point number`] : Sunshine Duration. Minimum: 0.000000 Maximum: 100.000000 Default: 50.000000 Daily sunshine duration as percentage of its potential maximum.
- TIME [`choice`] : Time. Available Choices: [0] day [1] month Default: 0
- - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 3
- - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 15
+ - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 5
+ - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 6
- LAT [`floating point number`] : Latitude. Minimum: -90.000000 Maximum: 90.000000 Default: 53.000000 [Degree]
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
@@ -680,8 +680,8 @@ def run_tool_climate_tools_8(T=None, T_MIN=None, T_MAX=None, RH=None, SR=None, W
- SR_EST [`boolean`] : Estimate Solar Radiation. Default: 0 Estimate solar radiation from date, latitudinal position and sunshine duration as percentage of its potential maximum.
- SUNSHINE [`floating point number`] : Sunshine Duration. Minimum: 0.000000 Maximum: 100.000000 Default: 50.000000 Daily sunshine duration as percentage of its potential maximum.
- TIME [`choice`] : Time. Available Choices: [0] day [1] month Default: 0
- - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 3
- - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 15
+ - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 5
+ - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 6
- LAT [`floating point number`] : Latitude. Minimum: -90.000000 Maximum: 90.000000 Default: 53.000000 [Degree]
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
@@ -728,7 +728,7 @@ def Sunrise_and_Sunset(TARGET=None, SUNRISE=None, SUNSET=None, LENGTH=None, DAY=
- SUNRISE [`output grid`] : Sunrise
- SUNSET [`output grid`] : Sunset
- LENGTH [`output grid`] : Day Length
- - DAY [`date`] : Day of Month. Default: 2024-04-15
+ - DAY [`date`] : Day of Month. Default: 2024-06-06
- TIME [`choice`] : Time. Available Choices: [0] local [1] world Default: 0
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
@@ -759,7 +759,7 @@ def run_tool_climate_tools_9(TARGET=None, SUNRISE=None, SUNSET=None, LENGTH=None
- SUNRISE [`output grid`] : Sunrise
- SUNSET [`output grid`] : Sunset
- LENGTH [`output grid`] : Day Length
- - DAY [`date`] : Day of Month. Default: 2024-04-15
+ - DAY [`date`] : Day of Month. Default: 2024-06-06
- TIME [`choice`] : Time. Available Choices: [0] local [1] world Default: 0
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
@@ -1911,7 +1911,7 @@ def PhenIps_Grids_Days(ATMEAN=None, ATMAX=None, SIREL=None, LAT_GRID=None, GENER
- YD_END_ONSET [`date`] : End of Breeding. Default: 2024-08-31
- YD_END [`date`] : End of Development. Default: 2024-10-31
- RESET [`boolean`] : Reset. Default: 1
- - DAY [`date`] : Start Day. Default: 2024-04-15
+ - DAY [`date`] : Start Day. Default: 2024-06-06
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
Returns
@@ -1998,7 +1998,7 @@ def run_tool_climate_tools_23(ATMEAN=None, ATMAX=None, SIREL=None, LAT_GRID=None
- YD_END_ONSET [`date`] : End of Breeding. Default: 2024-08-31
- YD_END [`date`] : End of Development. Default: 2024-10-31
- RESET [`boolean`] : Reset. Default: 1
- - DAY [`date`] : Start Day. Default: 2024-04-15
+ - DAY [`date`] : Start Day. Default: 2024-06-06
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
Returns
@@ -2066,7 +2066,7 @@ def Soil_Water_Balance_Days(TAVG=None, TMIN=None, TMAX=None, PSUM=None, LAT_GRID
- SWC_SURFACE [`floating point number`] : Top Soil Water Capacity. Minimum: 0.000000 Default: 30.000000
- SWT_RESIST [`floating point number`] : Transpiration Resistance. Minimum: 0.010000 Default: 0.500000
- RESET [`boolean`] : Reset. Default: 1
- - DAY [`date`] : Start Day. Default: 2024-04-15
+ - DAY [`date`] : Start Day. Default: 2024-06-06
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
Returns
@@ -2115,7 +2115,7 @@ def run_tool_climate_tools_24(TAVG=None, TMIN=None, TMAX=None, PSUM=None, LAT_GR
- SWC_SURFACE [`floating point number`] : Top Soil Water Capacity. Minimum: 0.000000 Default: 30.000000
- SWT_RESIST [`floating point number`] : Transpiration Resistance. Minimum: 0.010000 Default: 0.500000
- RESET [`boolean`] : Reset. Default: 1
- - DAY [`date`] : Start Day. Default: 2024-04-15
+ - DAY [`date`] : Start Day. Default: 2024-06-06
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
Returns
@@ -2701,8 +2701,8 @@ def Daily_Solar_Radiation(LATITUDE=None, SOLARRAD=None, MONTH=None, DAY=None, SU
----------
- LATITUDE [`input grid`] : Latitude. [Degree]
- SOLARRAD [`output grid`] : Solar Radiation. [J/cm²]
- - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 3
- - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 15
+ - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 5
+ - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 6
- SUNSHINE [`floating point number`] : Sunshine Duration. Minimum: 0.000000 Maximum: 100.000000 Default: 50.000000 Daily sunshine duration as percentage of its potential maximum.
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
@@ -2731,8 +2731,8 @@ def run_tool_climate_tools_31(LATITUDE=None, SOLARRAD=None, MONTH=None, DAY=None
----------
- LATITUDE [`input grid`] : Latitude. [Degree]
- SOLARRAD [`output grid`] : Solar Radiation. [J/cm²]
- - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 3
- - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 15
+ - MONTH [`choice`] : Month. Available Choices: [0] January [1] February [2] March [3] April [4] May [5] June [6] July [7] August [8] September [9] October [10] November [11] December Default: 5
+ - DAY [`integer number`] : Day of Month. Minimum: 1 Maximum: 31 Default: 6
- SUNSHINE [`floating point number`] : Sunshine Duration. Minimum: 0.000000 Maximum: 100.000000 Default: 50.000000 Daily sunshine duration as percentage of its potential maximum.
- Verbose [`integer number`] : Verbosity level, 0=silent, 1=tool name and success notification, 2=complete tool output.\n
=====================================
saga-gis/src/accessories/python/tools/ta_lighting.py
=====================================
@@ -28,7 +28,7 @@ def Analytical_Hillshading(ELEVATION=None, SHADE=None, METHOD=None, POSITION=Non
- POSITION [`choice`] : Sun's Position. Available Choices: [0] azimuth and height [1] date and time Default: 0
- AZIMUTH [`floating point number`] : Azimuth. Minimum: 0.000000 Maximum: 360.000000 Default: 315.000000 Direction of the light source, measured in degree clockwise from the North direction.
- DECLINATION [`floating point number`] : Height. Minimum: 0.000000 Maximum: 90.000000 Default: 45.000000 Height of the light source, measured in degree above the horizon.
- - DATE [`date`] : Day. Default: 2024-04-15
+ - DATE [`date`] : Day. Default: 2024-06-06
- TIME [`floating point number`] : Hour. Minimum: 0.000000 Maximum: 24.000000 Default: 12.000000
- EXAGGERATION [`floating point number`] : Exaggeration. Default: 1.000000 The terrain exaggeration factor allows one to increase the shading contrasts in flat areas.
- UNIT [`choice`] : Unit. Available Choices: [0] radians [1] degree Default: 0
@@ -73,7 +73,7 @@ def run_tool_ta_lighting_0(ELEVATION=None, SHADE=None, METHOD=None, POSITION=Non
- POSITION [`choice`] : Sun's Position. Available Choices: [0] azimuth and height [1] date and time Default: 0
- AZIMUTH [`floating point number`] : Azimuth. Minimum: 0.000000 Maximum: 360.000000 Default: 315.000000 Direction of the light source, measured in degree clockwise from the North direction.
- DECLINATION [`floating point number`] : Height. Minimum: 0.000000 Maximum: 90.000000 Default: 45.000000 Height of the light source, measured in degree above the horizon.
- - DATE [`date`] : Day. Default: 2024-04-15
+ - DATE [`date`] : Day. Default: 2024-06-06
- TIME [`floating point number`] : Hour. Minimum: 0.000000 Maximum: 24.000000 Default: 12.000000
- EXAGGERATION [`floating point number`] : Exaggeration. Default: 1.000000 The terrain exaggeration factor allows one to increase the shading contrasts in flat areas.
- UNIT [`choice`] : Unit. Available Choices: [0] radians [1] degree Default: 0
@@ -134,8 +134,8 @@ def Potential_Incoming_Solar_Radiation(GRD_DEM=None, GRD_SVF=None, GRD_VAPOUR=No
- LOCATION [`choice`] : Location. Available Choices: [0] constant latitude [1] calculate from grid system Default: 0
- LATITUDE [`degree`] : Latitude. Minimum: -90.000000 Maximum: 90.000000 Default: 53.000000
- PERIOD [`choice`] : Time Period. Available Choices: [0] moment [1] day [2] range of days Default: 1
- - DAY [`date`] : Day. Default: 2024-04-15
- - DAY_STOP [`date`] : Last Day. Default: 2024-04-15
+ - DAY [`date`] : Day. Default: 2024-06-06
+ - DAY_STOP [`date`] : Last Day. Default: 2024-06-06
- DAYS_STEP [`integer number`] : Resolution [d]. Minimum: 1 Default: 5 Time step size for a range of days calculation given in days.
- MOMENT [`floating point number`] : Moment [h]. Minimum: 0.000000 Maximum: 24.000000 Default: 12.000000
- HOUR_RANGE [`value range`] : Time Span [h]. Time span used for the calculation of daily radiation sums.
@@ -220,8 +220,8 @@ def run_tool_ta_lighting_2(GRD_DEM=None, GRD_SVF=None, GRD_VAPOUR=None, GRD_LINK
- LOCATION [`choice`] : Location. Available Choices: [0] constant latitude [1] calculate from grid system Default: 0
- LATITUDE [`degree`] : Latitude. Minimum: -90.000000 Maximum: 90.000000 Default: 53.000000
- PERIOD [`choice`] : Time Period. Available Choices: [0] moment [1] day [2] range of days Default: 1
- - DAY [`date`] : Day. Default: 2024-04-15
- - DAY_STOP [`date`] : Last Day. Default: 2024-04-15
+ - DAY [`date`] : Day. Default: 2024-06-06
+ - DAY_STOP [`date`] : Last Day. Default: 2024-06-06
- DAYS_STEP [`integer number`] : Resolution [d]. Minimum: 1 Default: 5 Time step size for a range of days calculation given in days.
- MOMENT [`floating point number`] : Moment [h]. Minimum: 0.000000 Maximum: 24.000000 Default: 12.000000
- HOUR_RANGE [`value range`] : Time Span [h]. Time span used for the calculation of daily radiation sums.
=====================================
saga-gis/src/saga_core/saga_api/api_core.h
=====================================
@@ -962,7 +962,7 @@ protected:
void * Get_Record_Pop (void)
{
- if( m_Stack.Get_Size() > 0 )
+ if( m_Stack.Get_Size() > 1 )
{
memcpy(m_Stack.Get_Array(), m_Stack.Get_Entry(m_Stack.Get_Size() - 1), m_Stack.Get_Value_Size());
=====================================
saga-gis/src/saga_core/saga_api/api_file.cpp
=====================================
@@ -112,7 +112,9 @@ bool CSG_File::Open(const CSG_String &FileName, int Mode, bool bBinary, int Enco
{
Close();
- if( !SG_Dir_Exists(SG_File_Get_Path(FileName)) )
+ CSG_String Path(SG_File_Get_Path(FileName));
+
+ if( !Path.is_Empty() && !SG_Dir_Exists(Path) )
{
return( false );
}
@@ -585,7 +587,9 @@ bool CSG_File_Zip::Open(const CSG_String &FileName, int Mode, int Encoding)
{
Close();
- if( !SG_Dir_Exists(SG_File_Get_Path(FileName)) )
+ CSG_String Path(SG_File_Get_Path(FileName));
+
+ if( !Path.is_Empty() && !SG_Dir_Exists(Path) )
{
return( false );
}
=====================================
saga-gis/src/saga_core/saga_api/saga_api.h
=====================================
@@ -86,8 +86,8 @@
//---------------------------------------------------------
#define SAGA_MAJOR_VERSION 9
#define SAGA_MINOR_VERSION 4
-#define SAGA_RELEASE_NUMBER 0
-#define SAGA_VERSION SG_T("9.4.0")
+#define SAGA_RELEASE_NUMBER 1
+#define SAGA_VERSION SG_T("9.4.1")
///////////////////////////////////////////////////////////
=====================================
saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1
=====================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "SAGA_CMD 1"
-.TH SAGA_CMD 1 "2021-07-07" "9.4.0" " "
+.TH SAGA_CMD 1 "2021-07-07" "9.4.1" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
=====================================
saga-gis/src/saga_core/saga_cmd/tool.cpp
=====================================
@@ -169,7 +169,7 @@ bool CCMD_Tool::Execute(int argc, char *argv[])
_Save_Output(m_pTool->Get_Parameters(i));
}
- SG_Get_Data_Manager().Delete(); // remove temporary data to save memory resources
+ SG_Get_Data_Manager().Delete(false, true); // remove temporary data to save memory resources
}
else
{
=====================================
saga-gis/src/saga_core/saga_gui/man/saga_gui.1
=====================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "SAGA_GUI 1"
-.TH SAGA_GUI 1 "2021-07-07" "9.4.0" " "
+.TH SAGA_GUI 1 "2021-07-07" "9.4.1" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
=====================================
saga-gis/src/saga_core/saga_gui/view_table_control.cpp
=====================================
@@ -307,25 +307,20 @@ bool CVIEW_Table_Control::_Update_Records(bool bViews)
//-----------------------------------------------------
for(int iField=0; iField<m_pTable->Get_Field_Count(); iField++)
{
- BeginBatch();
-
- for(int i=0; i<m_pData->GetNumberRows(); i++)
+ if( m_pTable->Get_Field_Type(iField) == SG_DATATYPE_Color )
{
- if( m_pTable->Get_Field_Type(iField) == SG_DATATYPE_Color )
+ BeginBatch();
+
+ for(int i=0; i<m_pData->GetNumberRows(); i++)
{
wxColour Colour(Get_Color_asWX(m_pData->Get_Record(i)->asInt(iField)));
SetCellBackgroundColour(i, iField, Colour);
SetCellTextColour (i, iField, Colour);
}
- else
- {
- SetCellBackgroundColour(i, iField, GetDefaultCellBackgroundColour());
- SetCellTextColour (i, iField, GetDefaultCellTextColour ());
- }
- }
- EndBatch();
+ EndBatch();
+ }
}
//-----------------------------------------------------
@@ -1038,7 +1033,7 @@ void CVIEW_Table_Control::On_Field_Type(wxCommandEvent &event)
if( DLG_Parameters(&P) )
{
- bool bChanged = false;
+ bool bChanged = false, bResetColors = false;
for(int i=0; i<m_pTable->Get_Field_Count(); i++)
{
@@ -1046,14 +1041,24 @@ void CVIEW_Table_Control::On_Field_Type(wxCommandEvent &event)
if( Type != m_pTable->Get_Field_Type(i) )
{
- m_pTable->Set_Field_Type(i, Type);
-
bChanged = true;
+
+ if( m_pTable->Get_Field_Type(i) == SG_DATATYPE_Color )
+ {
+ bResetColors = true;
+ }
+
+ m_pTable->Set_Field_Type(i, Type);
}
}
if( bChanged )
{
+ if( bResetColors )
+ {
+ DeleteRows(0, GetNumberRows(), false);
+ }
+
Update_Table();
g_pData->Update(m_pTable, NULL);
=====================================
saga-gis/src/tools/shapes/shapes_grid/Grid_To_Contour.cpp
=====================================
@@ -130,8 +130,8 @@ int CGrid_To_Contour::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Para
if( zStep > 0. )
{
- pParameters->Set_Parameter("ZMIN", zStep * (ceil (pParameter->asGrid()->Get_Min() / zStep)));
- pParameters->Set_Parameter("ZMAX", zStep * (floor(pParameter->asGrid()->Get_Max() / zStep)));
+ pParameters->Set_Parameter("ZMIN", zStep * (floor(pParameter->asGrid()->Get_Min() / zStep)));
+ pParameters->Set_Parameter("ZMAX", zStep * (ceil (pParameter->asGrid()->Get_Max() / zStep)));
}
else
{
@@ -761,15 +761,15 @@ bool CGrid_To_Contour::Get_Edge_Segments(CSG_Shapes &Edges, CSG_Shapes *pContour
}
else if( Edge.asLong(0) == Edge.asLong(1) ) // needs to determine 'going lower/higher' state in relation to contour elevation
{
- CSG_Point p[2] = { Edge.Get_Point(0), Edge.Get_Point(1) };
+ CSG_Point p(Edge.Get_Point(0)), d(Edge.Get_Point(1)); d.x -= p.x; d.y -= p.y;
- p[1].x = p[0].x + 0.5 * (p[1].x - p[0].x);
- p[1].y = p[0].y + 0.5 * (p[1].y - p[0].y);
+ int x = (int)floor((p.x - m_pGrid->Get_XMin()) / m_pGrid->Get_Cellsize());
+ int y = (int)floor((p.y - m_pGrid->Get_YMin()) / m_pGrid->Get_Cellsize());
- double dz = m_pGrid->Get_Value(p[1], GRID_RESAMPLING_Bilinear)
- - m_pGrid->Get_Value(p[0], GRID_RESAMPLING_Bilinear);
-
- if( dz < 0. )
+ if( (d.x < 0. && m_pGrid->asDouble(x + 1, y) > m_pGrid->asDouble(x, y))
+ || (d.x > 0. && m_pGrid->asDouble(x + 1, y) < m_pGrid->asDouble(x, y))
+ || (d.y < 0. && m_pGrid->asDouble(x, y + 1) > m_pGrid->asDouble(x, y))
+ || (d.y > 0. && m_pGrid->asDouble(x, y + 1) < m_pGrid->asDouble(x, y)) )
{
Edge.Add_Value(0, -1);
}
@@ -988,13 +988,6 @@ bool CGrid_To_Contour::Get_Polygons(CSG_Shape_Polygon &Polygon, CSG_Shapes &Edge
while( Add_Polygon_Segment(Segments, pPart) );
- if( !CSG_Point(pPart->Get_Point(0, true)).is_Equal(pPart->Get_Point(0, false)) )
- {
- pPart->Revert_Points();
-
- while( Add_Polygon_Segment(Segments, pPart) );
- }
-
if( !Polygon.Get_Area(iPart) )
{
Polygon.Del_Part(iPart);
=====================================
saga-gis/version.cmake
=====================================
@@ -1,7 +1,7 @@
# The version number.
set (SAGA_VERSION_MAJOR 9)
set (SAGA_VERSION_MINOR 4)
-set (SAGA_VERSION_PATCH 0)
+set (SAGA_VERSION_PATCH 1)
# get git commit hash (or dirty if git is not installed)
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/4cd3e5fe82401f3d5905859a9241306f52c05631...3ba64c50c3f172503616ce3d0401fb9e16c04ede
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/4cd3e5fe82401f3d5905859a9241306f52c05631...3ba64c50c3f172503616ce3d0401fb9e16c04ede
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240610/bb5fe20f/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list