ROBOT_DEMO: change name to RoboDruid and add CTU logo

diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
index 02d2e0fc8d978798b0c4573d6ea85e1153ec9669..33d8bd0a5168a813ac81e2451b6ce139c7095904 100644 (file)
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
+++ b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
@@ -12,29 +12,31 @@ public final class R {
     }
     public static final class drawable {
         public static final int ic_launcher=0x7f020000;
+        public static final int logo_cvut=0x7f020001;
     }
     public static final class id {
-        public static final int button1=0x7f07000d;
-        public static final int crane=0x7f070011;
-        public static final int editText1=0x7f070003;
-        public static final int editText2=0x7f070006;
-        public static final int editText3=0x7f070009;
-        public static final int editText4=0x7f07000c;
-        public static final int exit=0x7f070014;
-        public static final int hokuyo=0x7f070010;
-        public static final int hokuyo_view=0x7f070000;
-        public static final int magnet=0x7f070012;
-        public static final int speed=0x7f07000e;
-        public static final int speed_mon=0x7f07000f;
-        public static final int tableRow1=0x7f070001;
-        public static final int tableRow2=0x7f070004;
-        public static final int tableRow3=0x7f070007;
-        public static final int tableRow4=0x7f07000a;
-        public static final int textView1=0x7f070002;
-        public static final int textView2=0x7f070005;
-        public static final int textView3=0x7f070008;
-        public static final int textView4=0x7f07000b;
-        public static final int voltage=0x7f070013;
+        public static final int button1=0x7f07000e;
+        public static final int crane=0x7f070012;
+        public static final int editText1=0x7f070004;
+        public static final int editText2=0x7f070007;
+        public static final int editText3=0x7f07000a;
+        public static final int editText4=0x7f07000d;
+        public static final int exit=0x7f070015;
+        public static final int hokuyo=0x7f070011;
+        public static final int hokuyo_view=0x7f070001;
+        public static final int hokuyo_view_bg=0x7f070000;
+        public static final int magnet=0x7f070013;
+        public static final int speed=0x7f07000f;
+        public static final int speed_mon=0x7f070010;
+        public static final int tableRow1=0x7f070002;
+        public static final int tableRow2=0x7f070005;
+        public static final int tableRow3=0x7f070008;
+        public static final int tableRow4=0x7f07000b;
+        public static final int textView1=0x7f070003;
+        public static final int textView2=0x7f070006;
+        public static final int textView3=0x7f070009;
+        public static final int textView4=0x7f07000c;
+        public static final int voltage=0x7f070014;
     }
     public static final class layout {
         public static final int hokuyo_view=0x7f030000;

diff --git a/orte/Robot_Demo/res/drawable/logo_cvut.png b/orte/Robot_Demo/res/drawable/logo_cvut.png
new file mode 100644 (file)
index 0000000..2bdd495
Binary files /dev/null and b/orte/Robot_Demo/res/drawable/logo_cvut.png differ

diff --git a/orte/Robot_Demo/res/layout/hokuyo_view.xml b/orte/Robot_Demo/res/layout/hokuyo_view.xml
index ae553b99850ecf2d388a5ecc47a18f0e1de52d4e..40f1bc2908ff57257bc7c747309b3813aa71b334 100644 (file)
--- a/orte/Robot_Demo/res/layout/hokuyo_view.xml
+++ b/orte/Robot_Demo/res/layout/hokuyo_view.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent" >
 
-    <org.ocera.orte.demo.HokuyoView 
+    <ImageView
+        android:id="@+id/hokuyo_view_bg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:adjustViewBounds="true"
+        android:maxHeight="100dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/logo_cvut" />
+    
+       <org.ocera.orte.demo.HokuyoView 
         android:id="@+id/hokuyo_view"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
+        android:layout_height="fill_parent" />
+       
 
-</LinearLayout>
+ 
+</RelativeLayout>

diff --git a/orte/Robot_Demo/res/values/strings.xml b/orte/Robot_Demo/res/values/strings.xml
index aacc9ddffc7856bbd84a76856871f24a0572e51c..1f0a9807d3c617af3cfc48a5e9395343c2983376 100644 (file)
--- a/orte/Robot_Demo/res/values/strings.xml
+++ b/orte/Robot_Demo/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Robomon</string>
+    <string name="app_name">RoboDruid</string>
 
 </resources>
\ No newline at end of file

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 dd6c18332fbf380e1990eb5428f9fed1ea22a240..d79eee0a0c393c70b21e8e2bf48087a0a89fa306 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java
@@ -44,7 +44,7 @@ public class HokuyoView extends View {
                super(context, attrs);
                
                paint.setStyle(Style.STROKE);
-               paint.setStrokeWidth(4);
+               paint.setStrokeWidth(3);
                paint.setColor(Color.BLACK);
                paint.setAntiAlias(false);
        }
@@ -59,6 +59,9 @@ public class HokuyoView extends View {
                                        double norm = (double)getWidth()/(2*COSINUS);
                                        if (norm > getHeight())
                                                norm = getHeight();
+                                       paint.setStyle(Style.STROKE);
+                                       paint.setStrokeWidth(3);
+                                       paint.setColor(Color.BLACK);
                                        canvas.drawLine((int)(getWidth()*0.95),
                                                                        (int)(getHeight()*0.97),
                                                                        (int)(getWidth()*0.95-norm/4),
@@ -67,6 +70,8 @@ public class HokuyoView extends View {
                                        paint.setStrokeWidth(2);
                                        canvas.drawText("1 m", (int)(getWidth()*0.95-norm/8), (int)(getHeight()*0.97-10), paint);
                                        paint.setStrokeWidth(3);
+                                       paint.setStyle(Style.FILL);
+                                       paint.setColor(Color.argb(40, 62, 62, 171));
                                        if (!hasBeenDrawn) {
                                                path.reset();
                                                path.moveTo(getWidth()/2, getHeight());
@@ -92,6 +97,9 @@ public class HokuyoView extends View {
                                path.reset();
                        }
                        canvas.drawPath(path, paint);
+                       paint.setStyle(Style.STROKE);
+                       paint.setColor(Color.BLACK);
+                       canvas.drawPath(path, paint);
                        
                        if (isMonitoring) {
                                lockMotion.lock();
@@ -101,7 +109,9 @@ public class HokuyoView extends View {
                                                norm = getHeight()*0.125;
                                        else
                                                 norm = getWidth()*0.125;
+                                       paint.setStyle(Style.STROKE);
                                        paint.setStrokeWidth(1);
+                                       paint.setColor(Color.BLACK);
                                        canvas.drawLine((int)(10),
                                                                        (int)(10+norm*1.5),
                                                                        (int)(10+norm*3),
@@ -113,6 +123,7 @@ public class HokuyoView extends View {
                                                                        (int)(10+norm*3),
                                                                        paint);
                                        paint.setStrokeWidth(4);
+                                       paint.setColor(Color.BLUE);
                                        canvas.drawLine((int)(10+norm*1.5),
                                                                        (int)(10+norm*1.5),
                                                                        (int)(speedCo[0]*norm+10+norm*1.5),