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

[Viewer] Option Open/Close dashboard area #12636

Merged
merged 5 commits into from
Feb 8, 2024
Merged

[Viewer] Option Open/Close dashboard area #12636

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1df45e6
size of dashboard dynamic
Tamir91 Jan 23, 2024
1f50849
dashboard upgrated
Tamir91 Feb 5, 2024
86de5c7
fix assertion issue
Tamir91 Feb 6, 2024
87f0136
typo fixed
Tamir91 Feb 7, 2024
80bdddb
type of button changed
Tamir91 Feb 8, 2024
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
1 change: 1 addition & 0 deletions common/device-model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ namespace rs2
static const char* last_calib_notice{ "viewer_model.last_calib_notice" };
static const char* is_measuring{ "viewer_model.is_measuring" };
static const char* output_open{ "viewer_model.output_open" };
static const char* dashboard_open{ "viewer_model.dashboard_open" };
static const char* search_term{ "viewer_model.search_term" };

static const char* log_to_console{ "viewer_model.log_to_console" };
Expand Down
98 changes: 80 additions & 18 deletions common/output-model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ output_model::output_model() : fw_logger([this](){ thread_loop(); }) , incoming_
configurations::viewer::output_open, false);
search_line = config_file::instance().get_or_default(
configurations::viewer::search_term, std::string(""));
is_dashboard_open = config_file::instance().get_or_default(
configurations::viewer::dashboard_open, true );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dashboard

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I can't find the issue here.


if (search_line != "") search_open = true;

available_dashboards["Frame Drops per Second"] = [&](std::string name){
Expand Down Expand Up @@ -375,12 +378,12 @@ void output_model::draw(ux_window& win, rect view_rect, device_models_list & dev
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0,0));
ImGui::PushStyleColor(ImGuiCol_ChildWindowBg, dark_sensor_bg);

const float log_area_width = w - get_dashboard_width() - 2;

ImGui::BeginChild("##LogArea",
ImVec2(0.7f * w - 4, h - 38 - ImGui::GetTextLineHeightWithSpacing() - 1), true,
ImVec2(log_area_width, h - 38 - ImGui::GetTextLineHeightWithSpacing() - 1), true,
ImGuiWindowFlags_AlwaysVerticalScrollbar);

const auto log_area_width = 0.7f * w - 4;

bool copy_all = false;
bool save_all = false;
std::vector<std::string> output_strings;
Expand Down Expand Up @@ -524,7 +527,7 @@ void output_model::draw(ux_window& win, rect view_rect, device_models_list & dev

ImGui::PushFont(win.get_monofont());
ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, regular_blue);
ImGui::PushItemWidth(0.7f * w - 32);
ImGui::PushItemWidth( w - get_dashboard_width() - 30 );

bool force_refresh = false;
if (ImGui::IsWindowFocused() && (ImGui::IsKeyPressed(GLFW_KEY_UP) || ImGui::IsKeyPressed(GLFW_KEY_DOWN)))
Expand Down Expand Up @@ -611,16 +614,72 @@ void output_model::draw(ux_window& win, rect view_rect, device_models_list & dev
command_line = "";
}

ImGui::SetCursorPos(ImVec2(0.7f * w - 2, 35));
ImGui::BeginChild("##StatsArea",ImVec2(0.3f * w - 2, h - 38), true);
float child_height = 0;
for( auto && dash : dashboards )
{
child_height += dash->get_height();
}
float new_dashboard_button_height = 40.f;
child_height == 0 ? child_height = new_dashboard_button_height : child_height += 5;

auto dashboard_width = get_dashboard_width();
ImGui::SetCursorPos( ImVec2( w - dashboard_width, 35 ) );

ImGui::BeginChild( "##StatsArea", ImVec2( dashboard_width - 3.f, h - 38 ), true );

const ImVec2 collapse_dashboard_button_size = { 28, 28 };
const int max_dashboard_width = (int)( ( 0.3f * w ) );
const int min_dashboard_width = static_cast<int>(collapse_dashboard_button_size.x) + 2;

if( is_dashboard_open )
{
if( ImGui::Button( u8"\uf138", collapse_dashboard_button_size ) ) // close dashboard
{
is_dashboard_open = false;
config_file::instance().set( configurations::viewer::dashboard_open, is_dashboard_open );
default_dashboard_w = min_dashboard_width;
}
if( ImGui::IsItemHovered() )
{
ImGui::SetTooltip( "Collapse dashboard" );
}

// Animation of opening dashboard panel
if( default_dashboard_w.value() != max_dashboard_width )
default_dashboard_w = max_dashboard_width;
}
else
{
float cursor_pos_x = ImGui::GetCursorPosX();
ImGui::SetCursorPosX( 0 );

if( ImGui::Button( u8"\uf137", collapse_dashboard_button_size ) ) // open dashboard
{
is_dashboard_open = true;
config_file::instance().set( configurations::viewer::dashboard_open, is_dashboard_open );
default_dashboard_w = max_dashboard_width;
}
if( ImGui::IsItemHovered() )
{
ImGui::SetTooltip( "Open dashboard" );
}
ImGui::SetCursorPosX( cursor_pos_x );

// Animation of closing dashboard panel
if( default_dashboard_w.value() != min_dashboard_width )
default_dashboard_w = min_dashboard_width;
}

auto top = 0;
for(auto&& dash : dashboards)
if( is_dashboard_open && dashboard_width == max_dashboard_width )
{
auto h = dash->get_height();
auto r = rect { 0.f, (float)top, 0.3f * w - 2, (float)h };
dash->draw(win, r);
top += h;
for( auto && dash : dashboards )
{
auto h = dash->get_height();
auto r = rect{ 0.f, (float)top, get_dashboard_width() - 8.f, (float)h };
dash->draw( win, r );
top += h;
}
}

dashboards.erase(std::remove_if(dashboards.begin(), dashboards.end(),
Expand All @@ -642,7 +701,8 @@ void output_model::draw(ux_window& win, rect view_rect, device_models_list & dev
if (can_add)
{
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 5);
const auto new_dashboard_name = "new_dashaborad";
const auto new_dashboard_name = "new_dashboard";
ImGui::SameLine();
if (ImGui::Button(u8"\uF0D0 Add Dashboard", ImVec2(-1, 25)))
{
ImGui::OpenPopup(new_dashboard_name);
Expand Down Expand Up @@ -689,7 +749,6 @@ void output_model::draw(ux_window& win, rect view_rect, device_models_list & dev

ImGui::EndChild();


ImGui::PopStyleColor();
}
else foreach_log([&](log_entry& log) {});
Expand Down Expand Up @@ -981,13 +1040,14 @@ void stream_dashboard::draw_dashboard(ux_window& win, rect& r)
{ pos.x + r.w, pos.y + get_height() }, ImColor(dark_sensor_bg));

auto size = ImGui::CalcTextSize(name.c_str());
ImGui::SetCursorPos(ImVec2( r.w / 2 - size.x / 2, 5 ));
auto collapse_buton_h = 28 + 3;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is 28 and what is 3?
Is it the same 3 used on line 1050 ImGui::SetCursorPosY( 3.f + collapse_buton_h );

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 28 is the button size. It was declared in another function. Should we do it global for 1 usage only?

I can add a comment that explains what is 28.

  • 3 is a space, it does not add a significant difference. I can remove it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just add a comment // Dashboard button size plus some spacing

ImGui::SetCursorPos(ImVec2( r.w / 2 - size.x / 2, 5.f + collapse_buton_h));
OhadMeir marked this conversation as resolved.
Show resolved Hide resolved
ImGui::Text("%s", name.c_str());
ImGui::SameLine();

ImGui::PushStyleColor(ImGuiCol_Text, grey);
ImGui::SetCursorPosX(r.w - 25);
ImGui::SetCursorPosY(3);
ImGui::SetCursorPosY( 3.f + collapse_buton_h );
std::string id = rsutils::string::from() << u8"\uF00D##Close_" << name;
if (ImGui::Button(id.c_str(),ImVec2(22,22)))
{
Expand All @@ -1009,7 +1069,7 @@ void stream_dashboard::draw_dashboard(ux_window& win, rect& r)
auto y = max_y - i * (gap_y / ticks_y);
std::string y_label = rsutils::string::from() << std::fixed << std::setprecision(2) << y;
auto y_pixel = ImGui::GetTextLineHeight() + i * (height_y / ticks_y);
ImGui::SetCursorPos(ImVec2( 10, y_pixel ));
ImGui::SetCursorPos(ImVec2( 10, y_pixel + collapse_buton_h));
ImGui::Text("%s", y_label.c_str());

ImGui::GetWindowDrawList()->AddLine({ pos.x + max_y_label_width + 15.f, pos.y + y_pixel + 5.f },
Expand Down Expand Up @@ -1039,7 +1099,7 @@ void stream_dashboard::draw_dashboard(ux_window& win, rect& r)
{
auto x = min_x + i * (gap_x / ticks_x);
std::string x_label = rsutils::string::from() << std::fixed << std::setprecision(2) << x;
ImGui::SetCursorPos(ImVec2( 15 + max_y_label_width+ i * (graph_width / ticks_x), r.h - ImGui::GetTextLineHeight() ));
ImGui::SetCursorPos(ImVec2( 15 + max_y_label_width+ i * (graph_width / ticks_x), r.h - ImGui::GetTextLineHeight() + collapse_buton_h));
ImGui::Text("%s", x_label.c_str());

ImGui::GetWindowDrawList()->AddLine({ pos.x + 15 + max_y_label_width + i * (graph_width / ticks_x), pos.y + ImGui::GetTextLineHeight() + 5 },
Expand Down Expand Up @@ -1117,7 +1177,9 @@ void frame_drops_dashboard::draw(ux_window& win, rect r)
add_point((float)i, (float)hist[i]);
}
r.h -= ImGui::GetTextLineHeightWithSpacing() + 10;
draw_dashboard(win, r);

if( config_file::instance().get( configurations::viewer::dashboard_open) )
draw_dashboard(win, r);

ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 40);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 3);
Expand Down
3 changes: 3 additions & 0 deletions common/output-model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ namespace rs2
void draw(ux_window& win, rect view_rect, std::vector<std::unique_ptr<device_model>> & device_models);

int get_output_height() const { return default_log_h; }
int get_dashboard_width() const { return default_dashboard_w; }

void run_command(std::string command, std::vector<std::unique_ptr<device_model>> & device_models);
bool user_defined_command(std::string command, std::vector<std::unique_ptr<device_model>> & device_models);
Expand All @@ -157,6 +158,8 @@ namespace rs2

animated<int> default_log_h { 36 };
bool is_output_open = true;
animated< int > default_dashboard_w { 0 };
bool is_dashboard_open = true;

bool enable_firmware_logs = false;

Expand Down
1 change: 1 addition & 0 deletions common/ux-window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ namespace rs2
config_file::instance().set_default(configurations::viewer::log_severity, 2);
config_file::instance().set_default(configurations::viewer::metric_system, true);
config_file::instance().set_default(configurations::viewer::ground_truth_r, 2500);
config_file::instance().set_default(configurations::viewer::dashboard_open, true);

config_file::instance().set_default(configurations::record::compression_mode, 2); // Let the device decide
config_file::instance().set_default(configurations::record::file_save_mode, 0); // Auto-select name
Expand Down
1 change: 1 addition & 0 deletions common/viewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ namespace rs2
const float panel_y = 50.f;

float get_output_height() const { return (float)(not_model->output.get_output_height()); }
float get_dashboard_width() const { return (float)(not_model->output.get_dashboard_width()); }

rs2::frame handle_ready_frames(const rect& viewer_rect, ux_window& window, int devices, std::string& error_message);

Expand Down
Loading