Changeset 565 in ntrip for trunk/BNC

Timestamp:

Nov 6, 2007, 3:02:33 PM (17 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncabout.html (modified) (1 diff)
• bncapp.cpp (modified) (2 diffs)
• bncgetthread.cpp (modified) (2 diffs)
• bnchelp.html (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (7 diffs)

trunk/BNC/bncabout.html

@@ -21 +21 @@
 The Bundesamt fuer Geodaesie und Kartographie (BKG) may not be held liable for damages of any kind, direct or consequential, which may result from the use of this software.<br>
 <br>
-BKG, Frankfurt, Germany, July 2007<br>
+BKG, Frankfurt, Germany, November 2007<br>
 E-Mail: <a><u>euref-ip@bkg.bund.de</u></a>.<br>
 </p>

trunk/BNC/bncapp.cpp

@@ -68 +68 @@
   QApplication(argc, argv, GUIenabled) {
 
-  _bncVersion  = "BNC 1.4";
+  _bncVersion  = "BNC 1.5";
 
   _logFileFlag = 0;
@@ -346 +346 @@
         QString line;
         line.sprintf(
-          "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.1, "", "");
+          "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.11, "", "");
         *_ephStreamGPS << line;
          

trunk/BNC/bncgetthread.cpp

@@ -167 +167 @@
    reqStr = "GET " + hlp.path().toAscii() + 
             " HTTP/1.0\r\n"
-            "User-Agent: NTRIP BNC 1.4\r\n"
+            "User-Agent: NTRIP BNC 1.5\r\n"
             "Authorization: Basic " +
             userAndPwd.toBase64() + "\r\n";
@@ -173 +173 @@
    reqStr = "GET " + hlp.toEncoded() + 
             " HTTP/1.0\r\n"
-            "User-Agent: NTRIP BNC 1.4\r\n"
+            "User-Agent: NTRIP BNC 1.5\r\n"
             "Authorization: Basic " +
             userAndPwd.toBase64() + "\r\n";

trunk/BNC/bnchelp.html

@@ -338 +338 @@
 <p><a name="ephpath"><h4>B - 6.1 Ephemeris Directory - optional</h4></p>
 <p>
-Enter a path for saving Broadcast Ephemeris data as RINEX Navigation files in a directory. If this directory does not exist, BNC will not create RINEX Naviggation files. Default value for 'Ephemeris directory' is an empty option field, meaning that no RINEX Navigation files are created.
+Enter a path for saving Broadcast Ephemeris data as RINEX Navigation files in a directory. If this directory does not exist, BNC will not create RINEX Navigation files. Default value for 'Ephemeris directory' is an empty option field, meaning that no RINEX Navigation files are created.
 </p> 
 

trunk/BNC/bncmain.cpp

@@ -72 +72 @@
     settings.setValue("casterPort", 80);
     settings.setValue("rnxIntr",    "15 min");
+    settings.setValue("ephIntr",    "1 day");
     settings.setValue("rnxSkel",    "SKL");
     settings.setValue("waitTime",   2);

trunk/BNC/bnctabledlg.cpp

@@ -80 +80 @@
 
   _table = new QTableWidget(this);
-  _table->setWhatsThis(tr("<p>Hit button 'Get Table' to download the source-table from the NTRIP broadcaster. Select streams line by line, use +Shift and +Ctrl when necessary. Hit 'OK' to return to the main window.</p><p>Pay attention to data fields 'format' and 'format-details'. Keep in mind that BNC can only decode and convert streams that come in RTCM 2.x, RTCM 3, or RTIGS formats. RTCM 2.x streams must contain message types 18 and 19 while RTCM 3 streams must contain GPS message types 1002 or 1004 and may contain GLONASS message types 1010 or 1012, see data field 'format-details' for available message types and their repetition rates in brackets.</p><p>The contents of data field 'nmea' tells you whether or not a stream retrieval needs to be initiated by BNC through sending an NMEA-GGA string carrying the latitude and longitude parameters.</p>"));
+  _table->setWhatsThis(tr("<p>Hit button 'Get Table' to download the source-table from the NTRIP broadcaster. Select streams line by line, use +Shift and +Ctrl when necessary. Hit 'OK' to return to the main window.</p><p>Pay attention to data fields 'format' and 'format-details'. Keep in mind that BNC can only decode and convert streams that come in RTCM 2.x, RTCM 3, or RTIGS format. RTCM 2.x streams must contain message types 18 and 19 while RTCM 3 streams must contain GPS message types 1002 or 1004 and may contain GLONASS message types 1010 or 1012, see data field 'format-details' for available message types and their repetition rates in brackets.</p><p>Note that for saving RINEX Navigation files you need RTCM Version 3 streams carrying message types 1019 (GPS) and 1020 (GLONASS).</p><p>The contents of data field 'nmea' tells you whether or not a stream retrieval needs to be initiated by BNC through sending an NMEA-GGA string carrying the latitude and longitude parameters.</p>"));
   connect(_table, SIGNAL(itemSelectionChanged()),
           this, SLOT(slotSelectionChanged()));

trunk/BNC/bncwindow.cpp

@@ -60 +60 @@
   setMinimumSize(77*ww, 65*ww);
 
-  setWindowTitle(tr("BKG Ntrip Client (BNC), Version 1.4"));
+  setWindowTitle(tr("BKG Ntrip Client (BNC), Version 1.5"));
 
   // Create Actions
@@ -150 +150 @@
   _outPortLineEdit->setWhatsThis(tr("<p>BNC makes synchronized observations available in a binary format on your local host (IP 127.0.0.1) through an IP port. Enter an IP port number to activate this function.</p><p>Default is an empty option field, meaning that no binary output is generated.</p>"));
   _rnxPathLineEdit    = new QLineEdit(settings.value("rnxPath").toString());
-  _rnxPathLineEdit->setWhatsThis(tr("<p>Observations can be converted to RINEX Version 2.11. Enter a path for saving the RINEX files in a directory. If this directory does not exist, BNC will not create RINEX files.</p><p>Default value for 'RINEX directory' is an empty option field, meaning that streams are not converted to RINEX.</p>"));
+  _rnxPathLineEdit->setWhatsThis(tr("<p>Observations can be converted to RINEX. Enter a path for saving the RINEX files in a directory. If this directory does not exist, BNC will not create RINEX files.</p><p>Default value for 'RINEX directory' is an empty option field, meaning that streams are not converted to RINEX.</p>"));
   _ephPathLineEdit    = new QLineEdit(settings.value("ephPath").toString());
-  _ephPathLineEdit->setWhatsThis(tr("<p>Navigation messages can be converted to RINEX files. Enter a path for saving the files in a directory.</p>"));
+  _ephPathLineEdit->setWhatsThis(tr("<p>Ephemeris data from RTCM Version 3 streams can be converted to RINEX. Enter a path for saving the RINEX Navigation files in a directory. If this directory does not exist, BNC will not create RINEX Navigation files.</p><p>Default value for 'Ephemeris directory' is an empty option field, meaning that no RINEX Navigation files will be created.</p>"));
+
   _rnxV3CheckBox = new QCheckBox();
   _rnxV3CheckBox->setCheckState(Qt::CheckState(settings.value("rnxV3").toInt()));
@@ -176 +177 @@
   }
   _ephIntrComboBox    = new QComboBox();
-  _ephIntrComboBox->setWhatsThis(tr("<p>Select an interval for the ephemeris file generation."));
+  _ephIntrComboBox->setWhatsThis(tr("<p>Select an interval for the ephemeris file generation.</p><p>Default for 'Ephemeris file interval' is '1 day', meaning that a new Ephemeris file is generated every day.</p>"));
   _ephIntrComboBox->setMaximumWidth(9*ww);
   _ephIntrComboBox->setEditable(false);
@@ -291 +292 @@
   layout->addWidget(new QLabel("RINEX v3"),                      4, 3, 1, 2);
   layout->addWidget(_rnxV3CheckBox,                              4, 4);
+  _rnxV3CheckBox->setWhatsThis(tr("<p>Select the RINEX Observation file output format.</p><p>Default is RINEX Version 2.11 format. Output in RINEX Version 3 (RINEX v3) format is optional.</p>"));
 
   layout->addWidget(new QLabel("RINEX script (full path)"),      5, 0, 1, 2);
@@ -301 +303 @@
   bl->addWidget(new QLabel("RINEX"));
   bl->addWidget(_ephIntrComboBox);
-  bl->addWidget(new QLabel("EPH"));
+  bl->addWidget(new QLabel("Ephemeris"));
   layout->addLayout(bl, 6, 2, 1, 1);
 
@@ -318 +320 @@
   layout->addWidget(new QLabel("RINEX v3"),                      8, 3, 1, 2);
   layout->addWidget(_ephV3CheckBox,                              8, 4);
+  _ephV3CheckBox->setWhatsThis(tr("<p>Select the RINEX Ephemeris file output format.</p><p>Default is RINEX Version 2.11 format. Output in RINEX Version 3 (RINEX v3) format is optional.</p>"));
 
   layout->addWidget(new QLabel("Mountpoints"),                   9, 0, 1, 2);
@@ -612 +615 @@
   img->setPixmap(QPixmap(":ntrip-logo.png"));
   dlgLayout->addWidget(img, 0,0);
-  dlgLayout->addWidget(new QLabel("BKG NTRIP Client (BNC), Version 1.4"), 0,1);
+  dlgLayout->addWidget(new QLabel("BKG NTRIP Client (BNC), Version 1.5"), 0,1);
   dlgLayout->addWidget(tb,1,0,1,2);