From 289dc18c579b9250eb9e08b6b7b91847861872db Mon Sep 17 00:00:00 2001 From: Tag Date: Sat, 2 Jan 2021 13:24:12 -0800 Subject: [PATCH 1/3] Tickets 5, 54, 4, 30 --- package.nw/GridTracker.html | 356 ++++++++++++++++++++++------------ package.nw/gt_chat.html | 28 ++- package.nw/lib/adif.js | 8 +- package.nw/lib/defaults.js | 17 +- package.nw/lib/gt.js | 207 ++++++++++++++------ package.nw/lib/gtws.js | 7 +- package.nw/lib/style.css | 16 ++ package.nw/lib/third-party.js | 18 ++ 8 files changed, 441 insertions(+), 216 deletions(-) diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 74c12254..b9f1c4e3 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -88,7 +88,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Legend
QSX @@ -137,11 +138,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -171,7 +172,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- - + + - + + - - - + + +
@@ -1742,6 +1734,200 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +
+
+
+
+ + + + + +
Gridsquare Colors +
+
Reset Colors
+
+
+ +
+ + + + + + + +
QSO / Worked
+ +
+
+
+ + + + + + + +
QSL / Confirmed
+ +
+
+
+ + + + + + + +
QSX / Station-2-Station
+ +
+
+
+
+ + + + + + + +
'CQ' Stations
+ +
+
+ +
+ + + + + + + +
'CQ DX' Stations
+ +
+
+
+ + + + + + + +
QRZ / Your Traffic
+ +
+
+
+ + + + + + + +
QTH / Home Gridsquare
+ +
+
+ +
+ +
+
+
+ + + + + + + +
PSK-Spots Over Grids
+ +
+
+
+ + + + + + + + +
Grid Opacity10%
+ +
+
+
+ + + + + + + +
Split QSL Grids
+ +
+
+
+ + + + + + + +
Auto Mouseover Grids
+ +
+
+
+
+ + + + + + + + + + +
Live Grid Decay
10m
+ +
+
+
-
+
- - + + - + @@ -1942,56 +2126,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Live Grid Decay
Map Settings Transparency
10m50%
-
- - - - - - - - -
Grid Opacity10%
- -
-
- -
- - - - - - - -
Split QSL Grids
- -
-
-
-
- - - - - - - -
Grid Mouse-Over Tables
- -
-
@@ -2016,6 +2150,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
@@ -2028,7 +2163,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
@@ -2066,18 +2200,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- - - - - - - -
PSK-Spots Over Grids
- -
-
@@ -2090,7 +2212,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
@@ -2115,30 +2237,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- - - - - - - - - - -
Map Settings Transparency
50%
- -
-
+ +
diff --git a/package.nw/gt_chat.html b/package.nw/gt_chat.html index 3ffa6f4e..e5fd3015 100644 --- a/package.nw/gt_chat.html +++ b/package.nw/gt_chat.html @@ -268,21 +268,17 @@ } function makeCallsignRow(callObj, show) { - var oldRow = document.getElementById(callObj.cid); + let oldRow = document.getElementById(callObj.cid); if (!oldRow) { - var newCall = callObj.call.formatCallsign(); - - var x; - for ( - x = 0; - x < allCallTable.rows.length && newCall.localeCompare(allCallTable.rows[x].cells[0].innerHTML) != -1; - x++ - ) { + let newCall = callObj.call.formatCallsign(); + let x = 0; + for (x = 0; x < allCallTable.rows.length && newCall > allCallTable.rows[x].cells[0].innerHTML; x++) + { // just count } - var row = allCallTable.insertRow(x); + let row = allCallTable.insertRow(x); row.id = callObj.cid; row.style.cursor = "pointer"; @@ -290,7 +286,7 @@ row.onclick = openIdCid; row.oncontextmenu = openLookupCid; - var td = row.insertCell(); + let td = row.insertCell(); td.className = callObj.live == false ? "rosterOff" : "rosterOn"; td.innerHTML = newCall; @@ -298,7 +294,7 @@ td.onmouseout = onNoHoverCid; if (callObj.dxcc > 0 && callObj.dxcc in window.opener.g_dxccToGeoData) { - var imgClass = callObj.live == false ? "imgGray" : "imgNoFilter"; + let imgClass = callObj.live == false ? "imgGray" : "imgNoFilter"; td = row.insertCell(); td.innerHTML = " { + if (col <= 0.03928) { + return col / 12.92; + } + return Math.pow((col + 0.055) / 1.055, 2.4); + }); + var L = (0.2126 * c[0]) + (0.7152 * c[1]) + (0.0722 * c[2]); + return (L > 0.179) ? darkColor : lightColor; +} From a8e72047b4f1d635ebaff151a10164ed5925ca6a Mon Sep 17 00:00:00 2001 From: Tag Date: Sat, 2 Jan 2021 13:56:35 -0800 Subject: [PATCH 2/3] 'CQ' Stations losing color --- package.nw/lib/gt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index bb25cd45..72d2efb3 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -4144,7 +4144,7 @@ function qthToBox(iQTH, iDEcallsign, iCQ, iNew, locked, DE, band, wspr, hash) var myDEzOffset = 0; var myDEbox = false; - if (iCQ) + if (DE == "CQ" || iCQ) { boxColor = g_legendColors.CQ + g_gridAlpha; } From ee922727387f8fd05c39ddb0fcf7fc37576bf1d5 Mon Sep 17 00:00:00 2001 From: Tag Date: Sat, 2 Jan 2021 14:55:40 -0800 Subject: [PATCH 3/3] Dont toggle chat window Competes with other features --- package.nw/lib/gt.js | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 72d2efb3..dbb2cf5d 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -2487,21 +2487,11 @@ function showMessaging(show = true, cid) { try { - if (g_chatWindowHandle.window.g_isShowing == false) - { - g_chatWindowHandle.window.g_isShowing = true; - g_chatWindowHandle.window.saveScreenSettings(); - g_chatWindowHandle.show(); - g_chatWindowHandle.focus(); - if (typeof cid != "undefined") g_chatWindowHandle.window.openId(cid); - } - else - { - g_chatWindowHandle.window.g_isShowing = false; - g_chatWindowHandle.window.saveScreenSettings(); - g_chatWindowHandle.window.closeMessageArea(); - g_chatWindowHandle.hide(); - } + g_chatWindowHandle.window.g_isShowing = true; + g_chatWindowHandle.window.saveScreenSettings(); + g_chatWindowHandle.show(); + g_chatWindowHandle.focus(); + if (typeof cid != "undefined") g_chatWindowHandle.window.openId(cid); } catch (e) {} }