Fix crosshair overlay: video-only, backfill defaults, protect from unrelated saves

Addresses Nir-Az's review comments on PR realsenseai#15093:
- Restrict the grid/crosshair toggle button and rendering to 2D video
  streams (profile.as<rs2::video_stream_profile>()), matching the pattern
  used elsewhere for stream-details fields. Previously it also rendered on
  motion (IMU) streams.
- Backfill viewer_model.grid_overlay.* defaults into pre-existing, non-empty
  config files. set_nested_default() already only writes a missing key, so
  the is_empty() gate around it was redundant and wrong - it meant the grid
  keys were only ever written into a brand-new config file, never into an
  existing user's realsense-config.json.

Also fixes a related bug found while testing the above: hand-editing
viewer_model.grid_overlay.* in realsense-config.json while the viewer is
running got silently reverted by the next unrelated config save, because
config_file caches the whole document in memory and every set()/set_nested()
call blindly overwrites the entire file with that stale copy.

Adds config_file::set_protected(), used only by the specific call sites
known to fire often enough to have caused this - the window position/size
callbacks (drag/resize) and processing-block persistence (stream start,
filter enable/disable toggle) - which re-adopt the on-disk grid_overlay
section before writing. Every other config_file caller (device options, DDS
settings, calibration timestamps, ...) is unaffected and pays no extra I/O.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Evgeni Raikhel

common/rs-config.cpp

@@ -113,6 +113,7 @@ config_file& config_file::instance()
 config_file::config_file( std::string const & filename )
     : _filename( filename )
     , _dirty( false )
+    , _grid_overlay_dirty( false )
     , _save_stop( false )
 {
     try
@@ -127,8 +128,39 @@ config_file::config_file( std::string const & filename )
     _save_thread = std::thread( &config_file::save_loop, this );
 }
 
+bool config_file::is_grid_overlay_path( const std::string & path )
+{
+    static const std::string prefix = "viewer_model.grid_overlay.";
+    return path.rfind( prefix, 0 ) == 0;
+}
+
 void config_file::save()
 {
+    std::lock_guard< std::recursive_mutex > lk( _mutex );
+
+    // If nothing in this process has intentionally changed the crosshair/grid overlay
+    // section since the last flush, adopt whatever is currently on disk for it before
+    // writing. This flush can be triggered by any unrelated set() (window move/resize,
+    // device options, ...) up to once per SAVE_INTERVAL; without this, it would blindly
+    // overwrite a hand-edit made to realsense-config.json while the viewer is running
+    // with our stale in-memory copy.
+    if( ! _grid_overlay_dirty.exchange( false ) && ! _filename.empty() )
+    {
+        try
+        {
+            auto on_disk = rsutils::json_config::load_from_file( _filename );
+            if( on_disk.exists() && on_disk.contains( "viewer_model" )
+                && on_disk["viewer_model"].contains( "grid_overlay" ) )
+            {
+                _j["viewer_model"]["grid_overlay"] = on_disk["viewer_model"]["grid_overlay"];
+            }
+        }
+        catch( ... )
+        {
+            // Best effort - if the file can't be read, fall back to whatever _j already has.
+        }
+    }
+
     if( ! _filename.empty() )
         save( _filename.c_str() );
 }
@@ -162,6 +194,7 @@ void config_file::save_loop()
 config_file::config_file()
     : _j( rsutils::json::object() )
     , _dirty( false )
+    , _grid_overlay_dirty( false )
     , _save_stop( false )
 {
 }
@@ -181,7 +214,12 @@ config_file& config_file::operator=(const config_file& other)
         std::lock_guard< std::recursive_mutex > lk_this( _mutex );
         _j = std::move( j_copy );
         _defaults = std::move( defaults_copy );
+        // Assignment is always an intentional, wholesale replacement (Load Settings,
+        // Restore Defaults + Apply, etc.) - mark grid_overlay dirty too, or the next
+        // deferred flush would discard whatever value came with this assignment by
+        // merging stale on-disk content back over it.
         _dirty = true;
+        _grid_overlay_dirty = true;
     }
     return *this;
 }

common/rs-config.h

@@ -158,6 +158,8 @@ namespace rs2
 
             ( *current )[keys.back()] = val;
             _dirty = true;
+            if( is_grid_overlay_path( path ) )
+                _grid_overlay_dirty = true;
         }
 
         // Sets a default value to the config and default map
@@ -201,6 +203,8 @@ namespace rs2
                 }
                 ( *current )[keys.back()] = default_val;
                 _dirty = true;
+                if( is_grid_overlay_path( path ) )
+                    _grid_overlay_dirty = true;
             }
         }
 
@@ -212,6 +216,11 @@ namespace rs2
 
         static constexpr std::chrono::milliseconds SAVE_INTERVAL{ 1000 };
 
+        // True if `path` (dot-notation) falls under the viewport grid/crosshair overlay
+        // section - the one config section save() protects from being overwritten by an
+        // unrelated flush; see _grid_overlay_dirty and save().
+        static bool is_grid_overlay_path( const std::string & path );
+
         // Serializes all reads/writes of `_j` and the on-disk file. Required because
         // viewer reads/writes config_file from multiple threads (UI thread, the
         // config_save_worker background thread in subdevice-model.cpp, and ad-hoc
@@ -223,6 +232,7 @@ namespace rs2
         std::string _filename;
         rsutils::json _j;
         std::atomic<bool> _dirty;
+        std::atomic<bool> _grid_overlay_dirty;
         std::condition_variable _save_cv;
         std::mutex _save_cv_mutex;
         bool _save_stop;

common/stream-model.cpp

@@ -453,10 +453,11 @@ namespace rs2
     void stream_model::show_stream_header(ImFont* font, const rect &stream_rect, viewer_model& viewer)
     {
         const auto top_bar_height = 32.f;
-        auto num_of_buttons = 6; // Crosshair button is the latest addition
+        auto num_of_buttons = 5;
 
         if (!viewer.allow_stream_close) --num_of_buttons;
         if (viewer.streams.size() > 1) ++num_of_buttons;
+        if (profile.as<rs2::video_stream_profile>()) ++num_of_buttons; // Grid/crosshair button - video streams only
         if (RS2_STREAM_DEPTH == profile.stream_type()) ++num_of_buttons; // Color map ruler button
         if (RS2_FORMAT_MOTION_XYZ32F == profile.format()) ++num_of_buttons; // Motion graph button
         if (RS2_STREAM_OCCUPANCY == profile.stream_type() && _normalized_zoom.w == 1) ++num_of_buttons; // Safety zones button
@@ -599,29 +600,32 @@ namespace rs2
         }
         ImGui::SameLine();
 
-        label = rsutils::string::from() << textual_icons::grid << "##Grid " << profile.unique_id();
-        if (show_crosshair)
+        if (profile.as<rs2::video_stream_profile>()) // Grid/crosshair overlay is only meaningful on 2D video streams
         {
-            ImGui::PushStyleColor(ImGuiCol_Text, light_blue);
-            ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, light_blue);
-            if (ImGui::Button(label.c_str(), { 24, top_bar_height }))
+            label = rsutils::string::from() << textual_icons::grid << "##Grid " << profile.unique_id();
+            if (show_crosshair)
             {
-                show_crosshair = false;
+                ImGui::PushStyleColor(ImGuiCol_Text, light_blue);
+                ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, light_blue);
+                if (ImGui::Button(label.c_str(), { 24, top_bar_height }))
+                {
+                    show_crosshair = false;
+                }
+                if (ImGui::IsItemHovered())
+                    RsImGui::CustomTooltip("Hide crosshair overlay");
+                ImGui::PopStyleColor(2);
             }
-            if (ImGui::IsItemHovered())
-                RsImGui::CustomTooltip("Hide crosshair overlay");
-            ImGui::PopStyleColor(2);
-        }
-        else
-        {
-            if (ImGui::Button(label.c_str(), { 24, top_bar_height }))
+            else
             {
-                show_crosshair = true;
+                if (ImGui::Button(label.c_str(), { 24, top_bar_height }))
+                {
+                    show_crosshair = true;
+                }
+                if (ImGui::IsItemHovered())
+                    RsImGui::CustomTooltip("Show crosshair/grid overlay");
             }
-            if (ImGui::IsItemHovered())
-                RsImGui::CustomTooltip("Show crosshair/grid overlay");
+            ImGui::SameLine();
         }
-        ImGui::SameLine();
 
 
         if (RS2_STREAM_DEPTH == profile.stream_type())
@@ -2113,7 +2117,7 @@ namespace rs2
 
             update_ae_roi_rect(stream_rect, g, error_message);
 
-            if (show_crosshair)
+            if (show_crosshair && profile.as<rs2::video_stream_profile>())
                 draw_crosshair(stream_rect, grid_h_lines, grid_v_lines, grid_line_width,
                                grid_color_r, grid_color_g, grid_color_b);
 

common/ux-window.cpp

@@ -88,8 +88,9 @@ namespace rs2
         config_file::instance().set_default(configurations::viewer::commands_xml, "./Commands.xml");
         config_file::instance().set_default(configurations::viewer::hwlogger_xml, "./HWLoggerEvents.xml");
 
-        if( config_file::instance().is_empty() )
         {
+            // set_nested_default() only writes a key if it's missing, so this is safe to run
+            // unconditionally - it backfills the grid keys into pre-existing config files too.
             namespace cfg = configurations::viewer::viewport_grid_overlay;
             auto& cf = config_file::instance();
             cf.set_nested_default( cfg::horizontal_lines, 1   );