From dec625e51878c9167100837086f82fb0f78b0189 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
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-aruco/aruco-trackercontrols.ui | 81 +++++++++++++++++++---------------
 tracker-aruco/ftnoir_tracker_aruco.cpp |  6 ---
 tracker-aruco/ftnoir_tracker_aruco.h   |  7 ++-
 3 files changed, 48 insertions(+), 46 deletions(-)

(limited to 'tracker-aruco')

diff --git a/tracker-aruco/aruco-trackercontrols.ui b/tracker-aruco/aruco-trackercontrols.ui
index 807fa909..ed1c1edf 100644
--- a/tracker-aruco/aruco-trackercontrols.ui
+++ b/tracker-aruco/aruco-trackercontrols.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>485</width>
-    <height>202</height>
+    <height>180</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -40,6 +40,20 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Camera name</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Resolution</string>
+        </property>
+       </widget>
+      </item>
       <item row="3" column="1">
        <widget class="QComboBox" name="resolution">
         <property name="sizePolicy">
@@ -70,27 +84,6 @@
         </item>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Camera name</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Resolution</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Diagonal FOV</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="1">
        <widget class="QComboBox" name="cameraFPS">
         <property name="sizePolicy">
@@ -131,6 +124,13 @@
         </item>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Diagonal FOV</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="1">
        <widget class="QComboBox" name="cameraName">
         <property name="sizePolicy">
@@ -141,20 +141,6 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Camera settings</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QPushButton" name="camera_settings">
-        <property name="text">
-         <string>Open</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QSpinBox" name="cameraFOV">
         <property name="sizePolicy">
@@ -174,6 +160,19 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="1">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -264,6 +263,16 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>cameraFOV</tabstop>
+  <tabstop>cameraFPS</tabstop>
+  <tabstop>cameraName</tabstop>
+  <tabstop>resolution</tabstop>
+  <tabstop>cx</tabstop>
+  <tabstop>cy</tabstop>
+  <tabstop>cz</tabstop>
+  <tabstop>btn_calibrate</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
  <designerdata>
diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index 4fc5405f..d59ac9be 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -426,7 +426,6 @@ TrackerControls::TrackerControls()
     connect(ui.btn_calibrate, SIGNAL(clicked()), this, SLOT(toggleCalibrate()));
     connect(this, SIGNAL(destroyed()), this, SLOT(cleanupCalib()));
     connect(&calib_timer, SIGNAL(timeout()), this, SLOT(update_tracker_calibration()));
-    connect(ui.camera_settings, SIGNAL(clicked()), this, SLOT(camera_settings()));
 }
 
 void TrackerControls::toggleCalibrate()
@@ -478,9 +477,4 @@ void TrackerControls::doCancel()
     close();
 }
 
-void TrackerControls::camera_settings()
-{
-    open_camera_settings(tracker ? &tracker->camera : nullptr, s.camera_name, tracker ? &tracker->camera_mtx : nullptr);
-}
-
 OPENTRACK_DECLARE_TRACKER(Tracker, TrackerControls, TrackerDll)
diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h
index 1dd08cb1..101060f7 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.h
+++ b/tracker-aruco/ftnoir_tracker_aruco.h
@@ -11,11 +11,11 @@
 #include "api/plugin-api.hpp"
 #include "include/markerdetector.h"
 
-#include "cv/camera-dialog.hpp"
 #include "cv/video-widget.hpp"
 #include "cv/translation-calibrator.hpp"
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/videoio.hpp>
 
 #include <QObject>
 #include <QThread>
@@ -106,7 +106,7 @@ private:
     static constexpr double alpha_ = .95;
 };
 
-class TrackerControls : public ITrackerDialog, protected camera_dialog
+class TrackerControls : public ITrackerDialog
 {
     Q_OBJECT
 public:
@@ -125,7 +125,6 @@ private slots:
     void toggleCalibrate();
     void cleanupCalib();
     void update_tracker_calibration();
-    void camera_settings();
 };
 
 class TrackerDll : public Metadata
-- 
cgit v1.2.3