Changeset 10091 in ntrip


Ignore:
Timestamp:
Jun 16, 2023, 6:51:52 AM (16 months ago)
Author:
stuerze
Message:

same changes for future developments towards station individual navigation files

Location:
trunk/BNC/src
Files:
5 edited

Legend:

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

    r10073 r10091  
    226226#endif
    227227  printEphHeader();
     228  //printEphHeader(eph->receptStaID());
    228229  printEph(*eph, (ircPut == success));
    229230  return success;
     
    272273// Print Header of the output File(s)
    273274////////////////////////////////////////////////////////////////////////////
    274 void t_bncCore::printEphHeader() {
     275void t_bncCore::printEphHeader(QString receptStaID) {
    275276
    276277  bncSettings settings;
    277278  QStringList comments;
     279  bool separateFiles = false;// Qt::CheckState(settings.value("ephFilePerStation").toInt());
    278280
    279281  QListIterator<QString> it(settings.value("mountPoints").toStringList());
     
    284286    QUrl url(hlp[0]);
    285287    QString decoder = hlp[1];
    286     comments.append("Source: " + decoder +
    287                     " " + QUrl::toAce(url.host()) +
    288                     "/" + url.path().mid(1).toLatin1());
     288    if (!separateFiles) {
     289      comments.append("Source: " + decoder +
     290                      " " + QUrl::toAce(url.host()) +
     291                      "/" + url.path().mid(1).toLatin1());
     292    }
    289293  }
    290294
     
    311315    QDateTime datTim = currentDateAndTimeGPS();
    312316
    313     QString ephFileNameGPS = _ephPath + "BRDC";
     317    QString ephFileNameGPS = _ephPath; // + "BRDC";
     318
     319    (separateFiles) ?  ephFileNameGPS += receptStaID.left(4) :
     320                       ephFileNameGPS += "BRDC";
    314321
    315322    QString hlpStr = bncRinex::nextEpochStr(datTim,
     
    320327      QString monNum = "0";
    321328      QString recNum = "0";
     329      if (separateFiles && receptStaID.size() >= 9) {
     330        monNum = receptStaID.mid(4,1);
     331        recNum = receptStaID.mid(5,1);
     332        country = receptStaID.mid(6,3);
     333      }
    322334      ephFileNameGPS += QString("%1").arg(monNum, 1, 10) +
    323335                        QString("%1").arg(recNum, 1, 10) +
  • trunk/BNC/src/bnccore.h

    r10040 r10091  
    115115  t_irc checkPrintEph(t_eph* eph);
    116116  void  printEphHeader();
     117  //void  printEphHeader(QString receptStaID);
    117118  void  printEph(const t_eph& eph, bool printFile);
    118119  void  printOutputEph(bool printFile, QTextStream* stream,
  • trunk/BNC/src/bncutils.cpp

    r9797 r10091  
    916916int indexFromAccuracy(double accuracy, t_eph::e_type type) {
    917917
    918   if (type == t_eph::GPS || type == t_eph::BDS || type == t_eph::SBAS
    919       || type == t_eph::QZSS) {
     918  if (type == t_eph::GPS ||
     919      type == t_eph::BDS ||
     920      type == t_eph::SBAS ||
     921      type == t_eph::QZSS) {
    920922
    921923    if (accuracy <= 2.40) {
  • trunk/BNC/src/bncwindow.cpp

    r10034 r10091  
    280280    _ephVersComboBox->setCurrentIndex(jk);
    281281  }
     282  //_ephFilePerStation = new QCheckBox();
     283  //_ephFilePerStation->setCheckState(Qt::CheckState(settings.value("ephFilePerStation").toInt()));
    282284
    283285  connect(_ephOutPortLineEdit, SIGNAL(textChanged(const QString &)),
     
    839841  eLayout->addWidget(_ephVersComboBox,                            4, 1);
    840842  eLayout->setRowStretch(5, 999);
     843  //eLayout->addWidget(new QLabel("File per Station"),              5, 0);
     844  //eLayout->addWidget(_ephFilePerStation,                          5, 1);
     845  //eLayout->setRowStretch(6, 999);
    841846
    842847  egroup->setLayout(eLayout);
     
    13991404  _ephOutPortLineEdit->setWhatsThis(tr("<p>BNC can produce ephemeris data in RINEX Navigation ASCII format on your local host through an IP port.</p><p>Specify a port number here to activate this function. <i>[key: ephOutPort]</i></p>"));
    14001405  _ephVersComboBox->setWhatsThis(tr("<p>Select the format for RINEX Navigation files. <i>[key: ephVersion]</i></p>"));
     1406  //_ephFilePerStation->setWhatsThis(tr("<p>By default, all received Broadcast Ephemeris data will be stored within one File. Thick 'File per Stations' to get separate files per station/mountpoint. <i>[key: ephFilePerStation]</i></p>"));
    14011407
    14021408  // WhatsThis, RINEX Editing & QC
     
    16111617  delete _rnxV2Priority;
    16121618  delete _ephPathLineEdit;
     1619  //delete _ephFilePerStation;
    16131620  delete _ephIntrComboBox;
    16141621  delete _ephOutPortLineEdit;
     
    20812088  settings.setValue("ephOutPort",    _ephOutPortLineEdit->text());
    20822089  settings.setValue("ephVersion",    _ephVersComboBox->currentText());
     2090  //settings.setValue("ephFilePerStation", _ephFilePerStation->checkState());
    20832091// Broadcast Corrections
    20842092  settings.setValue("corrPath",    _corrPathLineEdit->text());
     
    25982606    enableWidget(enable, _ephIntrComboBox);
    25992607    enableWidget(enable, _ephVersComboBox);
     2608    //enableWidget(enable, _ephVersComboBox);
     2609    //enableWidget(enable, _ephFilePerStation);
    26002610  }
    26012611
  • trunk/BNC/src/bncwindow.h

    r9795 r10091  
    167167    QLineEdit* _rnxV2Priority;
    168168    QComboBox* _ephVersComboBox;
     169    //QCheckBox* _ephFilePerStation;
    169170    QCheckBox* _rnxFileCheckBox;
    170171    QLineEdit* _rnxScrpLineEdit;
Note: See TracChangeset for help on using the changeset viewer.