From 4ae020d9f6e71c1d025828e1bf9c1dd22c1598c4 Mon Sep 17 00:00:00 2001 From: chrbayer84 Date: Sat, 31 Dec 2022 03:39:23 +0000 Subject: [PATCH] Squashed commits '${title}' --- package.nw/GridTracker.html | 12 +++++++++++- package.nw/i18n/cn-t.json | 10 ++++++++++ package.nw/i18n/cn.json | 10 ++++++++++ package.nw/i18n/en.json | 12 +++++++++++- package.nw/lib/gt.js | 13 ++++++++++++- package.nw/lib/protos.js | 13 +++++++++++++ 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 136b3c2..38851ba 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -409,12 +409,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + + + + + + + @@ -3180,4 +3190,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + \ No newline at end of file diff --git a/package.nw/i18n/cn-t.json b/package.nw/i18n/cn-t.json index 7f2582d..62193ad 100644 --- a/package.nw/i18n/cn-t.json +++ b/package.nw/i18n/cn-t.json @@ -79,12 +79,22 @@ "mapFilter.band.12m": "12m", "mapFilter.band.11m": "11m", "mapFilter.band.10m": "10m", + "mapFilter.band.8m": "8m", "mapFilter.band.6m": "6m", "mapFilter.band.4m": "4m", "mapFilter.band.2m": "2m", "mapFilter.band.125cm": "125cm", "mapFilter.band.70cm": "70cm", "mapFilter.band.23cm": "23cm", + "mapFilter.band.13cm": "13cm", + "mapFilter.band.9cm": "9cm", + "mapFilter.band.3cm": "3cm", + "mapFilter.band.1_2cm": "1.2cm", + "mapFilter.band.6mm": "6mm", + "mapFilter.band.4mm": "4mm", + "mapFilter.band.2_5mm": "2.5mm", + "mapFilter.band.2mm": "2mm", + "mapFilter.band.1mm": "1mm", "mapFilter.band.OOB": "OOB", "mapFilter.mode.hover": "選擇模式", "mapFilter.mode.label": "模式", diff --git a/package.nw/i18n/cn.json b/package.nw/i18n/cn.json index d7c7099..56d6b6c 100644 --- a/package.nw/i18n/cn.json +++ b/package.nw/i18n/cn.json @@ -79,12 +79,22 @@ "mapFilter.band.12m": "12m", "mapFilter.band.11m": "11m", "mapFilter.band.10m": "10m", + "mapFilter.band.8m": "8m", "mapFilter.band.6m": "6m", "mapFilter.band.4m": "4m", "mapFilter.band.2m": "2m", "mapFilter.band.125cm": "125cm", "mapFilter.band.70cm": "70cm", "mapFilter.band.23cm": "23cm", + "mapFilter.band.13cm": "13cm", + "mapFilter.band.9cm": "9cm", + "mapFilter.band.3cm": "3cm", + "mapFilter.band.1_2cm": "1.2cm", + "mapFilter.band.6mm": "6mm", + "mapFilter.band.4mm": "4mm", + "mapFilter.band.2_5mm": "2.5mm", + "mapFilter.band.2mm": "2mm", + "mapFilter.band.1mm": "1mm", "mapFilter.band.OOB": "OOB", "mapFilter.mode.hover": "选择模式", "mapFilter.mode.label": "模式", diff --git a/package.nw/i18n/en.json b/package.nw/i18n/en.json index 0ecd3da..21c753f 100644 --- a/package.nw/i18n/en.json +++ b/package.nw/i18n/en.json @@ -78,12 +78,22 @@ "mapFilter.band.12m": "12m", "mapFilter.band.11m": "11m", "mapFilter.band.10m": "10m", + "mapFilter.band.8m": "8m", "mapFilter.band.6m": "6m", "mapFilter.band.4m": "4m", "mapFilter.band.2m": "2m", "mapFilter.band.125cm": "125cm", "mapFilter.band.70cm": "70cm", "mapFilter.band.23cm": "23cm", + "mapFilter.band.13cm": "13cm", + "mapFilter.band.9cm": "9cm", + "mapFilter.band.3cm": "3cm", + "mapFilter.band.1_2cm": "1.2cm", + "mapFilter.band.6mm": "6mm", + "mapFilter.band.4mm": "4mm", + "mapFilter.band.2_5mm": "2.5mm", + "mapFilter.band.2mm": "2mm", + "mapFilter.band.1mm": "1mm", "mapFilter.band.OOB": "OOB", "mapFilter.mode.hover": "Select Mode", "mapFilter.mode.label": "Mode", @@ -1068,4 +1078,4 @@ "COMMENT_sendAlerts.js": "", "sendAlerts.scriptEnabled": "Script Enabled", "sendAlerts.scriptDisabled": "Script Disabled" -} +} \ No newline at end of file diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index a9378e0..fb68953 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -414,12 +414,23 @@ var g_colorBands = [ "12m", "11m", "10m", + "8m", "6m", "4m", "2m", "1.25m", "70cm", - "23cm" + "23cm", + "13cm", + "9cm", + "5cm", + "3cm", + "1.2cm", + "6mm", + "4mm", + "2.5mm", + "2mm", + "1mm" ]; var g_pathIgnore = {}; diff --git a/package.nw/lib/protos.js b/package.nw/lib/protos.js index 3fcd598..9c71be1 100644 --- a/package.nw/lib/protos.js +++ b/package.nw/lib/protos.js @@ -33,6 +33,8 @@ Number.prototype.formatBand = function () "10m", 29, "10m", + 40, + "8m", 50, "6m", 51, @@ -82,6 +84,17 @@ Number.prototype.formatBand = function () else if (newFreq >= 420 && newFreq <= 450) return "70cm"; else if (newFreq >= 902 && newFreq <= 928) return "33cm"; else if (newFreq >= 1240 && newFreq <= 1300) return "23cm"; + else if (newFreq >= 2300 && newFreq <= 2450) return "13cm"; + else if (newFreq >= 2300 && newFreq <= 2450) return "13cm"; + else if (newFreq >= 3300 && newFreq <= 3500) return "9cm"; + else if (newFreq >= 5650 && newFreq <= 5925) return "5cm"; + else if (newFreq >= 10000 && newFreq <= 10500) return "3cm"; + else if (newFreq >= 24000 && newFreq <= 24250) return "1.2cm"; + else if (newFreq >= 47000 && newFreq <= 47200) return "6mm"; + else if (newFreq >= 75500 && newFreq <= 81000) return "4mm"; + else if (newFreq >= 122500 && newFreq <= 123000) return "2.5mm"; + else if (newFreq >= 134000 && newFreq <= 141000) return "2mm"; + else if (newFreq >= 241000 && newFreq <= 250000) return "1mm"; else if (freq >= 0.472 && freq <= 0.479) return "630m"; else if (freq >= 0.1357 && freq <= 0.1485) return "2200m"; else if (freq >= 0.009 && freq <= 0.02) return "4000m";