Changeset 7176 in ntrip for trunk/BNC


Ignore:
Timestamp:
Aug 7, 2015, 1:18:18 PM (10 years ago)
Author:
stuerze
Message:

country information from source table is added to have it available for RINEX v3 filenames

Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/bnccaster.cpp

    r6450 r7176  
    428428    if (!existFlg) {
    429429      QByteArray format    = hlp[1].toAscii();
    430       QByteArray latitude  = hlp[2].toAscii();
    431       QByteArray longitude = hlp[3].toAscii();
    432       QByteArray nmea      = hlp[4].toAscii();
    433       QByteArray ntripVersion = hlp[5].toAscii();
     430      QByteArray latitude  = hlp[3].toAscii();
     431      QByteArray longitude = hlp[4].toAscii();
     432      QByteArray nmea      = hlp[5].toAscii();
     433      QByteArray ntripVersion = hlp[6].toAscii();
    434434     
    435435      bncGetThread* getThread = new bncGetThread(url, format, latitude,

  • trunk/BNC/src/bnctabledlg.cpp

    r6960 r7176  
    291291      QStringList columns = lines[nRow].split(";");
    292292      for (int ic = 1; ic < columns.size(); ic++) {
    293         if (ic == 11) {
     293            if (ic == 11) {
    294294          if (columns[ic] == "0") {
    295295            columns[ic] = "no";
    … …  
    373373  if (_table) {
    374374    for (int ir = 0; ir < _table->rowCount(); ir++) {
    375       QTableWidgetItem* item  = _table->item(ir,0);
     375      QTableWidgetItem*   item = _table->item(ir,0);
    376376      QString             site = _table->item(ir,0)->text();
    377377      QString           format = _table->item(ir,2)->text();
     378      QString          country = _table->item(ir,7)->text();
    378379      QString         latitude = _table->item(ir,8)->text();
    379380      QString        longitude = _table->item(ir,9)->text();
    … …  
    382383      if (_table->isItemSelected(item)) {
    383384        url.setPath(item->text());
    384         mountPoints->push_back(url.toString() + " " + format + " " + latitude
     385        mountPoints->push_back(url.toString() + " " + format + " " + country + " " + latitude
    385386                        + " " + longitude + " " + nmea + " " + ntripVersion);
    386          
     387
    387388        site.resize(4);
    388389      }

  • trunk/BNC/src/bncwindow.cpp

    r7172 r7176  
    112112  int ww = QFontMetrics(this->font()).width('w');
    113113 
    114   static const QStringList labels = QString("account, Streams:   resource loader / mountpoint, decoder, lat, long, nmea, ntrip, bytes").split(",");
     114  static const QStringList labels = QString("account, Streams:   resource loader / mountpoint, decoder, country, lat, long, nmea, ntrip, bytes").split(",");
    115115
    116116  setMinimumSize(100*ww, 70*ww);
    … …  
    400400  // Streams
    401401  // -------
    402   _mountPointsTable   = new QTableWidget(0,8);
     402  _mountPointsTable   = new QTableWidget(0,9);
    403403
    404404  _mountPointsTable->horizontalHeader()->resizeSection(1,34*ww);
    405405  _mountPointsTable->horizontalHeader()->resizeSection(2,9*ww);
    406   _mountPointsTable->horizontalHeader()->resizeSection(3,7*ww);
    407   _mountPointsTable->horizontalHeader()->resizeSection(4,7*ww);
    408   _mountPointsTable->horizontalHeader()->resizeSection(5,5*ww);
    409   _mountPointsTable->horizontalHeader()->resizeSection(6,5*ww);
     406  _mountPointsTable->horizontalHeader()->resizeSection(3,9*ww);
     407  _mountPointsTable->horizontalHeader()->resizeSection(4,7*ww);
     408  _mountPointsTable->horizontalHeader()->resizeSection(5,7*ww);
     409  _mountPointsTable->horizontalHeader()->resizeSection(6,5*ww);
     410  _mountPointsTable->horizontalHeader()->resizeSection(7,5*ww);
    410411  _mountPointsTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
    411412  _mountPointsTable->horizontalHeader()->setStretchLastSection(true);
    … …  
    14061407
    14071408    QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
    1408     QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
    1409     QString nmea(hlp[4]);
    1410     if (hlp[5] == "S") {
     1409    QString format(hlp[1]); QString country(hlp[2]); QString latitude(hlp[3]); QString longitude(hlp[4]);
     1410    QString nmea(hlp[5]);
     1411    if (hlp[6] == "S") {
    14111412      fullPath = hlp[0].replace(0,2,"");
    14121413    }
    14131414    QString ntripVersion = "2";
    1414     if (hlp.size() >= 6) {
    1415       ntripVersion = (hlp[5]);
     1415    if (hlp.size() >= 7) {
     1416      ntripVersion = (hlp[6]);
    14161417    }
    14171418
    … …  
    14281429    _mountPointsTable->setItem(iRow, 2, it);
    14291430
     1431    it = new QTableWidgetItem(country);
     1432    _mountPointsTable->setItem(iRow, 3, it);
     1433
    14301434    if      (nmea == "yes") {
    1431     it = new QTableWidgetItem(latitude);
    1432     _mountPointsTable->setItem(iRow, 3, it);
    1433     it = new QTableWidgetItem(longitude);
    1434     _mountPointsTable->setItem(iRow, 4, it);
     1435      it = new QTableWidgetItem(latitude);
     1436      _mountPointsTable->setItem(iRow, 4, it);
     1437      it = new QTableWidgetItem(longitude);
     1438      _mountPointsTable->setItem(iRow, 5, it);
    14351439    } else {
    1436     it = new QTableWidgetItem(latitude);
    1437     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1438     _mountPointsTable->setItem(iRow, 3, it);
    1439     it = new QTableWidgetItem(longitude);
    1440     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1441     _mountPointsTable->setItem(iRow, 4, it);
     1440      it = new QTableWidgetItem(latitude);
     1441      it->setFlags(it->flags() & ~Qt::ItemIsEditable);
     1442      _mountPointsTable->setItem(iRow, 4, it);
     1443
     1444      it = new QTableWidgetItem(longitude);
     1445      it->setFlags(it->flags() & ~Qt::ItemIsEditable);
     1446      _mountPointsTable->setItem(iRow, 5, it);
    14421447    }
    14431448
    14441449    it = new QTableWidgetItem(nmea);
    14451450    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1446     _mountPointsTable->setItem(iRow, 5, it);
     1451    _mountPointsTable->setItem(iRow, 6, it);
    14471452
    14481453    it = new QTableWidgetItem(ntripVersion);
    14491454    ////    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1450     _mountPointsTable->setItem(iRow, 6, it);
     1455    _mountPointsTable->setItem(iRow, 7, it);
    14511456
    14521457    bncTableItem* bncIt = new bncTableItem();
    14531458    bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
    1454     _mountPointsTable->setItem(iRow, 7, bncIt);
     1459    _mountPointsTable->setItem(iRow, 8, bncIt);
    14551460
    14561461    iRow++;
    … …  
    15621567    QUrl    url(hlp[0]);
    15631568    QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
    1564     QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
    1565     QString nmea(hlp[4]);
    1566     if (hlp[5] == "S") {
     1569    QString format(hlp[1]); QString country(hlp[2]); QString latitude(hlp[3]); QString longitude(hlp[4]);
     1570    QString nmea(hlp[5]);
     1571    if (hlp[6] == "S") {
    15671572      fullPath = hlp[0].replace(0,2,"");
    15681573    }
    15691574    QString ntripVersion = "2";
    1570     if (hlp.size() >= 6) {
    1571       ntripVersion = (hlp[5]);
     1575    if (hlp.size() >= 7) {
     1576      ntripVersion = (hlp[6]);
    15721577    }
    15731578
    … …  
    15861591    _mountPointsTable->setItem(iRow, 2, it);
    15871592
     1593    it = new QTableWidgetItem(country);
     1594    _mountPointsTable->setItem(iRow, 3, it);
     1595
    15881596    if      (nmea == "yes") {
    15891597    it = new QTableWidgetItem(latitude);
    1590     _mountPointsTable->setItem(iRow, 3, it);
     1598    _mountPointsTable->setItem(iRow, 4, it);
    15911599    it = new QTableWidgetItem(longitude);
    1592     _mountPointsTable->setItem(iRow, 4, it);
     1600    _mountPointsTable->setItem(iRow, 5, it);
    15931601    } else {
    15941602    it = new QTableWidgetItem(latitude);
    15951603    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1596     _mountPointsTable->setItem(iRow, 3, it);
     1604    _mountPointsTable->setItem(iRow, 4, it);
    15971605    it = new QTableWidgetItem(longitude);
    15981606    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1599     _mountPointsTable->setItem(iRow, 4, it);
     1607    _mountPointsTable->setItem(iRow, 5, it);
    16001608    }
    16011609
    16021610    it = new QTableWidgetItem(nmea);
    16031611    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1604     _mountPointsTable->setItem(iRow, 5, it);
     1612    _mountPointsTable->setItem(iRow, 6, it);
    16051613
    16061614    it = new QTableWidgetItem(ntripVersion);
    1607     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
    1608     _mountPointsTable->setItem(iRow, 6, it);
     1615    ////it->setFlags(it->flags() & ~Qt::ItemIsEditable);
     1616    _mountPointsTable->setItem(iRow, 7, it);
    16091617
    16101618    bncTableItem* bncIt = new bncTableItem();
    1611     _mountPointsTable->setItem(iRow, 7, bncIt);
     1619    _mountPointsTable->setItem(iRow, 8, bncIt);
    16121620
    16131621    iRow++;
    … …  
    16441652                 + " " + _mountPointsTable->item(iRow, 4)->text()
    16451653                 + " " + _mountPointsTable->item(iRow, 5)->text()
    1646                  + " " + _mountPointsTable->item(iRow, 6)->text());
     1654                 + " " + _mountPointsTable->item(iRow, 6)->text()
     1655                 + " " + _mountPointsTable->item(iRow, 7)->text());
    16471656    } else {
    16481657      mountPoints.append(
    … …  
    16521661                 + " " + _mountPointsTable->item(iRow, 4)->text()
    16531662                 + " " + _mountPointsTable->item(iRow, 5)->text()
    1654                  + " " + _mountPointsTable->item(iRow, 6)->text());
     1663                 + " " + _mountPointsTable->item(iRow, 6)->text()
     1664                 + " " + _mountPointsTable->item(iRow, 7)->text());
    16551665    }
    16561666  }
    … …  
    20592069                "@"  + _mountPointsTable->item(iRow, 1)->text() );
    20602070      if (url                                      == thread->mountPoint() &&
    2061           _mountPointsTable->item(iRow, 3)->text() == thread->latitude()   &&
    2062           _mountPointsTable->item(iRow, 4)->text() == thread->longitude() ) {
    2063         ((bncTableItem*) _mountPointsTable->item(iRow, 7))->setGetThread(thread);
     2071          _mountPointsTable->item(iRow, 4)->text() == thread->latitude()   &&
     2072          _mountPointsTable->item(iRow, 5)->text() == thread->longitude() ) {
     2073        ((bncTableItem*) _mountPointsTable->item(iRow, 8))->setGetThread(thread);
    20642074        disconnect(thread, SIGNAL(newBytes(QByteArray, double)),
    20652075                  _bncFigure, SLOT(slotNewData(QByteArray, double)));
Note: See TracChangeset for help on using the changeset viewer.