diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-29 23:36:39 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-29 23:36:39 +0100 |
| commit | baafa2d561ff8d5121f6f6a6916ff0c06acbd4e8 (patch) | |
| tree | 0066c742b25dc75122170cec9c69f9df599e0ec1 | |
| parent | 91da8fbcaa2e1ca0cd89fdf3466c4a220781af50 (diff) | |
tracker/pt: remove dubious grayscaling modes
| -rw-r--r-- | tracker-pt/FTNoIR_PT_Controls.ui | 10 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt_dialog.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt_settings.h | 2 | ||||
| -rw-r--r-- | tracker-pt/point_extractor.cpp | 4 |
4 files changed, 4 insertions, 14 deletions
diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui index 6f911c1e..c311f5a7 100644 --- a/tracker-pt/FTNoIR_PT_Controls.ui +++ b/tracker-pt/FTNoIR_PT_Controls.ui @@ -433,11 +433,6 @@ </item> <item> <property name="text"> - <string>Floppy filter</string> - </property> - </item> - <item> - <property name="text"> <string>Red only</string> </property> </item> @@ -446,11 +441,6 @@ <string>Blue only</string> </property> </item> - <item> - <property name="text"> - <string>Smoothed average</string> - </property> - </item> </widget> </item> </layout> diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 075b024d..0746a85e 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -85,10 +85,8 @@ TrackerDialog_PT::TrackerDialog_PT() static constexpr pt_color_type color_types[] = { pt_color_average, pt_color_natural, - pt_color_floppy_filter, pt_color_red_only, pt_color_blue_only, - pt_color_smoothed_average, }; for (unsigned k = 0; k < std::size(color_types); k++) diff --git a/tracker-pt/ftnoir_tracker_pt_settings.h b/tracker-pt/ftnoir_tracker_pt_settings.h index d230de1c..3602674f 100644 --- a/tracker-pt/ftnoir_tracker_pt_settings.h +++ b/tracker-pt/ftnoir_tracker_pt_settings.h @@ -17,10 +17,8 @@ enum pt_color_type // don't reuse when removing some of the modes pt_color_natural = 2, pt_color_red_only = 3, - pt_color_floppy_filter = 4, pt_color_average = 5, pt_color_blue_only = 6, - pt_color_smoothed_average = 7, }; struct settings_pt : opts diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/point_extractor.cpp index d6a93c4c..106fb50a 100644 --- a/tracker-pt/point_extractor.cpp +++ b/tracker-pt/point_extractor.cpp @@ -144,6 +144,7 @@ void PointExtractor::color_to_grayscale(const cv::Mat& frame, cv::Mat& output) { switch (s.blob_color) { +#if 0 case pt_color_floppy_filter: { // weight for blue color @@ -162,6 +163,7 @@ void PointExtractor::color_to_grayscale(const cv::Mat& frame, cv::Mat& output) break; } +#endif case pt_color_blue_only: { extract_single_channel(frame, 0, output); @@ -172,6 +174,7 @@ void PointExtractor::color_to_grayscale(const cv::Mat& frame, cv::Mat& output) extract_single_channel(frame, 2, output); break; } +#if 0 case pt_color_smoothed_average: { extract_all_channels(frame); @@ -203,6 +206,7 @@ void PointExtractor::color_to_grayscale(const cv::Mat& frame, cv::Mat& output) break; } +#endif default: once_only(qDebug() << "wrong pt_color_type enum value" << int(s.blob_color)); /*FALLTHROUGH*/ |