1 files changed, 63 insertions, 15 deletions

diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp
index edf689a9..d67f79a7 100644
--- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp
+++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp
@@ -10,8 +10,6 @@
 #include "compat/math.hpp"
 #include "video/camera.hpp"
 
-#include <opencv2/core.hpp>
-
 #include <QString>
 #include <QtGlobal>
 #include <QDebug>
@@ -39,6 +37,7 @@ TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) :
     tie_setting(s.cam_res_x, ui.res_x_spin);
     tie_setting(s.cam_res_y, ui.res_y_spin);
     tie_setting(s.cam_fps, ui.fps_spin);
+    tie_setting(s.use_mjpeg, ui.use_mjpeg);
 
     tie_setting(s.threshold_slider, ui.threshold_slider);
 
@@ -92,14 +91,18 @@ TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) :
 
     poll_tracker_info_impl();
 
-    connect(this, &TrackerDialog_PT::poll_tracker_info, this, &TrackerDialog_PT::poll_tracker_info_impl, Qt::DirectConnection);
-
     constexpr pt_color_type color_types[] = {
-        pt_color_average,
-        pt_color_natural,
+        pt_color_bt709,
+        pt_color_hardware,
         pt_color_red_only,
         pt_color_green_only,
         pt_color_blue_only,
+        pt_color_red_chromakey,
+        pt_color_green_chromakey,
+        pt_color_blue_chromakey,
+        pt_color_cyan_chromakey,
+        pt_color_yellow_chromakey,
+        pt_color_magenta_chromakey,
     };
 
     for (unsigned k = 0; k < std::size(color_types); k++)
@@ -107,14 +110,38 @@ TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) :
 
     tie_setting(s.blob_color, ui.blob_color);
 
+    tie_setting(s.chroma_key_strength, ui.chroma_key_strength_slider);
+    connect(&s.chroma_key_strength, value_::value_changed<slider_value>(), ui.chroma_key_strength_label,
+            [this] { ui.chroma_key_strength_label->setValue(*s.chroma_key_strength); });
+    ui.chroma_key_strength_label->setValue(*s.chroma_key_strength);
+
+    tie_setting(s.chroma_key_overexposed, ui.chroma_key_overexposed);
+    connect(ui.blob_color, &QComboBox::currentTextChanged, this, &TrackerDialog_PT::chroma_key_controls_enable);
+
+    chroma_key_controls_enable("");
+
     tie_setting(s.threshold_slider, ui.threshold_value_display, [this](const slider_value& val) {
         return threshold_display_text(int(val));
     });
 
     // refresh threshold display on auto-threshold checkbox state change
-    tie_setting(s.auto_threshold,
-                this,
-                [this](bool) { s.threshold_slider.notify(); });
+    tie_setting(s.auto_threshold, this, [this](bool) { s.threshold_slider.notify_(); });
+
+    tie_setting(s.enable_point_filter, ui.enable_point_filter);
+    tie_setting(s.point_filter_coefficient, ui.point_filter_slider);
+    tie_setting(s.point_filter_limit, ui.point_filter_limit_slider);
+    connect(&s.point_filter_coefficient, value_::value_changed<slider_value>(),
+            ui.point_filter_label, [this] { ui.point_filter_label->setValue(*s.point_filter_coefficient); } );
+    connect(&s.point_filter_limit, value_::value_changed<slider_value>(), ui.point_filter_limit_label,
+        [this] { ui.point_filter_limit_label->setValue(*s.point_filter_limit); }, Qt::QueuedConnection);
+    ui.point_filter_label->setValue(*s.point_filter_coefficient);
+    ui.point_filter_limit_label->setValue(*s.point_filter_limit);
+
+    tie_setting(s.point_filter_deadzone, ui.point_filter_deadzone_slider);
+    ui.point_filter_deadzone_label->setValue(*s.point_filter_deadzone);
+
+    connect(&s.point_filter_deadzone, value_::value_changed<slider_value>(), ui.point_filter_deadzone_label,
+        [this] { ui.point_filter_deadzone_label->setValue(*s.point_filter_deadzone); }, Qt::QueuedConnection);
 }
 
 QString TrackerDialog_PT::threshold_display_text(int threshold_value)
@@ -226,14 +253,25 @@ void TrackerDialog_PT::set_camera_settings_available(const QString& /* camera_na
 void TrackerDialog_PT::show_camera_settings()
 {
     if (tracker)
-    {
-        QMutexLocker l(&tracker->camera_mtx);
-        tracker->camera->show_camera_settings();
-    }
+        tracker->open_camera_dialog_flag = true;
     else
         (void)video::show_dialog(s.camera_name);
 }
 
+void TrackerDialog_PT::chroma_key_controls_enable(const QString&)
+{
+    bool enabled = false;
+    QVariant data = ui.blob_color->currentData();
+    if (data.isValid())
+    {
+        pt_color_type blob_color = pt_color_type(data.toInt());
+        enabled = blob_color >= pt_color_red_chromakey && blob_color <= pt_color_magenta_chromakey;
+    }
+    ui.chroma_key_strength_slider->setEnabled(enabled);
+    ui.chroma_key_strength_label->setEnabled(enabled);
+    ui.chroma_key_overexposed->setEnabled(enabled);
+}
+
 void TrackerDialog_PT::trans_calib_step()
 {
     QMutexLocker l(&calibrator_mutex);
@@ -267,7 +305,7 @@ void TrackerDialog_PT::register_tracker(ITracker *t)
 {
     tracker = static_cast<Tracker_PT*>(t);
     ui.tcalib_button->setEnabled(true);
-    poll_tracker_info();
+    poll_tracker_info_impl();
     timer.start();
 }
 
@@ -275,8 +313,18 @@ void TrackerDialog_PT::unregister_tracker()
 {
     tracker = nullptr;
     ui.tcalib_button->setEnabled(false);
-    poll_tracker_info();
+    poll_tracker_info_impl();
     timer.stop();
 }
 
+void TrackerDialog_PT::set_buttons_visible(bool x)
+{
+    ui.buttonBox->setVisible(x);
+}
+
+void TrackerDialog_PT::reload()
+{
+    s.b->reload();
+}
+
 } // ns pt_impl