Changeset 5719 in ntrip

Timestamp:

Jul 31, 2014, 1:29:23 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppMain.cpp (modified) (3 diffs)
• PPP/pppMain.h (modified) (2 diffs)
• PPP/pppThread.cpp (modified) (4 diffs)
• PPP/pppThread.h (modified) (3 diffs)
• src.pri (modified) (2 diffs)

trunk/BNC/src/PPP/pppMain.cpp

@@ -56 +56 @@
 //////////////////////////////////////////////////////////////////////////////
 t_pppMain::~t_pppMain() {
+  stop();
 }
 
@@ -61 +62 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppMain::start() {
-  cout << "t_pppMain::start" << endl;
+  if (_running) {
+    return;
+  }
+
   readOptions();
+
+  QListIterator<QSharedPointer<t_options> > it(_options);
+  while (it.hasNext()) {
+    QSharedPointer<t_options> opt = it.next();
+    t_pppThread* pppThread = new t_pppThread(opt);
+    _running = true;
+  }
 }
 
@@ -68 +79 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppMain::stop() {
-  cout << "t_pppMain::stop" << endl;
+  if (!_running) {
+    return;
+  }
+  _running = false;
 }
 

trunk/BNC/src/PPP/pppMain.h

@@ -4 +4 @@
 #include <QtCore>
 #include "options.h"
+#include "pppThread.h"
 
 namespace BNC {
@@ -18 +19 @@
 
   QList<QSharedPointer<t_options> > _options;
+  QList<t_pppThread*>               _pppThreads;
   QString                           _logFile;
   QString                           _nmeaFile;
   int                               _nmeaPort;
+  bool                              _running;
 };
 

trunk/BNC/src/PPP/pppThread.cpp

@@ +1 @@
+
+// Part of BNC, a utility for retrieving decoding and
+// converting GNSS data streams from NTRIP broadcasters.
+//
+// Copyright (C) 2007
+// German Federal Agency for Cartography and Geodesy (BKG)
+// http://www.bkg.bund.de
+// Czech Technical University Prague, Department of Geodesy
+// http://www.fsv.cvut.cz
+//
+// Email: euref-ip@bkg.bund.de
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation, version 2.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/* -------------------------------------------------------------------------
+ * BKG NTRIP Client
+ * -------------------------------------------------------------------------
+ *
+ * Class:      t_pppThread
+ *
+ * Purpose:    Single PPP Client (running in its own thread)
+ *
+ * Author:     L. Mervart
+ *
+ * Created:    29-Jul-2014
+ *
+ * Changes:    
+ *
+ * -----------------------------------------------------------------------*/
+
 
 #include <iostream>
@@ -6 +47 @@
 #include "pppThread.h"
 #include "bnccore.h"
-#include "bncsettings.h" 
-#include "bnctime.h" 
 
+using namespace BNC;
 using namespace std;
 
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_pppThread::t_pppThread() : QThread(0) {
+t_pppThread::t_pppThread(QSharedPointer<t_options> opt) : QThread(0) {
 }
 
@@ -25 +65 @@
 void t_pppThread::run() {
 
-  bncSettings settings;
 
   // Connect to BNC Signals
@@ -75 +114 @@
 }
     
-//
-////////////////////////////////////////////////////////////////////////////
-void t_pppThread::processFrontEpoch() {
-}

trunk/BNC/src/PPP/pppThread.h

@@ -3 +3 @@
 
 #include <vector>
+#include <QtCore>
 
 #include "RTCM/GPSDecoder.h"
-#include "bncephuser.h"
+#include "options.h"
+
+namespace BNC {
 
 class t_pppThread : public QThread {
@@ -11 +14 @@
 
  public:
-  t_pppThread();
+  t_pppThread(QSharedPointer<t_options> opt);
   ~t_pppThread();
   virtual void run();
@@ -23 +26 @@
 
  private:
-  class t_epoData {
-   public:
-    bncTime            _time;
-    std::vector<t_obs> _obsRover; 
-  };
-  void processFrontEpoch();
-  QMutex                  _mutex;
-  QByteArray              _roverMount;
-  QByteArray              _corrMount;
-  std::vector<t_epoData*> _epochs;
+  QMutex _mutex;
 };
 
+}
+
 #endif

trunk/BNC/src/src.pri

@@ -59 +59 @@
           RTCM3/ephemeris.h RTCM3/timeutils.h                         \
           GPSS/gpssDecoder.h GPSS/hassDecoder.h                       \
-          PPP/pppwidgets.h PPP/options.h PPP/pppMain.h
+          PPP/pppwidgets.h PPP/options.h PPP/pppMain.h                \
+          PPP/pppThread.h
 
 HEADERS       += serial/qextserialbase.h serial/qextserialport.h
@@ -88 +89 @@
           RTCM3/ephemeris.cpp RTCM3/timeutils.cpp                     \
           GPSS/gpssDecoder.cpp GPSS/hassDecoder.cpp                   \
-          PPP/pppwidgets.cpp PPP/options.cpp PPP/pppMain.cpp
+          PPP/pppwidgets.cpp PPP/options.cpp PPP/pppMain.cpp          \
+          PPP/pppThread.cpp
 
 SOURCES       += serial/qextserialbase.cpp serial/qextserialport.cpp