diff options
| -rwxr-xr-x | tracker-hatire/ftnoir_tracker_hat.cpp | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | tracker-hatire/ftnoir_tracker_hat.h | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | tracker-hatire/ftnoir_tracker_hat_dialog.cpp | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | tracker-hatire/ftnoir_tracker_hat_dialog.h | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/tracker-hatire/ftnoir_tracker_hat.cpp b/tracker-hatire/ftnoir_tracker_hat.cpp index 845bbc02..22d0b2c8 100755 --- a/tracker-hatire/ftnoir_tracker_hat.cpp +++ b/tracker-hatire/ftnoir_tracker_hat.cpp @@ -48,7 +48,6 @@ void hatire::start_tracker(QFrame*) { CptError=0; frame_cnt=0; - new_frame=false; settings.load_ini(); applysettings(settings); t.Log("Starting Tracker"); diff --git a/tracker-hatire/ftnoir_tracker_hat.h b/tracker-hatire/ftnoir_tracker_hat.h index 00ec26e2..e951c69f 100644..100755 --- a/tracker-hatire/ftnoir_tracker_hat.h +++ b/tracker-hatire/ftnoir_tracker_hat.h @@ -46,7 +46,6 @@ private: TrackerSettings settings; int frame_cnt; - bool new_frame; bool bEnableRoll; bool bEnablePitch; diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp index 7d714d3a..6bec65ce 100644..100755 --- a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp +++ b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp @@ -15,6 +15,7 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), timer(this) { + // TODO move to settings api -sh 20160504 ui.setupUi( this ); settings.load_ini(); @@ -27,7 +28,6 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim ui.cbSerialPort->addItem(PortInfo.portName()); } - // Stop if no SerialPort dispo if (ui.cbSerialPort->count()<1) { QMessageBox::critical(this,"Error", "No SerialPort avaible"); @@ -117,11 +117,6 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim ui.cb_Endian->setChecked(settings.BigEndian); -#ifdef OPENTRACK_API - ui.spb_Fps->setValue(settings.FPSArduino); - connect(ui.spb_Fps, SIGNAL(valueChanged ( int )), this,SLOT(set_Fps(int))); -#endif - // Connect Qt signals to member-functions connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK())); connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel())); @@ -259,10 +254,10 @@ void TrackerControls::poll_tracker_info() { if (theTracker) { - int nb_trame; + int frame_cnt; - theTracker->get_info(&nb_trame); - ui.lab_vtps->setText(QString::number(nb_trame*(1000/last_time.elapsed()))); + theTracker->get_info(&frame_cnt); + ui.lab_vtps->setText(QString::number(frame_cnt*(1000/last_time.elapsed()))); last_time.restart(); } diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.h b/tracker-hatire/ftnoir_tracker_hat_dialog.h index 62d60646..f1c16219 100644..100755 --- a/tracker-hatire/ftnoir_tracker_hat_dialog.h +++ b/tracker-hatire/ftnoir_tracker_hat_dialog.h @@ -67,8 +67,6 @@ protected slots: void set_endian(bool val) { settings.BigEndian = val; settings_changed(); } - void set_Fps(int val) { settings.FPSArduino = val; settings_changed(); } - void set_mod_baud(int val) { settings.pBaudRate = static_cast<QSerialPort::BaudRate>(ui.QCB_Serial_baudRate->itemData(val).toInt()) ; settings_changed(); } void set_mod_dataBits(int val) { settings.pDataBits = static_cast<QSerialPort::DataBits>(ui.QCB_Serial_dataBits->itemData(val).toInt()) ; settings_changed(); } void set_mod_parity(int val) { settings.pParity = static_cast<QSerialPort::Parity>(ui.QCB_Serial_parity->itemData(val).toInt()) ; settings_changed(); } |