Merge pull request #7535 from daversintel/TareGT_OCCFL

Added on-chip focal length calibration and merged tare groun truth.
IntelRealSense · Dec 1, 2020 · 4e80752 · 4e80752
2 parents 959c9d5 + e543afb
commit 4e80752
Show file tree

Hide file tree

Showing 11 changed files with 1,847 additions and 279 deletions.
diff --git a/common/model-views.cpp b/common/model-views.cpp
@@ -5085,7 +5085,6 @@ namespace rs2
                 }
             }
 
-
             if (_allow_remove)
             {
                 something_to_show = true;
@@ -5191,9 +5190,7 @@ namespace rs2
                     }
                 }
             }
-
-
-
+
             bool has_autocalib = false;
             for (auto&& sub : subdevices)
             {
@@ -5205,8 +5202,7 @@ namespace rs2
                         try
                         {
                             auto manager = std::make_shared<on_chip_calib_manager>(viewer, sub, *this, dev);
-                            auto n = std::make_shared<autocalib_notification_model>(
-                                "", manager, false);
+                            auto n = std::make_shared<autocalib_notification_model>("", manager, false);
 
                             viewer.not_model->add_notification(n);
                             n->forced = true;
@@ -5260,9 +5256,9 @@ namespace rs2
                     }
                     if (ImGui::IsItemHovered())
                         ImGui::SetTooltip("Tare calibration is used to adjust camera absolute distance to flat target.\n"
-                            "User needs to enter the known ground truth");
+                            "User needs either to enter the known ground truth or use the get button\n"
+                            "with specific target to get the ground truth.");
 
-
                     if (_calib_model.supports())
                     {
                         if (ImGui::Selectable("Calibration Data"))

diff --git a/common/model-views.h b/common/model-views.h
@@ -145,6 +145,8 @@ namespace rs2
         {
             static const char* is_3d_view          { "viewer_model.is_3d_view" };
             static const char* ground_truth_r      { "viewer_model.ground_truth_r" };
+            static const char* target_width_r      { "viewer_model.target_width_r" };
+            static const char* target_height_r     { "viewer_model.target_height_r" };
             static const char* continue_with_ui_not_aligned { "viewer_model.continue_with_ui_not_aligned" };
             static const char* continue_with_current_fw{ "viewer_model.continue_with_current_fw" };
             static const char* settings_tab        { "viewer_model.settings_tab" };

diff --git a/common/notifications.h b/common/notifications.h
@@ -160,6 +160,7 @@ namespace rs2
 
         std::shared_ptr<process_manager> update_manager = nullptr;
         int update_state = 0;
+        int update_state_prev = 0;
         progress_bar _progress_bar;
     };