Changeset 10548 in ntrip


Ignore:
Timestamp:
Sep 25, 2024, 5:50:15 PM (2 months ago)
Author:
stuerze
Message:

replacement of obsolete qt-class members

Location:
trunk/BNC
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/CHANGELOG.md

    r10544 r10548  
    11# Changelog
    2 ## 2.13.1 (2024-0?-??)
    3 - FIXED: obs types from skl file can be used now to write them into RINEX version 3 AND 4 observation files as configured
     2## 2.13.1 (2024-10-??)
     3- FIXED: Obs types from skl file can be used now to write them into RINEX version 3 AND 4 observation files as configured
    44- FIXED: **Bug in IGS SSR Epoch Time (BDS and GLO)**, which is defined as follows: Full seconds since the beginning of the week of continuous time scale with no offset from GPS, Galileo, QZSS, SBAS, **UTC leap seconds from GLONASS, -14 s offset from BDS**
    5 - ADDED: data field range checks within RTCM3 Ephemeris decoders mainly regarding TOC and TOE
    6 - ADDED: decoder string 'ZERO2FILE': Using this, BNC allows to by-pass its decoders and directly save the input in daily log files
    7 - CHANGED: decoder string 'ZERO': means that the raw data are forwarded only
    8 
     5- ADDED: Service CRS and RTCM CRS message encodung and decoding
     6- ADDED: Data field range checks within RTCM3 Ephemeris decoders mainly regarding TOC and TOE
     7- ADDED: Decoder string 'ZERO2FILE': Using this, BNC allows to by-pass its decoders and directly save the input in daily log files
     8- CHANGED: Decoder string 'ZERO': means that the raw data are forwarded only
     9- CHANGED: Obsolete qt-class members are replaced
    910
    1011## 2.13.1 (2024-04-30)

  • trunk/BNC/src/PPP/pppSatObs.cpp

    r10546 r10548  
    7676  // Select pseudo-ranges and phase observations
    7777  // -------------------------------------------
    78   QStringList priorList = _signalPriorities.split(" ", QString::SkipEmptyParts);
     78  QStringList priorList = _signalPriorities.split(" ", Qt::SkipEmptyParts);
    7979  string preferredAttrib;
    8080  for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
    … …  
    9292    for (int ii = 0; ii < priorList.size(); ii++) {
    9393      if (priorList[ii].indexOf(":") != -1) {
    94         hlp = priorList[ii].split(":", QString::SkipEmptyParts);
     94        hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
    9595        if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) {
    96           hlp = hlp[1].split("&", QString::SkipEmptyParts);
     96          hlp = hlp[1].split("&", Qt::SkipEmptyParts);
    9797        }
    9898        if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) {

  • trunk/BNC/src/RTCM3/crsEncoder.cpp

    r10545 r10548  
    8787  SCALEADDBITS(32, 50000.0, helmertPar._ox)
    8888  SCALEADDBITS(32, 50000.0, helmertPar._oy)
    89   SCALEADDBITS(32, 50000.0, helmertPar._oz)
     89  SCALEADDBITS(31, 50000.0, helmertPar._oz)
    9090
    9191  SCALEADDBITS(25, 100000.0, helmertPar._sc)

  • trunk/BNC/src/bncmain.cpp

    r10546 r10548  
    458458      QString val(argv[ii+2]);
    459459      if (val.indexOf(";") != -1) {
    460         settings.setValue(key, val.split(";", QString::SkipEmptyParts));
     460        settings.setValue(key, val.split(";", Qt::SkipEmptyParts));
    461461      }
    462462      else {

  • trunk/BNC/src/bncsinextro.cpp

    r10546 r10548  
    9393    signalPriorities = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX";
    9494  }
    95   QStringList priorList = signalPriorities.split(" ", QString::SkipEmptyParts);
     95  QStringList priorList = signalPriorities.split(" ", Qt::SkipEmptyParts);
    9696  QStringList frqStrList;
    9797  for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
    … …  
    102102    for (int ii = 0; ii < priorList.size(); ii++) {
    103103      if (priorList[ii].indexOf(":") != -1) {
    104         hlp = priorList[ii].split(":", QString::SkipEmptyParts);
     104        hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
    105105        if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) {
    106           hlp = hlp[1].split("&", QString::SkipEmptyParts);
     106          hlp = hlp[1].split("&", Qt::SkipEmptyParts);
    107107        }
    108108        if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) {

  • trunk/BNC/src/combination/bnccomb.cpp

    r10546 r10548  
    176176      newAC->name         = hlp[1];
    177177      newAC->weightFactor = hlp[2].toDouble();
    178       newAC->excludeSats  = hlp[3].split(QRegExp("[ ,]"), QString::SkipEmptyParts);
     178      newAC->excludeSats  = hlp[3].split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
    179179      newAC->isAPC        = bool(newAC->mountPoint.mid(0,4) == "SSRA");
    180180      QMapIterator<char, unsigned> itSys(_cmbSysPrn);

  • trunk/BNC/src/orbComp/sp3Comp.cpp

    r10547 r10548  
    5454
    5555  bncSettings settings;
    56   _sp3FileNames = settings.value("sp3CompFile").toString().split(QRegExp("[ ,]"), QString::SkipEmptyParts);
     56  _sp3FileNames = settings.value("sp3CompFile").toString().split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
    5757  for (int ii = 0; ii < _sp3FileNames.size(); ii++) {
    5858    expandEnvVar(_sp3FileNames[ii]);
    … …  
    6262  _log         = 0;
    6363
    64   _excludeSats = settings.value("sp3CompExclude").toString().split(QRegExp("[ ,]"), QString::SkipEmptyParts);
     64  _excludeSats = settings.value("sp3CompExclude").toString().split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
    6565
    6666  _summaryOnly = (Qt::CheckState(settings.value("sp3CompSummaryOnly").toInt()) == Qt::Checked);

  • trunk/BNC/src/pppMain.cpp

    r10546 r10548  
    407407
    408408    QString     priorStr  = QString::fromStdString(opt->_signalPriorities);
    409     QStringList priorList = priorStr.split(" ", QString::SkipEmptyParts);
     409    QStringList priorList = priorStr.split(" ", Qt::SkipEmptyParts);
    410410    QStringList hlpList;
    411411    vector<char> systems = opt->systems();
    … …  
    414414      for (int ii = 0; ii < priorList.size(); ii++) {
    415415        if (priorList[ii].indexOf(":") != -1) {
    416           hlpList = priorList[ii].split(":", QString::SkipEmptyParts);
     416          hlpList = priorList[ii].split(":", Qt::SkipEmptyParts);
    417417          if (hlpList.size() == 2 && hlpList[0].length() == 1 && hlpList[0][0] == sys) {
    418             hlpList = hlpList[1].split("&", QString::SkipEmptyParts);
     418            hlpList = hlpList[1].split("&", Qt::SkipEmptyParts);
    419419            if (hlpList.size() == 2) {
    420420              for (int jj = 0; jj < hlpList[0].size(); jj++) {

  • trunk/BNC/src/rinex/reqcanalyze.cpp

    r10546 r10548  
    6666  _log             = 0;
    6767  _currEpo         = 0;
    68   _obsFileNames    = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
    69   _navFileNames    = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
     68  _obsFileNames    = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts);
     69  _navFileNames    = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts);
    7070  _reqcPlotSignals = settings.value("reqcSkyPlotSignals").toString();
    7171  _defaultSignalTypes << "G:1&2&5" << "R:1&2&3" << "J:1&2" << "E:1&5" << "S:1&5" << "C:2&6" << "I:5&9";
    … …  
    149149void t_reqcAnalyze::analyzePlotSignals() {
    150150
    151   QStringList signalsOpt = _reqcPlotSignals.split(" ", QString::SkipEmptyParts);
     151  QStringList signalsOpt = _reqcPlotSignals.split(" ", Qt::SkipEmptyParts);
    152152
    153153  for (int ii = 0; ii < signalsOpt.size(); ii++) {
    154     QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), QString::SkipEmptyParts);
     154    QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), Qt::SkipEmptyParts);
    155155    if (input.size() > 1 && input[0].length() == 1) {
    156156      char        system   = input[0].toLatin1().constData()[0];

  • trunk/BNC/src/rinex/reqcedit.cpp

    r10546 r10548  
    5858  _logFile        = 0;
    5959  _log            = 0;
    60   _obsFileNames   = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
     60  _obsFileNames   = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts);
    6161  _outObsFileName = settings.value("reqcOutObsFile").toString();
    62   _navFileNames   = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
     62  _navFileNames   = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts);
    6363  _outNavFileName = settings.value("reqcOutNavFile").toString();
    6464  int version     = settings.value("reqcRnxVersion").toInt();
    … …  
    242242  // ------------------------
    243243  bncSettings settings;
    244   QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", QString::SkipEmptyParts);
     244  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", Qt::SkipEmptyParts);
    245245
    246246  // Put together all observation types
    … …  
    785785        QString preferredAttrib;
    786786        if (preferredAttribListSys[ii].indexOf("&") != -1) {
    787           QStringList hlp = preferredAttribListSys[ii].split("&", QString::SkipEmptyParts);
     787          QStringList hlp = preferredAttribListSys[ii].split("&", Qt::SkipEmptyParts);
    788788          if (hlp.size() == 2 && hlp[0].contains(band)) {
    789789            preferredAttrib = hlp[1];

  • trunk/BNC/src/rinex/rnxnavfile.cpp

    r10546 r10548  
    158158    }
    159159
    160     QStringList hlp = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
     160    QStringList hlp = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts);
    161161    QString firstStr = hlp.at(0);
    162162    QString prn;
    … …  
    317317      }
    318318      else if (it.key() == "RUN BY DATE") {
    319           runByDate = it.value().split("\\n", QString::SkipEmptyParts);
     319          runByDate = it.value().split("\\n", Qt::SkipEmptyParts);
    320320      }
    321321      else if (it.key() == "COMMENT") {
    322         comments = it.value().split("\\n", QString::SkipEmptyParts);
     322        comments = it.value().split("\\n", Qt::SkipEmptyParts);
    323323      }
    324324    }

  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r10546 r10548  
    505505    for (int iType = 0; iType < useObsTypes->size(); iType++) {
    506506      if (useObsTypes->at(iType).indexOf(":") != -1) {
    507         QStringList hlp = useObsTypes->at(iType).split(":", QString::SkipEmptyParts);
     507        QStringList hlp = useObsTypes->at(iType).split(":", Qt::SkipEmptyParts);
    508508        if (hlp.size() == 2 && hlp[0].length() == 1) {
    509509          if (_version >= 3.0) {
    … …  
    551551    else {
    552552      foreach (const QString &str, *phaseShifts) {
    553         QStringList hlp  = str.split("_", QString::SkipEmptyParts);
    554         QStringList hlp1 = hlp.last().split(":", QString::SkipEmptyParts);
     553        QStringList hlp  = str.split("_", Qt::SkipEmptyParts);
     554        QStringList hlp1 = hlp.last().split(":", Qt::SkipEmptyParts);
    555555        QString type = hlp.first();
    556556        double shift = hlp1.first().toDouble();
    … …  
    577577    else {
    578578      foreach (const QString &str, *gloBiases) {
    579         QStringList hlp = str.split(":", QString::SkipEmptyParts);
     579        QStringList hlp = str.split(":", Qt::SkipEmptyParts);
    580580        QString type = hlp.first();;
    581581        double  value = hlp.last().toDouble();
    … …  
    590590    else {
    591591      foreach (const QString &str, *gloSlots) {
    592         QStringList hlp = str.split(":", QString::SkipEmptyParts);
     592        QStringList hlp = str.split(":", Qt::SkipEmptyParts);
    593593        QString sat = hlp.first();
    594594        int    slot = hlp.last().toInt();
    … …  
    631631      }
    632632      else if (it.key() == "RUN BY DATE") {
    633           runByDate = it.value().split("\\n", QString::SkipEmptyParts);
     633          runByDate = it.value().split("\\n", Qt::SkipEmptyParts);
    634634      }
    635635      else if ((it.key().indexOf("COMMENT")) != -1) {
    636         newComments += it.value().split("\\n", QString::SkipEmptyParts);
     636        newComments += it.value().split("\\n", Qt::SkipEmptyParts);
    637637      }
    638638    }
    … …  
    14281428      for (int ii = 0; ii < preferredAttribList.size(); ii++) {
    14291429        if (preferredAttribList[ii].indexOf("&") != -1) {
    1430           QStringList hlp = preferredAttribList[ii].split("&", QString::SkipEmptyParts);
     1430          QStringList hlp = preferredAttribList[ii].split("&", Qt::SkipEmptyParts);
    14311431          if (hlp.size() == 2 && hlp[0].contains(typeV2[1])) {
    14321432            preferredAttrib = hlp[1];
    … …  
    16771677  // ---------------------------------------------------
    16781678  if (reqcAction == "Edit/Concatenate") {
    1679     priorList = settings.value("reqcV2Priority").toString().split(" ", QString::SkipEmptyParts);
     1679    priorList = settings.value("reqcV2Priority").toString().split(" ", Qt::SkipEmptyParts);
    16801680  }
    16811681
    … …  
    16831683  // ----------------------------
    16841684  else {
    1685     priorList = settings.value("rnxV2Priority").toString().split(" ", QString::SkipEmptyParts);
     1685    priorList = settings.value("rnxV2Priority").toString().split(" ", Qt::SkipEmptyParts);
    16861686  }
    16871687
    … …  
    16891689  for (int ii = 0; ii < priorList.size(); ii++) {
    16901690    if (priorList[ii].indexOf(":") != -1) {
    1691       QStringList hlp = priorList[ii].split(":", QString::SkipEmptyParts);
     1691      QStringList hlp = priorList[ii].split(":", Qt::SkipEmptyParts);
    16921692      if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == sys) {
    16931693        result.append(hlp[1]);

  • trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

    r10546 r10548  
    331331    if      (nextEpoch != -1 && nextEpoch < iEpoEnd) {
    332332      rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch, nextEpochEnd);
    333       lines = rtnetStreamBuffer.split('\n', QString::SkipEmptyParts);
     333      lines = rtnetStreamBuffer.split('\n', Qt::SkipEmptyParts);
    334334      if (lines.size() > 2) {
    335335        decodeRtnetEpoch(lines);
    … …  
    343343  }
    344344
    345   lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
     345  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', Qt::SkipEmptyParts);
    346346
    347347  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
Note: See TracChangeset for help on using the changeset viewer.