Import vendor v1.20.0831a1

Canadian-Provinces-Territories-Award-Layer v1.20.0831a1
Paul Traina 2020-08-31 16:19:57 -07:00
rodzic 2d55924644
commit d86e90048a
8 zmienionych plików z 104 dodań i 57 usunięć

Wyświetl plik

@ -192,7 +192,7 @@
<option value="">Mixed</option>
<option value="4000m">4000m</option>
<option value="2200m">2200m</option>
<option value="600m">600m</option>
<option value="630m">630m</option>
<option value="160m">160m</option>
<option value="80m">80m</option>
<option value="60m">60m</option>
@ -286,12 +286,12 @@
<div id="buttonQRZCheckBoxDiv" onclick="if ( ValidateQrzApi(qrzApiKey ) ) grabQrzComLog()" class="iconButton" title="Download log from QRZ.com" ><img id="qrzLogImg" src="./img/log_QRZ.png" class="buttonImg" /></div>
<div id="buttonLOTWCheckBoxDiv" onclick="if ( ValidateText(lotwLogin) && ValidateText(lotwPassword) ) { grabLOtWLogQSO(false); grabLOtWLog(false); } " class="iconButton" title="Download log from Logbook of the World" ><img id="lotwLogImg" src="./img/log_LoTW.png" class="buttonImg" /></div>
<div id="buttonClubCheckBoxDiv" onclick="if ( ValidateText(clubEmail) && ValidateText(clubPassword) ) grabClubLog()" class="iconButton" title="Download log from ClubLog" ><img id="ClubLogImg" src="./img/log_club.png" class="buttonImg" /></div>
<div id="buttonAdifCheckBoxDiv" onclick="startupAdifLoadFunction()" class="iconButton" title="Reload Local ADIF Files" ><img src="./img/log_local.png" class="buttonImg" /></div>
<div id="buttonAdifCheckBoxDiv" onclick="startupAdifLoadFunction()" class="iconButton" title="Reload Local ADIF Files" ><img src="./img/log_local.png" class="buttonImg" /></div>
<div id="timezoneButton" onclick="toggleTimezones()" class="iconButton" title="Toggle Timezone Layer"><img src="./img/timezone-button.svg" class="buttonImg" /></div>
<div id="radarButton" onclick="toggleNexrad()" class="iconButton" title="Toggle US Nexrad"><img src="./img/radar-button.svg" class="buttonImg" /></div>
<div id="gridOverlayButton" onclick="toggleAllGrids()" class="iconButton" title="Toggle All Grid Overlay"><img src="./img/grid-overlay.svg" class="buttonImg" /></div>
<div id="gtFlagButton" onclick="toggleGtMap();" class="iconButton" title="Toggle View GridTracker Users"><img id="gtFlagImg" src="" class="buttonImg" /></div>
<div id="msgButton" onclick="showMessaging();" class="iconButton" title="Messaging Window" ><img id="msgImg" src="./img/gt_chat.png" class="buttonImg" /></div>
</div>
<div id="SpotsDiv" style="display:none;border:1px solid yellow;margin:1px;margin-bottom:1px;margin-top:2px;" class="roundBorder" >
<table align="center">
@ -583,7 +583,7 @@
</tr>
</table>
</div>
<div class="mapItem" id="lookupCloseLogDiv" style="display:none" >
<div class="mapItem" id="lookupCloseLogDiv" >
<table align="center">
<tr>
<td align="center">Close Lookup After Logging</td>

Wyświetl plik

@ -1,5 +1,5 @@
<center>
<img src="./img/unmuted-button.svg" width="100px"><img src="./img/settings-button.svg" width="100px"><br/>
<img src="./img/grid-overlay.svg" width="150px">
<font size="larger">
<p>
<b>This is a bug fix and look-and-feel update.</b><p>
@ -16,29 +16,22 @@ Here is a link to our Discord server. <a href="https://discord.gg/j9Cv9XU" targe
Fixes:
QSO Log Event:
When a QSO was completed in WSJT-X:
The map was not updating with the new QSO data
US Nexrad Layer:
Always on top regardless of other layers, it's clouds after all
Off-Air Message Service:
Sometimes not sending a message when "Enter" key pressed
the map was not updating with the new QSO data
fixed again
Lookups:
Open lookup window on transmit working properly when enabled
fixed again
Close Lookup window after QSO working correctly
Call Roster:
Roster mode header now sticky, thank you VE2ESF
Multiple Rig Instances:
Lookups:
Where active rig in main window was the only one doing lookups
Call Roster:
Band column not going away properly
US Callsign Database:
truncation of incomplete loads due to program restart, revisted
630m band properly recognized and added to "Band Activity Graph"
Update:
A few panel buttons have been updated for quality and clarity of purpose
"All Grid Overlay" hotkey "B" has a new panel button
@ -52,7 +45,17 @@ Update:
Thank you for reading the entire update!
Thank you for reading the entire update! limbo-fish
</pre>
<center><img class="button" src="./img/tokens.jpg" width="400px"></center>

File diff suppressed because one or more lines are too long

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 382 KiB

Wyświetl plik

@ -1229,7 +1229,6 @@ function startupAdifLoadCheck()
if ( loadAdifCheckBox.checked == true && g_startupLogs.length > 0 )
startupAdifLoadFunction();
if ( g_mapSettings.offlineMode == false )
{
if (g_appSettings.gtFlagImgSrc == 1)
@ -1251,7 +1250,6 @@ function startupAdifLoadCheck()
grabClubLog(false);
}
}
function getABuffer(file_url, callback, flag, mode, port, imgToGray, stringOfFlag , timeoutX, stringOfCounter = null )
@ -1712,7 +1710,7 @@ function sendToLogger(ADIF)
if ( reportHash != lastReportHash )
{
onAdiLoadComplete(report);
onAdiLoadComplete( "GT<EOH>" + report);
// Log worthy
if ( logGTqsoCheckBox.checked == true )
@ -1766,7 +1764,7 @@ function sendToLogger(ADIF)
alertLogMessage();
if ( lookupOnTx.checked == true && lookupCloseLog.checked == true && g_lastTranmitCallsign == g_lastLookupCallsign )
if ( lookupCloseLog.checked == true )
{
openLookupWindow(false);
}

Wyświetl plik

@ -620,14 +620,13 @@ function processulsCallsigns(data, flag, cookies, starting, finished)
g_callsignLookups.ulsLastUpdate = 0;
saveCallsignSettings();
ulsUpdatedTd.innerHTML = "<b><i>Processing...</i></b>";
tx.executeSql('drop table calls');
tx.executeSql('CREATE TABLE IF NOT EXISTS calls (callsign TEXT PRIMARY KEY, zip, state)');
}
for (var x in lines )
{
if ( lines[x].length )
{
tx.executeSql( 'INSERT INTO calls (callsign, zip, state) VALUES ("'+lines[x].substr(7)+'","'+lines[x].substr(0,5)+'","'+lines[x].substr(5,2)+'")');
tx.executeSql( 'INSERT OR REPLACE INTO calls (callsign, zip, state) VALUES ("'+lines[x].substr(7)+'","'+lines[x].substr(0,5)+'","'+lines[x].substr(5,2)+'")');
++g_ulsCallsignsCount;
if ( g_ulsCallsignsCount % 7969 == 0 )
ulsCountTd.innerHTML = g_ulsCallsignsCount;
@ -698,7 +697,15 @@ function lookupUsCallsign( object , writeState = false)
{
if ( object.zipcode in g_zipToCounty )
{
object.cnty = g_countyData[g_zipToCounty[object.zipcode][0]].geo["properties"]["st"]+","+ g_countyData[g_zipToCounty[object.zipcode][0]].geo["properties"]["n"].toUpperCase();
var counties = g_zipToCounty[object.zipcode];
var cntyString = g_countyData[counties[0]].geo["properties"]["st"]+","+ g_countyData[counties[0]].geo["properties"]["n"].toUpperCase();
for ( var county in counties )
{
cntyString = g_countyData[counties[county]].geo["properties"]["st"]+","+ g_countyData[counties[county]].geo["properties"]["n"].toUpperCase();
if ( !(cntyString in g_tracker.worked.cnty) )
break;
}
object.cnty = cntyString;
}
}
if ( writeState )

Wyświetl plik

@ -2,7 +2,7 @@
var gtComment1 = "GridTracker is not open source, you may not change, modify or 'borrow' code for your needs that is redistributed in any form without first asking and receiving permission from N0TTL *and* N2VFL";
var gtComment2 = "Third party libraries and functions used are seperated to third-party.js or their respective lib .js files, the GT close-source directive does not apply to these files of course";
var gtVersion = 1200830;
var gtBeta = "";
var gtBeta = "VHS";
var g_startVersion = 0;
@ -353,7 +353,7 @@ var g_showAllGrids = false;
var g_maps = Array();
var g_modes = {};
var g_modes_phone = {};
var g_colorBands = ["OOB", "4000m", "2200m", "600m", "160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "11m", "10m", "6m", "4m", "2m", "1.25m", "70cm", "23cm"];
var g_colorBands = ["OOB", "4000m", "2200m", "630m", "160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "11m", "10m", "6m", "4m", "2m", "1.25m", "70cm", "23cm"];
var g_pathIgnore = {};
g_pathIgnore["RU"] = true;
@ -478,7 +478,7 @@ var g_pskColors = {};
g_pskColors["OOB"] = '888888';
g_pskColors["4000m"] = '45E0FF';
g_pskColors["2200m"] = 'FF4500';
g_pskColors["600m"] = '1E90FF';
g_pskColors["630m"] = '1E90FF';
g_pskColors["160m"] = '7CFC00';
g_pskColors["80m"] = 'E550E5';
g_pskColors["60m"] = '0000FF';
@ -4652,7 +4652,7 @@ function initMap() {
createGlobalMapLayer("qso-pins");
createGlobalMapLayer("live");
createGlobalMapLayer("live-pins");
createGlobalMapLayer("line-grids",50000,0);
createGlobalMapLayer("line-grids");
createGlobalMapLayer("long-grids",3000);
createGlobalMapLayer("short-grids",8000,3001);
createGlobalMapLayer("big-grids",50000,3001);
@ -5409,7 +5409,8 @@ function activeRig( instance )
}
var g_lastDecodeCallsign = "";
var g_lastTranmitCallsign = {};
var g_lastTransmitCallsign = {};
var g_lastStatusCallsign = {};
function handleWsjtxStatus(newMessage) {
@ -5443,17 +5444,22 @@ function handleWsjtxStatus(newMessage) {
if ( DXcall.length > 1 )
{
if ( !(newMessage.instance in g_lastTranmitCallsign ) )
g_lastTranmitCallsign[newMessage.instance] = "";
if ( !(newMessage.instance in g_lastTransmitCallsign ) )
g_lastTransmitCallsign[newMessage.instance] = "";
if ( lookupOnTx.checked == true && newMessage.Transmitting == 1 )
if ( !(newMessage.instance in g_lastStatusCallsign ) )
g_lastStatusCallsign[newMessage.instance] = "";
if ( lookupOnTx.checked == true && newMessage.Transmitting == 1 && g_lastTransmitCallsign[newMessage.instance] != DXcall )
{
openLookupWindow(true);
g_lastTransmitCallsign[newMessage.instance] = DXcall;
}
if ( g_lastTranmitCallsign[newMessage.instance] != DXcall )
if ( g_lastStatusCallsign[newMessage.instance] != DXcall )
{
g_lastStatusCallsign[newMessage.instance] = DXcall;
lookupCallsign(DXcall, newMessage.DXgrid.trim() );
g_lastTranmitCallsign[newMessage.instance] = DXcall;
}
}
@ -6394,14 +6400,7 @@ function changeLookupMerge() {
function changelookupOnTx() {
g_appSettings.lookupOnTx = lookupOnTx.checked;
g_appSettings.lookupCloseLog = lookupCloseLog.checked;
if ( g_appSettings.lookupOnTx == true )
{
lookupCloseLogDiv.style.display = "inline-block";
}
else
{
lookupCloseLogDiv.style.display = "none";
}
}
function exportSettings() {
@ -6433,13 +6432,14 @@ function checkForSettings()
function importSettings()
{
checkForSettings();
var filename = g_appData + g_dirSeperator + "gt_settings.json";
if ( fs.existsSync(filename) )
{
var data = fs.readFileSync(filename);
data = JSON.parse(data);
if ( typeof data.appSettings != 'undefined' )
if ( typeof data.appSettings != 'undefined' && data.currentVersion == localStorage.currentVersion )
{
localStorage.clear();
for (var key in data )
@ -6449,9 +6449,20 @@ function importSettings()
fs.unlinkSync(filename);
chrome.runtime.reload();
}
else
{
if ( typeof data.appSettings == 'undefined' )
{
importSettingsFile.innerHTML = "<font style='color:red'>Settings File Corrupt!</font>";
}
else if ( data.currentVersion != localStorage.currentVersion )
{
importSettingsFile.innerHTML = "<font style='color:red'>Settings Version Mismatch!</font>";
}
}
}
checkForSettings();
}
@ -9142,7 +9153,9 @@ function renderBandActivity()
{
var lines = g_bandActivity.lines[myMode];
var bands = [ "160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m", "4m","2m"];
var bands = [ "630m", "160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m", "4m","2m"];
if ( g_myDXCC in g_callsignDatabaseUSplus )
bands = [ "630m", "160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m", "2m"];
var bandData = Array();
var maxValue = 0;
for (var i = 0; i < bands.length; i++) {
@ -9186,7 +9199,7 @@ function renderBandActivity()
{
var title = "Score: " + bandData[x].score + " Spots: " + bandData[x].spots + "\nTx: " + bandData[
x].tx + "\tRx: " + bandData[x].rx;
buffer += "<div title='" + title + "' style='display:inline-block' class='aBand'>";
buffer += "<div title='" + title + "' style='display:inline-block;margin:1px;' class='aBand'>";
buffer += "<div style='height: " + ((bandData[x].score * scaleFactor) + 1) +
"px;' class='barTx'></div>";
buffer += "<div style='height: " + ((bandData[x].spots * scaleFactor) + 1) +

Wyświetl plik

@ -15,8 +15,8 @@ Number.prototype.formatBand = function()
return "33cm";
else if ( newFreq >= 1240 && newFreq <= 1300 )
return "23cm";
else if ( freq >= 0.4720 && freq <= 0.4790 )
return "600m";
else if ( freq >= 0.472 && freq <= 0.479 )
return "630m";
else if ( freq >= 0.1357 && freq <= 0.1485 )
return "2200m";
else if ( freq >= 0.0090 && freq <= 0.0200 )

Wyświetl plik

@ -521,7 +521,8 @@ function viewRoster()
callRoster[callHash].tx = true;
callRoster[callHash].callObj.shouldAlert = false;
callRoster[callHash].callObj.reason = Array();
callRoster[callHash].callObj.awardReason = "Callsign";
if ( now - callRoster[callHash].callObj.age > window.opener.g_mapSettings.rosterTime )
{
callRoster[callHash].tx = false;
@ -883,7 +884,12 @@ function viewRoster()
{
tx = testAward(award, callRoster[callHash].callObj, baseHash );
if ( tx )
{
var x = g_awardTracker[award];
callRoster[callHash].callObj.awardReason = g_awards[x.sponsor].awards[x.name].tooltip+ " (" + g_awards[x.sponsor].sponsor + ")";
break;
}
}
}
@ -1398,7 +1404,7 @@ function viewRoster()
worker += "<tbody><tr id='" + thisCall + newCallList[x].band+newCallList[x].mode + "'>";
worker += "<td name='Callsign' align=left " +newCallList[x].style.callsign + " onClick='initiateQso(\"" +
worker += "<td title='"+ newCallList[x].awardReason +"' name='Callsign' align=left " +newCallList[x].style.callsign + " onClick='initiateQso(\"" +
thisCall + newCallList[x].band+newCallList[x].mode + "\")'>" + thisCall.formatCallsign() + "</td>";
if ( showBands )