Bug fixes

andan67 · Jan 16, 2022 · b13782f · b13782f
1 parent ab146b4
commit b13782f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/connectiq/monkey.jungle b/connectiq/monkey.jungle
@@ -1,9 +1,10 @@
 project.manifest = manifest.xml
 
-base.sourcePath = source
+base.sourcePath = $(semiround.sourcePath)
 
 # Set the source path for wearable devices by device family
 round.sourcePath = source;source-round
 semiround.sourcePath = source;source-semiround
 
+
 fr55.sourcePath = source;source-fr55
diff --git a/connectiq/source/TrackViewCommon.mc b/connectiq/source/TrackViewCommon.mc
@@ -290,14 +290,14 @@ class TrackViewCommon extends GenericView {
             // draw actual elevation
             dc.setColor(cursorColor, backgroundColor);
             dc.drawText(_x1Ele + ed,  _y1Ele - 1.5 * ed, fontsize, Track.eleAct.format("%d"), Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER);
-            dc.drawText(_x1Ele + ed,  _y1Ele - 1.5 * ed - dc.getFontAscent(fontsize), fontsize, "^" + Track.eleTotAscentAct.format("%d"), Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER);
+            dc.drawText(_x1Ele + ed,  _y1Ele - 1.5 * ed - dc.getFontAscent(fontsize), fontsize, "^" + (Track.eleTotAscentAct != null ? Track.eleTotAscentAct.format("%d") : ""), Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER);
             dc.drawLine(x2, _y2Ele, x2, _y1Ele);
 
             // draw small horizontal line at actual elevation
             dc.drawLine(x2 - 2, y2, x2 + 2, y2);
 
             // draw distance to end of course
-            dc.drawText(pixelWidth2, 1.12 * _y2Ele + 0.8 * dc.getFontHeight(fontsize), fontsize , Track.formatLength(Track.xyLength - dssn), 
+            dc.drawText(pixelWidth2, 1.12 * _y2Ele + 1.1 * dc.getFontAscent(fontsize), fontsize , Track.formatLength(Track.xyLength - dssn), 
                 Graphics.TEXT_JUSTIFY_CENTER | Graphics.TEXT_JUSTIFY_VCENTER);
             //}
         }