diff --git a/src/xrt/auxiliary/tracking/t_tracker_slam.cpp b/src/xrt/auxiliary/tracking/t_tracker_slam.cpp index 0059a7e59..7cb169473 100644 --- a/src/xrt/auxiliary/tracking/t_tracker_slam.cpp +++ b/src/xrt/auxiliary/tracking/t_tracker_slam.cpp @@ -407,7 +407,7 @@ timing_ui_setup(TrackerSlam &t) { t.timing.enabled = false; - u_var_add_ro_ftext(&t, "\n%s", "Tracker timing"); + u_var_add_ro_raw_text(&t, "\nTracker timing", "Tracker timing"); // Setup toggle button static const char *msg[2] = {"[OFF] Enable timing", "[ON] Disable timing"}; @@ -527,7 +527,7 @@ features_ui_setup(TrackerSlam &t) { t.features.enabled = false; - u_var_add_ro_ftext(&t, "\n%s", "Tracker features"); + u_var_add_ro_raw_text(&t, "\nTracker features", "Tracker features"); // Setup toggle button static const char *msg[2] = {"[OFF] Enable features info", "[ON] Disable features info"}; @@ -695,7 +695,7 @@ gt2xr_pose(const xrt_pose >_origin, const xrt_pose >_pose) static void gt_ui_setup(TrackerSlam &t) { - u_var_add_ro_ftext(&t, "\n%s", "Tracker groundtruth"); + u_var_add_ro_raw_text(&t, "\nTracker groundtruth", "Tracker groundtruth"); t.gt.diff_ui.values.data = t.gt.diffs_mm; t.gt.diff_ui.values.length = UI_GTDIFF_POSE_COUNT; t.gt.diff_ui.values.index_ptr = &t.gt.diff_idx; @@ -1081,7 +1081,7 @@ setup_ui(TrackerSlam &t) } u_var_add_gui_header(&t, NULL, "Stats"); - u_var_add_ro_ftext(&t, "\n%s", "Record to CSV files"); + u_var_add_ro_raw_text(&t, "\nRecord to CSV files", "Record to CSV files"); u_var_add_bool(&t, &t.slam_traj_writer->enabled, "Record tracked trajectory"); u_var_add_bool(&t, &t.pred_traj_writer->enabled, "Record predicted trajectory"); u_var_add_bool(&t, &t.filt_traj_writer->enabled, "Record filtered trajectory"); diff --git a/src/xrt/auxiliary/util/u_var.h b/src/xrt/auxiliary/util/u_var.h index e02d2b2c7..4e67e224c 100644 --- a/src/xrt/auxiliary/util/u_var.h +++ b/src/xrt/auxiliary/util/u_var.h @@ -236,7 +236,7 @@ enum u_var_kind U_VAR_KIND_NATIVE_IMAGES_DEBUG, U_VAR_KIND_LOG_LEVEL, U_VAR_KIND_RO_TEXT, - U_VAR_KIND_RO_FTEXT, + U_VAR_KIND_RO_RAW_TEXT, U_VAR_KIND_RO_I16, U_VAR_KIND_RO_I32, U_VAR_KIND_RO_U16, @@ -396,7 +396,7 @@ u_var_force_on(void); ADD_FUNC(native_images_debug, struct u_native_images_debug, NATIVE_IMAGES_DEBUG) \ ADD_FUNC(log_level, enum u_logging_level, LOG_LEVEL) \ ADD_FUNC(ro_text, const char, RO_TEXT) \ - ADD_FUNC(ro_ftext, const char, RO_FTEXT) \ + ADD_FUNC(ro_raw_text, const char, RO_RAW_TEXT) \ ADD_FUNC(ro_i16, int16_t, RO_I16) \ ADD_FUNC(ro_i32, int32_t, RO_I32) \ ADD_FUNC(ro_u16, uint16_t, RO_U16) \ diff --git a/src/xrt/state_trackers/gui/gui_scene_debug.c b/src/xrt/state_trackers/gui/gui_scene_debug.c index 537c03267..5359364e9 100644 --- a/src/xrt/state_trackers/gui/gui_scene_debug.c +++ b/src/xrt/state_trackers/gui/gui_scene_debug.c @@ -697,7 +697,7 @@ on_elem(struct u_var_info *info, void *priv) case U_VAR_KIND_POSE: on_pose(name, ptr); break; case U_VAR_KIND_LOG_LEVEL: igCombo_Str(name, (int *)ptr, "Trace\0Debug\0Info\0Warn\0Error\0\0", 5); break; case U_VAR_KIND_RO_TEXT: igText("%s: '%s'", name, (char *)ptr); break; - case U_VAR_KIND_RO_FTEXT: igText(ptr ? (char *)ptr : "%s", name); break; + case U_VAR_KIND_RO_RAW_TEXT: igText("%s", (char *)ptr); break; case U_VAR_KIND_RO_I16: igInputScalar(name, ImGuiDataType_S16, ptr, NULL, NULL, NULL, ro_i_flags); break; case U_VAR_KIND_RO_I32: igInputScalar(name, ImGuiDataType_S32, ptr, NULL, NULL, NULL, ro_i_flags); break; case U_VAR_KIND_RO_U16: igInputScalar(name, ImGuiDataType_U16, ptr, NULL, NULL, NULL, ro_i_flags); break;