Index: /trunk/BNC/src/PPP/pppThread.cpp =================================================================== --- /trunk/BNC/src/PPP/pppThread.cpp (revision 5679) +++ /trunk/BNC/src/PPP/pppThread.cpp (revision 5680) @@ -4,27 +4,24 @@ #include -#include "bncrtrover.h" +#include "pppThread.h" #include "bnccore.h" #include "bncsettings.h" #include "bnctime.h" -#include "rtrover_interface.h" - using namespace std; // Constructor //////////////////////////////////////////////////////////////////////////// -t_bncRtrover::t_bncRtrover() : QThread(0) { +t_pppThread::t_pppThread() : QThread(0) { } // Destructor //////////////////////////////////////////////////////////////////////////// -t_bncRtrover::~t_bncRtrover() { - rtrover_destroy(); +t_pppThread::~t_pppThread() { } // Run (virtual) //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::run() { +void t_pppThread::run() { bncSettings settings; @@ -112,5 +109,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::slotNewEphGPS(gpsephemeris gpseph) { +void t_pppThread::slotNewEphGPS(gpsephemeris gpseph) { QMutexLocker locker(&_mutex); @@ -153,5 +150,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::slotNewEphGlonass(glonassephemeris gloeph) { +void t_pppThread::slotNewEphGlonass(glonassephemeris gloeph) { QMutexLocker locker(&_mutex); @@ -192,5 +189,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::slotNewEphGalileo(galileoephemeris /* galeph */) { +void t_pppThread::slotNewEphGalileo(galileoephemeris /* galeph */) { // not yet implemented } @@ -198,5 +195,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::slotNewCorrections(QList corrList) { +void t_pppThread::slotNewCorrections(QList corrList) { QMutexLocker locker(&_mutex); @@ -397,5 +394,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::slotNewObs(QByteArray staID, QList obsList) { +void t_pppThread::slotNewObs(QByteArray staID, QList obsList) { QMutexLocker locker(&_mutex); @@ -459,5 +456,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_bncRtrover::processFrontEpoch() { +void t_pppThread::processFrontEpoch() { // Copy observations into rtrover_satObs structures Index: /trunk/BNC/src/PPP/pppThread.h =================================================================== --- /trunk/BNC/src/PPP/pppThread.h (revision 5679) +++ /trunk/BNC/src/PPP/pppThread.h (revision 5680) @@ -1,4 +1,4 @@ -#ifndef BNCRTROVER_H -#define BNCRTROVER_H +#ifndef PPPTHREAD_H +#define PPPTHREAD_H #include @@ -7,10 +7,10 @@ #include "bncephuser.h" -class t_bncRtrover : public QThread { +class t_pppThread : public QThread { Q_OBJECT public: - t_bncRtrover(); - ~t_bncRtrover(); + t_pppThread(); + ~t_pppThread(); virtual void run(); Index: /trunk/BNC/src/bnccaster.cpp =================================================================== --- /trunk/BNC/src/bnccaster.cpp (revision 5679) +++ /trunk/BNC/src/bnccaster.cpp (revision 5680) @@ -52,7 +52,4 @@ #include "bncsettings.h" #include "RTCM/GPSDecoder.h" -#ifdef RTROVER_INTERFACE -# include "RTRover/bncrtrover.h" -#endif using namespace std; @@ -120,13 +117,4 @@ _lastDumpSec = 0; _confInterval = -1; -#ifdef RTROVER_INTERFACE - if (!settings.value("rtroverMode").toString().isEmpty()) { - _bncRtrover = new t_bncRtrover(); - _bncRtrover->start(); - } - else { - _bncRtrover = 0; - } -#endif // Miscellaneous output port @@ -168,10 +156,4 @@ delete _nmeaSockets; delete _epochs; -#ifdef RTROVER_INTERFACE - if (_bncRtrover) { - _bncRtrover->quit(); - _bncRtrover->deleteLater(); - } -#endif delete _miscServer; delete _miscSockets; @@ -303,11 +285,4 @@ connect(getThread, SIGNAL(newRawData(QByteArray, QByteArray)), this, SLOT(slotNewRawData(QByteArray, QByteArray))); - -#ifdef RTROVER_INTERFACE - if (_bncRtrover) { - connect(getThread, SIGNAL(newObs(QByteArray, QList)), - _bncRtrover, SLOT(slotNewObs(QByteArray, QList))); - } -#endif connect(getThread, SIGNAL(getThreadFinished(QByteArray)), Index: /trunk/BNC/src/bnccaster.h =================================================================== --- /trunk/BNC/src/bnccaster.h (revision 5679) +++ /trunk/BNC/src/bnccaster.h (revision 5680) @@ -33,7 +33,4 @@ class bncGetThread; -#ifdef RTROVER_INTERFACE - class t_bncRtrover; -#endif class bncCaster : public QObject { @@ -91,7 +88,4 @@ QTcpServer* _miscServer; QList* _miscSockets; -#ifdef RTROVER_INTERFACE - t_bncRtrover* _bncRtrover; -#endif }; Index: /trunk/BNC/src/bncwindow.cpp =================================================================== --- /trunk/BNC/src/bncwindow.cpp (revision 5679) +++ /trunk/BNC/src/bncwindow.cpp (revision 5680) @@ -1285,107 +1285,4 @@ connect(_uploadEphHostLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(slotBncTextChanged())); - -#ifdef RTROVER_INTERFACE - QWidget* rtroverGroup = new QWidget(); - _aogroup->addTab(rtroverGroup,tr("RTRover")); - QGridLayout* rtroverLayout = new QGridLayout(); - - _rtroverModeComboBox = new QComboBox(); - - _rtroverModeComboBox->setEditable(false); - _rtroverModeComboBox->addItems(QString(",PPP_DF,SPP_DF,PPP_SF,SPP_SF,PPP_AR,RTK,PPP_FTTF").split(",")); - ik = _rtroverModeComboBox->findText(settings.value("rtroverMode").toString()); - if (ik != -1) { - _rtroverModeComboBox->setCurrentIndex(ik); - } - _rtroverModeComboBox->setMinimumWidth(10*ww); - - _rtroverRoverMountLineEdit = new QLineEdit(settings.value("rtroverRoverMount").toString()); - _rtroverRoverMountLineEdit->setMaximumWidth(8*ww); - _rtroverCorrMountLineEdit = new QLineEdit(settings.value("rtroverCorrMount").toString()); - _rtroverCorrMountLineEdit->setMaximumWidth(8*ww); - _rtroverBaseMountLineEdit = new QLineEdit(settings.value("rtroverBaseMount").toString()); - _rtroverBaseMountLineEdit->setMaximumWidth(8*ww); - _rtroverRoverRefCrdXLineEdit = new QLineEdit(settings.value("rtroverRoverRefCrdX").toString()); - _rtroverRoverRefCrdYLineEdit = new QLineEdit(settings.value("rtroverRoverRefCrdY").toString()); - _rtroverRoverRefCrdZLineEdit = new QLineEdit(settings.value("rtroverRoverRefCrdZ").toString()); - _rtroverBaseRefCrdXLineEdit = new QLineEdit(settings.value("rtroverBaseRefCrdX").toString()); - _rtroverBaseRefCrdYLineEdit = new QLineEdit(settings.value("rtroverBaseRefCrdY").toString()); - _rtroverBaseCrdZLineEdit = new QLineEdit(settings.value("rtroverBaseRefCrdZ").toString()); - _rtroverRoverDNLineEdit = new QLineEdit(settings.value("rtroverRoverDN").toString()); - _rtroverRoverDNLineEdit->setMaximumWidth(6*ww); - _rtroverRoverDELineEdit = new QLineEdit(settings.value("rtroverRoverDE").toString()); - _rtroverRoverDELineEdit->setMaximumWidth(6*ww); - _rtroverRoverDULineEdit = new QLineEdit(settings.value("rtroverRoverDU").toString()); - _rtroverRoverDULineEdit->setMaximumWidth(6*ww); - _rtroverBaseDNLineEdit = new QLineEdit(settings.value("rtroverBaseDN").toString()); - _rtroverBaseDNLineEdit->setMaximumWidth(6*ww); - _rtroverBaseDELineEdit = new QLineEdit(settings.value("rtroverBaseDE").toString()); - _rtroverBaseDELineEdit->setMaximumWidth(6*ww); - _rtroverBaseDULineEdit = new QLineEdit(settings.value("rtroverBaseDU").toString()); - _rtroverBaseDULineEdit->setMaximumWidth(6*ww); - _rtroverRoverAntennaLineEdit = new QLineEdit(settings.value("rtroverRoverAntenna").toString()); - _rtroverBaseAntennaLineEdit = new QLineEdit(settings.value("rtroverBaseAntenna").toString()); - _rtroverAntexFileChooser = new qtFileChooser; - _rtroverAntexFileChooser->setMinimumWidth(12*ww); - _rtroverAntexFileChooser->setFileName(settings.value("rtroverAntex").toString()); - _rtroverOutputLineEdit = new QLineEdit(settings.value("rtroverOutput").toString()); - _rtroverOutputLineEdit->setMinimumWidth(15*ww); - - ir = 0; - rtroverLayout->addWidget(new QLabel("Real-Time Rover"), ir, 0, 1, 2, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(new QLabel("Mode & mountpoints"),ir, 0, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverModeComboBox, ir, 1, Qt::AlignRight); - rtroverLayout->addWidget(_rtroverRoverMountLineEdit, ir, 3, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Rover"), ir, 4, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverCorrMountLineEdit, ir, 5, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Corr."), ir, 6, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseMountLineEdit, ir, 7, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Base"), ir, 8, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(new QLabel("Rover coordinates"), ir, 0, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverRoverRefCrdXLineEdit, ir, 1, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("X "), ir, 2, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverRoverRefCrdYLineEdit, ir, 3, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Y"), ir, 4, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverRoverRefCrdZLineEdit, ir, 5, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Z"), ir, 6, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(_rtroverRoverDNLineEdit, ir, 1, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("dN"), ir, 2, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverRoverDELineEdit, ir, 3, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("dE"), ir, 4, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverRoverDULineEdit, ir, 5, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("dU"), ir, 6, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(new QLabel("Base coordinates"), ir, 0, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseRefCrdXLineEdit, ir, 1, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("X "), ir, 2, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseRefCrdYLineEdit, ir, 3, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Y"), ir, 4, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseCrdZLineEdit, ir, 5, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Z"), ir, 6, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(_rtroverBaseDNLineEdit, ir, 1, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("dN"), ir, 2, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseDELineEdit, ir, 3, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("dE"), ir, 4, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseDULineEdit, ir, 5, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("dU"), ir, 6, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(new QLabel("ANTEX"), ir, 0, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverAntexFileChooser, ir, 1, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("file"), ir, 2, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverBaseAntennaLineEdit, ir, 3, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Ant. Rover"), ir, 4, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverRoverAntennaLineEdit, ir, 5, Qt::AlignRight); - rtroverLayout->addWidget(new QLabel("Ant. Base"), ir, 6, Qt::AlignLeft); - ++ir; - rtroverLayout->addWidget(new QLabel("Output"), ir, 0, Qt::AlignLeft); - rtroverLayout->addWidget(_rtroverOutputLineEdit, ir, 1, Qt::AlignRight); - - rtroverGroup->setLayout(rtroverLayout); -#endif // Main Layout @@ -1996,27 +1893,4 @@ settings.setValue("uploadEphSample", _uploadEphSampleSpinBox->value()); -#ifdef RTROVER_INTERFACE - settings.setValue("rtroverMode", _rtroverModeComboBox->currentText()); - settings.setValue("rtroverRoverMount", _rtroverRoverMountLineEdit->text()); - settings.setValue("rtroverCorrMount", _rtroverCorrMountLineEdit->text()); - settings.setValue("rtroverBaseMount", _rtroverBaseMountLineEdit->text()); - settings.setValue("rtroverRoverRefCrdX", _rtroverRoverRefCrdXLineEdit->text()); - settings.setValue("rtroverRoverRefCrdY", _rtroverRoverRefCrdYLineEdit->text()); - settings.setValue("rtroverRoverRefCrdZ", _rtroverRoverRefCrdZLineEdit->text()); - settings.setValue("rtroverBaseRefCrdX", _rtroverBaseRefCrdXLineEdit->text()); - settings.setValue("rtroverBaseRefCrdY", _rtroverBaseRefCrdYLineEdit->text()); - settings.setValue("rtroverBaseRefCrdZ", _rtroverBaseCrdZLineEdit->text()); - settings.setValue("rtroverRoverDN", _rtroverRoverDNLineEdit->text()); - settings.setValue("rtroverRoverDE", _rtroverRoverDELineEdit->text()); - settings.setValue("rtroverRoverDU", _rtroverRoverDULineEdit->text()); - settings.setValue("rtroverBaseDN", _rtroverBaseDNLineEdit->text()); - settings.setValue("rtroverBaseDE", _rtroverBaseDELineEdit->text()); - settings.setValue("rtroverBaseDU", _rtroverBaseDULineEdit->text()); - settings.setValue("rtroverRoverAntenna", _rtroverRoverAntennaLineEdit->text()); - settings.setValue("rtroverBaseAntenna", _rtroverBaseAntennaLineEdit->text()); - settings.setValue("rtroverAntex", _rtroverAntexFileChooser->fileName()); - settings.setValue("rtroverOutput", _rtroverOutputLineEdit->text()); -#endif - if (_caster) { _caster->readMountPoints(); Index: /trunk/BNC/src/bncwindow.h =================================================================== --- /trunk/BNC/src/bncwindow.h (revision 5679) +++ /trunk/BNC/src/bncwindow.h (revision 5680) @@ -273,26 +273,4 @@ QList _threads; -#ifdef RTROVER_INTERFACE - QComboBox* _rtroverModeComboBox; - QLineEdit* _rtroverRoverMountLineEdit; - QLineEdit* _rtroverCorrMountLineEdit; - QLineEdit* _rtroverBaseMountLineEdit; - QLineEdit* _rtroverRoverRefCrdXLineEdit; - QLineEdit* _rtroverRoverRefCrdYLineEdit; - QLineEdit* _rtroverRoverRefCrdZLineEdit; - QLineEdit* _rtroverBaseRefCrdXLineEdit; - QLineEdit* _rtroverBaseRefCrdYLineEdit; - QLineEdit* _rtroverBaseCrdZLineEdit; - QLineEdit* _rtroverRoverDNLineEdit; - QLineEdit* _rtroverRoverDELineEdit; - QLineEdit* _rtroverRoverDULineEdit; - QLineEdit* _rtroverBaseDNLineEdit; - QLineEdit* _rtroverBaseDELineEdit; - QLineEdit* _rtroverBaseDULineEdit; - QLineEdit* _rtroverRoverAntennaLineEdit; - QLineEdit* _rtroverBaseAntennaLineEdit; - qtFileChooser* _rtroverAntexFileChooser; - QLineEdit* _rtroverOutputLineEdit; -#endif };