Changeset 5569 in ntrip for trunk/BNC/src

Timestamp:

Nov 23, 2013, 6:50:41 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncmodel.h (modified) (1 diff)
• bncpppclient.cpp (modified) (2 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/src/bncmodel.h

@@ -99 +99 @@
                      SymmetricMatrix& QQ, ColumnVector& dx);
 
+  void reset();
+
  private:
   t_irc cmpBancroft(t_epoData* epoData);
-  void   reset();
   void   cmpEle(t_satData* satData);
   void   addAmb(t_satData* satData);

trunk/BNC/src/bncpppclient.cpp

@@ -70 +70 @@
   _model = new bncModel(this);
 
+  _streamID[0] = -1;
+  _streamID[1] = -1;
+  _streamID[2] = -1;
+
   if (connectSlots) {
     connect(this, SIGNAL(newMessage(QByteArray,bool)), 
@@ -537 +541 @@
 
   for (unsigned ii = 0; ii < 3; ii++) {
-    if (_providerID.streamID[ii] != -1) {
+    if (_streamID[ii] != -1) {
       alreadySet = true;
     }
     if (corr->streamID[ii] != -1) {
-      if (_providerID.streamID[ii] != corr->streamID[ii]) {
+      if (_streamID[ii] != corr->streamID[ii]) {
         different = true;
       }
-      _providerID.streamID[ii] = corr->streamID[ii];
+      _streamID[ii] = corr->streamID[ii];
     }
   }
     
   if (alreadySet && different) {
-    _providerID.reset = true;
-  }
-}
+    _model->reset();
+  }
+}

trunk/BNC/src/bncpppclient.h

@@ -153 +153 @@
   };
 
-  class t_providerID {
-   public:
-    t_providerID() {
-      streamID[0] = -1;
-      streamID[1] = -1;
-      streamID[2] = -1;
-      reset       = false;
-    }
-    int  streamID[3];
-    bool reset;
-  };
-
   t_irc getSatPos(const bncTime& tt, const QString& prn, 
                   ColumnVector& xc, ColumnVector& vv);
@@ -181 +169 @@
   bncModel*               _model;
   QMap<QString, slipInfo> _slips;
-  t_providerID            _providerID;
+  int                     _streamID[3];
 };