Changeset 8620 in ntrip for branches/BNC_2.12
- Timestamp:
- Feb 28, 2019, 3:17:07 PM (6 years ago)
- Location:
- branches/BNC_2.12/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/BNC_2.12/src/bnccaster.cpp
r8616 r8620 95 95 _uSockets = 0; 96 96 } 97 98 _ printLockTime = settings.value("printLockTime",false).toBool();97 98 _outLockTime = settings.value("outLockTime",false).toBool(); 99 99 _samplingRateMult10 = int(settings.value("outSampl").toString().split("sec").first().toDouble() * 10.0); 100 100 _outWait = settings.value("outWait").toDouble(); … … 173 173 << setw(4) << obs._time.gpsw() << " " 174 174 << setw(14) << setprecision(7) << obs._time.gpssec() << " " 175 << bncRinex::asciiSatLine(obs,_ printLockTime) << endl;175 << bncRinex::asciiSatLine(obs,_outLockTime) << endl; 176 176 177 177 string hlpStr = oStr.str(); … … 319 319 } 320 320 oStr << obs._staID << ' ' 321 << bncRinex::asciiSatLine(obs,_ printLockTime) << endl;321 << bncRinex::asciiSatLine(obs,_outLockTime) << endl; 322 322 if (!it.hasNext()) { 323 323 oStr << endl; … … 458 458 return; 459 459 } 460 460 461 461 int ms = 0; 462 462 -
branches/BNC_2.12/src/bnccaster.h
r8616 r8620 50 50 signals: 51 51 void mountPointsRead(QList<bncGetThread*>); 52 void getThreadsFinished(); 52 void getThreadsFinished(); 53 53 void newMessage(QByteArray msg, bool showOnScreen); 54 54 void newObs(QByteArray staID, QList<t_satObs> obsList); … … 75 75 QList<QByteArray> _staIDs; 76 76 QList<bncGetThread*> _threads; 77 bool _ printLockTime;77 bool _outLockTime; 78 78 int _samplingRateMult10; 79 79 double _outWait; -
branches/BNC_2.12/src/bncrinex.cpp
r8616 r8620 601 601 // One Line in ASCII (Internal) Format 602 602 //////////////////////////////////////////////////////////////////////////// 603 string bncRinex::asciiSatLine(const t_satObs& obs, bool printLockTime) {603 string bncRinex::asciiSatLine(const t_satObs& obs, bool outLockTime) { 604 604 605 605 ostringstream str; … … 631 631 << right << setw(8) << setprecision(3) << frqObs->_snr; 632 632 } 633 if (frqObs->_lockTimeValid && printLockTime) {633 if (frqObs->_lockTimeValid && outLockTime) { 634 634 str << ' ' 635 635 << left << setw(3) << "T" + frqObs->_rnxType2ch << ' ' 636 636 << right << setw(9) << setprecision(3) << frqObs->_lockTime; 637 } 637 } 638 638 } 639 639 -
branches/BNC_2.12/src/bncrinex.h
r8616 r8620 35 35 class bncRinex { 36 36 public: 37 bncRinex(const QByteArray& statID, const QUrl& mountPoint, 37 bncRinex(const QByteArray& statID, const QUrl& mountPoint, 38 38 const QByteArray& latitude, const QByteArray& longitude, 39 const QByteArray& nmea, const QByteArray& ntripVersion); 39 const QByteArray& nmea, const QByteArray& ntripVersion); 40 40 ~bncRinex(); 41 41 … … 46 46 47 47 static QString nextEpochStr(const QDateTime& datTim, 48 const QString& intStr, 48 const QString& intStr, 49 49 bool rnxV3, 50 50 QDateTime* nextEpoch = 0); 51 static std::string asciiSatLine(const t_satObs& obs, bool printLockTime);51 static std::string asciiSatLine(const t_satObs& obs, bool outLockTime); 52 52 53 53 private: -
branches/BNC_2.12/src/bncsettings.cpp
r8616 r8620 146 146 setValue_p("outFile", ""); 147 147 setValue_p("outUPort", ""); 148 setValue_p(" printLockTime", "0");148 setValue_p("outLockTime", "0"); 149 149 // Serial Output 150 150 setValue_p("serialMountPoint", ""); -
branches/BNC_2.12/src/bncwindow.cpp
r8616 r8620 286 286 _outFileLineEdit = new QLineEdit(settings.value("outFile").toString()); 287 287 _outUPortLineEdit = new QLineEdit(settings.value("outUPort").toString()); 288 _ printLockTimeCheckBox = new QCheckBox();289 _ printLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("printLockTime").toInt()));288 _outLockTimeCheckBox = new QCheckBox(); 289 _outLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("outLockTime").toInt())); 290 290 291 291 connect(_outPortLineEdit, SIGNAL(textChanged(const QString &)), … … 295 295 this, SLOT(slotBncTextChanged())); 296 296 297 connect(_ printLockTimeCheckBox, SIGNAL(stateChanged(int)),297 connect(_outLockTimeCheckBox, SIGNAL(stateChanged(int)), 298 298 this, SLOT(slotBncTextChanged())); 299 299 … … 764 764 sLayout->addWidget(_outUPortLineEdit, 4, 1); 765 765 sLayout->addWidget(new QLabel("Print lock time"), 5, 0); 766 sLayout->addWidget(_ printLockTimeCheckBox, 5, 1);766 sLayout->addWidget(_outLockTimeCheckBox, 5, 1); 767 767 sLayout->addWidget(new QLabel(""), 6, 1); 768 768 sLayout->setRowStretch(7, 999); … … 1290 1290 _outFileLineEdit->setWhatsThis(tr("<p>Specify the full path to a file where synchronized observations are saved in plain ASCII format.</p><p>Beware that the size of this file can rapidly increase depending on the number of incoming streams.</p>")); 1291 1291 _outUPortLineEdit->setWhatsThis(tr("<p>BNC can produce unsynchronized observations in a plain ASCII format on your local host via IP port.</p><p>Specify a port number to activate this function.</p>")); 1292 _ printLockTimeCheckBox->setWhatsThis(tr("<p>Print the lock time in seconds in the feed engine output.</p>"));1292 _outLockTimeCheckBox->setWhatsThis(tr("<p>Print the lock time in seconds in the feed engine output.</p>")); 1293 1293 1294 1294 // WhatsThis, Serial Output … … 1466 1466 delete _outFileLineEdit; 1467 1467 delete _outUPortLineEdit; 1468 delete _ printLockTimeCheckBox;1468 delete _outLockTimeCheckBox; 1469 1469 delete _serialMountPointLineEdit; 1470 1470 delete _serialPortNameLineEdit; … … 1884 1884 settings.setValue("outFile", _outFileLineEdit->text()); 1885 1885 settings.setValue("outUPort", _outUPortLineEdit->text()); 1886 settings.setValue(" printLockTime",_printLockTimeCheckBox->checkState());1886 settings.setValue("outLockTime",_outLockTimeCheckBox->checkState()); 1887 1887 // Serial Output 1888 1888 settings.setValue("serialMountPoint",_serialMountPointLineEdit->text()); -
branches/BNC_2.12/src/bncwindow.h
r8616 r8620 65 65 void AddToolbar(); 66 66 67 public slots: 67 public slots: 68 68 void slotMountPointsRead(QList<bncGetThread*>); 69 69 void slotBncTextChanged(); … … 116 116 QAction* _actFontSel; 117 117 QAction* _actSaveOpt; 118 QAction* _actQuit; 118 QAction* _actQuit; 119 119 QAction* _actMapMountPoints; 120 120 QAction* _actStart; … … 132 132 QLineEdit* _outPortLineEdit; 133 133 QLineEdit* _outUPortLineEdit; 134 QCheckBox* _ printLockTimeCheckBox;134 QCheckBox* _outLockTimeCheckBox; 135 135 QLineEdit* _ephOutPortLineEdit; 136 136 QLineEdit* _corrPortLineEdit; … … 236 236 bool _runningSp3Comp; 237 237 238 bool running() {return _runningRealTime || _runningPPP || _runningEdit || 238 bool running() {return _runningRealTime || _runningPPP || _runningEdit || 239 239 _runningQC || _runningSp3Comp;} 240 240 … … 252 252 Q_INTERFACES(GnssCenter::t_pluginFactoryInterface) 253 253 public: 254 virtual QWidget* create() {return new bncWindow();} 254 virtual QWidget* create() {return new bncWindow();} 255 255 virtual QString getName() const {return QString("BNC");} 256 256 };
Note:
See TracChangeset
for help on using the changeset viewer.