Changeset 3524 in ntrip

Timestamp:

Dec 15, 2011, 9:51:40 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

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

trunk/BNC/bncmain.cpp

@@ -64 +64 @@
   bool       GUIenabled  = true;
   QByteArray rawFileName;
-  QByteArray format; 
   QByteArray staID; 
   QString    confFileName;
@@ -80 +79 @@
         rawFileName = QByteArray(argv[ii+1]);
       }
-      if (QByteArray(argv[ii]).indexOf("-format") != -1) {
-        format = QByteArray(argv[ii+1]);
-      }
       if (QByteArray(argv[ii]).indexOf("-mountpoint") != -1) {
         staID = QByteArray(argv[ii+1]);
@@ -96 +92 @@
                       "           --conf       <confFileName>\n" 
                       "           --file       <rawFileName>\n"
-                      "           --mountpoint <station>\n"
-                      "           --format     <RTCM_2 | RTCM_3>\n";
+                      "           --mountpoint <station>\n";
 
   bncApp app(argc, argv, GUIenabled);
@@ -163 +158 @@
       app.setMode(bncApp::batchPostProcessing);
 
-      if ( format.isEmpty() || staID.isEmpty() ) {
+      if ( staID.isEmpty() ) {
         cout << printHelp.toAscii().data() << endl;
         exit(0);
       }
 
-      bncRawFile* rawFile = new bncRawFile(rawFileName, staID, format, 
+      bncRawFile* rawFile = new bncRawFile(rawFileName, staID, 
                                            bncRawFile::input);
 

trunk/BNC/bncrawfile.cpp

@@ -51 +51 @@
 ////////////////////////////////////////////////////////////////////////////
 bncRawFile::bncRawFile(const QByteArray& fileName, const QByteArray& staID,
-                       const QByteArray& format, inpOutFlag ioFlg) {
+                       inpOutFlag ioFlg) {
 
   _fileName   = fileName; expandEnvVar(_fileName);
+  _format     = "unset";
   _staID      = staID;
-  _format     = format;
   _inpFile    = 0;
   _outFile    = 0;

trunk/BNC/bncrawfile.h

@@ -37 +37 @@
 
   bncRawFile(const QByteArray& fileName, const QByteArray& staID,
-             const QByteArray& format, inpOutFlag ioflg);
+             inpOutFlag ioflg);
 
   ~bncRawFile();