Changeset 8236 in ntrip


Ignore:
Timestamp:
Jan 5, 2018, 10:54:26 AM (6 months ago)
Author:
stuerze
Message:

antenna and receiver info from message type 1007, 1008 and 1033 completed

File:
1 edited

Legend:

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

    r8197 r8236  
    859859      // -------------------------
    860860      for (int ii = 0; ii < decoder()->_antType.size(); ii++) {
    861         QString ant1 = QString("%1 ").arg(decoder()->_antType[ii]);
    862         emit(newMessage(_staID + ": Antenna descriptor " + ant1.toLatin1(), true));
     861        QString ant1 = QString(": Antenna Descriptor: %1 ").arg(decoder()->_antType[ii].descriptor);
     862        emit(newMessage(_staID + ant1.toLatin1(), true));
     863        if (strlen(decoder()->_antType[ii].serialnumber)) {
     864          QString ant2 = QString(": Antenna Serial Number: %1 ").arg(decoder()->_antType[ii].serialnumber);
     865          emit(newMessage(_staID + ant2.toLatin1(), true));
     866        }
    863867      }
    864868
     
    867871      for (int ii = 0; ii < decoder()->_antList.size(); ii++) {
    868872        QByteArray antT;
    869         if (decoder()->_antList[ii].type == GPSDecoder::t_antInfo::ARP) {
     873        if (decoder()->_antList[ii].type == GPSDecoder::t_antRefPoint::ARP) {
    870874          antT = "ARP";
    871         } else if (decoder()->_antList[ii].type == GPSDecoder::t_antInfo::APC) {
     875        } else if (decoder()->_antList[ii].type == GPSDecoder::t_antRefPoint::APC) {
    872876          antT = "APC";
    873877        }
    874878        QByteArray ant1, ant2, ant3;
    875         ant1 =
    876             QString("%1 ").arg(decoder()->_antList[ii].xx, 0, 'f', 4).toLatin1();
    877         ant2 =
    878             QString("%1 ").arg(decoder()->_antList[ii].yy, 0, 'f', 4).toLatin1();
    879         ant3 =
    880             QString("%1 ").arg(decoder()->_antList[ii].zz, 0, 'f', 4).toLatin1();
     879        ant1 = QString("%1 ").arg(decoder()->_antList[ii].xx, 0, 'f', 4).toLatin1();
     880        ant2 = QString("%1 ").arg(decoder()->_antList[ii].yy, 0, 'f', 4).toLatin1();
     881        ant3 = QString("%1 ").arg(decoder()->_antList[ii].zz, 0, 'f', 4).toLatin1();
    881882        emit(newMessage(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true));
    882883        emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true));
     
    896897      // --------------------------
    897898      for (int ii = 0; ii < decoder()->_recType.size(); ii++) {
    898         QString rec1 = QString("%1 ").arg(decoder()->_recType[ii]);
    899         emit(newMessage(_staID + ": Receiver descriptor " + rec1.toLatin1(), true));
     899        QString rec1 = QString(": Receiver Descriptor: %1 ").arg(decoder()->_recType[ii].descriptor);
     900        QString rec2 = QString(": Receiver Firmware Version: %1 ").arg(decoder()->_recType[ii].firmware);
     901        QString rec3 = QString(": Receiver Serial Number: %1 ").arg(decoder()->_recType[ii].serialnumber);
     902        emit(newMessage(_staID + rec1.toLatin1(), true));
     903        emit(newMessage(_staID + rec2.toLatin1(), true));
     904        emit(newMessage(_staID + rec3.toLatin1(), true));
    900905      }
    901906
Note: See TracChangeset for help on using the changeset viewer.