Changeset 8664 in ntrip

Timestamp:

Apr 4, 2019, 1:10:41 PM (5 years ago)

Author:

stuerze

Message:

minor changes reagarding skl filenames

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -170 +170 @@
   }
   if (!sklDir.isEmpty() && sklDir != "none") {
-    QString staID;
+    QString staID, staIDalternative;
+    QUrl url;
     int stIdLength = _mountPoint.path().length()-2;
-    staID = _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl";
-    QUrl url(sklDir  + staID);
+    staID =            _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl";
+    staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + ".skl";
+    url = sklDir + "/" + staID;
     if (url.port() == -1) {
       if (sklDir.contains("https", Qt::CaseInsensitive)) {
@@ -190 +192 @@
       QTextStream in(outData);
       irc = _sklHeader.read(&in);
+    }
+    else {
+      url = sklDir + "/" + staIDalternative;
+      query->waitForRequestResult(url, outData);
+      if (query->status() == bncNetQuery::finished &&
+              outData.contains("END OF HEADER")) {
+            QTextStream in(outData);
+            irc = _sklHeader.read(&in);
+          }
     }
 

trunk/BNC/src/bncwindow.cpp

@@ -1304 +1304 @@
   _rnxIntrComboBox->setWhatsThis(tr("<p>Select the length of the RINEX Observation file. <i>[key: rnxIntr]</i></p>"));
   _rnxSamplComboBox->setWhatsThis(tr("<p>Select the RINEX Observation sampling interval in seconds. <i>[key: rnxSampl]</i></p>"));
-  _rnxSkelLineEdit->setWhatsThis(tr("<p>BNC allows using personal RINEX skeleton files that contain the RINEX header records you would like to include. You can derive a skeleton file from information given in an up to date sitelog.</p><p>A file in the RINEX Observations 'Directory' with a 'Skeleton extension' skl or SKL is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream. In case of 'SKL'/'skl' the 4-char ID forming the base name has to be written in upper/lower cases. <i>[key: rnxSkel]</i></p>"));
+  _rnxSkelLineEdit->setWhatsThis(tr("<p>BNC allows using personal RINEX skeleton files that contain the RINEX header records you would like to include. You can derive a skeleton file from information given in an up to date sitelog.</p><p>A file in the RINEX Observations 'Directory' with a 'Skeleton extension' skl or SKL is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream. In case of 'SKL'/'skl' the 4/9-char ID forming the base name has to be written in upper cases. <i>[key: rnxSkel]</i></p>"));
   _rnxFileCheckBox->setWhatsThis(tr("<p>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.</p><p>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. <i>[key: rnxOnlyWithSKL]</i></p>"));
   _rnxScrpLineEdit->setWhatsThis(tr("<p>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.</p><p>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). <i>[key: rnxScript]</i></p>"));