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

Added measure text size setting, changed look and feel of point to point

Browse Source
This commit is contained in:
matlabbe
2025-02-17 23:05:11 -08:00
parent 674aebfb6b
commit fd80a39207
11 changed files with 275 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/ios/RTABMapApp.xcodeproj/project.pbxproj
View File

@@ -805,7 +805,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=\"$MARKETING_VERSION\"\n/usr/libexec/PlistBuddy -c \"Set PreferenceSpecifiers:21:DefaultValue $version\" \"${SRCROOT}/Settings.bundle/Root.plist\"\n";
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=\"$MARKETING_VERSION\"\n/usr/libexec/PlistBuddy -c \"Set PreferenceSpecifiers:24:DefaultValue $version\" \"${SRCROOT}/Settings.bundle/Root.plist\"\n";
};
/* End PBXShellScriptBuildPhase section */

7
app/ios/RTABMapApp/NativeWrapper.cpp
View File

@@ -658,6 +658,13 @@ void setMetricSystemNative(const void *object, bool enabled)
else
UERROR("object is null!");
}
void setMeasuringTextSizeNative(const void *object, float size)
{
if(object)
return native(object)->setMeasuringTextSize(size);
else
UERROR("object is null!");
}
void clearMeasuresNative(const void *object)
{
if(object)

1
app/ios/RTABMapApp/NativeWrapper.hpp
View File

@@ -120,6 +120,7 @@ void addMeasureNative(const void *object);
void teleportNative(const void *object);
void setMeasuringModeNative(const void *object, int mode);
void setMetricSystemNative(const void *object, bool enabled);
void setMeasuringTextSizeNative(const void *object, float size);
void clearMeasuresNative(const void *object);
typedef struct ImageNative

3
app/ios/RTABMapApp/RTABMap.swift
View File

@@ -167,6 +167,9 @@ class RTABMap {
func setMetricSystem(_ enabled: Bool) {
setMetricSystemNative(native_rtabmap, enabled)
}
func setMeasuringTextSize(_ size: Float32) {
setMeasuringTextSizeNative(native_rtabmap, size)
}
func clearMeasures() {
clearMeasuresNative(native_rtabmap)
}

3
app/ios/RTABMapApp/ViewController.swift
View File

@@ -1555,6 +1555,9 @@ class ViewController: GLKViewController, ARSessionDelegate, RTABMapObserver, UIP
rtabmap!.setMaxGainRadius(value: defaults.float(forKey: "ColorCorrectionRadius"));
rtabmap!.setRenderingTextureDecimation(value: defaults.integer(forKey: "TextureResolution"));
rtabmap!.setMetricSystem(defaults.integer(forKey: "MeasuringUnits") == 0);
rtabmap!.setMeasuringTextSize(defaults.float(forKey: "MeasuringTextSize"));
if(locationManager != nil && !defaults.bool(forKey: "SaveGPS"))
{
locationManager?.stopUpdatingLocation()

54
app/ios/Settings.bundle/Root.plist
View File

@@ -430,6 +430,60 @@
<real>0.01</real>
</array>
</dict>
<dict>
<key>Title</key>
<string>Measuring</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>DefaultValue</key>
<integer>0</integer>
<key>Key</key>
<string>MeasuringUnits</string>
<key>Title</key>
<string>System of Units</string>
<key>Titles</key>
<array>
<string>Metric</string>
<string>Imperial</string>
</array>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Values</key>
<array>
<integer>0</integer>
<integer>1</integer>
</array>
</dict>
<dict>
<key>DefaultValue</key>
<real>0.050000000000000003</real>
<key>Key</key>
<string>MeasuringTextSize</string>
<key>Title</key>
<string>Text Size</string>
<key>Titles</key>
<array>
<string>30 cm</string>
<string>25 cm</string>
<string>20 cm</string>
<string>15 cm</string>
<string>10 cm</string>
<string>5 cm</string>
</array>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Values</key>
<array>
<real>0.29999999999999999</real>
<real>0.25</real>
<real>0.20000000000000001</real>
<real>0.14999999999999999</real>
<real>0.10000000000000001</real>
<real>0.050000000000000003</real>
</array>
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2010-2024, Mathieu Labbe - IntRoLab - Université de Sherbrooke. All rights reserved.</string>