Changeset 8773 in ntrip


Ignore:
Timestamp:
Jun 7, 2019, 10:22:27 AM (10 days ago)
Author:
stuerze
Message:

celanup of PPP(3) panel

Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r8098 r8773  
    183183      opt->_corrWaitTime = 0;
    184184    }
    185 
    186     if      (settings.value("PPP/lcGPS").toString() == "P1") {
    187       opt->_LCsGPS.push_back(t_lc::c1);
    188     }
    189     else if (settings.value("PPP/lcGPS").toString() == "L1") {
    190       opt->_LCsGPS.push_back(t_lc::l1);
    191     }
    192     else if (settings.value("PPP/lcGPS").toString() == "P1&L1") {
    193       opt->_LCsGPS.push_back(t_lc::c1);
    194       opt->_LCsGPS.push_back(t_lc::l1);
    195     }
    196     if      (settings.value("PPP/lcGPS").toString() == "P2") {
    197       opt->_LCsGPS.push_back(t_lc::c2);
    198     }
    199     else if (settings.value("PPP/lcGPS").toString() == "L2") {
    200       opt->_LCsGPS.push_back(t_lc::l2);
    201     }
    202     else if (settings.value("PPP/lcGPS").toString() == "P2&L2") {
    203       opt->_LCsGPS.push_back(t_lc::c2);
    204       opt->_LCsGPS.push_back(t_lc::l2);
    205     }
     185    // GPS
    206186    if      (settings.value("PPP/lcGPS").toString() == "Pi") {
    207187      opt->_LCsGPS.push_back(t_lc::c1);
     
    228208      opt->_LCsGPS.push_back(t_lc::lIF);
    229209    }
    230 
    231     if      (settings.value("PPP/lcGLONASS").toString() == "P1") {
    232       opt->_LCsGLONASS.push_back(t_lc::c1);
    233     }
    234     else if (settings.value("PPP/lcGLONASS").toString() == "L1") {
    235       opt->_LCsGLONASS.push_back(t_lc::l1);
    236     }
    237     else if (settings.value("PPP/lcGLONASS").toString() == "P1&L1") {
    238       opt->_LCsGLONASS.push_back(t_lc::c1);
    239       opt->_LCsGLONASS.push_back(t_lc::l1);
    240     }
    241     if      (settings.value("PPP/lcGLONASS").toString() == "P2") {
    242       opt->_LCsGLONASS.push_back(t_lc::c2);
    243     }
    244     else if (settings.value("PPP/lcGLONASS").toString() == "L2") {
    245       opt->_LCsGLONASS.push_back(t_lc::l2);
    246     }
    247     else if (settings.value("PPP/lcGLONASS").toString() == "P2&L2") {
    248       opt->_LCsGLONASS.push_back(t_lc::c2);
    249       opt->_LCsGLONASS.push_back(t_lc::l2);
    250     }
     210    // GLONASS
    251211    if      (settings.value("PPP/lcGLONASS").toString() == "Pi") {
    252212      opt->_LCsGLONASS.push_back(t_lc::c1);
     
    273233      opt->_LCsGLONASS.push_back(t_lc::lIF);
    274234    }
    275 
    276     if      (settings.value("PPP/lcGalileo").toString() == "P1") {
    277       opt->_LCsGalileo.push_back(t_lc::c1);
    278     }
    279     else if (settings.value("PPP/lcGalileo").toString() == "L1") {
    280       opt->_LCsGalileo.push_back(t_lc::l1);
    281     }
    282     else if (settings.value("PPP/lcGalileo").toString() == "P1&L1") {
    283       opt->_LCsGalileo.push_back(t_lc::c1);
    284       opt->_LCsGalileo.push_back(t_lc::l1);
    285     }
    286     if      (settings.value("PPP/lcGalileo").toString() == "P5") {
    287       opt->_LCsGalileo.push_back(t_lc::c2);
    288     }
    289     else if (settings.value("PPP/lcGalileo").toString() == "L5") {
    290       opt->_LCsGalileo.push_back(t_lc::l2);
    291     }
    292     else if (settings.value("PPP/lcGalileo").toString() == "P5&L5") {
    293       opt->_LCsGalileo.push_back(t_lc::c2);
    294       opt->_LCsGalileo.push_back(t_lc::l2);
    295     }
     235    // Galileo
    296236    if      (settings.value("PPP/lcGalileo").toString() == "Pi") {
    297237      opt->_LCsGalileo.push_back(t_lc::c1);
     
    318258      opt->_LCsGalileo.push_back(t_lc::lIF);
    319259    }
    320 
    321     if      (settings.value("PPP/lcBDS").toString() == "P2") {
    322       opt->_LCsBDS.push_back(t_lc::c1);
    323     }
    324     else if (settings.value("PPP/lcBDS").toString() == "L2") {
    325       opt->_LCsBDS.push_back(t_lc::l1);
    326     }
    327     else if (settings.value("PPP/lcBDS").toString() == "P2&L2") {
    328       opt->_LCsBDS.push_back(t_lc::c1);
    329       opt->_LCsBDS.push_back(t_lc::l1);
    330     }
    331     if      (settings.value("PPP/lcBDS").toString() == "P7") {
    332       opt->_LCsBDS.push_back(t_lc::c2);
    333     }
    334     else if (settings.value("PPP/lcBDS").toString() == "L7") {
    335       opt->_LCsBDS.push_back(t_lc::l2);
    336     }
    337     else if (settings.value("PPP/lcBDS").toString() == "P7&L7") {
    338       opt->_LCsBDS.push_back(t_lc::c2);
    339       opt->_LCsBDS.push_back(t_lc::l2);
    340     }
     260    // BDS
    341261    if      (settings.value("PPP/lcBDS").toString() == "Pi") {
    342262      opt->_LCsBDS.push_back(t_lc::c1);
  • trunk/BNC/src/pppWidgets.cpp

    r8403 r8773  
    127127  _lcGPS->addItems(QString("P3,P3&L3").split(","));
    128128#else
    129   _lcGPS->addItems(QString("no,P1,L1,P1&L1,P2,L2,P2&L2,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
     129  _lcGPS->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
    130130#endif
    131131
     
    134134   _lcGLONASS->addItems(QString("no,P3,L3,P3&L3").split(","));
    135135#else
    136   _lcGLONASS->addItems(QString("no,P1,L1,P1&L1,P2,L2,P2&L2,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
     136  _lcGLONASS->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
    137137#endif
    138138
     
    141141  _lcGalileo->addItems(QString("no,P3,L3,P3&L3").split(","));
    142142#else
    143   _lcGalileo->addItems(QString("no,P1,L1,P1&L1,P5,L5,P5&L5,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
     143  _lcGalileo->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
    144144#endif
    145145
     
    148148  _lcBDS->addItems(QString("no,P3,L3,P3&L3").split(","));
    149149#else
    150   _lcBDS->addItems(QString("no,P2,L2,P2&L2,P7,L7,P7&L7,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
     150  _lcBDS->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
    151151#endif
    152152
Note: See TracChangeset for help on using the changeset viewer.