From: Martin Vajnar Date: Tue, 20 Aug 2013 17:48:01 +0000 (+0200) Subject: ROBOT_DEMO: draw scale in HokuyoView X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/19fb7c75d2bb024abb01d51a27c6bae7c147acd9 ROBOT_DEMO: draw scale in HokuyoView --- diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java index 5c6ea58..8ada9ae 100644 --- a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java +++ b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java @@ -52,12 +52,20 @@ public class HokuyoView extends View { if (isRunning) { lock.lock(); try { + double norm = (double)getWidth()/(2*COSINUS); + if (norm > getHeight()) + norm = getHeight(); + canvas.drawLine((int)(getWidth()*0.95), + (int)(getHeight()*0.97), + (int)(getWidth()*0.95-norm/4), + (int)(getHeight()*0.97), + paint); + paint.setStrokeWidth(2); + canvas.drawText("1 m", (int)(getWidth()*0.95-norm/8), (int)(getHeight()*0.97-10), paint); + paint.setStrokeWidth(3); if (!hasBeenDrawn) { path.reset(); path.moveTo(getWidth()/2, getHeight()); - double norm = (double)getWidth()/(2*COSINUS); - if (norm > getHeight()) - norm = getHeight(); for(int i = HOKUYO_INDEX_LOWER+1; i <= HOKUYO_INDEX_UPPER; i++) { data[i] = (int)(((double)data[i]/4000)*norm); int x = (int)(getWidth()/2) - (int)(data[i] * Math.sin(HOKUYO_INDEX_TO_RAD(i)));