Merge pull request #959 from dratini0/recorder-fixes

Assorted bugfixes to the recorder apps

apps.json

@@ -664,7 +664,7 @@
   {
     "id": "gpsrec",
     "name": "GPS Recorder",
-    "version": "0.25",
+    "version": "0.26",
     "description": "Application that allows you to record a GPS track. Can run in background",
     "icon": "app.png",
     "tags": "tool,outdoors,gps,widget",
@@ -683,7 +683,7 @@
     "id": "recorder",
     "name": "Recorder (BETA)",
     "shortName": "Recorder",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Record GPS position, heart rate and more in the background, then download to your PC.",
     "icon": "app.png",
     "tags": "tool,outdoors,gps,widget",

apps/gpsrec/ChangeLog

@@ -27,3 +27,4 @@
 0.23: Fix issue where tracks wouldn't record when running from OpenStMap if a period hadn't been set up first
 0.24: Better support for Bangle.js 2, avoid widget area for Graphs, smooth graphs more
 0.25: Fix issue where if Bangle.js 2 got a GPS fix but no reported time, errors could be caused by the widget (fix #935)
+0.26: Multiple bugfixes

apps/gpsrec/app.js

@@ -249,10 +249,10 @@ function plotTrack(info) {
   g.fillCircle(ox,oy,5);
   if (info.qOSTM) g.setColor(0, 0, 0);
   else g.setColor(1,1,1);
-  g.drawString(require("locale").distance(dist),120,220);
+  g.drawString(require("locale").distance(dist),g.getWidth() / 2, g.getHeight() - 20);
   g.setFont("6x8",2);
   g.setFontAlign(0,0,3);
-  g.drawString("Back",230,200);
+  g.drawString("Back",g.getWidth() - 10, g.getHeight() - 40);
   setWatch(function() {
     viewTrack(info.fn, info);
   }, global.BTN3||BTN1);
@@ -330,13 +330,13 @@ function plotGraph(info, style) {
     height: g.getHeight()-(24+8),
     axes : true,
     gridy : grid,
-    gridx : 50,
+    gridx : infn.length / 3,
     title: title,
     xlabel : x=>Math.round(x*dur/(60*infn.length))+" min" // minutes
   });
   g.setFont("6x8",2);
   g.setFontAlign(0,0,3);
-  g.drawString("Back",230,200);
+  g.drawString("Back",g.getWidth() - 10, g.getHeight() - 40);
   setWatch(function() {
     viewTrack(info.fn, info);
   }, global.BTN3||BTN1);

apps/recorder/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Use 'recorder.log..' rather than 'record.log..'
       Fix interface.html
 0.03: Fix theme and maps/graphing if no GPS
+0.04: Multiple bugfixes

apps/recorder/app.js

@@ -304,10 +304,10 @@ function plotTrack(info) {
   g.fillCircle(ox,oy,5);
   if (info.qOSTM) g.setColor("#000");
   else g.setColor(g.theme.fg);
-  g.drawString(require("locale").distance(dist),120,220);
+  g.drawString(require("locale").distance(dist),g.getWidth() / 2, g.getHeight() - 20);
   g.setFont("6x8",2);
   g.setFontAlign(0,0,3);
-  g.drawString("Back",230,200);
+  g.drawString("Back",g.getWidth() - 10, g.getHeight() - 40);
   setWatch(function() {
     viewTrack(info.fn, info);
   }, global.BTN3||BTN1);
@@ -360,6 +360,10 @@ function plotGraph(info, style) {
     var t,dx,dy,d,lt = c[timeIdx];
     while(l!==undefined) {
       ++nl;c=l.split(",");
+      l = f.readLine(f);
+      if (c[latIdx] == "") {
+        continue;
+      }
       t = c[timeIdx];
       i = Math.round(80*(t - strt)/dur);
       p = Bangle.project({lat:c[latIdx],lon:c[lonIdx]});
@@ -372,7 +376,6 @@ function plotGraph(info, style) {
       }
       lp = p;
       lt = t;
-      l = f.readLine(f);
     }
   } else throw new Error("Unknown type "+style);
   var min=100000,max=-100000;
@@ -396,13 +399,15 @@ function plotGraph(info, style) {
     height: g.getHeight()-(24+8),
     axes : true,
     gridy : grid,
-    gridx : 50,
+    gridx : infn.length / 3,
     title: title,
+    miny: min,
+    maxy: max,
     xlabel : x=>Math.round(x*dur/(60*infn.length))+" min" // minutes
   });
   g.setFont("6x8",2);
   g.setFontAlign(0,0,3);
-  g.drawString("Back",230,200);
+  g.drawString("Back",g.getWidth() - 10, g.getHeight() - 40);
   setWatch(function() {
     viewTrack(info.filename, info);
   }, global.BTN3||BTN1);