[Git][debian-gis-team/saga][upstream] New upstream version 8.4.2+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Dec 20 15:59:48 GMT 2022
Bas Couwenberg pushed to branch upstream at Debian GIS Project / saga
Commits:
b41d0475 by Bas Couwenberg at 2022-12-20T16:28:39+01:00
New upstream version 8.4.2+dfsg
- - - - -
15 changed files:
- 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/saga_core/saga_api/dataobject.cpp
- saga-gis/src/saga_core/saga_api/saga_api.h
- saga-gis/src/saga_core/saga_api/tool_chain.cpp
- saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1
- saga-gis/src/saga_core/saga_gui/man/saga_gui.1
- saga-gis/src/saga_core/saga_gui/view_map.cpp
- saga-gis/src/saga_core/saga_gui/view_map_control.cpp
- saga-gis/src/tools/imagery/imagery_tools/pansharpening.cpp
- saga-gis/src/tools/io/io_webservices/geocoding.cpp
- saga-gis/version.cmake
- saga_setup_win32.iss
- saga_setup_x64.iss
Changes:
=====================================
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 = v8.4.1
+PROJECT_NUMBER = v8.4.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ 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-8.4.1_api_doc
+OUTPUT_DIRECTORY = saga-8.4.2_api_doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -1363,7 +1363,7 @@ GENERATE_HTMLHELP = YES
# written to the html output directory.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-CHM_FILE = ../../saga-8.4.1_api.chm
+CHM_FILE = ../../saga-8.4.2_api.chm
# The HHC_LOCATION tag can be used to specify the location (absolute path
# including file name) of the HTML help compiler (hhc.exe). If non-empty,
=====================================
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 = v8.4.1
+PROJECT_NUMBER = v8.4.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ 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-8.4.1_api_doc
+OUTPUT_DIRECTORY = saga-8.4.2_api_doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -1363,7 +1363,7 @@ GENERATE_HTMLHELP = NO
# written to the html output directory.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-CHM_FILE = ../../saga-8.4.1_api.chm
+CHM_FILE = ../../saga-8.4.2_api.chm
# The HHC_LOCATION tag can be used to specify the location (absolute path
# including file name) of the HTML help compiler (hhc.exe). If non-empty,
=====================================
saga-gis/src/accessories/helper/make_saga_release.bat
=====================================
@@ -36,9 +36,9 @@ REM Version
REM For all bug-fix-releases!
REM Don't forget to activate the variable
REM - SWITCH_TO_BRANCH -
-SET SWITCH_TO_BRANCH=saga-8.4.0
-SET SAGA_VER_TEXT=8.4.1
-SET SAGA_VER_NEXT=8.4.2
+SET SWITCH_TO_BRANCH=saga-8.4.1
+SET SAGA_VER_TEXT=8.4.2
+SET SAGA_VER_NEXT=8.4.3
SET SAGA_VERSION=saga-%SAGA_VER_TEXT%
@@ -103,7 +103,7 @@ IF /i "%GIT_BRANCH%" == "true" (
%GITEXE% push release-%SAGA_VER_TEXT%
)
-IF /i "%SWITCH_TO_BRANCH%" == "true" (
+IF /i NOT "%SWITCH_TO_BRANCH%" == "" (
ECHO switch to branch %SWITCH_TO_BRANCH%
%GITEXE% checkout %SWITCH_TO_BRANCH%
)
=====================================
saga-gis/src/saga_core/saga_api/dataobject.cpp
=====================================
@@ -445,7 +445,7 @@ bool CSG_Data_Object::Set_Max_Samples(sLong Max_Samples)
{
m_Max_Samples = Max_Samples;
- On_Update();
+ Update(true);
}
return( true );
=====================================
saga-gis/src/saga_core/saga_api/saga_api.h
=====================================
@@ -86,8 +86,8 @@
//---------------------------------------------------------
#define SAGA_MAJOR_VERSION 8
#define SAGA_MINOR_VERSION 4
-#define SAGA_RELEASE_NUMBER 1
-#define SAGA_VERSION SG_T("8.4.1")
+#define SAGA_RELEASE_NUMBER 2
+#define SAGA_VERSION SG_T("8.4.2")
///////////////////////////////////////////////////////////
=====================================
saga-gis/src/saga_core/saga_api/tool_chain.cpp
=====================================
@@ -713,7 +713,7 @@ bool CSG_Tool_Chain::Data_Finalize(void)
{
CSG_Parameter *pParameter = Parameters(Parameter.Get_Property("varname"));
- if( pParameter && pParameter->is_DataObject() && pParameter->asDataObject() )
+ if( pParameter && pParameter->is_DataObject() && pParameter->asDataObject() && pParameter->asDataObject() != DATAOBJECT_CREATE )
{
if( Parameter("colours") )
{
=====================================
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" "8.4.1" " "
+.TH SAGA_CMD 1 "2021-07-07" "8.4.2" " "
.\" 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/man/saga_gui.1
=====================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "SAGA_GUI 1"
-.TH SAGA_GUI 1 "2021-07-07" "8.4.1" " "
+.TH SAGA_GUI 1 "2021-07-07" "8.4.2" " "
.\" 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_map.cpp
=====================================
@@ -257,8 +257,7 @@ void CVIEW_Map::On_Paint(wxPaintEvent &event)
//---------------------------------------------------------
void CVIEW_Map::On_Size(wxSizeEvent &event)
{
- int minSize = 2 * m_Ruler_Size + 10;
- wxSize Size(GetClientSize()), fSize(GetSize().x - Size.x, GetSize().y - Size.y);
+ wxSize Size(GetClientSize()); int minSize = 10 + 2 * m_Ruler_Size;
if( Size.x >= minSize && Size.y >= minSize )
{
=====================================
saga-gis/src/saga_core/saga_gui/view_map_control.cpp
=====================================
@@ -544,7 +544,7 @@ void CVIEW_Map_Control::Refresh_Map(void)
{
wxMemoryDC dc(m_Bitmap);
- m_pMap->Draw_Map(dc, 1., GetClientSize());
+ m_pMap->Draw_Map(dc, 1., m_Bitmap.GetSize());
m_pParent->Ruler_Refresh();
@@ -1043,7 +1043,7 @@ void CVIEW_Map_Control::On_Mouse_MUp(wxMouseEvent &event)
//---------------------------------------------------------
void CVIEW_Map_Control::On_Mouse_Motion(wxMouseEvent &event)
{
- wxPoint Point = event.GetPosition();
+ wxPoint Point = event.GetPosition();
switch( m_Mode )
{
@@ -1066,6 +1066,11 @@ void CVIEW_Map_Control::On_Mouse_Motion(wxMouseEvent &event)
GET_KEYS(event)
);
}
+
+ if( event.LeftIsDown() )
+ {
+ Refresh(false);
+ }
break;
//-----------------------------------------------------
=====================================
saga-gis/src/tools/imagery/imagery_tools/pansharpening.cpp
=====================================
@@ -723,7 +723,7 @@ bool CPanSharp_PCA::On_Execute(void)
delete(pPCA->Get_Grid(0));
- pPCA->Del_Items();
+ pPCA->Del_Items(); Tool_Parms.Set_Callback(false); pPCA->Get_Parent()->asGrid_System()->Destroy(); // reset grid system before adding hi-res-grids
for(i=0; i<n; i++)
{
=====================================
saga-gis/src/tools/io/io_webservices/geocoding.cpp
=====================================
@@ -125,7 +125,8 @@ CGeoCoding::CGeoCoding(void)
Parameters.Add_String("PROVIDER",
"API_KEY" , _TL("API Key"),
_TL(""),
- ""
+ "",
+ false, true
);
Parameters.Add_Bool("",
@@ -195,10 +196,10 @@ bool CGeoCoding::On_Execute(void)
switch( Provider )
{
default: Connection.Create("https://nominatim.openstreetmap.org"); break; // Nominatim
- case 1: Connection.Create("http://www.datasciencetoolkit.org" ); break; // The Data Science Toolkit
- case 2: Connection.Create("http://maps.googleapis.com" ); break; // Google
- case 3: Connection.Create("http://dev.virtualearth.net" ); break; // Bing
- case 4: Connection.Create("http://www.mapquestapi.com" ); break; // MapQuest
+ case 1: Connection.Create("https://www.datasciencetoolkit.org" ); break; // The Data Science Toolkit
+ case 2: Connection.Create("https://maps.googleapis.com" ); break; // Google
+ case 3: Connection.Create("https://dev.virtualearth.net" ); break; // Bing
+ case 4: Connection.Create("https://www.mapquestapi.com" ); break; // MapQuest
}
if( !Connection.is_Connected() )
=====================================
saga-gis/version.cmake
=====================================
@@ -1,7 +1,7 @@
# The version number.
set (SAGA_VERSION_MAJOR 8)
set (SAGA_VERSION_MINOR 4)
-set (SAGA_VERSION_PATCH 1)
+set (SAGA_VERSION_PATCH 2)
# get git commit hash (or dirty if git is not installed)
=====================================
saga_setup_win32.iss
=====================================
@@ -1,5 +1,5 @@
-; To build installer (for example, saga-8.4.1_setup.exe).
-; - Unzip the SAGA binary files in their own folder (for example, saga-8.4.1.zip).
+; To build installer (for example, saga-8.4.2_setup.exe).
+; - Unzip the SAGA binary files in their own folder (for example, saga-8.4.2.zip).
; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.).
; - Open saga.iss in Inno Setup.
; - Choose Build | Compile.
@@ -7,7 +7,7 @@
[Setup]
AppName=SAGA - System for Automated Geoscientific Analyses
-AppVerName=SAGA 8.4.1
+AppVerName=SAGA 8.4.2
DefaultDirName={commonpf}\SAGA
DefaultGroupName=SAGA
@@ -19,9 +19,9 @@ Compression=lzma
SolidCompression=yes
OutputDir=.
-OutputBaseFilename=saga-8.4.1_win32_setup
+OutputBaseFilename=saga-8.4.2_win32_setup
-VersionInfoVersion=8.4.1.0
+VersionInfoVersion=8.4.2.0
VersionInfoCompany=SAGA User Group Association
VersionInfoCopyright=(c) 2005-2018 by O. Conrad
VersionInfoDescription=SAGA single-file installer
@@ -47,5 +47,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\8.4.1"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.4.1"; ValueType: string; ValueName: "Version"; ValueData: "8.4.1.0"
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.4.2"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.4.2"; ValueType: string; ValueName: "Version"; ValueData: "8.4.2.0"
=====================================
saga_setup_x64.iss
=====================================
@@ -1,5 +1,5 @@
-; To build installer (for example, saga-8.4.1_setup.exe).
-; - Unzip the SAGA binary files in their own folder (for example, saga-8.4.1.zip).
+; To build installer (for example, saga-8.4.2_setup.exe).
+; - Unzip the SAGA binary files in their own folder (for example, saga-8.4.2.zip).
; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.).
; - Open saga.iss in Inno Setup.
; - Choose Build | Compile.
@@ -7,7 +7,7 @@
[Setup]
AppName=SAGA - System for Automated Geoscientific Analyses
-AppVerName=SAGA 8.4.1
+AppVerName=SAGA 8.4.2
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64
@@ -22,9 +22,9 @@ Compression=lzma
SolidCompression=yes
OutputDir=.
-OutputBaseFilename=saga-8.4.1_x64_setup
+OutputBaseFilename=saga-8.4.2_x64_setup
-VersionInfoVersion=8.4.1.0
+VersionInfoVersion=8.4.2.0
VersionInfoCompany=SAGA User Group Association
VersionInfoCopyright=(c) 2005-2018 by O. Conrad
VersionInfoDescription=SAGA single-file installer
@@ -50,5 +50,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\8.4.1"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.4.1"; ValueType: string; ValueName: "Version"; ValueData: "8.4.1.0"
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.4.2"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\8.4.2"; ValueType: string; ValueName: "Version"; ValueData: "8.4.2.0"
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/commit/b41d04750fd28e423003e5738af716fb55a9914f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/commit/b41d04750fd28e423003e5738af716fb55a9914f
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/20221220/f385918d/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list