Changeset 8320 in ntrip


Ignore:
Timestamp:
Mar 29, 2018, 12:42:32 PM (7 months ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r8204 r8320  
    152152  baseName.replace("${GPSWD}", gpswd);
    153153  baseName.replace("${V3}" , QString("_U_%1%2").arg(yyyy).arg(doy));
    154 
     154  if (_extension.count(".") == 2) {_extension.replace(0,1,"_"); }
     155 
    155156  return _path + baseName + epoStr + _extension;
    156157}
  • trunk/BNC/src/pppRun.cpp

    r8204 r8320  
    122122    connect(BNC_CMB, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
    123123            this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)),conType);
    124            
     124
    125125    connect(BNC_CORE, SIGNAL(providerIDChanged(QString)),
    126126            this, SLOT(slotProviderIDChanged(QString)));
     
    140140  _stopFlag = false;
    141141
    142   QString roverName(_opt->_roverName.c_str()), fullRoverName("");
     142  QString roverName(_opt->_roverName.c_str()), ID9("");
    143143  QString country;
    144144  QString monNum = "0";
     
    146146  QString intr = "1 day";
    147147  int     sampl  = 0;
     148  QString distStr;
     149  int num = 0;
     150  int statIDlength = roverName.size() -1;
     151  QString ID4 = roverName.left(4);
     152  ID4 = ID4.toUpper();
    148153  QListIterator<QString> it(settings.value("mountPoints").toStringList());
    149154  while (it.hasNext()) {
    150     QStringList hlp = it.next().split(" ");
     155    QString mp = it.next();
     156    if (mp.indexOf(roverName.left(statIDlength)) != -1) {
     157      ++num;
     158    }
     159    QStringList hlp = mp.split(" ");
    151160    if (hlp.size() < 7)
    152161      continue;
     
    155164    }
    156165  }
    157   fullRoverName = roverName.left(4) +
    158                   QString("%1").arg(monNum, 1, 10) +
    159                   QString("%1").arg(recNum, 1, 10) +
    160                   country;
     166
     167  if (num > 1) {
     168    distStr = "." + roverName.right(1);
     169  }
     170
     171  ID9 = ID4 +
     172        QString("%1").arg(monNum, 1, 10) +
     173        QString("%1").arg(recNum, 1, 10) +
     174        country;
    161175
    162176  bool v3filenames = settings.value("PPP/v3filenames").toBool();
     
    171185    }
    172186    if (v3filenames) {
    173       logFileSkl = logFileSkl + fullRoverName + "${V3}" + ".ppp";
     187      logFileSkl = logFileSkl + ID9 + "${V3}" + distStr + ".ppp";
    174188    }
    175189    else {
    176       logFileSkl = logFileSkl + roverName.left(4) + "${GPSWD}" + ".ppp";
     190      logFileSkl = logFileSkl + ID4 + "${GPSWD}" + distStr + ".ppp";
    177191    }
    178192    _logFile = new bncoutf(logFileSkl, intr, sampl);
     
    189203    }
    190204    if (v3filenames) {
    191       nmeaFileSkl = nmeaFileSkl + fullRoverName + "${V3}" + ".nmea";
     205      nmeaFileSkl = nmeaFileSkl + ID9 + "${V3}" + distStr + ".nmea";
    192206    }
    193207    else {
    194       nmeaFileSkl = nmeaFileSkl + roverName.left(4) + "${GPSWD}" + ".nmea";
     208      nmeaFileSkl = nmeaFileSkl + ID4 + "${GPSWD}" + distStr + ".nmea";
    195209    }
    196210    _nmeaFile = new bncoutf(nmeaFileSkl, intr, sampl);
    197211  }
    198 
    199212  QString snxtroFileSkl = settings.value("PPP/snxtroPath").toString();
    200213  l = snxtroFileSkl.length();
     
    207220    }
    208221    if (v3filenames) {
    209       snxtroFileSkl = snxtroFileSkl + fullRoverName + "${V3}" + ".tra";
     222      snxtroFileSkl = snxtroFileSkl + ID9 + "${V3}" + distStr + ".tra";
    210223    }
    211224    else {
    212       snxtroFileSkl = snxtroFileSkl + roverName.left(4) + "${GPSWD}" + ".tro";
     225      snxtroFileSkl = snxtroFileSkl + ID4 + "${GPSWD}" + distStr + ".tro";
    213226    }
    214227    sampl = settings.value("PPP/snxtroSampl").toInt();
Note: See TracChangeset for help on using the changeset viewer.