Changeset 8620 in ntrip


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

minor changes

Location:
branches/BNC_2.12/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/bnccaster.cpp

    r8616 r8620  
    9595    _uSockets = 0;
    9696  }
    97  
    98   _printLockTime = settings.value("printLockTime",false).toBool();
     97
     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;
     
    458458    return;
    459459  }
    460  
     460
    461461  int ms = 0;
    462462
  • branches/BNC_2.12/src/bnccaster.h

    r8616 r8620  
    5050 signals:
    5151   void mountPointsRead(QList<bncGetThread*>);
    52    void getThreadsFinished();   
     52   void getThreadsFinished();
    5353   void newMessage(QByteArray msg, bool showOnScreen);
    5454   void newObs(QByteArray staID, QList<t_satObs> obsList);
     
    7575   QList<QByteArray>               _staIDs;
    7676   QList<bncGetThread*>            _threads;
    77    bool                            _printLockTime;   
     77   bool                            _outLockTime;
    7878   int                             _samplingRateMult10;
    7979   double                          _outWait;
  • branches/BNC_2.12/src/bncrinex.cpp

    r8616 r8620  
    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;
     
    631631          << right << setw(8) << setprecision(3) << frqObs->_snr;
    632632    }
    633     if (frqObs->_lockTimeValid && printLockTime) {
     633    if (frqObs->_lockTimeValid && outLockTime) {
    634634      str << ' '
    635635          << left  << setw(3) << "T" + frqObs->_rnxType2ch << ' '
    636636          << right << setw(9) << setprecision(3) << frqObs->_lockTime;
    637     }   
     637    }
    638638  }
    639639
  • branches/BNC_2.12/src/bncrinex.h

    r8616 r8620  
    3535class bncRinex {
    3636 public:
    37    bncRinex(const QByteArray& statID, const QUrl& mountPoint, 
     37   bncRinex(const QByteArray& statID, const QUrl& mountPoint,
    3838            const QByteArray& latitude, const QByteArray& longitude,
    39             const QByteArray& nmea, const QByteArray& ntripVersion); 
     39            const QByteArray& nmea, const QByteArray& ntripVersion);
    4040   ~bncRinex();
    4141
     
    4646
    4747   static QString nextEpochStr(const QDateTime& datTim,
    48                                const QString& intStr, 
     48                               const QString& intStr,
    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:
  • branches/BNC_2.12/src/bncsettings.cpp

    r8616 r8620  
    146146    setValue_p("outFile",             "");
    147147    setValue_p("outUPort",            "");
    148     setValue_p("printLockTime",       "0");
     148    setValue_p("outLockTime",       "0");
    149149    // Serial Output
    150150    setValue_p("serialMountPoint",    "");
  • branches/BNC_2.12/src/bncwindow.cpp

    r8616 r8620  
    286286  _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
    287287  _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()));
    290290
    291291  connect(_outPortLineEdit, SIGNAL(textChanged(const QString &)),
     
    295295          this, SLOT(slotBncTextChanged()));
    296296
    297   connect(_printLockTimeCheckBox, SIGNAL(stateChanged(int)),
     297  connect(_outLockTimeCheckBox, SIGNAL(stateChanged(int)),
    298298          this, SLOT(slotBncTextChanged()));
    299299
     
    764764  sLayout->addWidget(_outUPortLineEdit,                             4, 1);
    765765  sLayout->addWidget(new QLabel("Print lock time"),                 5, 0);
    766   sLayout->addWidget(_printLockTimeCheckBox,                        5, 1);
     766  sLayout->addWidget(_outLockTimeCheckBox,                        5, 1);
    767767  sLayout->addWidget(new QLabel(""),                                6, 1);
    768768  sLayout->setRowStretch(7, 999);
     
    12901290  _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>"));
    12911291  _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>"));
    12931293
    12941294  // WhatsThis, Serial Output
     
    14661466  delete _outFileLineEdit;
    14671467  delete _outUPortLineEdit;
    1468   delete _printLockTimeCheckBox;
     1468  delete _outLockTimeCheckBox;
    14691469  delete _serialMountPointLineEdit;
    14701470  delete _serialPortNameLineEdit;
     
    18841884  settings.setValue("outFile",     _outFileLineEdit->text());
    18851885  settings.setValue("outUPort",    _outUPortLineEdit->text());
    1886   settings.setValue("printLockTime",_printLockTimeCheckBox->checkState()); 
     1886  settings.setValue("outLockTime",_outLockTimeCheckBox->checkState());
    18871887// Serial Output
    18881888  settings.setValue("serialMountPoint",_serialMountPointLineEdit->text());
  • branches/BNC_2.12/src/bncwindow.h

    r8616 r8620  
    6565    void AddToolbar();
    6666
    67   public slots: 
     67  public slots:
    6868    void slotMountPointsRead(QList<bncGetThread*>);
    6969    void slotBncTextChanged();
     
    116116    QAction*   _actFontSel;
    117117    QAction*   _actSaveOpt;
    118     QAction*   _actQuit; 
     118    QAction*   _actQuit;
    119119    QAction*   _actMapMountPoints;
    120120    QAction*   _actStart;
     
    132132    QLineEdit* _outPortLineEdit;
    133133    QLineEdit* _outUPortLineEdit;
    134     QCheckBox* _printLockTimeCheckBox;   
     134    QCheckBox* _outLockTimeCheckBox;
    135135    QLineEdit* _ephOutPortLineEdit;
    136136    QLineEdit* _corrPortLineEdit;
     
    236236    bool _runningSp3Comp;
    237237
    238     bool running() {return _runningRealTime || _runningPPP || _runningEdit || 
     238    bool running() {return _runningRealTime || _runningPPP || _runningEdit ||
    239239                    _runningQC || _runningSp3Comp;}
    240240
     
    252252 Q_INTERFACES(GnssCenter::t_pluginFactoryInterface)
    253253 public:
    254   virtual QWidget* create() {return new bncWindow();} 
     254  virtual QWidget* create() {return new bncWindow();}
    255255  virtual QString getName() const {return QString("BNC");}
    256256};
Note: See TracChangeset for help on using the changeset viewer.