From dec625e51878c9167100837086f82fb0f78b0189 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 5 Sep 2016 20:31:01 +0200 Subject: tracker/{aruco,pt}: remove camera settings button It's broken and users complain on the issue tracker. Also fix tab stops. --- tracker-pt/FTNoIR_PT_Controls.ui | 110 +++++++++++++------------------- tracker-pt/ftnoir_tracker_pt.h | 1 - tracker-pt/ftnoir_tracker_pt_dialog.cpp | 9 --- tracker-pt/ftnoir_tracker_pt_dialog.h | 6 +- 4 files changed, 46 insertions(+), 80 deletions(-) (limited to 'tracker-pt') diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui index 54628964..2675f1a4 100644 --- a/tracker-pt/FTNoIR_PT_Controls.ui +++ b/tracker-pt/FTNoIR_PT_Controls.ui @@ -10,7 +10,7 @@ 0 0 424 - 579 + 568 @@ -83,25 +83,16 @@ - - + + - + 0 0 - - Desired capture height - - - px - - - 2000 - - - 10 + + Width @@ -118,19 +109,6 @@ - - - - - 0 - 0 - - - - Width - - - @@ -147,23 +125,25 @@ - - - - - - - - - + + - + 0 0 - - Dynamic pose resolution + + Desired capture height + + + px + + + 2000 + + + 10 @@ -193,6 +173,26 @@ + + + + + + + + + + + + 0 + 0 + + + + Dynamic pose resolution + + + @@ -241,19 +241,6 @@ - - - - - 0 - 0 - - - - 10 - - - @@ -270,23 +257,16 @@ - - - - Camera settings dialog - - - - - + + - + 0 0 - - Open + + 10 diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 04a6646f..29902260 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -15,7 +15,6 @@ #include "point_extractor.h" #include "point_tracker.h" #include "compat/timer.hpp" -#include "cv/camera-dialog.hpp" #include "cv/video-widget.hpp" #include "compat/pi-constant.hpp" diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 88465c42..f5cabe4b 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -72,21 +72,12 @@ TrackerDialog_PT::TrackerDialog_PT() connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); connect(&timer,SIGNAL(timeout()), this,SLOT(poll_tracker_info())); - connect(ui.camera_settings, SIGNAL(clicked()), this, SLOT(camera_settings())); timer.start(250); connect(&calib_timer, &QTimer::timeout, this, &TrackerDialog_PT::trans_calib_step); calib_timer.setInterval(100); } -void TrackerDialog_PT::camera_settings() -{ - if (tracker) - open_camera_settings(static_cast(tracker->camera), s.camera_name, &tracker->camera_mtx); - else - open_camera_settings(nullptr, s.camera_name, nullptr); -} - void TrackerDialog_PT::startstop_trans_calib(bool start) { if (start) diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h index c13c1216..b57e32c3 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.h +++ b/tracker-pt/ftnoir_tracker_pt_dialog.h @@ -12,15 +12,12 @@ #include "ftnoir_tracker_pt_settings.h" #include "ftnoir_tracker_pt.h" #include "ui_FTNoIR_PT_Controls.h" -#include "cv/camera-dialog.hpp" #include "cv/translation-calibrator.hpp" #include "cv/video-widget.hpp" #include -//----------------------------------------------------------------------------- -// The dialog that shows up when the user presses "Settings" -class TrackerDialog_PT : public ITrackerDialog, protected camera_dialog +class TrackerDialog_PT : public ITrackerDialog { Q_OBJECT public: @@ -35,7 +32,6 @@ public slots: void startstop_trans_calib(bool start); void trans_calib_step(); void poll_tracker_info(); - void camera_settings(); private: settings_pt s; Tracker_PT* tracker; -- cgit v1.2.3