From ef3b8648ff173efb8963d8c4e803562d494d4063 Mon Sep 17 00:00:00 2001 From: Billy Kozma Date: Mon, 29 Mar 2021 08:08:47 -0600 Subject: [PATCH 1/2] Fixes #2. Also bumps the version numbers. --- dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs | 4 ++-- src/LongleyRice.cpp | 4 ++-- win32/ITMDrvr/ITMDrvr.rc | 8 ++++---- win32/itm/itm.rc | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs b/dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs index 35dd6bb..9b8bfa1 100644 --- a/dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs +++ b/dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +[assembly: AssemblyVersion("1.4.0.0")] +[assembly: AssemblyFileVersion("1.4.0.0")] diff --git a/src/LongleyRice.cpp b/src/LongleyRice.cpp index 88fdda0..6de72ab 100644 --- a/src/LongleyRice.cpp +++ b/src/LongleyRice.cpp @@ -209,12 +209,12 @@ int LongleyRice(double theta_hzn[2], double f__mhz, complex Z_g, double if (d__meter > d_x__meter) { *A_ref__db = M_s * d__meter + A_s0__db; - *propmode = MODE__DIFFRACTION; + *propmode = MODE__TROPOSCATTER; } else { *A_ref__db = M_d * d__meter + A_d0__db; - *propmode = MODE__TROPOSCATTER; + *propmode = MODE__DIFFRACTION; } } diff --git a/win32/ITMDrvr/ITMDrvr.rc b/win32/ITMDrvr/ITMDrvr.rc index 9b5d085..a7901e5 100644 --- a/win32/ITMDrvr/ITMDrvr.rc +++ b/win32/ITMDrvr/ITMDrvr.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,11 +69,11 @@ BEGIN BEGIN VALUE "CompanyName", "The Institute for Telecommunication Sciences" VALUE "FileDescription", "Irregular Terrain Model (ITM) Driver" - VALUE "FileVersion", "1.3.0.0" + VALUE "FileVersion", "1.4.0.0" VALUE "InternalName", "ITMDrvr.exe" VALUE "OriginalFilename", "ITMDrvr.exe" VALUE "ProductName", "Irregular Terrain Model (ITM) Driver" - VALUE "ProductVersion", "1.3.0.0" + VALUE "ProductVersion", "1.4.0.0" END END BLOCK "VarFileInfo" diff --git a/win32/itm/itm.rc b/win32/itm/itm.rc index fe21c9d..3b4598f 100644 --- a/win32/itm/itm.rc +++ b/win32/itm/itm.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,11 +69,11 @@ BEGIN BEGIN VALUE "CompanyName", "The Institute for Telecommunication Sciences" VALUE "FileDescription", "Irregular Terrain Model (ITM)" - VALUE "FileVersion", "1.3.0.0" + VALUE "FileVersion", "1.4.0.0" VALUE "InternalName", "itm.dll" VALUE "OriginalFilename", "itm.dll" VALUE "ProductName", "Irregular Terrain Model (ITM)" - VALUE "ProductVersion", "1.3.0.0" + VALUE "ProductVersion", "1.4.0.0" END END BLOCK "VarFileInfo" From 0fa9f9957d943c8dd57002a3e138bf5488bf28a3 Mon Sep 17 00:00:00 2001 From: Billy Kozma Date: Sun, 25 Apr 2021 20:50:39 -0600 Subject: [PATCH 2/2] bumped version number in nuspec file --- dotnet/nuget/itm.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/nuget/itm.nuspec b/dotnet/nuget/itm.nuspec index 57c05d6..c17b908 100644 --- a/dotnet/nuget/itm.nuspec +++ b/dotnet/nuget/itm.nuspec @@ -2,7 +2,7 @@ ITM - 1.3.0 + 1.4.0 The Institute for Telecommunication Sciences The Institute for Telecommunication Sciences LICENSE.md