summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tracker-easy/Resources/easy-tracker-logo.png (renamed from tracker-easy/Resources/Logo_IR.png)bin18357 -> 18357 bytes
-rw-r--r--tracker-easy/cv-point-extractor.cpp4
-rw-r--r--tracker-easy/module.cpp2
-rw-r--r--tracker-easy/tracker-easy-dialog.h2
-rw-r--r--tracker-easy/tracker-easy-settings.ui (renamed from tracker-easy/FTNoIR_PT_Controls.ui)25
-rw-r--r--tracker-easy/tracker-easy.cpp4
-rw-r--r--tracker-easy/tracker_easy.qrc2
7 files changed, 17 insertions, 22 deletions
diff --git a/tracker-easy/Resources/Logo_IR.png b/tracker-easy/Resources/easy-tracker-logo.png
index 5a7da41c..5a7da41c 100644
--- a/tracker-easy/Resources/Logo_IR.png
+++ b/tracker-easy/Resources/easy-tracker-logo.png
Binary files differ
diff --git a/tracker-easy/cv-point-extractor.cpp b/tracker-easy/cv-point-extractor.cpp
index 9720eb63..368f5587 100644
--- a/tracker-easy/cv-point-extractor.cpp
+++ b/tracker-easy/cv-point-extractor.cpp
@@ -79,10 +79,10 @@ namespace EasyTracker
}
}
- // Keep the three points which are highest, i.e. with lowest Y coordinates
+ // Keep only the three points which are highest, i.e. with lowest Y coordinates
// That's most usefull to discard noise from features below your cap/head.
// Typically noise comming from zippers and metal parts on your clothing.
- // With a cap tracker it also successfully discards noise glasses.
+ // With a cap tracker it also successfully discards noise from glasses.
// However it may not work as good with a clip user wearing glasses.
while (aPoints.size() > 3) // Until we have no more than three points
{
diff --git a/tracker-easy/module.cpp b/tracker-easy/module.cpp
index c5751e6e..b6d21c80 100644
--- a/tracker-easy/module.cpp
+++ b/tracker-easy/module.cpp
@@ -12,7 +12,7 @@ namespace EasyTracker
{
QString Metadata::name() { return tr("Easy Tracker 0.1"); }
- QIcon Metadata::icon() { return QIcon(":/Resources/Logo_IR.png"); }
+ QIcon Metadata::icon() { return QIcon(":/Resources/easy-tracker-logo.png"); }
}
diff --git a/tracker-easy/tracker-easy-dialog.h b/tracker-easy/tracker-easy-dialog.h
index 8d4cffbd..86b9771b 100644
--- a/tracker-easy/tracker-easy-dialog.h
+++ b/tracker-easy/tracker-easy-dialog.h
@@ -10,7 +10,7 @@
#include "tracker-easy-api.h"
#include "tracker-easy.h"
-#include "ui_FTNoIR_PT_Controls.h"
+#include "ui_tracker-easy-settings.h"
#include "cv/translation-calibrator.hpp"
#include "video/video-widget.hpp"
diff --git a/tracker-easy/FTNoIR_PT_Controls.ui b/tracker-easy/tracker-easy-settings.ui
index 061f5351..41f08707 100644
--- a/tracker-easy/FTNoIR_PT_Controls.ui
+++ b/tracker-easy/tracker-easy-settings.ui
@@ -23,8 +23,8 @@
<string>PointTracker Settings</string>
</property>
<property name="windowIcon">
- <iconset resource="module/tracker_pt.qrc">
- <normaloff>:/Resources/Logo_IR.png</normaloff>:/Resources/Logo_IR.png</iconset>
+ <iconset resource="tracker_easy.qrc">
+ <normaloff>:/Resources/tracker-easy-logo.png</normaloff>:/Resources/tracker-easy-logo.png</iconset>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
@@ -725,7 +725,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="tracker_pt_base.qrc">:/Resources/clip_side.png</pixmap>
+ <pixmap resource="tracker_easy.qrc">:/Resources/clip_side.png</pixmap>
</property>
</widget>
<widget class="QLabel" name="label_50">
@@ -805,7 +805,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="tracker_pt_base.qrc">:/Resources/clip_front.png</pixmap>
+ <pixmap resource="tracker_easy.qrc">:/Resources/clip_front.png</pixmap>
</property>
</widget>
</widget>
@@ -841,7 +841,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="tracker_pt_base.qrc">:/Resources/cap_side.png</pixmap>
+ <pixmap resource="tracker_easy.qrc">:/Resources/cap_side.png</pixmap>
</property>
</widget>
<widget class="QLabel" name="label_48">
@@ -889,7 +889,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="tracker_pt_base.qrc">:/Resources/cap_front.png</pixmap>
+ <pixmap resource="tracker_easy.qrc">:/Resources/cap_front.png</pixmap>
</property>
</widget>
<widget class="QSpinBox" name="cap_width_spin">
@@ -1349,7 +1349,7 @@ Don't roll or change position.</string>
<string/>
</property>
<property name="pixmap">
- <pixmap resource="module/tracker_pt.qrc">:/Resources/Logo_IR.png</pixmap>
+ <pixmap resource="tracker_easy.qrc">:/Resources/tracker-easy-logo.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -1410,16 +1410,7 @@ Don't roll or change position.</string>
<tabstop>tcalib_button</tabstop>
</tabstops>
<resources>
- <include location="module/tracker_pt.qrc"/>
- <include location="module/tracker_pt.qrc"/>
- <include location="module/tracker_pt.qrc"/>
- <include location="module/tracker_pt.qrc"/>
- <include location="module/tracker_pt.qrc"/>
- <include location="tracker_pt_base.qrc"/>
- <include location="tracker_pt_base.qrc"/>
- <include location="tracker_pt_base.qrc"/>
- <include location="tracker_pt_base.qrc"/>
- <include location="tracker_pt_base.qrc"/>
+ <include location="tracker_easy.qrc"/>
</resources>
<connections/>
<slots>
diff --git a/tracker-easy/tracker-easy.cpp b/tracker-easy/tracker-easy.cpp
index f0ff4bb7..42666677 100644
--- a/tracker-easy/tracker-easy.cpp
+++ b/tracker-easy/tracker-easy.cpp
@@ -332,6 +332,10 @@ namespace EasyTracker
{
QMutexLocker l(&camera_mtx);
+ iCameraInfo.fps = s.cam_fps;
+ iCameraInfo.width = s.cam_res_x;
+ iCameraInfo.height = s.cam_res_y;
+
return camera->start(iCameraInfo);
}
diff --git a/tracker-easy/tracker_easy.qrc b/tracker-easy/tracker_easy.qrc
index 8be79de9..b7d1a896 100644
--- a/tracker-easy/tracker_easy.qrc
+++ b/tracker-easy/tracker_easy.qrc
@@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/">
- <file>Resources/Logo_IR.png</file>
+ <file>Resources/easy-tracker-logo.png</file>
<file>Resources/cap_front.png</file>
<file>Resources/cap_side.png</file>
<file>Resources/clip_front.png</file>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 12:19:50 +0000