Skip to content

Commit 9f945c0

Browse files
Evgeni Raikhelclaude
andcommitted
fix(grid-overlay): write JSON defaults at startup, not per-stream
Move set_nested_default calls from stream_model constructor to ux_window startup so the viewer_model.grid section is written to realsense-config.json on first launch even when no camera is connected. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 94a81b3 commit 9f945c0

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

common/stream-model.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ namespace rs2
3737
namespace cfg = configurations::viewer::viewport_grid;
3838
auto& cf = config_file::instance();
3939

40-
cf.set_nested_default( cfg::horizontal_lines, 1 );
41-
cf.set_nested_default( cfg::vertical_lines, 1 );
42-
cf.set_nested_default( cfg::line_width, 1 );
43-
cf.set_nested_default( cfg::line_color_r, 255 );
44-
cf.set_nested_default( cfg::line_color_g, 255 );
45-
cf.set_nested_default( cfg::line_color_b, 255 );
46-
4740
auto valid_lines = []( int v ) { return ( v >= 1 && v <= 5 ) ? v : 1; };
4841
grid_h_lines = valid_lines( cf.get_nested<int>( cfg::horizontal_lines, 1 ) );
4942
grid_v_lines = valid_lines( cf.get_nested<int>( cfg::vertical_lines, 1 ) );

common/ux-window.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,19 @@ namespace rs2
8787
config_file::instance().set_default(configurations::viewer::commands_xml, "./Commands.xml");
8888
config_file::instance().set_default(configurations::viewer::hwlogger_xml, "./HWLoggerEvents.xml");
8989

90+
#ifdef BUILD_VIEWPORT_GRID_OVERLAY
91+
{
92+
namespace cfg = configurations::viewer::viewport_grid;
93+
auto& cf = config_file::instance();
94+
cf.set_nested_default( cfg::horizontal_lines, 1 );
95+
cf.set_nested_default( cfg::vertical_lines, 1 );
96+
cf.set_nested_default( cfg::line_width, 1 );
97+
cf.set_nested_default( cfg::line_color_r, 255 );
98+
cf.set_nested_default( cfg::line_color_g, 255 );
99+
cf.set_nested_default( cfg::line_color_b, 255 );
100+
}
101+
#endif
102+
90103
std::string path;
91104
try
92105
{

0 commit comments

Comments
 (0)