Changeset 7293 in ntrip

Timestamp:

Sep 22, 2015, 2:53:32 PM (9 years ago)

Author:

stuerze

Message:

minor changes with respect to command line options

File:

• trunk/BNC/src/bncmain.cpp (modified) (5 diffs)

trunk/BNC/src/bncmain.cpp

@@ -75 +75 @@
   QString    confFileName;
 
-  QByteArray printHelp = 
+  QByteArray printHelp =
       "Usage: bnc --nw                       \n"
       "           --version                  \n"
@@ -121 +121 @@
       "RINEX Editing and QC Panel keys:\n"
       "           reqcAction            <Action, Edit/Concatenate|Analyze>\n"
-      "           reqcObsFile           <Input observations file(s)>\n"
-      "           reqcNavFile           <Input navigation file(s)>\n"
+      "           reqcObsFile           <Input observations file(s) as comma separated list> \n"
+      "           reqcNavFile           <Input navigation file(s) as comma separated list>\n"
       "           reqcOutObsFile        <Output observations file>\n"
       "           reqcOutNavFile        <Output navigation file>\n"
@@ -197 +197 @@
       "\n"
       "PPP Client Panel 1 keys:\n"
-      "           dataSource  <Data source, Real-Time Streams| RINEX Files>\n"
-      "           rinexObs    <RINEX observation file>\n"
-      "           rinexNav    <RINEX navigation file>\n"
-      "           corrMount   <Corrections mountpoint>\n"
-      "           corrFile    <Corrections file>\n"
-      "           crdFile     <Coordinates file>\n"
-      "           logFilePPP  <PPP logfile>\n"
-      "           antexFile   <ANTEX file>\n"
-      "           nmeaFile    <NMEA output file>\n"
-      "           snxtroFile  <SINEX troposphere output filename>\n"
-      "           snxtroSampl <SINEX troposphere sampling rate [sec]>\n"
+      "           PPP/dataSource  <Data source, Real-Time Streams| RINEX Files>\n"
+      "           PPP/rinexObs    <RINEX observation file>\n"
+      "           PPP/rinexNav    <RINEX navigation file>\n"
+      "           PPP/corrMount   <Corrections mountpoint>\n"
+      "           PPP/corrFile    <Corrections file>\n"
+      "           PPP/crdFile     <Coordinates file>\n"
+      "           PPP/logFilePPP  <PPP logfile>\n"
+      "           PPP/antexFile   <ANTEX file>\n"
+      "           PPP/nmeaFile    <NMEA output file>\n"
+      "           PPP/snxtroFile  <SINEX troposphere output filename>\n"
+      "           PPP/snxtroSampl <SINEX troposphere sampling rate [sec]>\n"
       "\n"
       "PPP Client Panel 2 keys:\n"
-      "           staTable <Stations table>\n"
+      "           PPP/staTable <Stations table as semicolon separated list>\n"
       "\n"
       "PPP Client Panel 3 keys:\n"
-      "           lcGPS        <Select linear combination from GPS code or phase data>\n"
-      "           lcGLONASS    <Select linear combination from GLONASS code or phase data>\n"
-      "           lcGalileo    <Select linear combination from Galileo code or phase data>\n"
-      "           lcBDS        <Select linear combination from BDS code or phase data>\n"
-      "           sigmaC1      <Sigma for code observations [m]>\n"
-      "           sigmaL1      <Sigma for phase observations [m]>\n"
-      "           maxResC1     <Maximal residuum for code observations [m]>\n"
-      "           maxResL1     <Maximal residuum for phase observations [m]>\n"
-      "           eleWgtCode   <Elevation dependent waiting of code observations, 0=no, 2=yes>\n"
-      "           eleWgtPhase  <Elevation dependent waiting of phase observations, 0=no, 2=yes>\n"
-      "           minObs       <Minimum number of observations>\n"
-      "           minEle       <Minimum elevation [deg]>\n"
-      "           corrWaitTime <Wait for clock corrections [sec]>\n"
-      "           seedingTime  <Seeding time span for Quick Start [sec]>\n"
+      "           PPP/lcGPS        <Select linear combination from GPS code or phase data>\n"
+      "           PPP/lcGLONASS    <Select linear combination from GLONASS code or phase data>\n"
+      "           PPP/lcGalileo    <Select linear combination from Galileo code or phase data>\n"
+      "           PPP/lcBDS        <Select linear combination from BDS code or phase data>\n"
+      "           PPP/sigmaC1      <Sigma for code observations [m]>\n"
+      "           PPP/sigmaL1      <Sigma for phase observations [m]>\n"
+      "           PPP/maxResC1     <Maximal residuum for code observations [m]>\n"
+      "           PPP/maxResL1     <Maximal residuum for phase observations [m]>\n"
+      "           PPP/eleWgtCode   <Elevation dependent waiting of code observations, 0=no, 2=yes>\n"
+      "           PPP/eleWgtPhase  <Elevation dependent waiting of phase observations, 0=no, 2=yes>\n"
+      "           PPP/minObs       <Minimum number of observations>\n"
+      "           PPP/minEle       <Minimum elevation [deg]>\n"
+      "           PPP/corrWaitTime <Wait for clock corrections [sec]>\n"
+      "           PPP/seedingTime  <Seeding time span for Quick Start [sec]>\n"
       "\n"
       "PPP Client Panel 4 keys:\n"
-      "           plotCoordinates  <Mountpoint for time series plot>\n"
-      "           audioResponse    <Audio response threshold [m]>\n"
-      "           useOpenStreetMap <OSM track map, true|false>\n"
-      "           useGoogleMap     <Google track map, true|false>\n"
-      "           mapWinDotSize    <Size of dots on map>\n"
-      "           mapWinDotColor   <Color of dots and cross hair on map, red|yellow>\n"
-      "           mapSpeedSlider   <Offline processing speed for mapping, 1-100>\n"
+      "           PPP/plotCoordinates  <Mountpoint for time series plot>\n"
+      "           PPP/audioResponse    <Audio response threshold [m]>\n"
+      "           PPP/useOpenStreetMap <OSM track map, true|false>\n"
+      "           PPP/useGoogleMap     <Google track map, true|false>\n"
+      "           PPP/mapWinDotSize    <Size of dots on map>\n"
+      "           PPP/mapWinDotColor   <Color of dots and cross hair on map, red|yellow>\n"
+      "           PPP/mapSpeedSlider   <Offline processing speed for mapping, 1-100>\n"
       "\n"
       "Combine Corrections Panel keys:\n"
@@ -276 +276 @@
       "\n"
       "Add Stream keys:\n"
-      "           mountPoints  <Mountpoint list>\n"
+      "           mountPoints  <Mountpoints as semicolon separated list> \n"
       "           ntripVersion <Ntrip Version, 1|2|2s|R|U>\n"
       "           casterUrlList <Visited URLs>\n"
@@ -351 +351 @@
       QString key(argv[ii+1]);
       QString val(argv[ii+2]);
-      settings.setValue(key, val);
+      if (val.indexOf(";")) {
+        settings.setValue(key, val.split(";", QString::SkipEmptyParts));
+      }
+      else {
+        settings.setValue(key, val);
+      }
     }
   }