Changeset 8621 in ntrip
- Timestamp:
- Feb 28, 2019, 3:17:33 PM (6 years ago)
- Location:
- trunk/BNC/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bnccaster.cpp
r8617 r8621 96 96 } 97 97 98 _ printLockTime = settings.value("printLockTime",false).toBool();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; -
trunk/BNC/src/bnccaster.h
r8617 r8621 77 77 QList<QByteArray> _staIDs; 78 78 QList<bncGetThread*> _threads; 79 bool _ printLockTime;79 bool _outLockTime; 80 80 int _samplingRateMult10; 81 81 double _outWait; -
trunk/BNC/src/bncrinex.cpp
r8617 r8621 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; … … 630 630 << left << setw(3) << "S" + frqObs->_rnxType2ch << ' ' 631 631 << right << setw(8) << setprecision(3) << frqObs->_snr; 632 } 633 if (frqObs->_lockTimeValid && printLockTime) {632 } 633 if (frqObs->_lockTimeValid && outLockTime) { 634 634 str << ' ' 635 635 << left << setw(3) << "T" + frqObs->_rnxType2ch << ' ' -
trunk/BNC/src/bncrinex.h
r8617 r8621 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: -
trunk/BNC/src/bncsettings.cpp
r8617 r8621 145 145 setValue_p("outFile", ""); 146 146 setValue_p("outUPort", ""); 147 setValue_p(" printLockTime", "0");147 setValue_p("outLockTime", "0"); 148 148 // Serial Output 149 149 setValue_p("serialMountPoint", ""); -
trunk/BNC/src/bncwindow.cpp
r8617 r8621 307 307 _outFileLineEdit = new QLineEdit(settings.value("outFile").toString()); 308 308 _outUPortLineEdit = new QLineEdit(settings.value("outUPort").toString()); 309 _ printLockTimeCheckBox = new QCheckBox();310 _ printLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("printLockTime").toInt()));309 _outLockTimeCheckBox = new QCheckBox(); 310 _outLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("outLockTime").toInt())); 311 311 312 312 connect(_outPortLineEdit, SIGNAL(textChanged(const QString &)), … … 315 315 connect(_outFileLineEdit, SIGNAL(textChanged(const QString &)), 316 316 this, SLOT(slotBncTextChanged())); 317 318 connect(_ printLockTimeCheckBox, SIGNAL(stateChanged(int)),317 318 connect(_outLockTimeCheckBox, SIGNAL(stateChanged(int)), 319 319 this, SLOT(slotBncTextChanged())); 320 320 … … 830 830 sLayout->addWidget(_outUPortLineEdit, 4, 1); 831 831 sLayout->addWidget(new QLabel("Print lock time"), 5, 0); 832 sLayout->addWidget(_ printLockTimeCheckBox, 5, 1);832 sLayout->addWidget(_outLockTimeCheckBox, 5, 1); 833 833 sLayout->addWidget(new QLabel(""), 6, 1); 834 834 sLayout->setRowStretch(7, 999); … … 1349 1349 _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. <i>[key: outFile]</i></p>")); 1350 1350 _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. <i>[key: outUPort]</i></p>")); 1351 _ printLockTimeCheckBox->setWhatsThis(tr("<p>Print the lock time in seconds in the feed engine output.</p>"));1351 _outLockTimeCheckBox->setWhatsThis(tr("<p>Print the lock time in seconds in the feed engine output.<i>[key: outLockTime]</i></p>")); 1352 1352 1353 1353 // WhatsThis, Serial Output … … 1522 1522 delete _outFileLineEdit; 1523 1523 delete _outUPortLineEdit; 1524 delete _ printLockTimeCheckBox;1524 delete _outLockTimeCheckBox; 1525 1525 delete _serialMountPointLineEdit; 1526 1526 delete _serialPortNameLineEdit; … … 1975 1975 settings.setValue("outSampl", _outSamplComboBox->currentText()); 1976 1976 settings.setValue("outFile", _outFileLineEdit->text()); 1977 settings.setValue(" printLockTime",_printLockTimeCheckBox->checkState()); settings.setValue("outUPort", _outUPortLineEdit->text());1977 settings.setValue("outLockTime",_outLockTimeCheckBox->checkState()); settings.setValue("outUPort", _outUPortLineEdit->text()); 1978 1978 1979 1979 // Serial Output -
trunk/BNC/src/bncwindow.h
r8617 r8621 138 138 QLineEdit* _outPortLineEdit; 139 139 QLineEdit* _outUPortLineEdit; 140 QCheckBox* _ printLockTimeCheckBox;140 QCheckBox* _outLockTimeCheckBox; 141 141 QLineEdit* _ephOutPortLineEdit; 142 142 QLineEdit* _corrPortLineEdit;
Note:
See TracChangeset
for help on using the changeset viewer.