From 68b2c8b7cde57f7b97cf47480ae6ee38fd66ab24 Mon Sep 17 00:00:00 2001 From: Austin Sanders Date: Fri, 17 Sep 2021 14:48:53 -0700 Subject: [PATCH 1/2] Updated changelog with edrget deprecation --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1c42eaab..e8338fbe8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,10 @@ release. ### Added - Added the ability to search filenames in measure's drop down boxes in Qnet Point Editor. [#4581](https://github.com/USGS-Astrogeology/ISIS3/issues/4581) - Added slope, local normal, and ellipsoid normal calculations to phocube. [#3635](https://github.com/USGS-Astrogeology/ISIS3/issues/3645) +- Added additional translation files for TGO CaSSiS in order to support PSA compliant labels. [#4567](https://github.com/USGS-Astrogeology/ISIS3/issues/4567) + +### Deprecated +- Deprecated edrget as discussed in [#3313](https://github.com/USGS-Astrogeology/ISIS3/issues/3313). ## [6.0.0] - 2021-08-27 From 6a09c0664aed388729c1feeefb2f4c129920201e Mon Sep 17 00:00:00 2001 From: Austin Sanders Date: Fri, 17 Sep 2021 14:49:15 -0700 Subject: [PATCH 2/2] Added deprecation notice --- isis/src/base/apps/edrget/main.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/isis/src/base/apps/edrget/main.cpp b/isis/src/base/apps/edrget/main.cpp index af6e450a2a..2a43378138 100644 --- a/isis/src/base/apps/edrget/main.cpp +++ b/isis/src/base/apps/edrget/main.cpp @@ -14,6 +14,12 @@ using namespace Isis; using namespace std; void IsisMain() { + std::cout << "\n*********************************** WARNING ***********************************\n" + " This program is deprecated and will be made unavailable in a future release of\n" + " ISIS. A brief discussion that lead to this decision can be found at \n" + " https://github.com/USGS-Astrogeology/ISIS3/issues/3313. Users who require \n" + " similar functionality are encouraged to explore wget as a replacement. \n" + "*******************************************************************************\n" << '\n'; // Get the file name from the GUI int timeOut = 60000; @@ -33,7 +39,7 @@ void IsisMain() { QUrl qurl(guiURL); //test if scheme is ftp or http - if (qurl.scheme().toLower() == "ftp" || qurl.scheme().toLower() == "http" || + if (qurl.scheme().toLower() == "ftp" || qurl.scheme().toLower() == "http" || qurl.scheme().toLower() == "https") { if (ui.IsInteractive()) {