Changeset 4111 in ntrip for trunk/BNC/upload

Timestamp:

May 4, 2012, 5:43:29 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

• bncrtnetdecoder.cpp (modified) (1 diff)
• bncrtnetuploadcaster.cpp (modified) (2 diffs)
• bncrtnetuploadcaster.h (modified) (2 diffs)

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -60 +60 @@
       int  outPort = hlp[1].toInt();
       bool CoM     = (hlp[5].toInt() == Qt::Checked);
+      int PID = 0;
+      if (hlp.size() > 8) {
+        PID = hlp[8].toInt();
+      }
+      int SID = 0;
+      if (hlp.size() > 9) {
+        SID = hlp[9].toInt();
+      }
+      int IOD = 0;
+      if (hlp.size() > 10) {
+        IOD = hlp[10].toInt();
+      }
       bncRtnetUploadCaster* newCaster = new bncRtnetUploadCaster(
                                                        hlp[2], hlp[0], outPort, 
                                                        hlp[3], hlp[4], CoM,
-                                                       hlp[6], hlp[7], "", iRow);
+                                                       hlp[6], hlp[7], "", 
+                                                       PID, SID, IOD, iRow);
       newCaster->start();
       _casters.push_back(newCaster);

trunk/BNC/upload/bncrtnetuploadcaster.cpp

@@ -32 +32 @@
                                  const QString& sp3FileName,
                                  const QString& rnxFileName,
-                                 const QString& outFileName, int iRow) :
+                                 const QString& outFileName, 
+                                 int PID, int SID, int IOD, int iRow) :
   bncUploadCaster(mountpoint, outHost, outPort, password, iRow, 0) {
 
   _crdTrafo   = crdTrafo;
   _CoM        = CoM;
+  _PID        = PID;
+  _SID        = SID;
+  _IOD        = IOD;
 
   // Member that receives the ephemeris
@@ -256 +260 @@
   co.OrbitDataSupplied = 1;
   co.SatRefDatum       = DATUM_ITRF;
-  co.SSRIOD            =   0;
-  co.SSRProviderID     = 256; // 256 .. BKG,  257 ... EUREF
-  co.SSRSolutionID     =   1;
+  co.SSRIOD            = _IOD;
+  co.SSRProviderID     = _PID; // 256 .. BKG,  257 ... EUREF
+  co.SSRSolutionID     = _SID;
   
   struct Bias bias;

trunk/BNC/upload/bncrtnetuploadcaster.h

@@ -24 +24 @@
                   const QString& sp3FileName,
                   const QString& rnxFileName,
-                  const QString& outFileName, int iRow);
+                  const QString& outFileName,
+                  int PID, int SID, int IOD, int iRow);
   void decodeRtnetStream(char* buffer, int bufLen);
  protected:
@@ -40 +41 @@
   QString        _crdTrafo;
   bool           _CoM;
+  int            _PID;
+  int            _SID;
+  int            _IOD;
   double         _samplOrb;
   double         _dx;