i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tango: updated export workflow, added sketchfab activity, added graph optimization parameters, fixed raw images kept in memory (disabled reexctract words on loop closure while updating memory to be able to create more features for transform estimation than needed in vocabulary), portrait/landscape orientation, updated to Eisa TangoSDK. DBReader: fixed high variance when node has no links (if not the first in the current map id). MainWindow: remove frustums not in the current graph.

Browse Source
This commit is contained in:
matlabbe
2017-02-15 19:07:10 -05:00
parent 1be0d52051
commit af1cdadabd
40 changed files with 2090 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/android/res/layout/activity_rtabmap.xml
View File

@@ -280,6 +280,19 @@
</LinearLayout>
<ToggleButton
android:id="@+id/backface_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_above="@+id/light_button"
android:layout_alignLeft="@+id/light_button"
android:layout_alignParentRight="true"
android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:paddingRight="5dp"
android:textOff="@string/backface_off"
android:textOn="@string/backface_on" />
<ToggleButton
android:id="@+id/light_button"
android:layout_width="100dp"
@@ -336,18 +349,35 @@
android:layout_alignLeft="@+id/first_person_button"
android:layout_alignParentTop="true"
android:layout_marginTop="61dp"
android:layout_alignParentRight="true"
android:paddingRight="5dp"
android:textOff="@string/pause"
android:textOn="@string/resume" />
<Button
android:id="@+id/button_shareToSketchfab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignRight="@+id/pause_button"
android:text="@string/share_to_sketchfab" />
<Button
android:id="@+id/button_saveOnDevice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/button_shareToSketchfab"
android:text="@string/save_to_file" />
<Button
android:id="@+id/close_visualization_button"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_marginLeft="5dp"
android:layout_alignBaseline="@+id/top_down_button"
android:layout_alignBottom="@+id/top_down_button"
android:layout_centerHorizontal="true"
android:paddingLeft="5dp"
android:text="@string/close_visualization"/>
android:text="@string/close_visualization" />
</RelativeLayout>

19
app/android/res/layout/activity_settings.xml
View File

@@ -106,6 +106,13 @@
android:entries="@array/pref_sim_thr_keys"
android:entryValues="@array/pref_sim_thr_values"
android:defaultValue="@string/pref_default_sim_thr"/>
<ListPreference
android:key="@string/pref_key_min_inliers"
android:title="@string/pref_title_min_inliers"
android:summary="@string/pref_summary_min_inliers"
android:entries="@array/pref_min_inliers_keys"
android:entryValues="@array/pref_min_inliers_values"
android:defaultValue="@string/pref_default_min_inliers"/>
<ListPreference
android:key="@string/pref_key_opt_error"
android:title="@string/pref_title_opt_error"
@@ -134,6 +141,18 @@
android:entries="@array/pref_features_type_keys"
android:entryValues="@array/pref_features_type_values"
android:defaultValue="@string/pref_default_features_type"/>
<ListPreference
android:key="@string/pref_key_optimizer"
android:title="@string/pref_title_optimizer"
android:summary="@string/pref_summary_optimizer"
android:entries="@array/pref_optimizer_keys"
android:entryValues="@array/pref_optimizer_values"
android:defaultValue="@string/pref_default_optimizer"/>
<SwitchPreference
android:key="@string/pref_key_optimize_end"
android:title="@string/pref_title_optimize_end"
android:summary="@string/pref_summary_optimize_end"
android:defaultValue="@string/pref_default_optimize_end"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_title_mapping_database">

81
app/android/res/layout/activity_sketchfab.xml Normal file
View File

@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:focusableInTouchMode="true" >
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Model Name*:" />
<EditText
android:id="@+id/editText_filename"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="flagNoExtractUi"
android:ems="10" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Description:" />
<EditText
android:id="@+id/editText_description"
android:ems="10"
android:lines="4"
android:minLines="2"
android:gravity="top|left"
android:maxLines="8"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:scrollbars="vertical"
android:imeOptions="flagNoExtractUi"
android:inputType="textMultiLine" >
<requestFocus />
</EditText>
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tags:" />
<EditText
android:id="@+id/editText_tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="flagNoExtractUi"
android:ems="10" />
<CheckBox
android:id="@+id/checkBox_draft"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="Draft Mode" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="right|bottom"
android:orientation="horizontal" >
<Button
android:id="@+id/button_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.06"
android:text="Upload" />
</LinearLayout>
</LinearLayout>
</ScrollView>

40
app/android/res/menu/optionmenu.xml
View File

@@ -8,8 +8,26 @@
<item android:id="@+id/texture_mesh" android:checked="true" android:title="Texture Mesh" />
</group>
<item android:id="@+id/save" android:title="Save" android:showAsAction="ifRoom"/>
<item android:id="@+id/post_processing" android:title="Optimize" android:showAsAction="ifRoom">
<item android:id="@+id/export" android:showAsAction="ifRoom" android:title="Export">
<menu>
<item android:id="@+id/export_point_cloud" android:title="Point Cloud" />
<item android:id="@+id/export_mesh_menu" android:title="Raw Mesh..." >
<menu>
<item android:id="@+id/export_mesh" android:title="Colored Mesh" />
<item android:id="@+id/export_mesh_texture" android:title="Textured Mesh" />
</menu>
</item>
<item android:id="@+id/export_optimized_mesh_menu" android:title="Optimized Mesh..." >
<menu>
<item android:id="@+id/export_optimized_mesh" android:title="Colored Mesh" />
<item android:id="@+id/export_optimized_mesh_texture" android:title="Textured Mesh" />
</menu>
</item>
</menu>
</item>
<item android:id="@+id/post_processing" android:title="Optimize" android:showAsAction="ifRoom">
<menu>
<item android:id="@+id/post_processing_standard" android:title="Standard Optimization" />
<item android:id="@+id/post_processing_advanced" android:title="Advanced..." >
@@ -26,24 +44,6 @@
</menu>
</item>
<item android:id="@+id/export" android:showAsAction="ifRoom" android:title="Export">
<menu>
<item android:id="@+id/export_point_cloud" android:title="Point Cloud (*.ply)" />
<item android:id="@+id/export_mesh_menu" android:title="Raw Mesh..." >
<menu>
<item android:id="@+id/export_mesh" android:title="Colored Mesh (*.ply)" />
<item android:id="@+id/export_mesh_texture" android:title="Textured Mesh (*.obj)" />
</menu>
</item>
<item android:id="@+id/export_optimized_mesh_menu" android:title="Optimized Mesh..." >
<menu>
<item android:id="@+id/export_optimized_mesh" android:title="Colored Mesh (*.ply)" />
<item android:id="@+id/export_optimized_mesh_texture" android:title="Textured Mesh (*.obj)" />
</menu>
</item>
</menu>
</item>
<item android:id="@+id/open" android:title="Open" android:showAsAction="ifRoom"/>
<item android:id="@+id/menu_rendering_settings" android:title="Visibility...">

973
app/android/res/values/strings.xml
View File

File diff suppressed because it is too large Load Diff