Changeset 5680 in ntrip for trunk


Ignore:
Timestamp:
Jul 26, 2014, 5:05:09 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/PPP/pppThread.cpp

    r5677 r5680  
    44#include <string.h>
    55
    6 #include "bncrtrover.h"
     6#include "pppThread.h"
    77#include "bnccore.h"
    88#include "bncsettings.h"
    99#include "bnctime.h"
    1010
    11 #include "rtrover_interface.h"
    12 
    1311using namespace std;
    1412
    1513// Constructor
    1614////////////////////////////////////////////////////////////////////////////
    17 t_bncRtrover::t_bncRtrover() : QThread(0) {
     15t_pppThread::t_pppThread() : QThread(0) {
    1816}
    1917
    2018// Destructor
    2119////////////////////////////////////////////////////////////////////////////
    22 t_bncRtrover::~t_bncRtrover() {
    23   rtrover_destroy();
     20t_pppThread::~t_pppThread() {
    2421}
    2522
    2623// Run (virtual)
    2724////////////////////////////////////////////////////////////////////////////
    28 void t_bncRtrover::run() {
     25void t_pppThread::run() {
    2926  bncSettings settings;
    3027
    … …  
    112109//
    113110////////////////////////////////////////////////////////////////////////////
    114 void t_bncRtrover::slotNewEphGPS(gpsephemeris gpseph) {
     111void t_pppThread::slotNewEphGPS(gpsephemeris gpseph) {
    115112  QMutexLocker locker(&_mutex);
    116113
    … …  
    153150//
    154151////////////////////////////////////////////////////////////////////////////
    155 void t_bncRtrover::slotNewEphGlonass(glonassephemeris gloeph) {
     152void t_pppThread::slotNewEphGlonass(glonassephemeris gloeph) {
    156153  QMutexLocker locker(&_mutex);
    157154
    … …  
    192189//
    193190////////////////////////////////////////////////////////////////////////////
    194 void t_bncRtrover::slotNewEphGalileo(galileoephemeris /* galeph */) {
     191void t_pppThread::slotNewEphGalileo(galileoephemeris /* galeph */) {
    195192  // not yet implemented
    196193}
    … …  
    198195//
    199196////////////////////////////////////////////////////////////////////////////
    200 void t_bncRtrover::slotNewCorrections(QList<QString> corrList) {
     197void t_pppThread::slotNewCorrections(QList<QString> corrList) {
    201198  QMutexLocker locker(&_mutex);
    202199
    … …  
    397394//
    398395////////////////////////////////////////////////////////////////////////////
    399 void t_bncRtrover::slotNewObs(QByteArray staID, QList<t_obs> obsList) {
     396void t_pppThread::slotNewObs(QByteArray staID, QList<t_obs> obsList) {
    400397  QMutexLocker locker(&_mutex);
    401398
    … …  
    459456//
    460457////////////////////////////////////////////////////////////////////////////
    461 void t_bncRtrover::processFrontEpoch() {
     458void t_pppThread::processFrontEpoch() {
    462459
    463460  // Copy observations into rtrover_satObs structures

  • trunk/BNC/src/PPP/pppThread.h

    r5677 r5680  
    1 #ifndef BNCRTROVER_H
    2 #define BNCRTROVER_H
     1#ifndef PPPTHREAD_H
     2#define PPPTHREAD_H
    33
    44#include <vector>
    … …  
    77#include "bncephuser.h"
    88
    9 class t_bncRtrover : public QThread {
     9class t_pppThread : public QThread {
    1010 Q_OBJECT
    1111
    1212 public:
    13   t_bncRtrover();
    14   ~t_bncRtrover();
     13  t_pppThread();
     14  ~t_pppThread();
    1515  virtual void run();
    1616

  • trunk/BNC/src/bnccaster.cpp

    r5649 r5680  
    5252#include "bncsettings.h"
    5353#include "RTCM/GPSDecoder.h"
    54 #ifdef RTROVER_INTERFACE
    55 #  include "RTRover/bncrtrover.h"
    56 #endif
    5754
    5855using namespace std;
    … …  
    120117  _lastDumpSec  = 0;
    121118  _confInterval = -1;
    122 #ifdef RTROVER_INTERFACE
    123   if (!settings.value("rtroverMode").toString().isEmpty()) {
    124     _bncRtrover = new t_bncRtrover();
    125     _bncRtrover->start();
    126   }
    127   else {
    128     _bncRtrover = 0;
    129   }
    130 #endif
    131119
    132120  // Miscellaneous output port
    … …  
    168156  delete _nmeaSockets;
    169157  delete _epochs;
    170 #ifdef RTROVER_INTERFACE
    171   if (_bncRtrover) {
    172     _bncRtrover->quit();
    173     _bncRtrover->deleteLater();
    174   }
    175 #endif
    176158  delete _miscServer;
    177159  delete _miscSockets;
    … …  
    303285  connect(getThread, SIGNAL(newRawData(QByteArray, QByteArray)),
    304286          this,      SLOT(slotNewRawData(QByteArray, QByteArray)));
    305 
    306 #ifdef RTROVER_INTERFACE
    307   if (_bncRtrover) {
    308     connect(getThread, SIGNAL(newObs(QByteArray, QList<t_obs>)),
    309             _bncRtrover, SLOT(slotNewObs(QByteArray, QList<t_obs>)));
    310   }
    311 #endif
    312287
    313288  connect(getThread, SIGNAL(getThreadFinished(QByteArray)),

  • trunk/BNC/src/bnccaster.h

    r5648 r5680  
    3333
    3434class bncGetThread;
    35 #ifdef RTROVER_INTERFACE
    36  class t_bncRtrover;
    37 #endif
    3835
    3936class bncCaster : public QObject {
    … …  
    9188   QTcpServer*              _miscServer;
    9289   QList<QTcpSocket*>*      _miscSockets;
    93 #ifdef RTROVER_INTERFACE
    94    t_bncRtrover*            _bncRtrover;
    95 #endif
    9690};
    9791

  • trunk/BNC/src/bncwindow.cpp

    r5653 r5680  
    12851285  connect(_uploadEphHostLineEdit, SIGNAL(textChanged(const QString &)),
    12861286          this, SLOT(slotBncTextChanged()));
    1287 
    1288 #ifdef RTROVER_INTERFACE
    1289   QWidget* rtroverGroup = new QWidget();
    1290   _aogroup->addTab(rtroverGroup,tr("RTRover"));
    1291   QGridLayout* rtroverLayout = new QGridLayout();
    1292 
    1293   _rtroverModeComboBox = new QComboBox();
    1294 
    1295   _rtroverModeComboBox->setEditable(false);
    1296   _rtroverModeComboBox->addItems(QString(",PPP_DF,SPP_DF,PPP_SF,SPP_SF,PPP_AR,RTK,PPP_FTTF").split(","));
    1297   ik = _rtroverModeComboBox->findText(settings.value("rtroverMode").toString());
    1298   if (ik != -1) {
    1299     _rtroverModeComboBox->setCurrentIndex(ik);
    1300   }
    1301   _rtroverModeComboBox->setMinimumWidth(10*ww);
    1302 
    1303   _rtroverRoverMountLineEdit   = new QLineEdit(settings.value("rtroverRoverMount").toString());
    1304   _rtroverRoverMountLineEdit->setMaximumWidth(8*ww);
    1305   _rtroverCorrMountLineEdit    = new QLineEdit(settings.value("rtroverCorrMount").toString());
    1306   _rtroverCorrMountLineEdit->setMaximumWidth(8*ww);
    1307   _rtroverBaseMountLineEdit    = new QLineEdit(settings.value("rtroverBaseMount").toString());
    1308   _rtroverBaseMountLineEdit->setMaximumWidth(8*ww);
    1309   _rtroverRoverRefCrdXLineEdit = new QLineEdit(settings.value("rtroverRoverRefCrdX").toString());
    1310   _rtroverRoverRefCrdYLineEdit = new QLineEdit(settings.value("rtroverRoverRefCrdY").toString());
    1311   _rtroverRoverRefCrdZLineEdit = new QLineEdit(settings.value("rtroverRoverRefCrdZ").toString());
    1312   _rtroverBaseRefCrdXLineEdit  = new QLineEdit(settings.value("rtroverBaseRefCrdX").toString());
    1313   _rtroverBaseRefCrdYLineEdit  = new QLineEdit(settings.value("rtroverBaseRefCrdY").toString());
    1314   _rtroverBaseCrdZLineEdit     = new QLineEdit(settings.value("rtroverBaseRefCrdZ").toString());
    1315   _rtroverRoverDNLineEdit      = new QLineEdit(settings.value("rtroverRoverDN").toString());
    1316   _rtroverRoverDNLineEdit->setMaximumWidth(6*ww);
    1317   _rtroverRoverDELineEdit      = new QLineEdit(settings.value("rtroverRoverDE").toString());
    1318   _rtroverRoverDELineEdit->setMaximumWidth(6*ww);
    1319   _rtroverRoverDULineEdit      = new QLineEdit(settings.value("rtroverRoverDU").toString());
    1320   _rtroverRoverDULineEdit->setMaximumWidth(6*ww);
    1321   _rtroverBaseDNLineEdit       = new QLineEdit(settings.value("rtroverBaseDN").toString());
    1322   _rtroverBaseDNLineEdit->setMaximumWidth(6*ww);
    1323   _rtroverBaseDELineEdit       = new QLineEdit(settings.value("rtroverBaseDE").toString());
    1324   _rtroverBaseDELineEdit->setMaximumWidth(6*ww);
    1325   _rtroverBaseDULineEdit       = new QLineEdit(settings.value("rtroverBaseDU").toString());
    1326   _rtroverBaseDULineEdit->setMaximumWidth(6*ww);
    1327   _rtroverRoverAntennaLineEdit = new QLineEdit(settings.value("rtroverRoverAntenna").toString());
    1328   _rtroverBaseAntennaLineEdit  = new QLineEdit(settings.value("rtroverBaseAntenna").toString());
    1329   _rtroverAntexFileChooser     = new qtFileChooser;
    1330   _rtroverAntexFileChooser->setMinimumWidth(12*ww);
    1331   _rtroverAntexFileChooser->setFileName(settings.value("rtroverAntex").toString());
    1332   _rtroverOutputLineEdit       = new QLineEdit(settings.value("rtroverOutput").toString()); 
    1333   _rtroverOutputLineEdit->setMinimumWidth(15*ww);
    1334 
    1335   ir = 0;
    1336   rtroverLayout->addWidget(new QLabel("Real-Time Rover"), ir, 0, 1, 2, Qt::AlignLeft);
    1337   ++ir;
    1338   rtroverLayout->addWidget(new QLabel("Mode & mountpoints"),ir, 0, Qt::AlignLeft);
    1339   rtroverLayout->addWidget(_rtroverModeComboBox,            ir, 1, Qt::AlignRight);
    1340   rtroverLayout->addWidget(_rtroverRoverMountLineEdit,      ir, 3, Qt::AlignRight);
    1341   rtroverLayout->addWidget(new QLabel("Rover"),             ir, 4, Qt::AlignLeft);
    1342   rtroverLayout->addWidget(_rtroverCorrMountLineEdit,       ir, 5, Qt::AlignRight);
    1343   rtroverLayout->addWidget(new QLabel("Corr."),             ir, 6, Qt::AlignLeft);
    1344   rtroverLayout->addWidget(_rtroverBaseMountLineEdit,       ir, 7, Qt::AlignRight);
    1345   rtroverLayout->addWidget(new QLabel("Base"),              ir, 8, Qt::AlignLeft);
    1346   ++ir;
    1347   rtroverLayout->addWidget(new QLabel("Rover coordinates"), ir, 0, Qt::AlignLeft);
    1348   rtroverLayout->addWidget(_rtroverRoverRefCrdXLineEdit,    ir, 1, Qt::AlignRight);
    1349   rtroverLayout->addWidget(new QLabel("X     "),            ir, 2, Qt::AlignLeft);
    1350   rtroverLayout->addWidget(_rtroverRoverRefCrdYLineEdit,    ir, 3, Qt::AlignRight);
    1351   rtroverLayout->addWidget(new QLabel("Y"),                 ir, 4, Qt::AlignLeft);
    1352   rtroverLayout->addWidget(_rtroverRoverRefCrdZLineEdit,    ir, 5, Qt::AlignRight);
    1353   rtroverLayout->addWidget(new QLabel("Z"),                 ir, 6, Qt::AlignLeft);
    1354   ++ir;
    1355   rtroverLayout->addWidget(_rtroverRoverDNLineEdit,         ir, 1, Qt::AlignRight);
    1356   rtroverLayout->addWidget(new QLabel("dN"),                ir, 2, Qt::AlignLeft);
    1357   rtroverLayout->addWidget(_rtroverRoverDELineEdit,         ir, 3, Qt::AlignRight);
    1358   rtroverLayout->addWidget(new QLabel("dE"),                ir, 4, Qt::AlignLeft);
    1359   rtroverLayout->addWidget(_rtroverRoverDULineEdit,         ir, 5, Qt::AlignRight);
    1360   rtroverLayout->addWidget(new QLabel("dU"),                ir, 6, Qt::AlignLeft);
    1361   ++ir;
    1362   rtroverLayout->addWidget(new QLabel("Base coordinates"),  ir, 0, Qt::AlignLeft);
    1363   rtroverLayout->addWidget(_rtroverBaseRefCrdXLineEdit,     ir, 1, Qt::AlignRight);
    1364   rtroverLayout->addWidget(new QLabel("X     "),            ir, 2, Qt::AlignLeft);
    1365   rtroverLayout->addWidget(_rtroverBaseRefCrdYLineEdit,     ir, 3, Qt::AlignRight);
    1366   rtroverLayout->addWidget(new QLabel("Y"),                 ir, 4, Qt::AlignLeft);
    1367   rtroverLayout->addWidget(_rtroverBaseCrdZLineEdit,        ir, 5, Qt::AlignRight);
    1368   rtroverLayout->addWidget(new QLabel("Z"),                 ir, 6, Qt::AlignLeft);
    1369   ++ir;
    1370   rtroverLayout->addWidget(_rtroverBaseDNLineEdit,          ir, 1, Qt::AlignRight);
    1371   rtroverLayout->addWidget(new QLabel("dN"),                ir, 2, Qt::AlignLeft);
    1372   rtroverLayout->addWidget(_rtroverBaseDELineEdit,          ir, 3, Qt::AlignRight);
    1373   rtroverLayout->addWidget(new QLabel("dE"),                ir, 4, Qt::AlignLeft);
    1374   rtroverLayout->addWidget(_rtroverBaseDULineEdit,          ir, 5, Qt::AlignRight);
    1375   rtroverLayout->addWidget(new QLabel("dU"),                ir, 6, Qt::AlignLeft);
    1376   ++ir;
    1377   rtroverLayout->addWidget(new QLabel("ANTEX"),             ir, 0, Qt::AlignLeft);
    1378   rtroverLayout->addWidget(_rtroverAntexFileChooser,        ir, 1, Qt::AlignRight);
    1379   rtroverLayout->addWidget(new QLabel("file"),              ir, 2, Qt::AlignLeft);
    1380   rtroverLayout->addWidget(_rtroverBaseAntennaLineEdit,     ir, 3, Qt::AlignRight);
    1381   rtroverLayout->addWidget(new QLabel("Ant. Rover"),        ir, 4, Qt::AlignLeft);
    1382   rtroverLayout->addWidget(_rtroverRoverAntennaLineEdit,    ir, 5, Qt::AlignRight);
    1383   rtroverLayout->addWidget(new QLabel("Ant. Base"),         ir, 6, Qt::AlignLeft);
    1384   ++ir;
    1385   rtroverLayout->addWidget(new QLabel("Output"),            ir, 0, Qt::AlignLeft);
    1386   rtroverLayout->addWidget(_rtroverOutputLineEdit,          ir, 1, Qt::AlignRight);
    1387 
    1388   rtroverGroup->setLayout(rtroverLayout);
    1389 #endif
    13901287
    13911288  // Main Layout
    … …  
    19961893  settings.setValue("uploadEphSample",    _uploadEphSampleSpinBox->value());
    19971894
    1998 #ifdef RTROVER_INTERFACE
    1999   settings.setValue("rtroverMode",         _rtroverModeComboBox->currentText());
    2000   settings.setValue("rtroverRoverMount",   _rtroverRoverMountLineEdit->text());
    2001   settings.setValue("rtroverCorrMount",    _rtroverCorrMountLineEdit->text());
    2002   settings.setValue("rtroverBaseMount",    _rtroverBaseMountLineEdit->text());
    2003   settings.setValue("rtroverRoverRefCrdX", _rtroverRoverRefCrdXLineEdit->text());
    2004   settings.setValue("rtroverRoverRefCrdY", _rtroverRoverRefCrdYLineEdit->text());
    2005   settings.setValue("rtroverRoverRefCrdZ", _rtroverRoverRefCrdZLineEdit->text());
    2006   settings.setValue("rtroverBaseRefCrdX",  _rtroverBaseRefCrdXLineEdit->text());
    2007   settings.setValue("rtroverBaseRefCrdY",  _rtroverBaseRefCrdYLineEdit->text());
    2008   settings.setValue("rtroverBaseRefCrdZ",  _rtroverBaseCrdZLineEdit->text());
    2009   settings.setValue("rtroverRoverDN",      _rtroverRoverDNLineEdit->text());
    2010   settings.setValue("rtroverRoverDE",      _rtroverRoverDELineEdit->text());
    2011   settings.setValue("rtroverRoverDU",      _rtroverRoverDULineEdit->text());
    2012   settings.setValue("rtroverBaseDN",       _rtroverBaseDNLineEdit->text());
    2013   settings.setValue("rtroverBaseDE",       _rtroverBaseDELineEdit->text());
    2014   settings.setValue("rtroverBaseDU",       _rtroverBaseDULineEdit->text());
    2015   settings.setValue("rtroverRoverAntenna", _rtroverRoverAntennaLineEdit->text());
    2016   settings.setValue("rtroverBaseAntenna",  _rtroverBaseAntennaLineEdit->text());
    2017   settings.setValue("rtroverAntex",        _rtroverAntexFileChooser->fileName());
    2018   settings.setValue("rtroverOutput",       _rtroverOutputLineEdit->text()); 
    2019 #endif
    2020 
    20211895  if (_caster) {
    20221896    _caster->readMountPoints();

  • trunk/BNC/src/bncwindow.h

    r5641 r5680  
    273273    QList<bncGetThread*> _threads;
    274274
    275 #ifdef RTROVER_INTERFACE
    276     QComboBox* _rtroverModeComboBox;
    277     QLineEdit* _rtroverRoverMountLineEdit;
    278     QLineEdit* _rtroverCorrMountLineEdit;
    279     QLineEdit* _rtroverBaseMountLineEdit;
    280     QLineEdit* _rtroverRoverRefCrdXLineEdit;
    281     QLineEdit* _rtroverRoverRefCrdYLineEdit;
    282     QLineEdit* _rtroverRoverRefCrdZLineEdit;
    283     QLineEdit* _rtroverBaseRefCrdXLineEdit;
    284     QLineEdit* _rtroverBaseRefCrdYLineEdit;
    285     QLineEdit* _rtroverBaseCrdZLineEdit;
    286     QLineEdit* _rtroverRoverDNLineEdit;
    287     QLineEdit* _rtroverRoverDELineEdit;
    288     QLineEdit* _rtroverRoverDULineEdit;
    289     QLineEdit* _rtroverBaseDNLineEdit;
    290     QLineEdit* _rtroverBaseDELineEdit;
    291     QLineEdit* _rtroverBaseDULineEdit;
    292     QLineEdit* _rtroverRoverAntennaLineEdit;
    293     QLineEdit* _rtroverBaseAntennaLineEdit;
    294     qtFileChooser* _rtroverAntexFileChooser;
    295     QLineEdit* _rtroverOutputLineEdit;
    296 #endif
    297275};
    298276
Note: See TracChangeset for help on using the changeset viewer.