Skip to content

Commit 11c7b6a

Browse files
author
Evgeni Raikhel
committed
Minor refactoring - address PR comments
1 parent 5db5e5d commit 11c7b6a

5 files changed

Lines changed: 17 additions & 18 deletions

File tree

‎common/device-model.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ namespace rs2
150150
static const char* lpc_point_size{ "viewer_model.lpc_point_size" };
151151
static const char* show_safety_zones_3d{ "viewer_model.show_safety_zones_3d" };
152152
static const char* show_safety_zones_2d{ "viewer_model.show_safety_zones_2d" };
153-
namespace viewport_grid
153+
namespace viewport_grid_overlay
154154
{
155-
static const char* horizontal_lines{ "viewer_model.grid.horizontal_lines" };
156-
static const char* vertical_lines { "viewer_model.grid.vertical_lines" };
157-
static const char* line_width { "viewer_model.grid.line_width" };
158-
static const char* line_color_r { "viewer_model.grid.line_color_r" };
159-
static const char* line_color_g { "viewer_model.grid.line_color_g" };
160-
static const char* line_color_b { "viewer_model.grid.line_color_b" };
155+
static const char* horizontal_lines{ "viewer_model.grid_overlay.horizontal_lines" };
156+
static const char* vertical_lines { "viewer_model.grid_overlay.vertical_lines" };
157+
static const char* line_width { "viewer_model.grid_overlay.line_width" };
158+
static const char* line_color_r { "viewer_model.grid_overlay.line_color_r" };
159+
static const char* line_color_g { "viewer_model.grid_overlay.line_color_g" };
160+
static const char* line_color_b { "viewer_model.grid_overlay.line_color_b" };
161161
}
162162
}
163163
namespace window

‎common/stream-model.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace rs2
3131
show_safety_zones_2d = config_file::instance().get_or_default(
3232
configurations::viewer::show_safety_zones_2d, true);
3333
{
34-
namespace cfg = configurations::viewer::viewport_grid;
34+
namespace cfg = configurations::viewer::viewport_grid_overlay;
3535
auto& cf = config_file::instance();
3636

3737
auto valid_lines = []( int v ) { return ( v >= 1 && v <= 5 ) ? v : 1; };
@@ -448,14 +448,13 @@ namespace rs2
448448
void stream_model::show_stream_header(ImFont* font, const rect &stream_rect, viewer_model& viewer)
449449
{
450450
const auto top_bar_height = 32.f;
451-
auto num_of_buttons = 5;
451+
auto num_of_buttons = 6; // Crosshair button is the latest addition
452452

453453
if (!viewer.allow_stream_close) --num_of_buttons;
454454
if (viewer.streams.size() > 1) ++num_of_buttons;
455455
if (RS2_STREAM_DEPTH == profile.stream_type()) ++num_of_buttons; // Color map ruler button
456456
if (RS2_FORMAT_MOTION_XYZ32F == profile.format()) ++num_of_buttons; // Motion graph button
457457
if (RS2_STREAM_OCCUPANCY == profile.stream_type() && _normalized_zoom.w == 1) ++num_of_buttons; // Safety zones button
458-
++num_of_buttons; // Grid overlay button
459458

460459
RsImGui_ScopePushFont(font);
461460
ImGui::PushStyleColor(ImGuiCol_Text, light_grey);
@@ -592,23 +591,23 @@ namespace rs2
592591
ImGui::SameLine();
593592

594593
label = rsutils::string::from() << textual_icons::grid << "##Grid " << profile.unique_id();
595-
if (show_grid)
594+
if (show_crosshair)
596595
{
597596
ImGui::PushStyleColor(ImGuiCol_Text, light_blue);
598597
ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, light_blue);
599598
if (ImGui::Button(label.c_str(), { 24, top_bar_height }))
600599
{
601-
show_grid = false;
600+
show_crosshair = false;
602601
}
603602
if (ImGui::IsItemHovered())
604-
RsImGui::CustomTooltip("Hide crosshair/grid overlay");
603+
RsImGui::CustomTooltip("Hide crosshair overlay");
605604
ImGui::PopStyleColor(2);
606605
}
607606
else
608607
{
609608
if (ImGui::Button(label.c_str(), { 24, top_bar_height }))
610609
{
611-
show_grid = true;
610+
show_crosshair = true;
612611
}
613612
if (ImGui::IsItemHovered())
614613
RsImGui::CustomTooltip("Show crosshair/grid overlay");
@@ -2105,7 +2104,7 @@ namespace rs2
21052104

21062105
update_ae_roi_rect(stream_rect, g, error_message);
21072106

2108-
if (show_grid)
2107+
if (show_crosshair)
21092108
draw_crosshair(stream_rect, grid_h_lines, grid_v_lines, grid_line_width,
21102109
grid_color_r, grid_color_g, grid_color_b);
21112110

‎common/stream-model.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ namespace rs2
106106
bool show_metadata = false;
107107
bool show_safety_zones_2d = true;
108108

109-
bool show_grid = false;
109+
bool show_crosshair = false;
110110
int grid_h_lines = 1;
111111
int grid_v_lines = 1;
112112
int grid_line_width = 1;

‎common/ux-window.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ namespace rs2
8989

9090
if( config_file::instance().is_empty() )
9191
{
92-
namespace cfg = configurations::viewer::viewport_grid;
92+
namespace cfg = configurations::viewer::viewport_grid_overlay;
9393
auto& cf = config_file::instance();
9494
cf.set_nested_default( cfg::horizontal_lines, 1 );
9595
cf.set_nested_default( cfg::vertical_lines, 1 );

‎common/viewer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2984,7 +2984,7 @@ namespace rs2
29842984
reload_required = true;
29852985
temp_cfg = config_file();
29862986
{
2987-
namespace cfg = configurations::viewer::viewport_grid;
2987+
namespace cfg = configurations::viewer::viewport_grid_overlay;
29882988
temp_cfg.set_nested_default( cfg::horizontal_lines, 1 );
29892989
temp_cfg.set_nested_default( cfg::vertical_lines, 1 );
29902990
temp_cfg.set_nested_default( cfg::line_width, 1 );

0 commit comments

Comments
 (0)