Changeset 3004 in ntrip

Timestamp:

Feb 22, 2011, 11:53:04 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (1 diff)
• bncmain.cpp (modified) (4 diffs)
• bncrawfile.cpp (modified) (1 diff)
• bncrawfile.h (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -839 +839 @@
     QByteArray fileName = settings.value("rawOutFile").toByteArray();
     if (!fileName.isEmpty()) {
-      _rawFile = new bncRawFile(fileName, format, bncRawFile::output);
+      _rawFile = new bncRawFile(fileName, staID, format, bncRawFile::output);
     }
   }

trunk/BNC/bncmain.cpp

@@ -64 +64 @@
   QByteArray rawFileName;
   QByteArray format; 
+  QByteArray staID; 
   QString    confFileName;
 
@@ -81 +82 @@
         format = QByteArray(argv[ii+1]);
       }
+      if (QByteArray(argv[ii]).indexOf("-staID") != -1) {
+        staID = QByteArray(argv[ii+1]);
+      }
     }
   }
@@ -89 +93 @@
 
   QString printHelp = "Usage: bnc -nw\n" 
-                      "           --conf <confFileName>\n" 
-                      "           --file <rawFileName>\n"
+                      "           --conf   <confFileName>\n" 
+                      "           --file   <rawFileName>\n"
+                      "           --staID  <station>\n"
                       "           --format <RTIGS | RTCM_2 | RTCM_3>\n";
 
@@ -150 +155 @@
     // -----------------------------
     else {
-      if ( format.isEmpty() ) {
+      if ( format.isEmpty() || staID.isEmpty() ) {
         cout << printHelp.toAscii().data() << endl;
         exit(0);
       }
 
-      bncRawFile* rawFile = new bncRawFile(rawFileName, format, 
+      bncRawFile* rawFile = new bncRawFile(rawFileName, staID, format, 
                                            bncRawFile::input);
 

trunk/BNC/bncrawfile.cpp

@@ -49 +49 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncRawFile::bncRawFile(const QByteArray& fileName, const QByteArray& format,
-                       inpOutFlag ioFlg) {
+bncRawFile::bncRawFile(const QByteArray& fileName, const QByteArray& staID,
+                       const QByteArray& format, inpOutFlag ioFlg) {
+
   _fileName   = fileName; expandEnvVar(_fileName);
+  _staID      = staID;
   _format     = format;
-  _staID      = fileName.mid(fileName.lastIndexOf(QDir::separator())+1,5);  
   _inpFile    = 0;
   _outFile    = 0;

trunk/BNC/bncrawfile.h

@@ -36 +36 @@
   enum inpOutFlag {input, output};
 
-  bncRawFile(const QByteArray& fileName, const QByteArray& format,
-             inpOutFlag ioflg);
+  bncRawFile(const QByteArray& fileName, const QByteArray& staID,
+             const QByteArray& format, inpOutFlag ioflg);
 
   ~bncRawFile();