Changeset 8621 in ntrip for trunk

Timestamp:

Feb 28, 2019, 3:17:33 PM (6 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bnccaster.cpp (modified) (3 diffs)
• bnccaster.h (modified) (1 diff)
• bncrinex.cpp (modified) (2 diffs)
• bncrinex.h (modified) (1 diff)
• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (6 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/src/bnccaster.cpp

@@ -96 +96 @@
   }
 
-  _printLockTime = settings.value("printLockTime",false).toBool();
+  _outLockTime = settings.value("outLockTime",false).toBool();
   _samplingRateMult10 = int(settings.value("outSampl").toString().split("sec").first().toDouble() * 10.0);
   _outWait            = settings.value("outWait").toDouble();
@@ -173 +173 @@
            << setw(4)  << obs._time.gpsw()                      << " "
            << setw(14) << setprecision(7) << obs._time.gpssec() << " "
-           << bncRinex::asciiSatLine(obs,_printLockTime) << endl;
+           << bncRinex::asciiSatLine(obs,_outLockTime) << endl;
 
       string hlpStr = oStr.str();
@@ -319 +319 @@
           }
           oStr << obs._staID << ' '
-               << bncRinex::asciiSatLine(obs,_printLockTime) << endl;
+               << bncRinex::asciiSatLine(obs,_outLockTime) << endl;
           if (!it.hasNext()) {
             oStr << endl;

trunk/BNC/src/bnccaster.h

@@ -77 +77 @@
    QList<QByteArray>               _staIDs;
    QList<bncGetThread*>            _threads;
-   bool                            _printLockTime;   
+   bool                            _outLockTime;
    int                             _samplingRateMult10;
    double                          _outWait;

trunk/BNC/src/bncrinex.cpp

@@ -601 +601 @@
 // One Line in ASCII (Internal) Format
 ////////////////////////////////////////////////////////////////////////////
-string bncRinex::asciiSatLine(const t_satObs& obs, bool printLockTime) {
+string bncRinex::asciiSatLine(const t_satObs& obs, bool outLockTime) {
 
   ostringstream str;
@@ -630 +630 @@
           << left  << setw(3) << "S" + frqObs->_rnxType2ch << ' '
           << right << setw(8) << setprecision(3) << frqObs->_snr;
-    }    
-    if (frqObs->_lockTimeValid && printLockTime) {
+    }
+    if (frqObs->_lockTimeValid && outLockTime) {
       str << ' '
           << left  << setw(3) << "T" + frqObs->_rnxType2ch << ' '

trunk/BNC/src/bncrinex.h

@@ -49 +49 @@
                                bool rnxV3,
                                QDateTime* nextEpoch = 0);
-   static std::string asciiSatLine(const t_satObs& obs, bool printLockTime);
+   static std::string asciiSatLine(const t_satObs& obs, bool outLockTime);
 
  private:

trunk/BNC/src/bncsettings.cpp

@@ -145 +145 @@
     setValue_p("outFile",             "");
     setValue_p("outUPort",            "");
-    setValue_p("printLockTime",       "0");    
+    setValue_p("outLockTime",       "0");
     // Serial Output
     setValue_p("serialMountPoint",    "");

trunk/BNC/src/bncwindow.cpp

@@ -307 +307 @@
   _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
   _outUPortLineEdit   = new QLineEdit(settings.value("outUPort").toString());
-  _printLockTimeCheckBox = new QCheckBox();
-  _printLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("printLockTime").toInt()));  
+  _outLockTimeCheckBox = new QCheckBox();
+  _outLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("outLockTime").toInt()));
 
   connect(_outPortLineEdit, SIGNAL(textChanged(const QString &)),
@@ -315 +315 @@
   connect(_outFileLineEdit, SIGNAL(textChanged(const QString &)),
           this, SLOT(slotBncTextChanged()));
-          
-  connect(_printLockTimeCheckBox, SIGNAL(stateChanged(int)),
+
+  connect(_outLockTimeCheckBox, SIGNAL(stateChanged(int)),
           this, SLOT(slotBncTextChanged()));
 
@@ -830 +830 @@
   sLayout->addWidget(_outUPortLineEdit,                             4, 1);
   sLayout->addWidget(new QLabel("Print lock time"),                 5, 0);
-  sLayout->addWidget(_printLockTimeCheckBox,                        5, 1);
+  sLayout->addWidget(_outLockTimeCheckBox,                        5, 1);
   sLayout->addWidget(new QLabel(""),                                6, 1);
   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>"));
   _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>"));
-  _printLockTimeCheckBox->setWhatsThis(tr("<p>Print the lock time in seconds in the feed engine output.</p>"));
+  _outLockTimeCheckBox->setWhatsThis(tr("<p>Print the lock time in seconds in the feed engine output.<i>[key: outLockTime]</i></p>"));
 
   // WhatsThis, Serial Output
@@ -1522 +1522 @@
   delete _outFileLineEdit;
   delete _outUPortLineEdit;
-  delete _printLockTimeCheckBox;  
+  delete _outLockTimeCheckBox;
   delete _serialMountPointLineEdit;
   delete _serialPortNameLineEdit;
@@ -1975 +1975 @@
   settings.setValue("outSampl",    _outSamplComboBox->currentText());
   settings.setValue("outFile",     _outFileLineEdit->text());
-  settings.setValue("printLockTime",_printLockTimeCheckBox->checkState());    settings.setValue("outUPort",    _outUPortLineEdit->text());
+  settings.setValue("outLockTime",_outLockTimeCheckBox->checkState());    settings.setValue("outUPort",    _outUPortLineEdit->text());
 
 // Serial Output

trunk/BNC/src/bncwindow.h

@@ -138 +138 @@
     QLineEdit* _outPortLineEdit;
     QLineEdit* _outUPortLineEdit;
-    QCheckBox* _printLockTimeCheckBox;        
+    QCheckBox* _outLockTimeCheckBox;
     QLineEdit* _ephOutPortLineEdit;
     QLineEdit* _corrPortLineEdit;