Changeset 6563 in ntrip

Timestamp:

Jan 23, 2015, 4:32:40 PM (9 years ago)

Author:

stuerze

Message:

try to catch incorrect user input

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (3 diffs)
• reqcanalyze.h (modified) (1 diff)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -70 +70 @@
   _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:1&7";}
+  _defaultSignalTypes << "G:1&2" << "R:1&2" << "J:1&2" << "E:1&5" << "S:1&5" << "C:1&7";
+  if (_reqcPlotSignals.isEmpty()) {
+    _reqcPlotSignals = _defaultSignalTypes.join(" ");
+  }
   analyzePlotSignals(_signalTypes);
 
@@ -146 +149 @@
 
   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]);
+    QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), QString::SkipEmptyParts);
+    if (input.size() > 1 && input[0].length() == 1) {
+      char system = input[0].toAscii().constData()[0];
+      QStringList sysValid       = _defaultSignalTypes.filter(QString(system));
+      QStringList defaultSignals = sysValid.at(0).split(QRegExp("[:&]"));
+      if (sysValid.isEmpty()) {continue;}
+      if (input[1][0].isDigit()) {
+        signalTypes[system].append(input[1]);
+      }
+      else {
+        signalTypes[system].append(defaultSignals[1]);
+      }
+      if (input.size() > 2) {
+        if (input[2][0].isDigit()) {
+          signalTypes[system].append(input[2]);
+        }
+        else {
+          signalTypes[system].append(defaultSignals[2]);
+        }
+      } else {
+        signalTypes[system].append(defaultSignals[2]);
+        if (signalTypes[system][0] == signalTypes[system][1]) {
+          signalTypes[system][0] = defaultSignals[1];
+        }
       }
     }
@@ -518 +539 @@
   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] + " ";
+      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] + " ";
   }
 

trunk/BNC/src/rinex/reqcanalyze.h

@@ -189 +189 @@
   QString                       _reqcPlotSignals;
   QMap<char, QVector<QString> > _signalTypes;
+  QStringList                   _defaultSignalTypes;
   QVector<t_eph*>               _ephs;
   t_rnxObsFile::t_rnxEpo*       _currEpo;