Merge branch 'qso-hotfix' into 'master'

Further fixes for CQz and ITUz non-array support

See merge request gridtracker.org/gridtracker!227

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!

debian/changelog

@@ -1,3 +1,8 @@
+gridtracker (1.22.1009) unstable; urgency=low
+  - Fix issue loading logs and generating scores tab
+
+ -- Tag Loomis <n0ttl@gridtracker.org>  Sat, 08 Oct 2022 12:00:00 -0000
+
 gridtracker (1.22.1008) unstable; urgency=low
   - Fix missing callsigns in mh-root when importing BIGCTY
 

gridtracker.spec

@@ -1,6 +1,6 @@
 Name:           {{{ git_name name=gridtracker }}}
 Summary:        GridTracker: An amateur radio companion to WSJT-X or JTDX
-Version:        {{{ git_version lead=1.22.1008 }}}
+Version:        {{{ git_version lead=1.22.1009 }}}
 Release:        1%{?dist}
 BuildArch:      noarch
 Source0:        {{{ git_dir_pack }}}
@@ -40,6 +40,8 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/
 
 %changelog
+* Sat Oct 08 2022 Tag Loomis <n0ttl@gridtracker.org> - 1.22.1009-1
+  - Fix issue with loading logs and generating scores
 * Sat Oct 08 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1008-1
   - Fix missing callsigns in mh-root when importing BIGCTY
 * Fri Oct 07 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1006-1

package.nw/lib/gt.js

@@ -265,7 +265,6 @@ function saveLogSettings()
 function saveAndCloseApp()
 {
   g_closing = true;
-
   saveReceptionReports();
 
   try
@@ -280,6 +279,13 @@ function saveAndCloseApp()
     data.version = gtVersion;
 
     fs.writeFileSync(g_NWappData + "internal_qso.json", JSON.stringify(data));
+
+    saveScreenSettings();
+    g_conditionsWindowHandle.window.saveScreenSettings();
+    g_callRosterWindowHandle.window.saveScreenSettings();
+    g_statsWindowHandle.window.saveScreenSettings();
+    g_baWindowHandle.window.saveScreenSettings();
+    g_lookupWindowHandle.window.saveScreenSettings();
   }
   catch (e)
   {
@@ -1371,7 +1377,7 @@ function addDeDx(
           g_tracker.confirmed.grid[fourGrid + band + "dg"] = true;
         }
       }
-      if (details.ituz.length > 0)
+      if (details.ituz && details.ituz.length > 0)
       {
         g_tracker.confirmed.ituz[details.ituz + "|" + band + mode] = true;
         g_tracker.confirmed.ituz[details.ituz + "|"] = true;
@@ -1383,7 +1389,7 @@ function addDeDx(
           g_tracker.confirmed.ituz[details.ituz + "|" + band + "dg"] = true;
         }
       }
-      if (details.cqz.length > 0)
+      if (details.cqz && details.cqz.length > 0)
       {
         g_tracker.confirmed.cqz[details.cqz + "|" + band + mode] = true;
         g_tracker.confirmed.cqz[details.cqz + "|"] = true;
@@ -9681,7 +9687,7 @@ function renderStatsBox()
         );
       }
 
-      if (cqz.length > 0)
+      if (cqz && cqz.length > 0)
       {
         var name = g_cqZones[cqz].name;
         if (!(name in cqZones)) cqZones[name] = newStatObject();
@@ -9689,7 +9695,7 @@ function renderStatsBox()
         workObject(cqZones[name], false, band, mode, type, didConfirm);
       }
 
-      if (ituz.length > 0)
+      if (ituz && ituz.length > 0)
       {
         if (!(ituz in ituZones)) ituZones[ituz] = newStatObject();
 
@@ -10580,6 +10586,59 @@ function redrawGrids()
           ~~g_worldGeoData[g_dxccToGeoData[finalDxcc]].confirmed_modes[mode] +
           1;
       }
+
+      if (cqz && cqz.length > 0)
+      {
+        if (g_cqZones[cqz].worked == false)
+        {
+          g_cqZones[cqz].worked = worked;
+        }
+        if (worked)
+        {
+          g_cqZones[cqz].worked_bands[band] =
+            ~~g_cqZones[cqz].worked_bands[band] + 1;
+          g_cqZones[cqz].worked_modes[mode] =
+            ~~g_cqZones[cqz].worked_modes[mode] + 1;
+        }
+        if (g_cqZones[cqz].confirmed == false)
+        {
+          g_cqZones[cqz].confirmed = didConfirm;
+        }
+        if (didConfirm)
+        {
+          g_cqZones[cqz].confirmed_bands[band] =
+            ~~g_cqZones[cqz].confirmed_bands[band] + 1;
+          g_cqZones[cqz].confirmed_modes[mode] =
+            ~~g_cqZones[cqz].confirmed_modes[mode] + 1;
+        }
+      }
+     
+      if (ituz && ituz.length > 0)
+      {
+        if (g_ituZones[ituz].worked == false)
+        {
+          g_ituZones[ituz].worked = worked;
+        }
+        if (worked)
+        {
+          g_ituZones[ituz].worked_bands[band] =
+            ~~g_ituZones[ituz].worked_bands[band] + 1;
+          g_ituZones[ituz].worked_modes[mode] =
+            ~~g_ituZones[ituz].worked_modes[mode] + 1;
+        }
+        if (g_ituZones[ituz].confirmed == false)
+        {
+          g_ituZones[ituz].confirmed = didConfirm;
+        }
+        if (didConfirm)
+        {
+          g_ituZones[ituz].confirmed_bands[band] =
+            ~~g_ituZones[ituz].confirmed_bands[band] + 1;
+          g_ituZones[ituz].confirmed_modes[mode] =
+            ~~g_ituZones[ituz].confirmed_modes[mode] + 1;
+        }
+      }
+      
       if (finalGrid.length > 0)
       {
         var gridCheck = finalGrid.substr(0, 4);
@@ -10609,58 +10668,6 @@ function redrawGrids()
               ~~g_us48Data[gridCheck].confirmed_modes[mode] + 1;
           }
         }
-
-        if (cqz.length > 0)
-        {
-          if (g_cqZones[cqz].worked == false)
-          {
-            g_cqZones[cqz].worked = worked;
-          }
-          if (worked)
-          {
-            g_cqZones[cqz].worked_bands[band] =
-              ~~g_cqZones[cqz].worked_bands[band] + 1;
-            g_cqZones[cqz].worked_modes[mode] =
-              ~~g_cqZones[cqz].worked_modes[mode] + 1;
-          }
-          if (g_cqZones[cqz].confirmed == false)
-          {
-            g_cqZones[cqz].confirmed = didConfirm;
-          }
-          if (didConfirm)
-          {
-            g_cqZones[cqz].confirmed_bands[band] =
-              ~~g_cqZones[cqz].confirmed_bands[band] + 1;
-            g_cqZones[cqz].confirmed_modes[mode] =
-              ~~g_cqZones[cqz].confirmed_modes[mode] + 1;
-          }
-        }
-       
-        if (ituz.length > 0)
-        {
-          if (g_ituZones[ituz].worked == false)
-          {
-            g_ituZones[ituz].worked = worked;
-          }
-          if (worked)
-          {
-            g_ituZones[ituz].worked_bands[band] =
-              ~~g_ituZones[ituz].worked_bands[band] + 1;
-            g_ituZones[ituz].worked_modes[mode] =
-              ~~g_ituZones[ituz].worked_modes[mode] + 1;
-          }
-          if (g_ituZones[ituz].confirmed == false)
-          {
-            g_ituZones[ituz].confirmed = didConfirm;
-          }
-          if (didConfirm)
-          {
-            g_ituZones[ituz].confirmed_bands[band] =
-              ~~g_ituZones[ituz].confirmed_bands[band] + 1;
-            g_ituZones[ituz].confirmed_modes[mode] =
-              ~~g_ituZones[ituz].confirmed_modes[mode] + 1;
-          }
-        }
       }
 
       for (var key in g_QSOhash[i].vucc_grids)

package.nw/lib/screens.js

@@ -16,6 +16,7 @@ function setWindowInfo()
   if (g_screenLost) return;
   var win = nw.Window.get();
   var windowInfo = {};
+
   windowInfo.x = win.x;
   windowInfo.y = win.y;
   windowInfo.width = win.width;
@@ -68,7 +69,9 @@ var screenCB = {
 
 function saveScreenSettings()
 {
-  var setting = { showing: g_isShowing, zoomLevel: s_zoomLevel };
+  setWindowInfo();
+
+  var setting = { showing: g_isShowing, zoomLevel: s_zoomLevel, window: g_windowInfo };
 
   s_screenSettings = JSON.parse(localStorage.screenSettings);
 
@@ -84,9 +87,9 @@ var g_isShowing = false;
 
 nw.Window.get().on("loaded", function ()
 {
-  // Use the first 16 bytes of the title(trimmed) as storage names
+  // Use the first 12 bytes of the title(trimmed) as storage names
   // This cannot be changed as current installs (12,000+) use this naming convention
-  s_title = document.title.substr(0, 16).trim();
+  s_title = document.title.substr(0, 12).trim();
   g_isShowing = false;
   if (typeof localStorage.screenSettings == "undefined")
   {
@@ -102,9 +105,21 @@ nw.Window.get().on("loaded", function ()
   {
     saveScreenSettings();
   }
+  if (!("window" in s_screenSettings[s_title]))
+  {
+    saveScreenSettings();
+  }
   g_isShowing = s_screenSettings[s_title].showing;
   nw.Window.get().zoomLevel = s_zoomLevel = s_screenSettings[s_title].zoomLevel;
 
+  g_windowInfo = s_screenSettings[s_title].window;
+
+  var win = nw.Window.get();
+  win.x = g_windowInfo.x;
+  win.y = g_windowInfo.y;
+  win.width = g_windowInfo.width;
+  win.height = g_windowInfo.height;
+
   // Check the first part of the string, only one window has "GridTracker" in the name.
   // It is reserved to the main app window.
   if (g_isShowing || s_title.indexOf("GridTracker") == 0)
@@ -117,8 +132,8 @@ nw.Window.get().on("loaded", function ()
   }
 
   g_initialScreenCount = nw.Screen.screens.length;
+ 
   setWindowInfo();
-
   document.addEventListener("keydown", onZoomControlDown, true);
 });
 

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.22.1008",
+  "version": "1.22.1009",
   "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "GridTracker.org",