Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

B5b diplay in cm #9145

Merged
merged 6 commits into from
Jun 10, 2021
Merged

B5b diplay in cm #9145

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2f1f60
Depth Visualization Thresholds in cm for D405
remibettan Jun 2, 2021
73269f9
Depth Units in cm for b5b, and bug correction
remibettan Jun 2, 2021
5ca2bdc
param added to get_option_description private method, bug fixed
remibettan Jun 3, 2021
c806c11
edit mode updated for displaying in cm
remibettan Jun 3, 2021
ac36bf2
corrections according to code review
remibettan Jun 8, 2021
cfb2e4d
fixing typos
remibettan Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 82 additions & 5 deletions common/model-views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,13 @@ namespace rs2
}
return option;
}
std::string adjust_description(const std::string& str_in, const std::string& to_be_replaced, const std::string& to_replace)
{
std::string adjusted_string(str_in);
auto pos = adjusted_string.find(to_be_replaced);
adjusted_string.replace(pos, to_be_replaced.size(), to_replace);
return adjusted_string;
}

bool option_model::draw(std::string& error_message, notifications_model& model, bool new_line, bool use_option_name)
{
Expand All @@ -560,7 +567,26 @@ namespace rs2
if (opt == RS2_OPTION_HOLES_FILL)
use_option_name = false;

auto desc = endpoint->get_option_description(opt);
// lambda function used to convert meters to cm - while the number is a string
auto convert_float_str = [](std::string float_str, float conversion_factor) {
if (float_str.size() == 0)
return float_str;
float number_float = std::stof(float_str);
return std::to_string(number_float * conversion_factor);
};

std::string desc_str (endpoint->get_option_description(opt));

// Device D405 is for short range, therefore, its units are in cm - for better UX
bool use_cm_units = false;
std::string device_pid = dev->s->get_info(RS2_CAMERA_INFO_PRODUCT_ID);
if (device_pid == "0B5B" && val_in_range(opt, { RS2_OPTION_MIN_DISTANCE, RS2_OPTION_MAX_DISTANCE, RS2_OPTION_DEPTH_UNITS }))
{
use_cm_units = true;
desc_str = adjust_description(desc_str, "meters", "cm");
}

auto desc = desc_str.c_str();

// remain option to append to the current line
if (!new_line)
Expand Down Expand Up @@ -675,12 +701,25 @@ namespace rs2
}
else if (edit_mode)
{
std::string buff_str = edit_value;

// when cm must be used instead of meters
if (use_cm_units)
buff_str = convert_float_str(buff_str, 100.f);

char buff[TEXT_BUFF_SIZE];
memset(buff, 0, TEXT_BUFF_SIZE);
strcpy(buff, edit_value.c_str());
strcpy(buff, buff_str.c_str());

if (ImGui::InputText(id.c_str(), buff, TEXT_BUFF_SIZE,
ImGuiInputTextFlags_EnterReturnsTrue))
{
if (use_cm_units)
{
buff_str = convert_float_str(std::string(buff), 0.01f);
memset(buff, 0, TEXT_BUFF_SIZE);
strcpy(buff, buff_str.c_str());
}
float new_value;
if(!utilities::string::string_to_value<float>(buff, new_value))
{
Expand All @@ -696,9 +735,14 @@ namespace rs2
{
set_option(opt, new_value, error_message);
}

edit_mode = false;
}
else if (use_cm_units)
{
buff_str = convert_float_str(buff_str, 0.01f);
memset(buff, 0, TEXT_BUFF_SIZE);
strcpy(buff, buff_str.c_str());
}
edit_value = buff;
}
else if (is_all_integers())
Expand All @@ -720,9 +764,42 @@ namespace rs2
else
{
float tmp_value = value;
if (ImGui::SliderFloat(id.c_str(), &tmp_value,
range.min, range.max, "%.4f"))
float temp_value_displayed = tmp_value;
float min_range_displayed = range.min;
float max_range_displayed = range.max;

// computing the number of decimal digits taken from the step options' property
// this will then be used to format the displayed value
auto num_of_decimal_digits = [](float f) {
int res = 0;
while (f && (int)f == 0)
{
f *= 10.f;
++res;
}
return res;
};
int num_of_decimal_digits_displayed = num_of_decimal_digits(range.step);

// displaying in cm instead of meters for D405
if (use_cm_units)
{
temp_value_displayed *= 100.f;
min_range_displayed *= 100.f;
max_range_displayed *= 100.f;
int updated_num_of_decimal_digits_displayed = num_of_decimal_digits_displayed - 2;
if (updated_num_of_decimal_digits_displayed > 0)
num_of_decimal_digits_displayed = updated_num_of_decimal_digits_displayed;
}

std::stringstream formatting_ss;
formatting_ss << "%." << num_of_decimal_digits_displayed << "f";

if (ImGui::SliderFloat(id.c_str(), &temp_value_displayed,
min_range_displayed, max_range_displayed, formatting_ss.str().c_str()))
{
if (use_cm_units)
tmp_value = temp_value_displayed / 100.f;
auto loffset = std::abs(fmod(tmp_value, range.step));
auto roffset = range.step - loffset;
if (tmp_value >= 0)
Expand Down