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

Tango: fixed "Waiting creating clouds..." dialog not closing

Browse Source
This commit is contained in:
matlabbe
2017-03-26 13:40:25 -04:00
parent a3f1e04a4d
commit def90355a9
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/android/AndroidManifest.xml.in
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- BEGIN_INCLUDE(manifest) --> <!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.introlab.rtabmap" package="com.introlab.rtabmap"
android:versionCode="45" android:versionCode="47"
android:versionName="@RTABMAP_VERSION@"> android:versionName="@RTABMAP_VERSION@">
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
app/android/res/values/strings.xml
+1 -1
View File
@@ -113,7 +113,7 @@
<string name="pref_key_opt_depth">pref_key_opt_depth</string> <string name="pref_key_opt_depth">pref_key_opt_depth</string>
<string name="pref_default_opt_depth">8</string> <string name="pref_default_opt_depth">8</string>
<string name="pref_key_opt_color_radius">pref_key_opt_color_radius</string> <string name="pref_key_opt_color_radius">pref_key_opt_color_radius</string>
<string name="pref_default_opt_color_radius">0.025</string> <string name="pref_default_opt_color_radius">0.05</string>
<string name="pref_key_opt_clean_white">pref_key_opt_clean_white</string> <string name="pref_key_opt_clean_white">pref_key_opt_clean_white</string>
<string name="pref_default_opt_clean_white">true</string> <string name="pref_default_opt_clean_white">true</string>
<string name="pref_key_gain_max_radius">pref_key_gain_max_radius</string> <string name="pref_key_gain_max_radius">pref_key_gain_max_radius</string>
app/android/src/com/introlab/rtabmap/RTABMapActivity.java
+1 -2
View File
@@ -2074,9 +2074,9 @@ public class RTABMapActivity extends Activity implements OnClickListener {
public void run() { public void run() {
setCamera(1); setCamera(1);
updateState(State.STATE_IDLE); updateState(State.STATE_IDLE);
mProgressDialog.dismiss();
if(status == -1) if(status == -1)
{ {
mProgressDialog.dismiss();
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(getActivity())
.setCancelable(false) .setCancelable(false)
.setTitle("Error") .setTitle("Error")
@@ -2104,7 +2104,6 @@ public class RTABMapActivity extends Activity implements OnClickListener {
{ {
mProgressDialog.setTitle("Loading"); mProgressDialog.setTitle("Loading");
mProgressDialog.setMessage(String.format("Database \"%s\" loaded. Please wait while rendering point clouds and meshes...", fileName)); mProgressDialog.setMessage(String.format("Database \"%s\" loaded. Please wait while rendering point clouds and meshes...", fileName));
mProgressDialog.show();
} }
} }
} }