From 025a83e9d794857cc7b39040411051d635b5316e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 22 Jan 2016 14:41:06 +0100 Subject: gui: reorder for usability's sake --- gui/main.ui | 1207 +++++++++++++++++++++++------------------------------------ gui/ui.cpp | 10 +- 2 files changed, 473 insertions(+), 744 deletions(-) diff --git a/gui/main.ui b/gui/main.ui index a6db08c9..6c605262 100644 --- a/gui/main.ui +++ b/gui/main.ui @@ -7,10 +7,16 @@ 0 0 - 646 - 448 + 738 + 463 + + + 0 + 0 + + :/images/facetracknoir.png:/images/facetracknoir.png @@ -53,23 +59,8 @@ 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - + + @@ -94,138 +85,23 @@ 0 - 4 + 0 - - 0 - 0 - - - - - 320 - 240 - - - - - - 0 - 0 - 320 - 240 - - - - - 0 - 0 - - - - - - 0 - 0 - 320 - 240 - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - - - - :/images/no-feed.png - - - true - - - - - - - - - + 0 0 - 320 - 240 + 384 + 288 - - - - - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - 0 - - - - 6 - - - 5 - - - 0 - - - 0 - - - 6 - - - - - - 0 - 0 - - - - Raw tracker data - - + 0 @@ -241,586 +117,450 @@ 0 - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TZ - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - pitch - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TY - - - - - - - 0 - 0 - - - - QFrame::Raised - - - TX - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - + - - 0 - 0 - - - - QFrame::Raised - - - roll - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - yaw - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - + 0 0 - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - + + + + 0 + 0 + 384 + 288 + + + + + 0 + 0 + + + + + 384 + 0 + + + + + 384 + 288 + + + + + + + :/images/no-feed.png + + + true + + - - - - 0 - 0 - + + + QFrame::NoFrame - - Game data + + QFrame::Raised - + - 0 + 6 - 0 + 2 - 0 + 2 - 0 - - - 0 + 2 - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - TX - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TY - - - - - - - true - - - - 0 - 0 - + + + + QFrame +{ + border-color: #000; + border: 1px solid; + background-color: #ccc; +} QFrame::NoFrame - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - QFrame::Raised - - pitch - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - roll - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - yaw - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TZ - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 320 + 127 + + + + + - - - - true - + + - + 0 0 - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat + + Raw tracker data + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + TZ + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + pitch + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + TY + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + TX + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + roll + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + yaw + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + @@ -829,7 +569,7 @@ - + @@ -883,49 +623,6 @@ 8 - - - - Protocol - - - - 4 - - - 0 - - - 4 - - - 0 - - - 3 - - - 0 - - - - - - - - true - - - ... - - - false - - - - - - @@ -937,7 +634,7 @@ Controls - + 8 @@ -999,10 +696,7 @@ 0 - - - 3 - + 0 @@ -1015,7 +709,7 @@ 0 - + @@ -1042,7 +736,50 @@ - + + + + Protocol + + + + 4 + + + 0 + + + 4 + + + 0 + + + 3 + + + 0 + + + + + + + + true + + + ... + + + false + + + + + + + @@ -1104,7 +841,7 @@ - + @@ -1127,7 +864,7 @@ - + diff --git a/gui/ui.cpp b/gui/ui.cpp index 83ef523a..09739b92 100644 --- a/gui/ui.cpp +++ b/gui/ui.cpp @@ -359,11 +359,10 @@ void MainWindow::display_pose(const double *mapped, const double *raw) if (mapping_widget) mapping_widget->update(); - double mapped_[6], raw_[6]; + double raw_[6]; for (int i = 0; i < 6; i++) { - mapped_[i] = (int) mapped[i]; raw_[i] = (int) raw[i]; } @@ -374,13 +373,6 @@ void MainWindow::display_pose(const double *mapped, const double *raw) ui.raw_pitch->display(raw_[Pitch]); ui.raw_roll->display(raw_[Roll]); - ui.pose_x->display(mapped_[TX]); - ui.pose_y->display(mapped_[TY]); - ui.pose_z->display(mapped_[TZ]); - ui.pose_yaw->display(mapped_[Yaw]); - ui.pose_pitch->display(mapped_[Pitch]); - ui.pose_roll->display(mapped_[Roll]); - QString game_title; if (libs.pProtocol) game_title = libs.pProtocol->game_name(); -- cgit v1.2.3