add Tare calib

Author: Noy-Zini

common/calibration-model.cpp

@@ -536,7 +536,17 @@ void calibration_model::d400_update(ux_window& window, std::string& error_messag
         }
         ImGui::SameLine();
 
-        auto streams = dev.first<rs2::depth_sensor>().get_active_streams();
+        rs2::sensor depth_sensor;
+        try 
+        {
+            depth_sensor = dev.first<rs2::depth_sensor>();
+        }
+        catch (const std::exception& ex)
+        {
+            error_message = ex.what();
+            ImGui::CloseCurrentPopup();
+        }
+        auto streams = depth_sensor.get_active_streams();
         if (_accept && streams.size())
         {
             if (ImGui::Button(u8"\uF2DB  Write Table", ImVec2(120, 25)))

common/device-model.cpp

@@ -3181,7 +3181,7 @@ namespace rs2
                 if (ImGui::IsItemHovered())
                     RsImGui::CustomTooltip("Focal length calibration is used to adjust camera focal length with specific target.");
 
-                if (ImGui::Selectable("Tare Calibration"))
+                if (ImGui::Selectable("Tare Calibration", false, avoid_selection_flag))
                 {
                     try
                     {

common/on-chip-calib.cpp

@@ -1428,6 +1428,10 @@ namespace rs2
         if (action == RS2_CALIB_ACTION_FL_CALIB || action == RS2_CALIB_ACTION_UVMAPPING_CALIB || action == RS2_CALIB_ACTION_FL_PLUS_CALIB)
             stop_viewer(invoke);
 
+        if( action == RS2_CALIB_ACTION_ON_CHIP_CALIB || action == RS2_CALIB_ACTION_TARE_CALIB )
+            if( _model.is_color_streaming() )
+                throw std::runtime_error( "Turn off RGB Camera streaming before calibrating." );
+
         update_last_used();
 
         if (action == RS2_CALIB_ACTION_ON_CHIP_FL_CALIB || action == RS2_CALIB_ACTION_FL_CALIB)
@@ -2192,39 +2196,30 @@ namespace rs2
                 //if (ImGui::IsItemHovered())
                 //    RsImGui::CustomTooltip("%s", "On-Chip Calibration Extended");
 
-                if( get_manager().get_device_model().is_color_streaming() )
-                {
-                    dismiss(false);
-                    ImGui::PopStyleColor(7);
-                    ImGui::PopFont();
-                    throw std::runtime_error("Turn off \"RGB Camera\" streaming before using on-chip calibration.");
-                }
-                else 
-                {
-                    auto sat = 1.f + sin(duration_cast<milliseconds>(system_clock::now() - created_time).count() / 700.f) * 0.1f;
-                    ImGui::PushStyleColor(ImGuiCol_Button, saturate(sensor_header_light_blue, sat));
-                    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, saturate(sensor_header_light_blue, 1.5f));
-
-                    std::string button_name = rsutils::string::from() << "Calibrate" << "##self" << index;
 
-                    ImGui::SetCursorScreenPos({ float(x + 5), float(y + height - 28) });
-                    if (ImGui::Button(button_name.c_str(), { float(bar_width), 20.f }))
-                    {
-                        get_manager().restore_workspace([this](std::function<void()> a) { a(); });
-                        get_manager().reset();
-                        get_manager().retry_times = 0;
-                        auto _this = shared_from_this();
-                        auto invoke = [_this](std::function<void()> action) {_this->invoke(action); };
-                        get_manager().start(invoke);
-                        update_state = RS2_CALIB_STATE_CALIB_IN_PROCESS;
-                        enable_dismiss = false;
-                    }
+                auto sat = 1.f + sin(duration_cast<milliseconds>(system_clock::now() - created_time).count() / 700.f) * 0.1f;
+                ImGui::PushStyleColor(ImGuiCol_Button, saturate(sensor_header_light_blue, sat));
+                ImGui::PushStyleColor(ImGuiCol_ButtonHovered, saturate(sensor_header_light_blue, 1.5f));
 
-                    ImGui::PopStyleColor(2);
+                std::string button_name = rsutils::string::from() << "Calibrate" << "##self" << index;
 
-                    if (ImGui::IsItemHovered())
-                        RsImGui::CustomTooltip("%s", "Begin On-Chip Calibration");
+                ImGui::SetCursorScreenPos({ float(x + 5), float(y + height - 28) });
+                if (ImGui::Button(button_name.c_str(), { float(bar_width), 20.f }))
+                {
+                    get_manager().restore_workspace([this](std::function<void()> a) { a(); });
+                    get_manager().reset();
+                    get_manager().retry_times = 0;
+                    auto _this = shared_from_this();
+                    auto invoke = [_this](std::function<void()> action) {_this->invoke(action);};
+                    get_manager().start(invoke);
+                    update_state = RS2_CALIB_STATE_CALIB_IN_PROCESS;
+                    enable_dismiss = false;
                 }
+
+                ImGui::PopStyleColor(2);
+
+                if (ImGui::IsItemHovered())
+                    RsImGui::CustomTooltip("%s", "Begin On-Chip Calibration");
             }
             else if (update_state == RS2_CALIB_STATE_FL_INPUT)
             {

common/on-chip-calib.h

@@ -122,8 +122,6 @@ namespace rs2
         void stop_viewer();
         void reset_device() { _dev.hardware_reset(); }
 
-        const device_model& get_device_model() const { return _model; }
-
     private:
         void save_laser_emitter_state();
         void save_thermal_loop_state();