]> rtime.felk.cvut.cz Git - orte.git/commitdiff
ROBOT_DEMO: draw scale in HokuyoView
authorMartin Vajnar <martin.vajnar@gmail.com>
Tue, 20 Aug 2013 17:48:01 +0000 (19:48 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Tue, 20 Aug 2013 17:48:01 +0000 (19:48 +0200)
orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java

index 5c6ea58ef5f87db4b8adfaab31f78fadf2db8690..8ada9ae2576ed90430623a144bdb80eef8e9b4e0 100644 (file)
@@ -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)));