i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 00:37:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tango: updated UI

Browse Source
This commit is contained in:
matlabbe
2017-06-28 13:59:20 -04:00
parent 64fc9f203e
commit ebada30984
19 changed files with 323 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/android/res/drawable/custom_seekbar.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape>
<gradient
android:endColor="#00ffffff"
android:startColor="#ff686868"
android:useLevel="false" />
</shape>
</item>
</layer-list>
app/android/res/layout/activity_rtabmap.xml
+32 -44
View File
@@ -25,7 +25,7 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<ToggleButton
@@ -35,7 +35,7 @@
android:layout_above="@+id/light_button"
android:layout_alignLeft="@+id/light_button"
android:layout_alignParentRight="true"
android:layout_marginBottom="15dp"
android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:paddingRight="5dp"
android:textOff="@string/wireframe"
@@ -48,7 +48,7 @@
android:layout_above="@+id/backface_button"
android:layout_alignLeft="@+id/backface_button"
android:layout_alignParentRight="true"
android:layout_marginBottom="15dp"
android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:paddingRight="5dp"
android:textOff="@string/light_off"
@@ -58,56 +58,33 @@
android:id="@+id/backface_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_above="@+id/first_person_button"
android:layout_alignLeft="@+id/first_person_button"
android:layout_above="@+id/camera_button"
android:layout_alignRight="@+id/camera_button"
android:layout_alignParentRight="true"
android:layout_marginBottom="5dp"
android:layout_marginBottom="15dp"
android:layout_marginRight="5dp"
android:paddingRight="5dp"
android:textOff="@string/backface_off"
android:textOn="@string/backface_on" />
<ToggleButton
android:id="@+id/first_person_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_above="@+id/third_person_button"
android:layout_alignLeft="@+id/third_person_button"
android:layout_alignParentRight="true"
android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:paddingRight="5dp"
android:textOff="@string/first_person"
android:textOn="@string/first_person" />
<ToggleButton
android:id="@+id/third_person_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_above="@+id/top_down_button"
android:layout_alignParentRight="true"
android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:paddingRight="5dp"
android:textOff="@string/third_person"
android:textOn="@string/third_person" />
<ToggleButton
android:id="@+id/top_down_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
<com.introlab.rtabmap.NDSpinner
android:id="@+id/camera_button"
android:layout_width="140dp"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp"
android:paddingRight="5dp"
android:textOff="@string/top_down"
android:textOn="@string/top_down" />
android:paddingBottom="10dp"
android:text="@string/camera_button"
android:spinnerMode="dropdown"/>
<ToggleButton
android:id="@+id/pause_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/first_person_button"
android:layout_marginRight="5dp"
android:layout_alignParentTop="true"
android:layout_marginTop="61dp"
android:layout_alignParentRight="true"
@@ -135,10 +112,8 @@
android:id="@+id/close_visualization_button"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/top_down_button"
android:layout_alignBottom="@+id/top_down_button"
android:layout_above="@+id/camera_button"
android:layout_centerHorizontal="true"
android:paddingLeft="5dp"
android:text="@string/close_visualization" />
<SeekBar
@@ -146,10 +121,23 @@
android:layout_width="200dp"
android:layout_height="wrap_content"
android:rotation="270"
android:layout_above="@+id/light_button"
android:layout_alignParentLeft="true"
android:layout_alignBaseline="@+id/first_person_button"
android:layout_gravity="center"
android:layout_marginLeft="-50dp" />
android:layout_marginLeft="-50dp"
android:progressDrawable="@drawable/custom_seekbar" />
<SeekBar
android:id="@+id/seekBar_grid"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignBottom="@+id/camera_button"
android:layout_marginLeft="35dp"
android:paddingBottom="10dp"
android:progressDrawable="@drawable/custom_seekbar" />
</RelativeLayout>
</RelativeLayout>
app/android/res/values/arrays.xml
+9
View File
@@ -0,0 +1,9 @@
<resources>
<string-array name="camera_view_array">
<item>First View</item>
<item>Third-P. View</item>
<item>Top View</item>
<item>Ortho View</item>
</string-array>
</resources>
app/android/res/values/strings.xml
+2 -4
View File
@@ -8,9 +8,7 @@
<string name="sketchfab">Upload to Sketchfab&#8230;</string>
<string name="status">"Status: "</string>
<string name="words">"Words: "</string>
<string name="first_person">First</string>
<string name="third_person">Third</string>
<string name="top_down">Top</string>
<string name="camera_button">First View</string>
<string name="pause">Pause</string>
<string name="resume">Resume</string>
<string name="backface_on">Backface</string>
@@ -36,7 +34,7 @@
<string name="memory">"Used Memory (MB): "</string>
<string name="hypothesis">"Hypothesis (%): "</string>
<string name="fps">"FPS (rendering): "</string>
<!-- Preference keys: BEGIN -->
<string name="pref_key_tags">pref_key_tags</string>
<string name="pref_default_tags">rtabmap 3dscan tango</string>