From a664af379749f01e13600fad2850273f39db898f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 19 Oct 2013 19:39:06 +0200 Subject: cleanup headpose timer Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 8786ed385..569f0f3f1 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -651,21 +651,7 @@ void FaceTrackNoIR::startTracker( ) { // // Start the timer to update the head-pose (digits and 'man in black') // - timUpdateHeadPose.start(40); - - ui.lblX->setVisible(true); - ui.lblY->setVisible(true); - ui.lblZ->setVisible(true); - ui.lblRotX->setVisible(true); - ui.lblRotY->setVisible(true); - ui.lblRotZ->setVisible(true); - - ui.lcdNumOutputPosX->setVisible(true); - ui.lcdNumOutputPosY->setVisible(true); - ui.lcdNumOutputPosZ->setVisible(true); - ui.lcdNumOutputRotX->setVisible(true); - ui.lcdNumOutputRotY->setVisible(true); - ui.lcdNumOutputRotZ->setVisible(true); + timUpdateHeadPose.start(50); } /** stop tracking the face **/ @@ -759,8 +745,6 @@ void FaceTrackNoIR::setInvertAxis(Axis axis, int invert ) { void FaceTrackNoIR::showHeadPose() { double newdata[6]; - const QString format("%1"); - tracker->getHeadPose(newdata); ui.lcdNumX->display(newdata[TX]); ui.lcdNumY->display(newdata[TY]); -- cgit v1.2.3 From 8c55d5fc650d49245fa94408eaaa12cf40f27849 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 20 Oct 2013 16:43:50 +0200 Subject: cleanup old cruft Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.cpp | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 569f0f3f1..e53f414a0 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -167,20 +167,6 @@ FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WindowFlags flags) : //Q_INIT_RESOURCE(PoseWidget); - ui.lblX->setVisible(false); - ui.lblY->setVisible(false); - ui.lblZ->setVisible(false); - ui.lblRotX->setVisible(false); - ui.lblRotY->setVisible(false); - ui.lblRotZ->setVisible(false); - - ui.lcdNumOutputPosX->setVisible(false); - ui.lcdNumOutputPosY->setVisible(false); - ui.lcdNumOutputPosZ->setVisible(false); - ui.lcdNumOutputRotX->setVisible(false); - ui.lcdNumOutputRotY->setVisible(false); - ui.lcdNumOutputRotZ->setVisible(false); - #ifndef _WIN32 connect(&keyCenter, SIGNAL(activated()), this, SLOT(shortcutRecentered())); connect(&keyToggle, SIGNAL(activated()), this, SLOT(shortcutToggled())); @@ -672,21 +658,6 @@ void FaceTrackNoIR::stopTracker( ) { timUpdateHeadPose.stop(); ui.pose_display->rotateBy(0, 0, 0); - ui.lblX->setVisible(false); - ui.lblY->setVisible(false); - ui.lblZ->setVisible(false); - ui.lblRotX->setVisible(false); - ui.lblRotY->setVisible(false); - ui.lblRotZ->setVisible(false); - - ui.lcdNumOutputPosX->setVisible(false); - ui.lcdNumOutputPosY->setVisible(false); - ui.lcdNumOutputPosZ->setVisible(false); - ui.lcdNumOutputRotX->setVisible(false); - ui.lcdNumOutputRotY->setVisible(false); - ui.lcdNumOutputRotZ->setVisible(false); - - // // UnRegister the Tracker instance with the Tracker Dialog (if open) // if (pTrackerDialog) { -- cgit v1.2.3 From ac6d76a7c6a7ff924684609a73ac54d95fa5c9b1 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 20 Oct 2013 16:50:06 +0200 Subject: in preparation for a4 Waiting for mm0zct's okay Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.cpp | 2 +- installer/opentrack-installer.iss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index e53f414a0..1d5312290 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -415,7 +415,7 @@ void FaceTrackNoIR::loadSettings() { // Put the filename in the window-title. // QFileInfo pathInfo ( currentFile ); - setWindowTitle ( "opentrack 2.0a3 - " + pathInfo.fileName() ); + setWindowTitle ( "opentrack 2.0a4 - " + pathInfo.fileName() ); // // Get a List of all the INI-files in the (currently active) Settings-folder. diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index dc6e624b2..5ff42ea5e 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "opentrack" -#define MyAppVersion "2.0a3" +#define MyAppVersion "2.0a4" #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" -- cgit v1.2.3 From adfe6cfe1e1fb3d580248788d8f1b239ddd41f7f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 20 Oct 2013 20:34:29 +0200 Subject: add kbd shortcut for quitting the software Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.cpp | 6 +++++- facetracknoir/facetracknoir.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'facetracknoir') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 1d5312290..48bca959c 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -102,7 +102,8 @@ FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WindowFlags flags) : pSecondTrackerDialog(NULL), pProtocolDialog(NULL), pFilterDialog(NULL), - looping(false) + looping(false), + kbd_quit(QKeySequence("Ctrl+Q"), this) { ui.setupUi(this); setFixedSize(size()); @@ -171,6 +172,9 @@ FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WindowFlags flags) : connect(&keyCenter, SIGNAL(activated()), this, SLOT(shortcutRecentered())); connect(&keyToggle, SIGNAL(activated()), this, SLOT(shortcutToggled())); #endif + + connect(&kbd_quit, SIGNAL(activated()), this, SLOT(exit())); + kbd_quit.setEnabled(true); } /** destructor stops the engine and quits the faceapi **/ diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index c5b2dc01b..491274c85 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -38,6 +38,7 @@ #include #include #include +#include #if !defined(_WIN32) # include "qxt-mini/QxtGlobalShortcut" #else @@ -123,6 +124,7 @@ private: QList dlopen_filters; QList dlopen_trackers; QList dlopen_protocols; + QShortcut kbd_quit; #ifndef _WIN32 void bind_keyboard_shortcut(QxtGlobalShortcut& key, const QString label, QSettings& iniFile); -- cgit v1.2.3 From 732644b87e4fbc999170d13f6cda179113d3940b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 20 Oct 2013 20:34:45 +0200 Subject: needless fun with main for layout Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.ui | 1325 +++++++++++++++++++++++----------------- 1 file changed, 772 insertions(+), 553 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui index 5bda6067f..7ef415376 100644 --- a/facetracknoir/facetracknoir.ui +++ b/facetracknoir/facetracknoir.ui @@ -142,7 +142,7 @@ 120 - 40 + 60 203 97 @@ -163,33 +163,29 @@ - Qt::AlignJustify|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - false + true - - - - true - - - - 65536 - 65536 - - - - false - - - Y - - - - - + + QLayout::SetMaximumSize + + + 2 + + + 2 + + + 2 + + + 6 + + + true @@ -214,16 +210,19 @@ false + + 5 + 5 - QLCDNumber::Filled + QLCDNumber::Flat - - + + true @@ -248,16 +247,45 @@ false + + 5 + 5 - QLCDNumber::Filled + QLCDNumber::Flat - - + + + + + 65536 + 65536 + + + + roll + + + + + + + + 65536 + 65536 + + + + pitch + + + + + true @@ -282,16 +310,19 @@ false + + 5 + 5 - QLCDNumber::Filled + QLCDNumber::Flat - - + + true @@ -304,21 +335,26 @@ false - - Z + + QFrame::NoFrame - - - - - - - 65536 - 65536 - + + QFrame::Plain - - pitch + + 1 + + + false + + + 5 + + + 5 + + + QLCDNumber::Flat @@ -348,11 +384,14 @@ false + + 5 + 5 - QLCDNumber::Filled + QLCDNumber::Flat @@ -364,21 +403,37 @@ 65536 + + + 9 + + X - - + + + + true + 65536 65536 + + + 9 + + + + false + - roll + Y @@ -408,16 +463,19 @@ false + + 5 + 5 - QLCDNumber::Filled + QLCDNumber::Flat - - + + true @@ -427,26 +485,16 @@ 65536 - - false - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 + + + 9 + - + false - - 5 - - - QLCDNumber::Filled + + Z @@ -468,9 +516,9 @@ - 10 - 40 - 90 + 20 + 50 + 81 100 @@ -499,7 +547,7 @@ 350 370 191 - 80 + 91 @@ -524,7 +572,7 @@ Qt::AlignCenter - false + true false @@ -583,7 +631,7 @@ 580 - 470 + 460 171 38 @@ -621,7 +669,7 @@ - 120 + 98 24 @@ -629,9 +677,9 @@ - 350 + 130 36 - 371 + 651 20 @@ -649,7 +697,7 @@ 350 - 262 + 270 191 91 @@ -676,7 +724,7 @@ Qt::AlignCenter - false + true false @@ -732,9 +780,9 @@ 350 - 70 + 60 191 - 83 + 91 @@ -759,7 +807,7 @@ Qt::AlignCenter - false + true false @@ -811,21 +859,15 @@ - + - 20 - 420 - 321 - 131 + 130 + 10 + 651 + 25 - - - 0 - 0 - - 0 @@ -838,266 +880,226 @@ 65536 + + + + + + + + 600 + 240 + 124 + 117 + + + + + 65536 + 65536 + + + + + true + + - Raw data + Axis inversion + + + Qt::AlignCenter + true + + false - + + + QLayout::SetMinAndMaxSize + 6 - + 65536 65536 + + Qt::RightToLeft + + + background:none; + - TX + Yaw - - - true - + 65536 65536 - - false - - - QFrame::NoFrame - - - 0 - - - 0 - - - false + + Qt::RightToLeft - - 5 + + background:none; - - QLCDNumber::Flat + + TX - - + + 65536 65536 - - yaw - - - - - - - true - - - - 65536 - 65536 - + + Qt::RightToLeft false - - QFrame::NoFrame - - - 0 - - - 0 - - - false - - - 5 - - - QLCDNumber::Flat - - - - - - - - 65536 - 65536 - + + background:none; - TY + Pitch - - - true - + 65536 65536 - - false - - - QFrame::NoFrame - - - 0 - - - 0 - - - false - - - 5 - - - QLCDNumber::Flat + + Qt::RightToLeft - - - - - - - 65536 - 65536 - + + background:none; - pitch + TY - - - - true - + + 65536 65536 - - false - - - QFrame::NoFrame - - - 0 - - - 0 - - - false - - - 5 - - - QLCDNumber::Flat + + Qt::RightToLeft - - - - - - - 65536 - 65536 - + + background:none; - TZ + Roll - - - true - + 65536 65536 - - false - - - QFrame::NoFrame - - - 0 - - - 0 - - - false + + Qt::RightToLeft - - 5 + + background:none; - - QLCDNumber::Flat + + TZ - - + + + + + + 350 + 160 + 191 + 91 + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + Auxiliary tracker + + + Qt::AlignCenter + + + true + + + false + + + + QLayout::SetDefaultConstraint + + + 65536 65536 - - roll + + + + + -1 + + + 42 - - + + true @@ -1107,38 +1109,26 @@ 65536 - - false - - - QFrame::NoFrame - - - 0 - - - 0 - - - false + + Change tracker settings - - 5 + + - - QLCDNumber::Flat + + Settings - + 350 - 10 - 371 - 25 + 470 + 190 + 65 @@ -1153,274 +1143,14 @@ 65536 - - + + GO! - - - - - 600 - 240 - 124 - 117 - - - - - 65536 - 65536 - - - - - true - - - - Axis inversion - - - Qt::AlignCenter - - - false - - - false - - - - QLayout::SetMinAndMaxSize - - - 6 - - - - - - 65536 - 65536 - - - - Qt::RightToLeft - - - background:none; - - - Yaw - - - - - - - - 65536 - 65536 - - - - Qt::RightToLeft - - - background:none; - - - TX - - - - - - - - 65536 - 65536 - - - - Qt::RightToLeft - - - false - - - background:none; - - - Pitch - - - - - - - - 65536 - 65536 - - - - Qt::RightToLeft - - - background:none; - - - TY - - - - - - - - 65536 - 65536 - - - - Qt::RightToLeft - - - background:none; - - - Roll - - - - - - - - 65536 - 65536 - - - - Qt::RightToLeft - - - background:none; - - - TZ - - - - - - - - - 350 - 180 - 191 - 83 - - - - - 0 - 0 - - - - - 65536 - 65536 - - - - Auxiliary tracker - - - Qt::AlignCenter + + Qt::AlignCenter - false - - - false - - - - QLayout::SetDefaultConstraint - - - - - - 65536 - 65536 - - - - - - - -1 - - - 42 - - - - - - - true - - - - 65536 - 65536 - - - - Change tracker settings - - - - - - Settings - - - - - - - - - 350 - 470 - 190 - 65 - - - - - 0 - 0 - - - - - 65536 - 65536 - - - - GO! - - - Qt::AlignCenter + true @@ -1476,7 +1206,7 @@ 580 - 420 + 410 171 38 @@ -1506,7 +1236,7 @@ Edit the Keyboard and mouse shortcuts - Shortcuts + Keys @@ -1514,7 +1244,7 @@ - 24 + 98 24 @@ -1546,6 +1276,9 @@ Qt::AlignCenter + + true + QLayout::SetDefaultConstraint @@ -1637,6 +1370,492 @@ + + + + 30 + 420 + 131 + 111 + + + + Raw translation + + + Qt::AlignBottom|Qt::AlignHCenter + + + true + + + + QLayout::SetMaximumSize + + + QFormLayout::FieldsStayAtSizeHint + + + QFormLayout::DontWrapRows + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + Qt::AlignBottom|Qt::AlignHCenter + + + 6 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + TX + + + + + + + true + + + + 0 + 0 + + + + + 65536 + 65536 + + + + + 12 + + + + false + + + QFrame::NoFrame + + + 0 + + + 0 + + + false + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + TY + + + + + + + true + + + + 0 + 0 + + + + + 65536 + 65536 + + + + + 12 + + + + false + + + QFrame::NoFrame + + + 0 + + + 0 + + + false + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + TZ + + + + + + + true + + + + 0 + 0 + + + + + 65536 + 65536 + + + + + 12 + + + + false + + + QFrame::NoFrame + + + 0 + + + 0 + + + false + + + 4 + + + QLCDNumber::Flat + + + + + + + + + 190 + 420 + 131 + 111 + + + + Raw rotation + + + Qt::AlignBottom|Qt::AlignHCenter + + + true + + + + QLayout::SetMaximumSize + + + QFormLayout::FieldsStayAtSizeHint + + + QFormLayout::DontWrapRows + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + Qt::AlignBottom|Qt::AlignHCenter + + + 6 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + yaw + + + + + + + true + + + + 0 + 0 + + + + + 65536 + 65536 + + + + + 12 + + + + false + + + QFrame::NoFrame + + + 0 + + + 0 + + + false + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + pitch + + + + + + + true + + + + 0 + 0 + + + + + 65536 + 65536 + + + + + 12 + + + + false + + + QFrame::NoFrame + + + 0 + + + 0 + + + false + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + + 65536 + 65536 + + + + roll + + + + + + + true + + + + 0 + 0 + + + + + 65536 + 65536 + + + + + 12 + + + + false + + + QFrame::NoFrame + + + 0 + + + 0 + + + false + + + 4 + + + QLCDNumber::Flat + + + + + lcdNumRotZ + label_8 + label_7 + lcdNumRotY + lcdNumRotX + label_9 + -- cgit v1.2.3