Address PR comments

Author: Evgeni Raikhel

common/rs-config.h

@@ -87,7 +87,7 @@ namespace rs2
 
         void remove(const char* key);
 
-        bool is_new_file() const { return _j.empty(); }
+        bool is_empty() const { return _j.empty(); }
 
         static config_file& instance();
 

common/stream-model.cpp

@@ -7,10 +7,8 @@
 #include "os.h"
 #include <imgui_internal.h>
 #include <realsense_imgui.h>
-#ifdef BUILD_VIEWPORT_GRID_OVERLAY
 #include <iomanip>
 #include <sstream>
-#endif
 
 struct attribute
 {

common/ux-window.cpp

@@ -88,16 +88,16 @@ namespace rs2
         config_file::instance().set_default(configurations::viewer::hwlogger_xml, "./HWLoggerEvents.xml");
 
 #ifdef BUILD_VIEWPORT_GRID_OVERLAY
-        if( config_file::instance().is_new_file() )
+        if( config_file::instance().is_empty() )
         {
             namespace cfg = configurations::viewer::viewport_grid;
             auto& cf = config_file::instance();
-            cf.set_nested( cfg::horizontal_lines, 1   );
-            cf.set_nested( cfg::vertical_lines,   1   );
-            cf.set_nested( cfg::line_width,       1   );
-            cf.set_nested( cfg::line_color_r,     255 );
-            cf.set_nested( cfg::line_color_g,     255 );
-            cf.set_nested( cfg::line_color_b,     255 );
+            cf.set_nested_default( cfg::horizontal_lines, 1   );
+            cf.set_nested_default( cfg::vertical_lines,   1   );
+            cf.set_nested_default( cfg::line_width,       1   );
+            cf.set_nested_default( cfg::line_color_r,     255 );
+            cf.set_nested_default( cfg::line_color_g,     255 );
+            cf.set_nested_default( cfg::line_color_b,     255 );
         }
 #endif
 

common/viewer.cpp

@@ -2986,12 +2986,12 @@ namespace rs2
 #ifdef BUILD_VIEWPORT_GRID_OVERLAY
                         {
                             namespace cfg = configurations::viewer::viewport_grid;
-                            temp_cfg.set_nested( cfg::horizontal_lines, 1   );
-                            temp_cfg.set_nested( cfg::vertical_lines,   1   );
-                            temp_cfg.set_nested( cfg::line_width,       1   );
-                            temp_cfg.set_nested( cfg::line_color_r,     255 );
-                            temp_cfg.set_nested( cfg::line_color_g,     255 );
-                            temp_cfg.set_nested( cfg::line_color_b,     255 );
+                            temp_cfg.set_nested_default( cfg::horizontal_lines, 1   );
+                            temp_cfg.set_nested_default( cfg::vertical_lines,   1   );
+                            temp_cfg.set_nested_default( cfg::line_width,       1   );
+                            temp_cfg.set_nested_default( cfg::line_color_r,     255 );
+                            temp_cfg.set_nested_default( cfg::line_color_g,     255 );
+                            temp_cfg.set_nested_default( cfg::line_color_b,     255 );
                         }
 #endif
                     }