Changeset 5863 in ntrip


Ignore:
Timestamp:
Aug 8, 2014, 10:43:23 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppRunPostProc.cpp

    r5860 r5863  
    103103  else {
    104104    BNC_CORE->slotMessage(msg, false);
    105   }
    106 }
    107 
    108 // Set Observations from RINEX File
    109 ////////////////////////////////////////////////////////////////////////////
    110 void t_postProcessing::setObsFromRnx(const t_rnxObsFile* rnxObsFile,
    111                                      const t_rnxObsFile::t_rnxEpo* epo,
    112                                      const t_rnxObsFile::t_rnxSat& rnxSat,
    113                                      t_obs& obs) {
    114 
    115   strncpy(obs.StatID, rnxObsFile->markerName().toAscii().constData(),
    116           sizeof(obs.StatID));
    117 
    118   obs.satSys   = rnxSat.satSys;
    119   obs.satNum   = rnxSat.satNum;
    120   obs.GPSWeek  = epo->tt.gpsw();
    121   obs.GPSWeeks = epo->tt.gpssec();
    122 
    123   for (int iType = 0; iType < rnxObsFile->nTypes(obs.satSys); iType++) {
    124     QString type = rnxObsFile->obsType(obs.satSys,iType).toAscii();
    125     obs.setMeasdata(type, rnxObsFile->version(), rnxSat.obs[iType]);
    126     if      (type.indexOf("L1") == 0) {
    127       obs.snrL1  = rnxSat.snr[iType];
    128       obs.slipL1 = (rnxSat.lli[iType] & 1);
    129     }
    130     else if (type.indexOf("L2") == 0) {
    131       obs.snrL2  = rnxSat.snr[iType];
    132       obs.slipL2 = (rnxSat.lli[iType] & 1);
    133     }
    134     else if (type.indexOf("L5") == 0) {
    135       obs.snrL5  = rnxSat.snr[iType];
    136       obs.slipL5 = (rnxSat.lli[iType] & 1);
    137     }
    138105  }
    139106}
  • trunk/BNC/src/PPP/pppRunPostProc.h

    r5860 r5863  
    4444 public:
    4545  t_postProcessing(QObject* parent, int maxSpeed, int speed);
    46   static void setObsFromRnx(const t_rnxObsFile* rnxObsFile,
    47                             const t_rnxObsFile::t_rnxEpo* epo,
    48                             const t_rnxObsFile::t_rnxSat& rnxSat,
    49                             t_obs& obs);
    50 
    5146  ~t_postProcessing();
    5247
  • trunk/BNC/src/bncmain.cpp

    r5845 r5863  
    5252#include "upload/bncephuploadcaster.h"
    5353#ifdef USE_POSTPROCESSING
    54 #  include "rinex/bncpostprocess.h"
    5554#  include "rinex/reqcedit.h"
    5655#  include "rinex/reqcanalyze.h"
     
    160159#ifdef USE_POSTPROCESSING
    161160
    162   // Post-Processing PPP
    163   // -------------------
    164   else if (settings.value("pppSPP").toString() == "Post-Processing") {
    165     BNC_CORE->setMode(t_bncCore::batchPostProcessing);
    166     t_postProcessing* postProcessing = new t_postProcessing(0, 0, 0);
    167     postProcessing->start();
    168   }
    169 
    170161  // Post-Processing reqc edit
    171162  // -------------------------
    172   else if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
     163  if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
    173164    BNC_CORE->setMode(t_bncCore::batchPostProcessing);
    174165    t_reqcEdit* reqcEdit = new t_reqcEdit(0);
  • trunk/BNC/src/bncwindow.h

    r5861 r5863  
    8686    void slotMapPPPClosed();
    8787    void slotStart();
    88     void slotFinishedPostProcessingPPP();
    8988    void slotFinishedPostProcessingReqc();
    9089    void slotStop();
  • trunk/BNC/src/rinex/reqcanalyze.cpp

    r5776 r5863  
    4848#include "reqcedit.h"
    4949#include "bncutils.h"
    50 #include "bncpostprocess.h"
    5150#include "graphwin.h"
    5251#include "polarplot.h"
     
    5857
    5958const double SLIPTRESH = 10.0; // cycle-slip threshold (meters)
     59
     60// Set Observations from RINEX File
     61////////////////////////////////////////////////////////////////////////////
     62void t_reqcAnalyze::setObsFromRnx(const t_rnxObsFile* rnxObsFile,
     63                                  const t_rnxObsFile::t_rnxEpo* epo,
     64                                  const t_rnxObsFile::t_rnxSat& rnxSat,
     65                                  t_obs& obs) {
     66
     67  strncpy(obs.StatID, rnxObsFile->markerName().toAscii().constData(),
     68          sizeof(obs.StatID));
     69
     70  obs.satSys   = rnxSat.satSys;
     71  obs.satNum   = rnxSat.satNum;
     72  obs.GPSWeek  = epo->tt.gpsw();
     73  obs.GPSWeeks = epo->tt.gpssec();
     74
     75  for (int iType = 0; iType < rnxObsFile->nTypes(obs.satSys); iType++) {
     76    QString type = rnxObsFile->obsType(obs.satSys,iType).toAscii();
     77    obs.setMeasdata(type, rnxObsFile->version(), rnxSat.obs[iType]);
     78    if      (type.indexOf("L1") == 0) {
     79      obs.snrL1  = rnxSat.snr[iType];
     80      obs.slipL1 = (rnxSat.lli[iType] & 1);
     81    }
     82    else if (type.indexOf("L2") == 0) {
     83      obs.snrL2  = rnxSat.snr[iType];
     84      obs.slipL2 = (rnxSat.lli[iType] & 1);
     85    }
     86    else if (type.indexOf("L5") == 0) {
     87      obs.snrL5  = rnxSat.snr[iType];
     88      obs.slipL5 = (rnxSat.lli[iType] & 1);
     89    }
     90  }
     91}
    6092
    6193// Constructor
     
    239271        const t_rnxObsFile::t_rnxSat& rnxSat = _currEpo->rnxSat[iObs];
    240272        t_obs obs;
    241         t_postProcessing::setObsFromRnx(obsFile, _currEpo, rnxSat, obs);
     273        setObsFromRnx(obsFile, _currEpo, rnxSat, obs);
    242274 
    243275        QString prn = QString("%1%2").arg(obs.satSys)
  • trunk/BNC/src/rinex/reqcanalyze.h

    r5738 r5863  
    169169                   QVector<t_polarPoint*>* dataSNR2);
    170170
     171  void setObsFromRnx(const t_rnxObsFile* rnxObsFile,
     172                     const t_rnxObsFile::t_rnxEpo* epo,
     173                    const t_rnxObsFile::t_rnxSat& rnxSat,
     174                    t_obs& obs);
     175
    171176  QString                    _logFileName;
    172177  QFile*                     _logFile;
Note: See TracChangeset for help on using the changeset viewer.