Index: trunk/BNC/src/bnchelp.html =================================================================== --- trunk/BNC/src/bnchelp.html (revision 8636) +++ trunk/BNC/src/bnchelp.html (revision 8637) @@ -1609,6 +1609,6 @@

@@ -1616,5 +1616,5 @@ The default 'Signal priority' list is defined as follows: Index: trunk/BNC/src/bncmain.cpp =================================================================== --- trunk/BNC/src/bncmain.cpp (revision 8636) +++ trunk/BNC/src/bncmain.cpp (revision 8637) @@ -127,5 +127,5 @@ " reqcRnxVersion {RINEX version [integer number: 2|3]}\n" " reqcSampling {RINEX output file sampling rate [character string: 0.1 sec|1 sec|5 sec|10 sec|15 sec|30 sec|60 sec]}\n" - " reqcV2Priority {Version 2 priority of signal attributes [character string, list separated by blank character, example: G:12&PWCSLXYN G:5&IQX C:IQX]}\n" + " reqcV2Priority {Version 2 priority of signal attributes [character string, list separated by blank character, example: G:12&PWCSLX G:5&IQX]}\n" " reqcStartDateTime {Start time [character string, example: 1967-11-02T00:00:00]}\n" " reqcEndDateTime {Stop time [character string, example: 2099-01-01T00:00:00 }\n" @@ -214,5 +214,5 @@ "PPP Client Panel 2 keys:\n" " PPP/staTable {Station specifications table [character string, semicolon separated list, each element in quotaion marks, example:\n" - " \"FFMJ1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;CUT07,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778\"]}\n" + " \"FFMJ00DEU1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778\"]}\n" "\n" "PPP Client Panel 3 keys:\n" @@ -282,6 +282,6 @@ "Add Stream keys:\n" " mountPoints {Mountpoints [character string, semicolon separated list, example:\n" - " \"//user:pass@www.igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2;\n" - " //user:pass@www.igs-ip.net:2101/FFMJ2 RTCM_3.1 DEU 50.09 8.66 no 2\"}\n" + " \"//user:pass@www.igs-ip.net:2101/FFMJ00DEU1 RTCM_3.1 DEU 50.09 8.66 no 2;\n" + " //user:pass@www.igs-ip.net:2101/FFMJ00DEU0 RTCM_3.1 DEU 50.09 8.66 no 2\"}\n" " ntripVersion {Ntrip Version [character string: 1|2|2s|R|U]}\n" " casterUrlList {Visited Broadcasters [character string, comma separated list]}\n" @@ -305,12 +305,12 @@ "(5) bnc --conf /dev/null --key startTab 4 --key reqcAction Edit/Concatenate" " --key reqcObsFile AGAR.15O --key reqcOutObsFile AGAR_X.15O" - " --key reqcRnxVersion 2 --key reqcSampling 30 sec --key reqcV2Priority CWPX_?\n" - "(6) bnc --key mountPoints \"//user:pass@mgex.igs-ip.net:2101/CUT07 RTCM_3.0 ETH 9.03 38.74 no 2;" - "//user:pass@www.igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2\"\n" + " --key reqcRnxVersion 2 --key reqcSampling 30 sec --key reqcV2Priority G:12&PWCSLX G:5&IQX\n" + "(6) bnc --key mountPoints \"//user:pass@mgex.igs-ip.net:2101/CUT000AUS0 RTCM_3.0 ETH 9.03 38.74 no 2;" + "//user:pass@www.igs-ip.net:2101/FFMJ00DEU1 RTCM_3.1 DEU 50.09 8.66 no 2\"\n" "(7) bnc --key cmbStreams \"CLK11 BLG 1.0;CLK93 CNES 1.0\"\n" "(8) bnc --key uploadMountpointsOut \"products.igs-ip.net,98756,TEST,letmein,IGS14,2,/Users/weber/BNC${GPSWD}.clk,,33,3,2;" "www.euref-ip.net,333,TEST2,aaaaa,ETRF2000,2,,,33,5,5\"\n" - "(9) bnc --key PPP/staTable \"FFMJ1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;" - "CUT07,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778\"\n"; + "(9) bnc --key PPP/staTable \"FFMJ00DEU1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;" + "CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778\"\n"; for (int ii = 1; ii < argc; ii++) { Index: trunk/BNC/src/bncsettings.cpp =================================================================== --- trunk/BNC/src/bncsettings.cpp (revision 8636) +++ trunk/BNC/src/bncsettings.cpp (revision 8637) @@ -130,5 +130,5 @@ setValue_p("reqcNewReceiverNumber", ""); setValue_p("reqcUseObsTypes", ""); - setValue_p("reqcV2Priority", "G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_"); + setValue_p("reqcV2Priority", "G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX"); // SP3 setValue_p("sp3CompFile", ""); Index: trunk/BNC/src/bncwindow.cpp =================================================================== --- trunk/BNC/src/bncwindow.cpp (revision 8636) +++ trunk/BNC/src/bncwindow.cpp (revision 8637) @@ -243,5 +243,5 @@ QString hlp = settings.value("rnxV2Priority").toString(); if (hlp.isEmpty()) { - hlp = "G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_"; + hlp = "G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX"; } _rnxV2Priority = new QLineEdit(hlp); @@ -1307,5 +1307,5 @@ _rnxFileCheckBox->setWhatsThis(tr("

Tick check box 'Skeleton mandatory' in case you want that RINEX files are only produced if skeleton files are available for BNC. If no skeleton file is available for a particular source then no RINEX Observation file will be produced from the affected stream.

Note that a skeleton file contains RINEX header information such as receiver and antenna types. In case of stream conversion to RINEX Version 3, a skeleton file should also contain information on potentially available observation types. A missing skeleton file will therefore enforce BNC to only save a default set of RINEX 3 observation types. [key: rnxOnlyWithSKL]

")); _rnxScrpLineEdit->setWhatsThis(tr("

Whenever a RINEX Observation file is finally saved, you may want to compress, copy or upload it immediately, for example via FTP. BNC allows you to execute a script/batch file to carry out such operation.

Specify the full path of a script or batch file. BNC will pass the full RINEX Observation file path to the script as command line parameter (%1 on Windows systems, $1 on Unix/Linux/Mac systems). [key: rnxScript]

")); - _rnxV2Priority->setWhatsThis(tr("

Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.

Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example:

Default is the following priority list 'G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_'. [key: rnxV2Priority]

")); + _rnxV2Priority->setWhatsThis(tr("

Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.

Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example:

Default is the following priority list 'G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX'. [key: rnxV2Priority]

")); _rnxV3CheckBox->setWhatsThis(tr("

The default format for RINEX Observation files is RINEX Version 2.

Select 'Version 3' if you want to save observations in RINEX Version 3 format. [key: rnxV3]

")); Index: trunk/BNC/src/reqcdlg.cpp =================================================================== --- trunk/BNC/src/reqcdlg.cpp (revision 8636) +++ trunk/BNC/src/reqcdlg.cpp (revision 8637) @@ -148,5 +148,5 @@ QString hlp = settings.value("reqcV2Priority").toString(); if (hlp.isEmpty()) { - hlp = "G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_"; + hlp = "G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX"; } _reqcV2Priority = new QLineEdit(hlp); @@ -242,5 +242,5 @@ _reqcRnxVersion->setWhatsThis(tr("

Select version number of emerging new RINEX file.

Note the following:

When converting RINEX Version 2 to Version 3 Observation files, the tracking mode or channel information (signal attribute, see RINEX Version 3 documentation) in the (last out of the three characters) observation code is left blank if unknown.

When converting RINEX Version 3 to Version 2, the mapping of observations follows a 'Signal priority list' with signal attributes as defined in RINEX Version 3. [key: reqcRnxVersion]

")); _reqcSampling->setWhatsThis(tr("

Select sampling rate of emerging new RINEX Observation file. [key: reqcSampling]

")); - _reqcV2Priority->setWhatsThis(tr("

Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.

Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example:

Default is the following priority list 'G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_'. [key: reqcV2Priority]

")); + _reqcV2Priority->setWhatsThis(tr("

Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.

Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example:

Default is the following priority list 'G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX'. [key: reqcV2Priority]

")); _reqcStartDateTime->setWhatsThis(tr("

Specify begin of emerging new RINEX Observation file. [key: reqcStartDateTime]

")); _reqcEndDateTime->setWhatsThis(tr("

Specify end of emerging new RINEX Observation file. [key: reqcEndDateTime]

"));