diff --git a/apps/clock-analog.js b/apps/clock-analog.js index 8e6650508..dfd1a7ddb 100644 --- a/apps/clock-analog.js +++ b/apps/clock-analog.js @@ -3,13 +3,11 @@ g.clear(); var minuteDate = new Date(); var secondDate = new Date(); -function line(angle, r1,r2) { +function seconds(angle, r) { var a = angle*Math.PI/180; - g.drawLine( - 120+Math.sin(a)*r1, - 120-Math.cos(a)*r1, - 120+Math.sin(a)*r2, - 120-Math.cos(a)*r2); + var x = 120+Math.sin(a)*r; + var y = 120-Math.cos(a)*r; + g.fillRect(x-1,y-1,x+1,y+1); } function hand(angle, r1,r2) { var a = angle*Math.PI/180; @@ -28,20 +26,20 @@ function hand(angle, r1,r2) { function drawAll() { g.clear(); - g.setColor(0,0,0.3); + g.setColor(0,0,0.6); for (var i=0;i<60;i++) - line(360*i/60, 92, 95); + seconds(360*i/60, 90); secondDate = minuteDate = new Date(); onSecond(); onMinute(); } function onSecond() { - g.setColor(0,0,0.3); - line(360*secondDate.getSeconds()/60, 92, 95); + g.setColor(0,0,0.6); + seconds(360*secondDate.getSeconds()/60, 90); g.setColor(1,0,0); secondDate = new Date(); - line(360*secondDate.getSeconds()/60, 92, 95); + seconds(360*secondDate.getSeconds()/60, 90); g.setColor(1,1,1); } @@ -49,11 +47,11 @@ function onSecond() { function onMinute() { g.setColor(0,0,0); hand(360*minuteDate.getHours()/12, -10, 50); - hand(360*minuteDate.getMinutes()/60, -10, 85); + hand(360*minuteDate.getMinutes()/60, -10, 82); oldMinute = new Date(); g.setColor(1,1,1); hand(360*minuteDate.getHours()/12, -10, 50); - hand(360*minuteDate.getMinutes()/60, -10, 85); + hand(360*minuteDate.getMinutes()/60, -10, 82); } setInterval(onSecond,1000);