Skip to content

Commit 4dfed89

Browse files
dalerobertsdaleroberts
authored
Merge pull request GeoscienceAustralia#260 from rogerfraser/master
Roll back version (for master branch) to 1.2.8
2 parents 0edd403 + 308c84b commit 4dfed89

File tree

8 files changed

+29
-45
lines changed

8 files changed

+29
-45
lines changed

‎dynadjust/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.15)
22

33
project (dynadjust)
44

5-
set (DYNADJUST_VERSION "1.2.9")
5+
set (DYNADJUST_VERSION "1.2.8")
66

77
if (BUILD_TESTING)
88
enable_testing()

‎dynadjust/dynadjust.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 1,2,9,0
29-
PRODUCTVERSION 1,2,9,0
28+
FILEVERSION 1,2,8,0
29+
PRODUCTVERSION 1,2,8,0
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -42,12 +42,12 @@ BEGIN
4242
BLOCK "040904b0"
4343
BEGIN
4444
VALUE "FileDescription", "DynAdjust is a rigorous, high performance least squares adjustment application."
45-
VALUE "FileVersion", "1.2.9.0"
45+
VALUE "FileVersion", "1.2.8.0"
4646
VALUE "InternalName", "DynAdjust"
4747
VALUE "LegalCopyright", "Copyright 2025 Geoscience Australia"
4848
VALUE "OriginalFilename", "DynAdjust"
4949
VALUE "ProductName", "DynAdjust"
50-
VALUE "ProductVersion", "1.2.9.0"
50+
VALUE "ProductVersion", "1.2.8.0"
5151
END
5252
END
5353
BLOCK "VarFileInfo"

‎dynadjust/dynadjust/dnaimportwrapper/dnaimportwrapper.cpp‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,23 +1043,12 @@ int ImportDataFiles(dna_import& parserDynaML, vdnaStnPtr* vStations, vdnaMsrPtr*
10431043
isStaticFrame = isEpsgDatumStatic(LongFromString<UINT32>(projectEpsgCode));
10441044

10451045
// Has the user supplied a static reference frame?
1046-
// If so, set the epoch from the user-supplied static frame
1046+
// If so, set the epoch
10471047
if (p.i.user_supplied_frame && isStaticFrame)
10481048
{
10491049
p.i.epoch = referenceepochFromEpsgString<std::string>(projectEpsgCode);
10501050
p.r.epoch = p.i.epoch;
10511051
}
1052-
// Has the user supplied a SINEX file, but no reference frame?
1053-
// If so, set the epoch from the DynAdjust default datum
1054-
else if (!p.i.user_supplied_frame && input_file_meta.filetype == sinex)
1055-
{
1056-
// revert to epoch of the file frame
1057-
p.i.epoch = referenceepochFromEpsgString<std::string>(projectEpsgCode);
1058-
p.r.epoch = p.i.epoch;
1059-
}
1060-
// At this point, one of the following is true:
1061-
// - a dynamic reference frame has been supplied
1062-
// - a frame has not been supplied, in which case the file frame will be taken
10631052
else if (!p.i.user_supplied_epoch)
10641053
{
10651054
if (inputFileEpoch.empty())
@@ -1149,7 +1138,7 @@ int ImportDataFiles(dna_import& parserDynaML, vdnaStnPtr* vStations, vdnaMsrPtr*
11491138
std::stringstream epochSource;
11501139
if (isStaticFrame)
11511140
{
1152-
epochSource << " - Warning: File epoch (" << inputFileEpoch << ") differs from project epoch (" << p.i.epoch << ")." << std::endl;
1141+
epochSource << " - Warning: File epoch (" << inputFileEpoch << ") will be ignored." << std::endl;
11531142
if (!p.g.quiet)
11541143
std::cout << epochSource.str();
11551144
*imp_file << epochSource.str();

‎dynadjust/dynadjust/dnasegmentwrapper/dnasegmentwrapper.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,6 @@ int main(int argc, char* argv[])
277277
if (ParseCommandLineOptions(argc, argv, vm, p) != EXIT_SUCCESS)
278278
return EXIT_FAILURE;
279279

280-
// Has the user supplied a maximum block size that is less
281-
// than the minimum block size?
282-
if (p.s.min_inner_stations > p.s.max_total_stations)
283-
p.s.min_inner_stations = p.s.max_total_stations;
284-
285280
if (vm.count(QUIET))
286281
p.g.quiet = 1;
287282

dynadjust/dynadjust_1_02_09.sln renamed to dynadjust/dynadjust_1_02_08.sln

File renamed without changes.

‎dynadjust/include/config/dnaversion.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ const char* const __plot_dll_name__ = "libdnaplot.so";
191191
// 2.2.0.a1 02020001 Alpha release
192192
// 2.2.0.b2 02020002 Beta release
193193
// 2.2.0.rc2 02020003 Release candidate 1 (unless bug notification is received, this is taken to be the final release)
194-
#define __BINARY_VERSION__ "1.2.9"
195-
#define __SHORT_VERSION__ "10209" // used to record DynAdjust version in binary file header
194+
#define __BINARY_VERSION__ "1.2.8"
195+
#define __SHORT_VERSION__ "10208" // used to record DynAdjust version in binary file header
196196

197197
// define executable name
198198
#define __GLOBAL_BINARY_NAME__ __dynadjust_app_name__

‎dynadjust/include/parameters/dnaconsts-datums.hpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -126,24 +126,24 @@ const char* const WGS84_G1674_c = "7662";
126126
const char* const WGS84_G1762_c = "7664";
127127
const char* const WGS84_G2139_c = "9753";
128128

129-
const char* const AGD66_epoch = "01.01.1966";
130-
const char* const AGD84_epoch = "01.01.1984";
131-
const char* const GDA94_epoch = "01.01.1994";
132-
const char* const GDA2020_epoch = "01.01.2020";
133-
const char* const ITRF2020_epoch = "01.01.2020";
134-
const char* const ITRF2014_epoch = "01.01.2010";
135-
const char* const ITRF2008_epoch = "01.01.2008";
136-
const char* const ITRF2005_epoch = "01.01.2005";
137-
const char* const ITRF2000_epoch = "01.01.2000";
138-
const char* const ITRF1997_epoch = "01.01.1997";
139-
const char* const ITRF1996_epoch = "01.01.1996";
140-
const char* const ITRF1994_epoch = "01.01.1994";
141-
const char* const ITRF1993_epoch = "01.01.1993";
142-
const char* const ITRF1992_epoch = "01.01.1992";
143-
const char* const ITRF1991_epoch = "01.01.1991";
144-
const char* const ITRF1990_epoch = "01.01.1990";
145-
const char* const ITRF1989_epoch = "01.01.1989";
146-
const char* const ITRF1988_epoch = "01.01.1988";
129+
const char* const AGD66_epoch = "1.1.1966";
130+
const char* const AGD84_epoch = "1.1.1984";
131+
const char* const GDA94_epoch = "1.1.1994";
132+
const char* const GDA2020_epoch = "1.1.2020";
133+
const char* const ITRF2020_epoch = "1.1.2020";
134+
const char* const ITRF2014_epoch = "1.1.2010";
135+
const char* const ITRF2008_epoch = "1.1.2008";
136+
const char* const ITRF2005_epoch = "1.1.2005";
137+
const char* const ITRF2000_epoch = "1.1.2000";
138+
const char* const ITRF1997_epoch = "1.1.1997";
139+
const char* const ITRF1996_epoch = "1.1.1996";
140+
const char* const ITRF1994_epoch = "1.1.1994";
141+
const char* const ITRF1993_epoch = "1.1.1993";
142+
const char* const ITRF1992_epoch = "1.1.1992";
143+
const char* const ITRF1991_epoch = "1.1.1991";
144+
const char* const ITRF1990_epoch = "1.1.1990";
145+
const char* const ITRF1989_epoch = "1.1.1989";
146+
const char* const ITRF1988_epoch = "1.1.1988";
147147

148148
// epochs for WGS84 are not the reference epoch, but rather,
149149
// the starting date from which the respective WGS realisation

‎resources/make_dynadjust_gcc.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ done
9999
# opt installation folder
100100
OPT_DYNADJUST_PATH=/opt/dynadjust
101101
OPT_DYNADJUST_GCC_PATH=/opt/dynadjust/gcc
102-
DYNADJUST_INSTALL_PATH=/opt/dynadjust/gcc/1_2_9
102+
DYNADJUST_INSTALL_PATH=/opt/dynadjust/gcc/1_2_8
103103

104104
# version info
105-
_version="1.2.9"
105+
_version="1.2.8"
106106

107107
echo -e "\n==========================================================================="
108108
echo -e "DynAdjust $_version build configuration options..."

0 commit comments

Comments
 (0)