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

RS-Viewer: add minimal delay between set_option commands #9824

Merged
merged 13 commits into from
Oct 7, 2021
Merged

RS-Viewer: add minimal delay between set_option commands #9824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5f92371
protect repeated option set
Nir-Az Sep 30, 2021
2e9eac4
merge option set logs
Nir-Az Sep 30, 2021
76880d5
add delayed set
Nir-Az Oct 4, 2021
8866b52
add delayed set
Nir-Az Oct 4, 2021
b358d30
increase set delay to 150 ms
Nir-Az Oct 4, 2021
64f0aaf
try set once on button unclick
Nir-Az Oct 4, 2021
1420326
set delayed option only if changed
Nir-Az Oct 4, 2021
b17033e
invalidate options only after set
Nir-Az Oct 4, 2021
ef75fce
move res close to set
Nir-Az Oct 5, 2021
bb24251
invalidate options only when unclicking slider
Nir-Az Oct 6, 2021
5104956
invalidate on set
Nir-Az Oct 6, 2021
b8028d2
CR fixes
Nir-Az Oct 6, 2021
f64ef8e
move duplicated code into functions
Nir-Az Oct 6, 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
108 changes: 91 additions & 17 deletions common/model-views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,8 @@ namespace rs2
option.label = options->get_option_name(opt) + std::string("##") + ss.str();
option.invalidate_flag = options_invalidated;
option.dev = model;
option.range = { 0, 1, 0, 0 };
option.value = 0;

option.supported = options->supports(opt);
if (option.supported)
Expand All @@ -544,8 +546,6 @@ namespace rs2
}
catch (const error& e)
{
option.range = { 0, 1, 0, 0 };
option.value = 0;
error_message = error_to_string(e);
}
}
Expand Down Expand Up @@ -771,10 +771,11 @@ namespace rs2
static_cast<int>(range.step)))
{
// TODO: Round to step?
model.add_log(to_string() << "Setting " << opt << " to " << int_value);
set_option(opt, static_cast<float>(int_value), error_message);
*invalidate_flag = true;
res = true;
res = slider_selected( opt, static_cast< float >( int_value ), error_message, model );
maloel marked this conversation as resolved.
Show resolved Hide resolved
}
else
{
res = slider_unselected( opt, static_cast< float >( int_value ), error_message, model );
}
}
else
Expand Down Expand Up @@ -811,6 +812,7 @@ namespace rs2
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()))
{
Expand All @@ -823,10 +825,12 @@ namespace rs2
tmp_value = (loffset < roffset) ? tmp_value + loffset : tmp_value - roffset;
tmp_value = (tmp_value < range.min) ? range.min : tmp_value;
tmp_value = (tmp_value > range.max) ? range.max : tmp_value;
model.add_log(to_string() << "Setting " << opt << " to " << tmp_value);
set_option(opt, tmp_value, error_message);
*invalidate_flag = true;
res = true;

res = slider_selected( opt, tmp_value, error_message, model );
}
else
{
res = slider_unselected( opt, tmp_value, error_message, model );
}
}
}
Expand Down Expand Up @@ -1007,6 +1011,59 @@ namespace rs2
return true;
}

bool option_model::slider_selected( rs2_option opt,
float value,
std::string & error_message,
notifications_model & model )
{
bool res = false;
auto option_was_set
= set_option( opt, value, error_message, std::chrono::milliseconds( 200 ) );
if( option_was_set )
{
have_unset_value = false;
*invalidate_flag = true;
model.add_log( to_string() << "Setting " << opt << " to " << value );
res = true;
}
else
{
have_unset_value = true;
unset_value = value;
}
return res;
}
bool option_model::slider_unselected( rs2_option opt,
float value,
std::string & error_message,
notifications_model & model )
{
bool res = false;
// Slider unselected, if last value was ignored, set with last value if the value was
// changed.
if( have_unset_value )
{
if( value != unset_value )
{
auto set_ok = set_option( opt,
unset_value,
error_message,
std::chrono::milliseconds( 100 ) );
if( set_ok )
{
model.add_log( to_string() << "Setting " << opt << " to " << unset_value );
*invalidate_flag = true;
have_unset_value = false;
res = true;
}
}
else
have_unset_value = false;
}
return res;
}


void subdevice_model::populate_options(std::map<int, option_model>& opt_container,
const std::string& opt_base_label,
subdevice_model* model,
Expand Down Expand Up @@ -2307,19 +2364,36 @@ namespace rs2
return draw(error_message, model);
}

void option_model::set_option(rs2_option opt, float req_value, std::string &error_message)
bool option_model::set_option( rs2_option opt,
float req_value,
std::string & error_message,
std::chrono::steady_clock::duration ignore_period )
{
// Only set the value if `ignore_period` time past since last set_option() call for this option
if ( last_set_stopwatch.get_elapsed() < ignore_period )
return false;

try
{
endpoint->set_option(opt, req_value);
last_set_stopwatch.reset();
endpoint->set_option( opt, req_value );
}
catch (const error& e)
catch( const error & e )
{
error_message = error_to_string(e);
error_message = error_to_string( e );
}
// Only update the cached value once set_option is done! That way, if it doesn't change anything...
try { value = endpoint->get_option(opt); }
catch (...) {}

// Only update the cached value once set_option is done! That way, if it doesn't change
// anything...
try
{
value = endpoint->get_option( opt );
}
catch( ... )
{
}

return true;
}

stream_model::stream_model()
Expand Down
17 changes: 16 additions & 1 deletion common/model-views.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,19 @@ namespace rs2
void update_supported(std::string& error_message);
void update_read_only_status(std::string& error_message);
void update_all_fields(std::string& error_message, notifications_model& model);
void set_option(rs2_option opt, float value, std::string &error_message);
bool set_option( rs2_option opt,
float value,
std::string & error_message,
std::chrono::steady_clock::duration ignore_period = std::chrono::seconds( 0 ) );
bool draw_option(bool update_read_only_options, bool is_streaming,
std::string& error_message, notifications_model& model);

rs2_option opt;
option_range range;
std::shared_ptr<options> endpoint;
float unset_value = 0;
bool have_unset_value = false;
utilities::time::stopwatch last_set_stopwatch;
bool* invalidate_flag = nullptr;
bool supported = false;
bool read_only = false;
Expand All @@ -336,6 +342,15 @@ namespace rs2
bool is_enum() const;
bool is_checkbox() const;
bool allow_change(float val, std::string& error_message) const;
bool slider_selected( rs2_option opt,
float value,
std::string& error_message,
notifications_model& model);

bool slider_unselected(rs2_option opt,
float value,
std::string& error_message,
notifications_model& model);
};

class frame_queues
Expand Down