Changeset 5973 in ntrip

Timestamp:

Aug 17, 2014, 1:35:50 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppMain.cpp (modified) (3 diffs)
• pppRun.cpp (modified) (5 diffs)
• pppRun.h (modified) (2 diffs)
• pppThread.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppMain.cpp

@@ -52 +52 @@
 //////////////////////////////////////////////////////////////////////////////
 t_pppMain::t_pppMain() {
+  cout << "t_pppMain" << endl;
   _running = false;
 }
@@ -58 +59 @@
 //////////////////////////////////////////////////////////////////////////////
 t_pppMain::~t_pppMain() {
+  cout << "~t_pppMain" << endl;
   stop();
 }
@@ -89 +91 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppMain::stop() {
+
+  cout << "t_pppMain::stop" << endl;
 
   if (!_running) {

trunk/BNC/src/PPP/pppRun.cpp

@@ -61 +61 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppRun::t_pppRun(const t_pppOptions* opt) {
+
+  cout << "t_pppRun" << endl;
 
   _opt = opt;
@@ -108 +110 @@
     connect(BNC_CORE, SIGNAL(mapSpeedSliderChanged(int)),    
             this, SLOT(slotSetSpeed(int)));
-  }
+    connect(BNC_CORE, SIGNAL(stopRinexPPP()), this, SLOT(slotSetStopFlag()));
+  }
+ 
+  _stopFlag = false;
 }
 
@@ -114 +119 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppRun::~t_pppRun() {
+  cout << "~t_pppRun" << endl;
 }
 
@@ -380 +386 @@
   int   nEpo = 0;
   const t_rnxObsFile::t_rnxEpo* epo = 0;
-  while ( (epo = _rnxObsFile->nextEpoch()) != 0 ) {
+  while ( !_stopFlag && (epo = _rnxObsFile->nextEpoch()) != 0 ) {
     ++nEpo;
 
@@ -439 +445 @@
   _speed = speed;
 }
+
+//  
+////////////////////////////////////////////////////////////////////////////
+void t_pppRun::slotSetStopFlag() {
+  QMutexLocker locker(&_mutex);
+  cout << "t_pppRun::slotSetStopFlag" << endl;
+  _stopFlag = true;
+}

trunk/BNC/src/PPP/pppRun.h

@@ -38 +38 @@
   void slotNewObs(QByteArray staID, QList<t_obs> obsList);
   void slotSetSpeed(int speed);
+  void slotSetStopFlag();
 
  private:
@@ -64 +65 @@
   t_corrFile*   _corrFile;
   int           _speed;
+  bool          _stopFlag;
 };
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -57 +57 @@
 t_pppThread::t_pppThread(const t_pppOptions* opt) : QThread(0) {
 
+  cout << "t_pppThread" << endl;
+
   _opt       = opt;
   _pppRun    = 0;
@@ -69 +71 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppThread::~t_pppThread() {
+  cout << "~t_pppThread" << endl;
   delete _pppRun;
 }