Changeset 6539 in ntrip for trunk/BNC/src/rinex

Timestamp:

Jan 9, 2015, 6:43:09 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• availplot.cpp (modified) (1 diff)
• reqcanalyze.cpp (modified) (8 diffs)
• reqcanalyze.h (modified) (2 diffs)

trunk/BNC/src/rinex/availplot.cpp

@@ -63 +63 @@
  public:
   t_scaleDrawPrn() {}
-  virtual QwtText label(int iPrn) const {
+  virtual QwtText label(double iPrn) const {
     return _yLabels[iPrn];
   }

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -63 +63 @@
   bncSettings settings;
 
-  _logFileName  = settings.value("reqcOutLogFile").toString(); expandEnvVar(_logFileName);
-  _logFile      = 0;
-  _log          = 0;
-  _currEpo      = 0;
-  _obsFileNames = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
-  _navFileNames = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
+  _logFileName     = settings.value("reqcOutLogFile").toString(); expandEnvVar(_logFileName);
+  _logFile         = 0;
+  _log             = 0;
+  _currEpo         = 0;
+  _obsFileNames    = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
+  _navFileNames    = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
+  _reqcPlotSignals = settings.value("reqcSkyPlotSignals").toString();
+  if (_reqcPlotSignals.isEmpty()) {_reqcPlotSignals = "G:1&2 R:1&2 J:1&2 E:1&5 S:1&5 C:2&7";}
+  analyzePlotSignals(_signalTypes);
 
   connect(this, SIGNAL(dspSkyPlot(const QString&, const QString&, QVector<t_polarPoint*>*,
@@ -134 +137 @@
   emit finished();
   deleteLater();
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_reqcAnalyze::analyzePlotSignals(QMap<char, QVector<QString> >& signalTypes) {
+
+  QStringList signalsOpt = _reqcPlotSignals.split(" ", QString::SkipEmptyParts);
+
+  for (int ii = 0; ii < signalsOpt.size(); ii++) {
+    QStringList hlp = signalsOpt.at(ii).split(QRegExp("[:&]"), QString::SkipEmptyParts);
+    if (hlp.size() > 1 && hlp[0].length() == 1) {
+      char system = hlp[0].toAscii().constData()[0];
+      signalTypes[system].append(hlp[1]);
+      if (hlp.size() > 2) {
+        signalTypes[system].append(hlp[2]);
+      }
+    }
+  }
 }
 
@@ -170 +191 @@
       for (unsigned iObs = 0; iObs < _currEpo->rnxSat.size(); iObs++) {
         const t_rnxObsFile::t_rnxSat& rnxSat = _currEpo->rnxSat[iObs];
+        if (_signalTypes.find(rnxSat.prn.system()) == _signalTypes.end()) {
+          continue;
+        }
         t_satObs satObs;
         t_rnxObsFile::setObsFromRnx(obsFile, _currEpo, rnxSat, satObs);
@@ -216 +240 @@
     const t_rnxObsFile::t_rnxSat& rnxSat = _currEpo->rnxSat[iSat];
     const t_prn& prn = rnxSat.prn;
+
+    if (_signalTypes.find(prn.system()) == _signalTypes.end()) {
+      continue;
+    }
 
     t_eph* eph = 0;
@@ -532 +560 @@
   QString sn2Title = "Signal-to-Noise Ratio\n";
 
-  bncSettings settings;
-  
-  QString reqcSkyPlotSignals = settings.value("reqcSkyPlotSignals").toString();
-  if (reqcSkyPlotSignals.isEmpty()) {
-    reqcSkyPlotSignals = "G:1&2 R:1&2 J:1&2 E:1&7 C:1&6";
-  }
-
-  QStringList signalsOpt = reqcSkyPlotSignals.split(" ", QString::SkipEmptyParts);
-  QMap<char, QString> signalTypes1;
-  QMap<char, QString> signalTypes2;
-  for (int ii = 0; ii < signalsOpt.size(); ii++) {
-    QStringList hlp = signalsOpt.at(ii).split(QRegExp("[:&]"), QString::SkipEmptyParts);
-    if (hlp.size() > 1 && hlp[0].length() == 1) {
-      char system = hlp[0].toAscii().constData()[0];    
-      signalTypes1[system] = hlp[1];
-      mp1Title += hlp[0] + ":" + hlp[1] + " ";
-      sn1Title += hlp[0] + ":" + hlp[1] + " ";
-      if (hlp.size() > 2) {
-        signalTypes2[system] = hlp[2];
-        mp2Title += hlp[0] + ":" + hlp[2] + " ";
-        sn2Title += hlp[0] + ":" + hlp[2] + " ";
-      }
-    }
+  for(QMap<char, QVector<QString> >::iterator it = _signalTypes.begin();
+      it != _signalTypes.end(); it++) {
+    mp1Title += QString(it.key()) + ":" + it.value()[0] + " ";
+    sn1Title += QString(it.key()) + ":" + it.value()[0] + " ";
+    mp2Title += QString(it.key()) + ":" + it.value()[1] + " ";
+    sn2Title += QString(it.key()) + ":" + it.value()[1] + " ";
   }
 
@@ -579 +590 @@
 
           for (int ii = 0; ii < 2; ii++) {
-            const QMap<char, QString>& signalTypes = (ii == 0 ? signalTypes1 : signalTypes2);
             if (frqType[ii].isEmpty()) {
-              QMapIterator<char, QString> it(signalTypes);
+              QMapIterator<char, QVector<QString> > it(_signalTypes);
               while (it.hasNext()) {
                 it.next();
                 if (it.key() == prn.system()) {
-                  if (it.value() == qcFrq._rnxType2ch || it.value() == qcFrq._rnxType2ch.left(1)) {
+                  if (it.value()[ii] == qcFrq._rnxType2ch || it.value()[ii] == qcFrq._rnxType2ch.left(1)) {
                     frqType[ii] = qcFrq._rnxType2ch;
                     break;
@@ -715 +725 @@
       const t_prn&   prn   = it.key();
       const t_qcSat& qcSat = it.value();
+
       t_plotData&    data  = plotDataMap[prn];
 
@@ -722 +733 @@
       }
 
-      char frqChar1 = '1';
-      char frqChar2 = '2';
-      if      (prn.system() == 'E' || prn.system() == 'S') {
-        frqChar2 = '5';
-      }
-      else if (prn.system() == 'C') {
-        frqChar2 = '7';
-      }
+      char frqChar1 = _signalTypes[prn.system()][0][0].toAscii();
+      char frqChar2 = _signalTypes[prn.system()][1][0].toAscii();
+
       QString frqType1;
       QString frqType2;

trunk/BNC/src/rinex/reqcanalyze.h

@@ -164 +164 @@
   void   checkEphemerides();
 
+  void   analyzePlotSignals(QMap<char, QVector<QString> >& signalTypes);
+
   void   analyzeFile(t_rnxObsFile* obsFile);
 
@@ -179 +181 @@
   void   printReport(const t_rnxObsFile* obsFile);
 
-  QString                 _logFileName;
-  QFile*                  _logFile;
-  QTextStream*            _log;
-  QStringList             _obsFileNames;
-  QVector<t_rnxObsFile*>  _rnxObsFiles;
-  QStringList             _navFileNames;
-  QVector<t_eph*>         _ephs;
-  t_rnxObsFile::t_rnxEpo* _currEpo;
-  t_qcFile                _qcFile;
+  QString                       _logFileName;
+  QFile*                        _logFile;
+  QTextStream*                  _log;
+  QStringList                   _obsFileNames;
+  QVector<t_rnxObsFile*>        _rnxObsFiles;
+  QStringList                   _navFileNames;
+  QString                       _reqcPlotSignals;
+  QMap<char, QVector<QString> > _signalTypes;
+  QVector<t_eph*>               _ephs;
+  t_rnxObsFile::t_rnxEpo*       _currEpo;
+  t_qcFile                      _qcFile;
 };