Changeset 8621 in ntrip for trunk


Ignore:
Timestamp:
Feb 28, 2019, 3:17:33 PM (3 months ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccaster.cpp

    r8617 r8621  
    9696  }
    9797
    98   _printLockTime = settings.value("printLockTime",false).toBool();
     98  _outLockTime = settings.value("outLockTime",false).toBool();
    9999  _samplingRateMult10 = int(settings.value("outSampl").toString().split("sec").first().toDouble() * 10.0);
    100100  _outWait            = settings.value("outWait").toDouble();
     
    173173           << setw(4)  << obs._time.gpsw()                      << " "
    174174           << setw(14) << setprecision(7) << obs._time.gpssec() << " "
    175            << bncRinex::asciiSatLine(obs,_printLockTime) << endl;
     175           << bncRinex::asciiSatLine(obs,_outLockTime) << endl;
    176176
    177177      string hlpStr = oStr.str();
     
    319319          }
    320320          oStr << obs._staID << ' '
    321                << bncRinex::asciiSatLine(obs,_printLockTime) << endl;
     321               << bncRinex::asciiSatLine(obs,_outLockTime) << endl;
    322322          if (!it.hasNext()) {
    323323            oStr << endl;
  • trunk/BNC/src/bnccaster.h

    r8617 r8621  
    7777   QList<QByteArray>               _staIDs;
    7878   QList<bncGetThread*>            _threads;
    79    bool                            _printLockTime;   
     79   bool                            _outLockTime;
    8080   int                             _samplingRateMult10;
    8181   double                          _outWait;
  • trunk/BNC/src/bncrinex.cpp

    r8617 r8621  
    601601// One Line in ASCII (Internal) Format
    602602////////////////////////////////////////////////////////////////////////////
    603 string bncRinex::asciiSatLine(const t_satObs& obs, bool printLockTime) {
     603string bncRinex::asciiSatLine(const t_satObs& obs, bool outLockTime) {
    604604
    605605  ostringstream str;
     
    630630          << left  << setw(3) << "S" + frqObs->_rnxType2ch << ' '
    631631          << right << setw(8) << setprecision(3) << frqObs->_snr;
    632     }   
    633     if (frqObs->_lockTimeValid && printLockTime) {
     632    }
     633    if (frqObs->_lockTimeValid && outLockTime) {
    634634      str << ' '
    635635          << left  << setw(3) << "T" + frqObs->_rnxType2ch << ' '
  • trunk/BNC/src/bncrinex.h

    r8617 r8621  
    4949                               bool rnxV3,
    5050                               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);
    5252
    5353 private:
  • trunk/BNC/src/bncsettings.cpp

    r8617 r8621  
    145145    setValue_p("outFile",             "");
    146146    setValue_p("outUPort",            "");
    147     setValue_p("printLockTime",       "0");   
     147    setValue_p("outLockTime",       "0");
    148148    // Serial Output
    149149    setValue_p("serialMountPoint",    "");
  • trunk/BNC/src/bncwindow.cpp

    r8617 r8621  
    307307  _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
    308308  _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()));
    311311
    312312  connect(_outPortLineEdit, SIGNAL(textChanged(const QString &)),
     
    315315  connect(_outFileLineEdit, SIGNAL(textChanged(const QString &)),
    316316          this, SLOT(slotBncTextChanged()));
    317          
    318   connect(_printLockTimeCheckBox, SIGNAL(stateChanged(int)),
     317
     318  connect(_outLockTimeCheckBox, SIGNAL(stateChanged(int)),
    319319          this, SLOT(slotBncTextChanged()));
    320320
     
    830830  sLayout->addWidget(_outUPortLineEdit,                             4, 1);
    831831  sLayout->addWidget(new QLabel("Print lock time"),                 5, 0);
    832   sLayout->addWidget(_printLockTimeCheckBox,                        5, 1);
     832  sLayout->addWidget(_outLockTimeCheckBox,                        5, 1);
    833833  sLayout->addWidget(new QLabel(""),                                6, 1);
    834834  sLayout->setRowStretch(7, 999);
     
    13491349  _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>"));
    13501350  _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>"));
    13521352
    13531353  // WhatsThis, Serial Output
     
    15221522  delete _outFileLineEdit;
    15231523  delete _outUPortLineEdit;
    1524   delete _printLockTimeCheckBox; 
     1524  delete _outLockTimeCheckBox;
    15251525  delete _serialMountPointLineEdit;
    15261526  delete _serialPortNameLineEdit;
     
    19751975  settings.setValue("outSampl",    _outSamplComboBox->currentText());
    19761976  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());
    19781978
    19791979// Serial Output
  • trunk/BNC/src/bncwindow.h

    r8617 r8621  
    138138    QLineEdit* _outPortLineEdit;
    139139    QLineEdit* _outUPortLineEdit;
    140     QCheckBox* _printLockTimeCheckBox;       
     140    QCheckBox* _outLockTimeCheckBox;
    141141    QLineEdit* _ephOutPortLineEdit;
    142142    QLineEdit* _corrPortLineEdit;
Note: See TracChangeset for help on using the changeset viewer.