Changeset 3548 in ntrip

Timestamp:

Dec 23, 2011, 11:08:50 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncrawfile.cpp (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -78 +78 @@
   _rawFile      = rawFile;
   _format       = rawFile->format();
-  if (!_staID.isEmpty()) {
-    _staID        = rawFile->staID();
-  }
+  _staID        = rawFile->staID();
   _rawOutput    = false;
   _ntripVersion = "N";

trunk/BNC/bncmain.cpp

@@ -152 +152 @@
     else {
       app.setMode(bncApp::batchPostProcessing);
-      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "unset", 
+      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "", 
                                                bncRawFile::input);
       bncGetThread* getThread = new bncGetThread(rawFile);

trunk/BNC/bncrawfile.cpp

@@ -55 +55 @@
   _fileName   = fileName; expandEnvVar(_fileName);
   _format     = "unset";
+  _staID      = staID;
   _inpFile    = 0;
   _outFile    = 0;
@@ -72 +73 @@
   // ---------------------
   else {    
-    _staID = staID;
     QDate currDate = currentDateAndTimeGPS().date();
     _currentFileName = _fileName + "_" + currDate.toString("yyMMdd");