Rx Spot |
";
@@ -2115,8 +2108,8 @@ function createTooltTipTable(toolElement)
var callsign = newCallList[x];
var bgDX = " style='font-weight:bold;color:cyan;' ";
var bgDE = " style='font-weight:bold;color:yellow;' ";
- if (callsign.DXcall == myDEcall) { bgDX = " style='background-color:cyan;color:#000;font-weight:bold' "; }
- if (callsign.DEcall == myDEcall) { bgDE = " style='background-color:#FFFF00;color:#000;font-weight:bold' "; }
+ if (callsign.DXcall == GT.appSettings.myCall) { bgDX = " style='background-color:cyan;color:#000;font-weight:bold' "; }
+ if (callsign.DEcall == GT.appSettings.myCall) { bgDE = " style='background-color:#FFFF00;color:#000;font-weight:bold' "; }
if (typeof callsign.msg == "undefined" || callsign.msg == "") { callsign.msg = "-"; }
var ageString = "";
if (timeNowSec() - callsign.time < 3601) { ageString = toDHMS(timeNowSec() - callsign.time); }
@@ -2239,8 +2232,8 @@ function createTooltTipTableLogbook(toolElement)
var callsign = newCallList[x];
var bgDX = " style='font-weight:bold;color:cyan;' ";
var bgDE = " style='font-weight:bold;color:yellow;' ";
- if (callsign.DXcall == myDEcall) { bgDX = " style='background-color:cyan;color:#000;font-weight:bold' "; }
- if (callsign.DEcall == myDEcall) { bgDE = " style='background-color:#FFFF00;color:#000;font-weight:bold' "; }
+ if (callsign.DXcall == GT.appSettings.myCall) { bgDX = " style='background-color:cyan;color:#000;font-weight:bold' "; }
+ if (callsign.DEcall == GT.appSettings.myCall) { bgDE = " style='background-color:#FFFF00;color:#000;font-weight:bold' "; }
var ageString = "";
if (timeNowSec() - callsign.time < 3601) { ageString = toDHMS(timeNowSec() - callsign.time); }
else
@@ -3075,13 +3068,13 @@ function makeTitleInfo(mapWindow)
GT.appSettings.gtBandFilter.length == 0
? "Mixed"
: GT.appSettings.gtBandFilter == "auto"
- ? myBand
+ ? GT.appSettings.myBand
: GT.appSettings.gtBandFilter;
var mode =
GT.appSettings.gtModeFilter.length == 0
? "Mixed"
: GT.appSettings.gtModeFilter == "auto"
- ? myMode
+ ? GT.appSettings.myMode
: GT.appSettings.gtModeFilter;
var news = `GridTracker ${gtVersionStr} [Band: ${band} Mode: ${mode}`;
@@ -4306,7 +4299,7 @@ function qthToBox(iQTH, iDEcallsign, iCQ, locked, DE, band, wspr, hash)
boxColor = GT.legendColors.CQ + GT.gridAlpha;
}
- if (DE == myDEcall)
+ if (DE == GT.appSettings.myCall)
{
borderColor = "#FF0000FF";
boxColor = GT.legendColors.QRZ + GT.gridAlpha;
@@ -4806,7 +4799,7 @@ function updateCountStats()
{
var count = Object.keys(GT.liveCallsigns).length;
- if (myDEcall in GT.liveCallsigns) count--;
+ if (GT.appSettings.myCall in GT.liveCallsigns) count--;
callsignCount.innerHTML = count;
@@ -5023,8 +5016,8 @@ function clearLogFilesAndCounts()
function getCurrentBandModeHTML()
{
- var band = GT.appSettings.gtBandFilter == "auto" ? myBand + " (Auto)" : GT.appSettings.gtBandFilter.length == 0 ? "Mixed Bands" : GT.appSettings.gtBandFilter;
- var mode = GT.appSettings.gtModeFilter == "auto" ? myMode + " (Auto)" : GT.appSettings.gtModeFilter.length == 0 ? "Mixed Modes" : GT.appSettings.gtModeFilter;
+ var band = GT.appSettings.gtBandFilter == "auto" ? GT.appSettings.myBand + " (Auto)" : GT.appSettings.gtBandFilter.length == 0 ? "Mixed Bands" : GT.appSettings.gtBandFilter;
+ var mode = GT.appSettings.gtModeFilter == "auto" ? GT.appSettings.myMode + " (Auto)" : GT.appSettings.gtModeFilter.length == 0 ? "Mixed Modes" : GT.appSettings.gtModeFilter;
return (
"Viewing: " +
band +
@@ -5801,20 +5794,20 @@ function liveHash(call, band, mode)
function setHomeGridsquare()
{
- GT.appSettings.centerGridsquare = myDEGrid;
+ GT.appSettings.centerGridsquare = GT.appSettings.myGrid;
if (GT.appSettings.centerGridsquare.length > 0)
{
homeQTHInput.value = GT.appSettings.centerGridsquare;
}
- var hash = myDEcall;
+ var hash = GT.appSettings.myCall;
var rect = qthToBox(
- myDEGrid,
- myDEcall,
+ GT.appSettings.myGrid,
+ GT.appSettings.myCall,
false,
true,
"",
- myBand,
+ GT.appSettings.myBand,
null,
hash
);
@@ -5828,18 +5821,18 @@ function setHomeGridsquare()
push = true;
}
else newCallsign = GT.liveCallsigns[hash];
- newCallsign.DEcall = myDEcall;
- newCallsign.grid = myDEGrid;
+ newCallsign.DEcall = GT.appSettings.myCall;
+ newCallsign.grid = GT.appSettings.myGrid;
newCallsign.wspr = null;
- newCallsign.msg = myDEGrid;
+ newCallsign.msg = GT.appSettings.myGrid;
newCallsign.RSTsent = "-";
newCallsign.RSTrecv = "-";
newCallsign.time = timeNowSec();
newCallsign.delta = -1;
newCallsign.DXcall = "Self";
newCallsign.rect = rect;
- newCallsign.mode = myMode;
- newCallsign.band = myBand;
+ newCallsign.mode = GT.appSettings.myMode;
+ newCallsign.band = GT.appSettings.myBand;
newCallsign.worked = false;
newCallsign.confirmed = false;
newCallsign.state = null;
@@ -5849,7 +5842,7 @@ function setHomeGridsquare()
newCallsign.instance = null;
newCallsign.alerted = false;
newCallsign.shouldAlert = false;
- GT.myDXCC = newCallsign.dxcc = callsignToDxcc(myDEcall);
+ GT.myDXCC = newCallsign.dxcc = callsignToDxcc(GT.appSettings.myCall);
newCallsign.locked = true;
if (push) GT.liveCallsigns[hash] = newCallsign;
@@ -6214,11 +6207,11 @@ function handleWsjtxStatus(newMessage)
var modeChange = false;
wsjtxMode.innerHTML = "" + newMessage.MO + "";
- myMode = newMessage.MO;
- myBand = newMessage.Band;
- if (GT.lastBand != myBand)
+ GT.appSettings.myMode = newMessage.MO;
+ GT.appSettings.myBand = newMessage.Band;
+ if (GT.lastBand != GT.appSettings.myBand)
{
- GT.lastBand = myBand;
+ GT.lastBand = GT.appSettings.myBand;
bandChange = true;
if (GT.pskBandActivityTimerHandle != null)
{
@@ -6226,9 +6219,9 @@ function handleWsjtxStatus(newMessage)
GT.pskBandActivityTimerHandle = null;
}
}
- if (GT.lastMode != myMode)
+ if (GT.lastMode != GT.appSettings.myMode)
{
- GT.lastMode = myMode;
+ GT.lastMode = GT.appSettings.myMode;
modeChange = true;
if (GT.pskBandActivityTimerHandle != null)
{
@@ -6246,7 +6239,7 @@ function handleWsjtxStatus(newMessage)
redrawParks();
redrawPins();
- var msg = "" + myBand + " / " + myMode + "";
+ var msg = "" + GT.appSettings.myBand + " / " + GT.appSettings.myMode + "";
addLastTraffic(msg);
ackAlerts();
updateChatWindow();
@@ -6254,22 +6247,22 @@ function handleWsjtxStatus(newMessage)
GT.gtLiveStatusUpdate = true;
}
- myRawFreq = newMessage.Frequency;
- frequency.innerHTML = "" + formatMhz(Number(newMessage.Frequency / 1000), 3, 3) + " Hz (" + myBand + ")";
- myRawCall = newMessage.DEcall.trim();
- myRawGrid = newMessage.DEgrid.trim().substr(0, 6);
+ GT.appSettings.myRawFreq = newMessage.Frequency;
+ frequency.innerHTML = "" + formatMhz(Number(newMessage.Frequency / 1000), 3, 3) + " Hz (" + GT.appSettings.myBand + ")";
+ GT.appSettings.myRawCall = newMessage.DEcall.trim();
+ GT.appSettings.myRawGrid = newMessage.DEgrid.trim().substr(0, 6);
- var LL = squareToCenter(myRawGrid);
+ var LL = squareToCenter(GT.appSettings.myRawGrid);
GT.mapSettings.latitude = GT.myLat = LL.a;
GT.mapSettings.longitude = GT.myLon = LL.o;
- if (myRawGrid != GT.lastRawGrid)
+ if (GT.appSettings.myRawGrid != GT.lastRawGrid)
{
- GT.lastRawGrid = myRawGrid;
+ GT.lastRawGrid = GT.appSettings.myRawGrid;
}
dxCallBoxDiv.className = "DXCallBox";
- var hash = DXcall + myBand + myMode;
+ var hash = DXcall + GT.appSettings.myBand + GT.appSettings.myMode;
if (hash in GT.tracker.worked.call)
{
@@ -6298,11 +6291,11 @@ function handleWsjtxStatus(newMessage)
localDXcall.innerHTML = "-";
GT.localDXcall = "";
}
- localDXGrid.innerHTML = myDXGrid = newMessage.DXgrid.trim();
+ localDXGrid.innerHTML = GT.myDXGrid = newMessage.DXgrid.trim();
- if (myDXGrid.length == 0 && hash in GT.liveCallsigns)
+ if (GT.myDXGrid.length == 0 && hash in GT.liveCallsigns)
{
- localDXGrid.innerHTML = myDXGrid = GT.liveCallsigns[hash].grid.substr(0, 4);
+ localDXGrid.innerHTML = GT.myDXGrid = GT.liveCallsigns[hash].grid.substr(0, 4);
}
if (localDXGrid.innerHTML.length == 0)
@@ -6313,7 +6306,7 @@ function handleWsjtxStatus(newMessage)
}
else
{
- var LL = squareToCenter(myDXGrid);
+ var LL = squareToCenter(GT.myDXGrid);
localDXDistance.innerHTML = parseInt(MyCircle.distance(GT.myLat, GT.myLon, LL.a, LL.o, distanceUnit.value) * MyCircle.validateRadius(distanceUnit.value)) + distanceUnit.value.toLowerCase();
localDXAzimuth.innerHTML = parseInt(MyCircle.bearing(GT.myLat, GT.myLon, LL.a, LL.o)) + "°";
}
@@ -6335,10 +6328,10 @@ function handleWsjtxStatus(newMessage)
localDXReport.innerHTML = localDXCountry.innerHTML = "";
}
- myDEcall = newMessage.DEcall;
- myDEGrid = newMessage.DEgrid.trim().substr(0, 6);
- if (myDEGrid.length > 0) setHomeGridsquare();
- if (myDEGrid.length > 0) GT.appSettings.centerGridsquare = myDEGrid;
+ GT.appSettings.myCall = newMessage.DEcall;
+ GT.appSettings.myGrid = newMessage.DEgrid.trim().substr(0, 6);
+ if (GT.appSettings.myGrid.length > 0) setHomeGridsquare();
+ if (GT.appSettings.myGrid.length > 0) GT.appSettings.centerGridsquare = GT.appSettings.myGrid;
if (newMessage.Decoding == 1)
{
@@ -6399,16 +6392,16 @@ function handleWsjtxStatus(newMessage)
GT.lastMapView.LoLa = GT.mapView.getCenter();
GT.lastMapView.zoom = GT.mapView.getZoom();
}
- if (myDXGrid.length > 0)
+ if (GT.myDXGrid.length > 0)
{
- fitViewBetweenPoints([getPoint(myRawGrid), getPoint(myDXGrid)]);
+ fitViewBetweenPoints([getPoint(GT.appSettings.myRawGrid), getPoint(GT.myDXGrid)]);
}
else if (GT.mapSettings.qrzDxccFallback && DXcall.length > 0 && callsignToDxcc(DXcall) > 0)
{
var dxcc = callsignToDxcc(DXcall);
var Lat = GT.dxccInfo[dxcc].lat;
var Lon = GT.dxccInfo[dxcc].lon;
- fitViewBetweenPoints([getPoint(myRawGrid), ol.proj.fromLonLat([Lon, Lat])], 15);
+ fitViewBetweenPoints([getPoint(GT.appSettings.myRawGrid), ol.proj.fromLonLat([Lon, Lat])], 15);
}
}
}
@@ -6439,17 +6432,17 @@ function handleWsjtxStatus(newMessage)
GT.layerSources.transmit.clear();
GT.transmitFlightPath = null;
- if (qrzPathWidthValue.value != 0 && GT.appSettings.gridViewMode != 2 && validateGridFromString(myRawGrid))
+ if (qrzPathWidthValue.value != 0 && GT.appSettings.gridViewMode != 2 && validateGridFromString(GT.appSettings.myRawGrid))
{
var strokeColor = getQrzPathColor();
var strokeWeight = qrzPathWidthValue.value;
- var LL = squareToCenter(myRawGrid);
+ var LL = squareToCenter(GT.appSettings.myRawGrid);
var fromPoint = ol.proj.fromLonLat([LL.o, LL.a]);
var toPoint = null;
- if (validateGridFromString(myDXGrid))
+ if (validateGridFromString(GT.myDXGrid))
{
- LL = squareToCenter(myDXGrid);
+ LL = squareToCenter(GT.myDXGrid);
toPoint = ol.proj.fromLonLat([LL.o, LL.a]);
}
else if (GT.mapSettings.qrzDxccFallback && DXcall.length > 0 && callsignToDxcc(DXcall) > 0)
@@ -6491,14 +6484,6 @@ function handleWsjtxStatus(newMessage)
}
GT.weAreDecoding = false;
}
-
- GT.appSettings.myDEcall = myDEcall;
- GT.appSettings.myDEGrid = myDEGrid;
- GT.appSettings.myMode = myMode;
- GT.appSettings.myBand = myBand;
- GT.appSettings.myRawFreq = myRawFreq;
- GT.appSettings.myRawCall = myRawCall;
- GT.appSettings.myRawGrid = myRawGrid;
}
if (newMessage.Decoding == 0)
@@ -6531,11 +6516,11 @@ function drawTraffic()
.split(GT.localDXcall)
.join("" + GT.localDXcall + "");
}
- if (myRawCall.length > 1)
+ if (GT.appSettings.myRawCall.length > 1)
{
worker = worker
- .split(myRawCall)
- .join("" + myRawCall + "");
+ .split(GT.appSettings.myRawCall)
+ .join("" + GT.appSettings.myRawCall + "");
}
trafficDiv.innerHTML = worker;
}
@@ -6687,10 +6672,10 @@ function handleWsjtxDecode(newMessage)
var canPath = false;
if (
(GT.appSettings.gtBandFilter.length == 0 ||
- (GT.appSettings.gtBandFilter == "auto" && newMessage.OB == myBand) ||
+ (GT.appSettings.gtBandFilter == "auto" && newMessage.OB == GT.appSettings.myBand) ||
newMessage.OB == GT.appSettings.gtBandFilter) &&
(GT.appSettings.gtModeFilter.length == 0 ||
- (GT.appSettings.gtModeFilter == "auto" && newMessage.OM == myMode) ||
+ (GT.appSettings.gtModeFilter == "auto" && newMessage.OM == GT.appSettings.myMode) ||
newMessage.OM == GT.appSettings.gtModeFilter ||
GT.appSettings.gtModeFilter == "Digital")
)
@@ -6788,11 +6773,11 @@ function handleWsjtxDecode(newMessage)
if (
(GT.appSettings.gtBandFilter.length == 0 ||
(GT.appSettings.gtBandFilter == "auto" &&
- newMessage.OB == myBand) ||
+ newMessage.OB == GT.appSettings.myBand) ||
newMessage.OB == GT.appSettings.gtBandFilter) &&
(GT.appSettings.gtModeFilter.length == 0 ||
(GT.appSettings.gtModeFilter == "auto" &&
- newMessage.OM == myMode) ||
+ newMessage.OM == GT.appSettings.myMode) ||
newMessage.OM == GT.appSettings.gtModeFilter ||
GT.appSettings.gtModeFilter == "Digital")
)
@@ -6829,7 +6814,7 @@ function handleWsjtxDecode(newMessage)
callsign.CQ = CQ;
callsign.RR73 = RR73;
- callsign.qrz = (msgDXcallsign == myDEcall);
+ callsign.qrz = (msgDXcallsign == GT.appSettings.myCall);
if (callsign.grid.length > 0 && callsign.distance == 0)
{
@@ -6950,7 +6935,7 @@ function handleWsjtxDecode(newMessage)
var strokeWeight = pathWidthValue.value;
var flightPath = null;
var isQRZ = false;
- if (msgDXcallsign == myDEcall)
+ if (msgDXcallsign == GT.appSettings.myCall)
{
strokeColor = getQrzPathColor();
strokeWeight = qrzPathWidthValue.value;
@@ -6989,14 +6974,14 @@ function handleWsjtxDecode(newMessage)
}
}
}
- else if (GT.mapSettings.qrzDxccFallback && msgDXcallsign == myDEcall && callsign.dxcc > 0)
+ else if (GT.mapSettings.qrzDxccFallback && msgDXcallsign == GT.appSettings.myCall && callsign.dxcc > 0)
{
// the caller is calling us, but they don't have a grid, so lookup the DXCC and show it
var strokeColor = getQrzPathColor();
var strokeWeight = qrzPathWidthValue.value;
var flightPath = null;
var isQRZ = true;
- var DEcallsign = GT.liveCallsigns[myDEcall];
+ var DEcallsign = GT.liveCallsigns[GT.appSettings.myCall];
if (strokeWeight != 0)
{
@@ -7467,7 +7452,7 @@ function showCallsignBox(redraw)
newCallList.sort(compareCallsignTime).reverse();
for (var x in newCallList)
{
- if (newCallList[x].DEcall == myRawCall) continue;
+ if (newCallList[x].DEcall == GT.appSettings.myRawCall) continue;
var grid = newCallList[x].rect ? newCallList[x].rect.qth : "-";
var cqzone = newCallList[x].cqz ? newCallList[x].cqz : "-";
var ituzone = newCallList[x].ituz ? newCallList[x].ituz : "-";
@@ -8437,7 +8422,7 @@ function showDXCCsBox()
Object.keys(List).forEach(function (key, i)
{
- var band = GT.appSettings.gtBandFilter == "auto" ? myBand : GT.appSettings.gtBandFilter.length == 0 ? "" : GT.appSettings.gtBandFilter;
+ var band = GT.appSettings.gtBandFilter == "auto" ? GT.appSettings.myBand : GT.appSettings.gtBandFilter.length == 0 ? "" : GT.appSettings.gtBandFilter;
var unconfirmedCallsKey = new UnconfirmedCallsKey(List[key].dxcc, band);
if (GT.unconfirmedCalls.has(unconfirmedCallsKey.key) && GT.unconfirmedCalls.get(unconfirmedCallsKey.key) != GT.unconfirmedCallsSentinel)
{
@@ -8594,8 +8579,8 @@ function displayItemList(table, color)
function showWPXBox()
{
var worker = getCurrentBandModeHTML();
- var band = GT.appSettings.gtBandFilter == "auto" ? myBand : GT.appSettings.gtBandFilter.length == 0 ? "" : GT.appSettings.gtBandFilter;
- var mode = GT.appSettings.gtModeFilter == "auto" ? myMode : GT.appSettings.gtModeFilter.length == 0 ? "" : GT.appSettings.gtModeFilter;
+ var band = GT.appSettings.gtBandFilter == "auto" ? GT.appSettings.myBand : GT.appSettings.gtBandFilter.length == 0 ? "" : GT.appSettings.gtBandFilter;
+ var mode = GT.appSettings.gtModeFilter == "auto" ? GT.appSettings.myMode : GT.appSettings.gtModeFilter.length == 0 ? "" : GT.appSettings.gtModeFilter;
if (mode == "Digital") { mode = "dg"; }
if (mode == "Phone") { mode = "ph"; }
@@ -8667,7 +8652,7 @@ function showWPXBox()
{
worker +=
"" +
- key.formatCallsign() +
+ formatCallsign(key) +
" | " +
formatCallsign(GT.QSOhash[GT.tracker.confirmed.px[key]].DEcall) +
" |
";
@@ -10003,11 +9988,11 @@ function validatePropMode(propMode)
function validateMapBandAndMode(band, mode)
{
- if ((GT.appSettings.gtBandFilter.length == 0 || (GT.appSettings.gtBandFilter == "auto" ? myBand == band : GT.appSettings.gtBandFilter == band)))
+ if ((GT.appSettings.gtBandFilter.length == 0 || (GT.appSettings.gtBandFilter == "auto" ? GT.appSettings.myBand == band : GT.appSettings.gtBandFilter == band)))
{
if (GT.appSettings.gtModeFilter.length == 0) return true;
- if (GT.appSettings.gtModeFilter == "auto") return myMode == mode;
+ if (GT.appSettings.gtModeFilter == "auto") return GT.appSettings.myMode == mode;
if (GT.appSettings.gtModeFilter == "Digital")
{
@@ -10658,9 +10643,9 @@ GT.us_bands = [
function renderBandActivity()
{
var buffer = "";
- if (typeof GT.bandActivity.lines[myMode] != "undefined" || GT.oamsBandActivityData != null)
+ if (typeof GT.bandActivity.lines[GT.appSettings.myMode] != "undefined" || GT.oamsBandActivityData != null)
{
- var lines = (myMode in GT.bandActivity.lines) ? GT.bandActivity.lines[myMode] : [];
+ var lines = (GT.appSettings.myMode in GT.bandActivity.lines) ? GT.bandActivity.lines[GT.appSettings.myMode] : [];
var bands = (GT.myDXCC in GT.callsignDatabaseUSplus) ? GT.us_bands : GT.non_us_bands;
var bandData = {};
var maxValue = 0;
@@ -10732,7 +10717,7 @@ function renderBandActivity()
}
for (const band in bandData)
{
- let blockMyBand = (band == myBand) ? " class='myBand' " : "";
+ let blockMyBand = (band == GT.appSettings.myBand) ? " class='myBand' " : "";
let title;
let blueBarValue;
@@ -10773,8 +10758,8 @@ function pskBandActivityCallback(buffer, flag)
if (result.indexOf("frequency score") > -1)
{
// looks good so far
- GT.bandActivity.lines[myMode] = result.split("\n");
- GT.bandActivity.lastUpdate[myMode] = GT.timeNow + 600;
+ GT.bandActivity.lines[GT.appSettings.myMode] = result.split("\n");
+ GT.bandActivity.lastUpdate[GT.appSettings.myMode] = GT.timeNow + 600;
localStorage.bandActivity = JSON.stringify(GT.bandActivity);
}
@@ -10793,15 +10778,15 @@ function pskBandActivityCallback(buffer, flag)
function pskGetBandActivity()
{
if (GT.mapSettings.offlineMode == true) return;
- if (typeof GT.bandActivity.lastUpdate[myMode] == "undefined")
+ if (typeof GT.bandActivity.lastUpdate[GT.appSettings.myMode] == "undefined")
{
- GT.bandActivity.lastUpdate[myMode] = 0;
+ GT.bandActivity.lastUpdate[GT.appSettings.myMode] = 0;
}
- if (myMode.length > 0 && myDEGrid.length > 0 && GT.timeNow > GT.bandActivity.lastUpdate[myMode])
+ if (GT.appSettings.myMode.length > 0 && GT.appSettings.myGrid.length > 0 && GT.timeNow > GT.bandActivity.lastUpdate[GT.appSettings.myMode])
{
getBuffer(
- "https://pskreporter.info/cgi-bin/psk-freq.pl?mode=" + myMode + "&grid=" + myDEGrid.substr(0, 4) + "&cb=" + timeNowSec(),
+ "https://pskreporter.info/cgi-bin/psk-freq.pl?mode=" + GT.appSettings.myMode + "&grid=" + GT.appSettings.myGrid.substr(0, 4) + "&cb=" + timeNowSec(),
pskBandActivityCallback,
null,
"https",
@@ -11027,10 +11012,10 @@ function updateBasedOnIni()
if (which != null)
{
- myDEcall = which.MyCall;
- myDEGrid = which.MyGrid;
- GT.lastBand = myBand;
- GT.lastMode = myMode;
+ GT.appSettings.myCall = which.MyCall;
+ GT.appSettings.myGrid = which.MyGrid;
+ GT.lastBand = GT.appSettings.myBand;
+ GT.lastMode = GT.appSettings.myMode;
GT.workingIniPath = which.IniPath;
}
@@ -11053,7 +11038,7 @@ function updateBasedOnIni()
}
}
- if (myDEGrid.length > 0)
+ if (GT.appSettings.myGrid.length > 0)
{
setHomeGridsquare();
}
@@ -13016,9 +13001,9 @@ function loadAdifSettings()
}
}
}
- if (clubCall.value == "" && myRawCall != "NOCALL")
+ if (clubCall.value == "" && GT.appSettings.myRawCall != "NOCALL")
{
- clubCall.value = myRawCall;
+ clubCall.value = GT.appSettings.myRawCall;
ValidateText(clubCall);
localStorage.adifLogSettings = JSON.stringify(GT.adifLogSettings);
}
@@ -15064,7 +15049,7 @@ function searchLogForCallsign(call)
{
return value.DEcall == call;
})
- .sort(myBandCompare);
+ .sort(GT.appSettings.myBandCompare);
var worker = ""
@@ -15457,7 +15442,7 @@ function pskSpotCheck(timeSec)
{
if (GT.mapSettings.offlineMode == true) return;
- if (myDEcall == null || myDEcall == "NOCALL" || myDEcall == "") return;
+ if (GT.appSettings.myCall == null || GT.appSettings.myCall == "NOCALL" || GT.appSettings.myCall == "") return;
if (
(GT.spotView > 0 || GT.rosterSpot) &&
@@ -15473,7 +15458,7 @@ function pskSpotCheck(timeSec)
spotRefreshDiv.innerHTML = "…refreshing…";
getBuffer(
`https://retrieve.pskreporter.info/query?rronly=1&lastseqno=${GT.receptionReports.lastSequenceNumber}` +
- `&senderCallsign=${encodeURIComponent(myRawCall)}` +
+ `&senderCallsign=${encodeURIComponent(GT.appSettings.myRawCall)}` +
`&appcontact=${encodeURIComponent(`GT-${pjson.version}`)}`,
pskSpotResults,
null,
@@ -15715,7 +15700,7 @@ function redrawSpots()
GT.layerSources["psk-hop"].clear();
GT.layerSources["psk-heat"].clear();
- var fromPoint = getPoint(myRawGrid);
+ var fromPoint = getPoint(GT.appSettings.myRawGrid);
if (GT.receptionSettings.mergeSpots == false)
{
@@ -16006,7 +15991,7 @@ function currentTimeStampString()
" " +
padNumber(now.getHours()) +
"." +
- padNumber(now.getMinutes())+
+ padNumber(now.getMinutes()) +
"." +
padNumber(now.getSeconds())
);
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index dc4a841..7e9405e 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -241,11 +241,11 @@ function gtChatSendStatus()
msg.type = "status";
msg.uuid = GT.appSettings.chatUUID;
- msg.call = myDEcall;
- msg.grid = myRawGrid;
- msg.freq = myRawFreq;
- msg.mode = myMode;
- msg.band = myBand;
+ msg.call = GT.appSettings.myCall;
+ msg.grid = GT.appSettings.myRawGrid;
+ msg.freq = GT.appSettings.myRawFreq;
+ msg.mode = GT.appSettings.myMode;
+ msg.band = GT.appSettings.myBand;
msg.src = "GT";
msg.canmsg = GT.appSettings.gtMsgEnable;
msg.o = GT.appSettings.gtSpotEnable == true ? 1 : 0;
@@ -280,9 +280,9 @@ function gtChatSendDecodes(instancesObject)
function oamsBandActivityCheck()
{
- if (GT.appSettings.oamsBandActivity == true && myDEGrid.length >= 4)
+ if (GT.appSettings.oamsBandActivity == true && GT.appSettings.myGrid.length >= 4)
{
- let grid = myDEGrid.substring(0, 4).toUpperCase();
+ let grid = GT.appSettings.myGrid.substring(0, 4).toUpperCase();
if (GT.appSettings.oamsBandActivityNeighbors == true)
{
gtChatSendBandActivityRequest(squareToNeighbors(grid));
@@ -633,7 +633,7 @@ function gtChatSendUUID()
msg.uuid = null;
}
- msg.call = myDEcall;
+ msg.call = GT.appSettings.myCall;
msg.ver = gtShortVersion;
sendGtJson(JSON.stringify(msg), true);
diff --git a/package.nw/lib/pota.js b/package.nw/lib/pota.js
index e27a9ce..00fd619 100644
--- a/package.nw/lib/pota.js
+++ b/package.nw/lib/pota.js
@@ -159,7 +159,7 @@ function makeParkFeatures()
function potaSpotFromDecode(callObj)
{
- if (myDEcall != "" && myDEcall != "NOCALL")
+ if (GT.appSettings.myCall != "" && GT.appSettings.myCall != "NOCALL")
{
var park = callObj.pota;
@@ -228,7 +228,7 @@ function reportPotaRBN(callSpot)
{
var report = {
activator: callSpot.activator,
- spotter: myDEcall + "-#",
+ spotter: GT.appSettings.myCall + "-#",
frequency: String(parseInt(callSpot.frequency * 1000)),
reference: callSpot.reference,
mode: callSpot.mode,
@@ -306,8 +306,8 @@ function spotFromCallObj(callObj, park, inCount, rbnTime)
var callSpot = {
activator: callObj.DEcall,
activatorGrid: callObj.grid,
- spotter: myDEcall + "-#",
- spotterGrid: myDEGrid,
+ spotter: GT.appSettings.myCall + "-#",
+ spotterGrid: GT.appSettings.myGrid,
frequency: Number((GT.instances[callObj.instance].status.Frequency / 1000000).toFixed(3)),
reference: park,
mode: callObj.mode,
@@ -315,7 +315,7 @@ function spotFromCallObj(callObj, park, inCount, rbnTime)
spotTime: Date.now(),
source: "GT",
count: inCount + 1,
- comments: "GT " + callObj.RSTsent + " dB " + myDEGrid + " via " + myDEcall + "-#"
+ comments: "GT " + callObj.RSTsent + " dB " + GT.appSettings.myGrid + " via " + GT.appSettings.myCall + "-#"
};
return callSpot;
}
diff --git a/package.nw/lib/roster/processRosterHunting.js b/package.nw/lib/roster/processRosterHunting.js
index 42977c0..fefbca6 100644
--- a/package.nw/lib/roster/processRosterHunting.js
+++ b/package.nw/lib/roster/processRosterHunting.js
@@ -777,7 +777,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
}
// Station is calling us
- if (callObj.DXcall == window.opener.myDEcall)
+ if (callObj.DXcall == window.opener.GT.appSettings.myCall)
{
callingBg = "#0000FF" + inversionAlpha;
calling = "#FFFF00;text-shadow: 0px 0px 2px #FFFF00";