From 6b1ce4c18b19c2601a53efe81d4e0574edbfc1d5 Mon Sep 17 00:00:00 2001 From: Darren Croton Date: Fri, 21 Jul 2017 17:01:34 +1000 Subject: [PATCH] Added an option to colour the graph RED when the move alert is on (or orange if red is already the graph colour) --- bin/SnapshotWatch-settings.json | 2 +- bin/SnapshotWatch.prg | Bin 64599 -> 64498 bytes bin/SnapshotWatch.prg.debug.xml | 871 ++++++++++++++++---------------- resources/resources.xml | 7 +- source/SnapshotWatchView.mc | 16 +- 5 files changed, 460 insertions(+), 436 deletions(-) diff --git a/bin/SnapshotWatch-settings.json b/bin/SnapshotWatch-settings.json index d894890..653123f 100644 --- a/bin/SnapshotWatch-settings.json +++ b/bin/SnapshotWatch-settings.json @@ -1 +1 @@ -{"settings":[{"key":"code","valueType":"string","defaultValue":"get code at app store page","configTitle":"CodeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"alphaNumeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showHeartRate","valueType":"boolean","defaultValue":true,"configTitle":"ShowHeartRateLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"graphColour","valueType":"number","defaultValue":0,"configTitle":"GraphColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"list","configReadonly":false,"configRequired":true,"configOptions":[{"display":"DK_GRAY","value":0},{"display":"RED","value":1},{"display":"DK_RED","value":2},{"display":"ORANGE","value":3},{"display":"YELLOW","value":4},{"display":"GREEN","value":5},{"display":"DK_GREEN","value":6},{"display":"BLUE","value":7},{"display":"DK_BLUE","value":8},{"display":"PURPLE","value":9},{"display":"PINK","value":10}],"configMin":null,"configMax":null,"configMaxLength":null},{"key":"useZonesColour","valueType":"boolean","defaultValue":true,"configTitle":"UseZonesColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSteps","valueType":"boolean","defaultValue":false,"configTitle":"ShowStepsLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showRiseSet","valueType":"boolean","defaultValue":false,"configTitle":"ShowRiseSetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSecondTime","valueType":"boolean","defaultValue":false,"configTitle":"ShowSecondTimeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"secondTimeOffset","valueType":"number","defaultValue":0,"configTitle":"SecondTimeOffsetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"numeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null}],"languages":{"valyrian":{"UseZonesColourLabel":"Additionally colour code graph by profile heart rate zones?","ShowRiseSetLabel":"[PRO] Show sunrise/sunset","DK_GRAY":"Dark Gray","DK_GREEN":"Dark Green","BLUE":"Blue","SecondTimeOffsetLabel":"[PRO] Second (digital) time hour offset (integer, +-24)","PURPLE":"Purple","GREEN":"Green","DK_RED":"Dark Red","DK_BLUE":"Dark Blue","AppName":"SnapshotWatch","RED":"Red","PINK":"Pink","CodeLabel":"Activation code for PRO features","ShowHeartRateLabel":"Show heart rate, graph, and min/max values","GraphColourLabel":"Heart rate graph colour","ShowSecondTimeLabel":"[PRO] Show second (digital) time","YELLOW":"Yellow","ORANGE":"Orange","ShowStepsLabel":"[PRO] Show steps/step goal"}}} \ No newline at end of file +{"settings":[{"key":"code","valueType":"string","defaultValue":"get code at app store page","configTitle":"CodeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"alphaNumeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showHeartRate","valueType":"boolean","defaultValue":true,"configTitle":"ShowHeartRateLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"graphColour","valueType":"number","defaultValue":0,"configTitle":"GraphColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"list","configReadonly":false,"configRequired":true,"configOptions":[{"display":"DK_GRAY","value":0},{"display":"RED","value":1},{"display":"DK_RED","value":2},{"display":"ORANGE","value":3},{"display":"YELLOW","value":4},{"display":"GREEN","value":5},{"display":"DK_GREEN","value":6},{"display":"BLUE","value":7},{"display":"DK_BLUE","value":8},{"display":"PURPLE","value":9},{"display":"PINK","value":10}],"configMin":null,"configMax":null,"configMaxLength":null},{"key":"useZonesColour","valueType":"boolean","defaultValue":true,"configTitle":"UseZonesColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showMoveBar","valueType":"boolean","defaultValue":false,"configTitle":"ShowMoveBarLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSteps","valueType":"boolean","defaultValue":false,"configTitle":"ShowStepsLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showRiseSet","valueType":"boolean","defaultValue":false,"configTitle":"ShowRiseSetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSecondTime","valueType":"boolean","defaultValue":false,"configTitle":"ShowSecondTimeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"secondTimeOffset","valueType":"number","defaultValue":0,"configTitle":"SecondTimeOffsetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"numeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null}],"languages":{"valyrian":{"UseZonesColourLabel":"Additionally colour code graph by profile heart rate zones","ShowRiseSetLabel":"[PRO] Show sunrise/sunset","DK_GRAY":"Dark Gray","DK_GREEN":"Dark Green","BLUE":"Blue","SecondTimeOffsetLabel":"[PRO] Second (digital) time hour offset (integer, +-24)","PURPLE":"Purple","GREEN":"Green","ShowMoveBarLabel":"Colour graph red when move bar alert is on (or orange if red set above)","DK_RED":"Dark Red","DK_BLUE":"Dark Blue","AppName":"SnapshotWatch","RED":"Red","PINK":"Pink","CodeLabel":"Activation code for PRO features","ShowHeartRateLabel":"Show heart rate, graph, and min/max values","GraphColourLabel":"Heart rate graph colour","ShowSecondTimeLabel":"[PRO] Show second (digital) time","YELLOW":"Yellow","ORANGE":"Orange","ShowStepsLabel":"[PRO] Show steps/step goal"}}} \ No newline at end of file diff --git a/bin/SnapshotWatch.prg b/bin/SnapshotWatch.prg index f16aac75952331f90c294f4f4fb4bc58a5cc12b6..55099eeb2090fb598273ece80cbb639375c2d532 100644 GIT binary patch delta 25289 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 delta 25272 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 lX3hNV - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + - - + + - + - + - - - + + + - + - + - + - + - - + + - + - - - - - - - + + + + + + + - - - + + + - + - + - - - + + + - - + + - + - - - - - - + + + + + + - - - + + + - + - + - + - - + + + - + - - - + + + - + - + - + - - - - + + + + + @@ -448,99 +455,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -664,8 +671,8 @@ - - - + + + diff --git a/resources/resources.xml b/resources/resources.xml index d03165c..f82312d 100644 --- a/resources/resources.xml +++ b/resources/resources.xml @@ -5,6 +5,7 @@ true 0 true + false false false false @@ -26,7 +27,8 @@ Dark Blue Purple Pink - Additionally colour code graph by profile heart rate zones? + Additionally colour code graph by profile heart rate zones + Colour graph red when move bar alert is on (or orange if red set above) [PRO] Show steps/step goal [PRO] Show sunrise/sunset [PRO] Show second (digital) time @@ -58,6 +60,9 @@ + + + diff --git a/source/SnapshotWatchView.mc b/source/SnapshotWatchView.mc index 8d84a2f..8f319b8 100644 --- a/source/SnapshotWatchView.mc +++ b/source/SnapshotWatchView.mc @@ -31,6 +31,7 @@ class SnapshotWatchView extends Ui.WatchFace { var graphColour = 0; var useZonesColour = true; var heartRateZones; + var showMoveBar = false; var background_color = Gfx.COLOR_BLACK; // var background_color = Gfx.COLOR_DK_GRAY; @@ -89,6 +90,7 @@ class SnapshotWatchView extends Ui.WatchFace { showHeartRate = Application.getApp().getProperty("showHeartRate"); graphColour = Application.getApp().getProperty("graphColour"); useZonesColour = Application.getApp().getProperty("useZonesColour"); + showMoveBar = Application.getApp().getProperty("showMoveBar"); showSteps = Application.getApp().getProperty("showSteps"); showRiseSet = Application.getApp().getProperty("showRiseSet"); showSecondTime = Application.getApp().getProperty("showSecondTime"); @@ -314,8 +316,18 @@ class SnapshotWatchView extends Ui.WatchFace { var height = (heartBinMid-heartMin*0.9) / (heartMax-heartMin*0.9) * totHeight; var xVal = (width_screen-totWidth)/2 + totWidth - i*binPixels -2; var yVal = height_screen/2+28 + totHeight - height; - - dc.setColor(arrayColours[getHRColour(heartBinMid)], Gfx.COLOR_TRANSPARENT); + + if (showMoveBar && ActMon.getInfo().moveBarLevel > 0) + { + if (graphColour == 1) + { dc.setColor(Gfx.COLOR_ORANGE, Gfx.COLOR_TRANSPARENT); } + else + { dc.setColor(Gfx.COLOR_RED, Gfx.COLOR_TRANSPARENT); } + } else + { + dc.setColor(arrayColours[getHRColour(heartBinMid)], Gfx.COLOR_TRANSPARENT); + } + dc.fillRectangle(xVal, yVal, binPixels, height); // Sys.println(i + ": " + binWidthSecs + " " + secsBin + " " + heartBinMin + " " + heartBinMax);