From 173d9a2dae7885051ff044ec6399d8aaa96f85f5 Mon Sep 17 00:00:00 2001 From: msdeibel Date: Sun, 1 Mar 2020 12:10:17 +0100 Subject: [PATCH] Adds rounded corners for upper limit button --- apps/wohrm/.gitignore | 4 ++++ apps/wohrm/wohrm.js | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 apps/wohrm/.gitignore diff --git a/apps/wohrm/.gitignore b/apps/wohrm/.gitignore new file mode 100644 index 000000000..2060ed3f3 --- /dev/null +++ b/apps/wohrm/.gitignore @@ -0,0 +1,4 @@ +/node_modules +/.eslintrc.js +/package.json +/package-lock.json \ No newline at end of file diff --git a/apps/wohrm/wohrm.js b/apps/wohrm/wohrm.js index 7d39f5e63..c30c62eb6 100644 --- a/apps/wohrm/wohrm.js +++ b/apps/wohrm/wohrm.js @@ -1,13 +1,14 @@ +/* eslint-disable no-undef */ const Setter = { UPPER: 'upper', LOWER: 'lower' }; -upperLimit = 130; -lowerLimit = 100; -limitSetter = Setter.LOWER; -currentHeartRate = 0; -hrConfidence = -1; +let upperLimit = 130; +let lowerLimit = 100; +let limitSetter = Setter.LOWER; +let currentHeartRate = 0; +let hrConfidence = -1; function drawTrainingHeartRate() { renderUpperLimit(); @@ -26,6 +27,36 @@ function renderUpperLimit() { g.fillRect(140,40, 230, 70); g.fillRect(200,70, 230, 210); + //Round top left corner + g.setColor(0,0,0); + g.fillRect(140,40, 145, 45); + g.setColor(255,0,0); + g.fillCircle(150,50, 10); + + //Round top right corner + g.setColor(0,0,0); + g.fillRect(225,40, 230, 45); + g.setColor(255,0,0); + g.fillCircle(220,50, 10); + + //Round middle left corner + g.setColor(0,0,0); + g.fillRect(140,65, 145, 70); + g.setColor(255,0,0); + g.fillCircle(150,60, 10); + + //Round bottom left corner + g.setColor(0,0,0); + g.fillRect(200,205, 205, 210); + g.setColor(255,0,0); + g.fillCircle(210,200, 10); + + //Round bottom right corner + g.setColor(0,0,0); + g.fillRect(225,205, 230, 210); + g.setColor(255,0,0); + g.fillCircle(220,200, 10); + if(limitSetter === Setter.UPPER){ g.setColor(255,255, 255); g.drawPoly([140,40,230,40,230,210,200,210,200,70,140,70], true);