add --debug and --sw-only to rs-depth-quality

maloel · Aug 1, 2024 · 7be5b18 · 7be5b18
1 parent f22025d
commit 7be5b18
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 7 deletions.
diff --git a/tools/depth-quality/depth-quality-model.cpp b/tools/depth-quality/depth-quality-model.cpp
@@ -11,10 +11,10 @@ namespace rs2
 {
     namespace depth_quality
     {
-        tool_model::tool_model(rs2::context &ctx)
+        tool_model::tool_model( rs2::context & ctx, bool disable_log_to_console )
             : _ctx(ctx),
               _pipe(ctx),
-              _viewer_model(ctx),
+              _viewer_model( ctx, disable_log_to_console ),
               _update_readonly_options_timer(std::chrono::seconds(6)), _roi_percent(0.4f),
               _roi_located(std::chrono::seconds(4)),
               _too_close(std::chrono::seconds(4)),

diff --git a/tools/depth-quality/depth-quality-model.h b/tools/depth-quality/depth-quality-model.h
@@ -357,7 +357,7 @@ namespace rs2
         class tool_model
         {
         public:
-            tool_model(rs2::context& ctx);
+            tool_model( rs2::context & ctx, bool disable_log_to_console = false );
 
             bool start(ux_window& win);
 

diff --git a/tools/depth-quality/rs-depth-quality.cpp b/tools/depth-quality/rs-depth-quality.cpp
@@ -1,15 +1,79 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2015 Intel Corporation. All Rights Reserved.
 
-#include <numeric>
-#include <librealsense2/rs.hpp>
 #include "depth-quality-model.h"
 
+#include <rsutils/os/ensure-console.h>
+#include <tclap/CmdLine.h>
+
+#include <librealsense2/rs.hpp>
+#include <numeric>
+
 int main(int argc, const char * argv[]) try
 {
-    rs2::context ctx;
+    TCLAP::CmdLine cmd( "realsense-viewer", ' ', RS2_API_FULL_VERSION_STR );
+#ifdef BUILD_EASYLOGGINGPP
+    TCLAP::SwitchArg debug_arg( "", "debug", "Turn on LibRS debug logs" );
+    cmd.add( debug_arg );
+#endif
+    TCLAP::SwitchArg only_sw_arg( "", "sw-only", "Show only software devices (playback, DDS, etc. -- but not USB/HID/etc.)" );
+    cmd.add( only_sw_arg );
+    // There isn't always a console... so if we need to show an error/usage, we need to enable it:
+    class cmdline_output : public TCLAP::StdOutput
+    {
+        typedef TCLAP::StdOutput super;
+
+    public:
+        void usage( TCLAP::CmdLineInterface & c ) override
+        {
+            rsutils::os::ensure_console();
+            super::usage( c );
+        }
+
+        void version( TCLAP::CmdLineInterface & c ) override
+        {
+            rsutils::os::ensure_console();
+            super::version( c );
+        }
+
+        void failure( TCLAP::CmdLineInterface & c, TCLAP::ArgException & e ) override
+        {
+            rsutils::os::ensure_console();
+            super::failure( c, e );
+        }
+    } our_cmdline_output;
+    cmd.setOutput( &our_cmdline_output );
+    cmd.parse( argc, argv );
+
+#ifdef BUILD_EASYLOGGINGPP
+    if( debug_arg.getValue() )
+        rsutils::os::ensure_console();
+#if defined( WIN32 )
+    // In Windows, we have no console unless we start the viewer from one; without one, calling log_to_console will
+    // ensure a console, so we want to avoid it by default!
+    if( GetStdHandle( STD_OUTPUT_HANDLE ) )
+#endif
+        rs2::log_to_console( debug_arg.getValue() ? RS2_LOG_SEVERITY_DEBUG : RS2_LOG_SEVERITY_INFO );
+#endif
+
+    rsutils::json settings = rsutils::json::object();
+    if( only_sw_arg.getValue() )
+    {
+#if defined( BUILD_WITH_DDS )
+        settings["dds"]["enabled"];  // null: remove global dds:false or dds/enabled:false, if any
+#endif
+        settings["device-mask"] = RS2_PRODUCT_LINE_SW_ONLY | RS2_PRODUCT_LINE_ANY;
+    }
+
+    rs2::context ctx( settings.dump() );
     rs2::ux_window window("Depth Quality Tool", ctx);
-    rs2::depth_quality::tool_model model(ctx);
+
+#ifdef BUILD_EASYLOGGINGPP
+    bool const disable_log_to_console = debug_arg.getValue();
+#else
+    bool const disable_log_to_console = false;
+#endif
+    rs2::depth_quality::tool_model model( ctx, disable_log_to_console );
 
     using namespace rs2::depth_quality;