From 87b6d1572369111c72015e78181bb6a463c3796d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Oct 2014 07:18:22 +0100 Subject: rename main window, no more "LaMe" caps --- facetracknoir/facetracknoir.cpp | 48 ++++++++++++++++++++--------------------- facetracknoir/facetracknoir.h | 8 +++---- facetracknoir/main.cpp | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 7f198e76..3ea95baa 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -31,7 +31,7 @@ # include #endif -FaceTrackNoIR::FaceTrackNoIR() : +MainWindow::MainWindow() : pose_update_timer(this), kbd_quit(QKeySequence("Ctrl+Q"), this), no_feed_pixmap(":/images/no-feed.png") @@ -80,14 +80,14 @@ FaceTrackNoIR::FaceTrackNoIR() : kbd_quit.setEnabled(true); } -FaceTrackNoIR::~FaceTrackNoIR() +MainWindow::~MainWindow() { stopTracker(); save(); _exit(0); } -void FaceTrackNoIR::open() { +void MainWindow::open() { QFileDialog dialog(this); dialog.setFileMode(QFileDialog::ExistingFile); @@ -108,7 +108,7 @@ void FaceTrackNoIR::open() { } } -void FaceTrackNoIR::save_mappings() { +void MainWindow::save_mappings() { pose.save_mappings(); } @@ -116,7 +116,7 @@ void FaceTrackNoIR::save_mappings() { # include #endif -void FaceTrackNoIR::save() { +void MainWindow::save() { b->save(); save_mappings(); @@ -133,7 +133,7 @@ void FaceTrackNoIR::save() { #endif } -void FaceTrackNoIR::saveAs() +void MainWindow::saveAs() { QSettings settings("opentrack"); QString oldFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString(); @@ -162,18 +162,18 @@ void FaceTrackNoIR::saveAs() fill_profile_combobox(); } -void FaceTrackNoIR::load_mappings() { +void MainWindow::load_mappings() { pose.load_mappings(); } -void FaceTrackNoIR::load_settings() { +void MainWindow::load_settings() { b->reload(); load_mappings(); } extern "C" volatile const char* opentrack_version; -void FaceTrackNoIR::fill_profile_combobox() +void MainWindow::fill_profile_combobox() { QSettings settings("opentrack"); QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() @@ -189,7 +189,7 @@ void FaceTrackNoIR::fill_profile_combobox() ui.iconcomboProfile->setCurrentText(pathInfo.fileName()); } -void FaceTrackNoIR::updateButtonState(bool running, bool inertialp) +void MainWindow::updateButtonState(bool running, bool inertialp) { bool not_running = !running; ui.iconcomboProfile->setEnabled ( not_running ); @@ -203,13 +203,13 @@ void FaceTrackNoIR::updateButtonState(bool running, bool inertialp) ui.video_frame_label->setVisible(not_running || inertialp); } -void FaceTrackNoIR::bindKeyboardShortcuts() +void MainWindow::bindKeyboardShortcuts() { if (work) work->reload_shortcuts(); } -void FaceTrackNoIR::startTracker( ) { +void MainWindow::startTracker( ) { b->save(); load_settings(); bindKeyboardShortcuts(); @@ -242,7 +242,7 @@ void FaceTrackNoIR::startTracker( ) { updateButtonState(true, is_inertial); } -void FaceTrackNoIR::stopTracker( ) { +void MainWindow::stopTracker( ) { //ui.game_name->setText("Not connected"); pose_update_timer.stop(); @@ -276,7 +276,7 @@ void FaceTrackNoIR::stopTracker( ) { updateButtonState(false, false); } -void FaceTrackNoIR::display_pose(const double *mapped, const double *raw) +void MainWindow::display_pose(const double *mapped, const double *raw) { ui.pose_display->rotateBy(mapped[Yaw], mapped[Pitch], mapped[Roll]); @@ -306,7 +306,7 @@ void FaceTrackNoIR::display_pose(const double *mapped, const double *raw) ui.pose_roll->display(mapped_[Roll]); } -void FaceTrackNoIR::showHeadPose() +void MainWindow::showHeadPose() { double mapped[6], raw[6]; @@ -337,7 +337,7 @@ ptr mk_dialog(ptr lib) return nullptr; } -void FaceTrackNoIR::showTrackerSettings() +void MainWindow::showTrackerSettings() { auto dialog = mk_dialog(current_tracker()); @@ -348,7 +348,7 @@ void FaceTrackNoIR::showTrackerSettings() } } -void FaceTrackNoIR::showProtocolSettings() { +void MainWindow::showProtocolSettings() { auto dialog = mk_dialog(current_protocol()); if (dialog) { @@ -357,7 +357,7 @@ void FaceTrackNoIR::showProtocolSettings() { } } -void FaceTrackNoIR::showFilterSettings() { +void MainWindow::showFilterSettings() { auto dialog = mk_dialog(current_filter()); if (dialog) { @@ -367,24 +367,24 @@ void FaceTrackNoIR::showFilterSettings() { } } -void FaceTrackNoIR::showKeyboardShortcuts() { +void MainWindow::showKeyboardShortcuts() { shortcuts_widget = std::make_shared(); shortcuts_widget->setWindowFlags(Qt::Dialog); connect(shortcuts_widget.get(), SIGNAL(reload()), this, SLOT(bindKeyboardShortcuts())); shortcuts_widget->show(); } -void FaceTrackNoIR::showCurveConfiguration() { +void MainWindow::showCurveConfiguration() { mapping_widget = std::make_shared(pose, s); mapping_widget->setWindowFlags(Qt::Dialog); mapping_widget->show(); } -void FaceTrackNoIR::exit() { +void MainWindow::exit() { QCoreApplication::exit(0); } -void FaceTrackNoIR::profileSelected(int index) +void MainWindow::profileSelected(int index) { QSettings settings("opentrack"); QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString(); @@ -393,14 +393,14 @@ void FaceTrackNoIR::profileSelected(int index) load_settings(); } -void FaceTrackNoIR::shortcutRecentered() +void MainWindow::shortcutRecentered() { qDebug() << "Center"; if (work) work->tracker->center(); } -void FaceTrackNoIR::shortcutToggled() +void MainWindow::shortcutToggled() { qDebug() << "Toggle"; if (work) diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index c74bb1c8..6e7ea4e0 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -1,5 +1,5 @@ /******************************************************************************* -* FaceTrackNoIR This program is a private project of the some enthusiastic +* MainWindow This program is a private project of the some enthusiastic * gamers from Holland, who don't like to pay much for * head-tracking. * @@ -56,7 +56,7 @@ using namespace options; -class FaceTrackNoIR : public QMainWindow, private State +class MainWindow : public QMainWindow, private State { Q_OBJECT @@ -110,8 +110,8 @@ private slots: void startTracker(); void stopTracker(); public: - FaceTrackNoIR(); - ~FaceTrackNoIR(); + MainWindow(); + ~MainWindow(); void save_mappings(); void load_mappings(); }; diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp index 692ce060..ee8da907 100644 --- a/facetracknoir/main.cpp +++ b/facetracknoir/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char** argv) QApplication::setAttribute(Qt::AA_X11InitThreads, true); QApplication app(argc, argv); - auto w = std::make_shared(); + auto w = std::make_shared(); w->show(); app.exec(); -- cgit v1.2.3