Changeset 5899 in ntrip

Timestamp:

Aug 9, 2014, 9:29:34 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (2 diffs)
• bnccore.h (modified) (3 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (5 diffs)
• bncwindow.h (modified) (2 diffs)

trunk/BNC/src/bnccore.cpp

@@ -51 +51 @@
 #include "rinex/rnxobsfile.h" 
 #include "rinex/rnxnavfile.h" 
+#include "PPP/pppMain.h"
 
 #ifdef USE_COMBINATION
@@ -126 +127 @@
 
   _mainWindow = 0;
+
+  _pppMain = new BNC_PPP::t_pppMain();
 }
 

trunk/BNC/src/bnccore.h

@@ -35 +35 @@
 class bncComb;
 class bncTableItem;
+namespace BNC_PPP {
+  class t_pppMain;
+}
 
 class t_bncCore : public QObject {
@@ -68 +71 @@
   void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
   bool GUIenabled() const {return _GUIenabled;}
+  BNC_PPP::t_pppMain* pppMain() {return _pppMain;}
 
   QMap<int, bncTableItem*> _uploadTableItems;
@@ -148 +152 @@
   QDateTime*          _dateAndTimeGPS;
   mutable QMutex      _mutexDateAndTimeGPS;
+  BNC_PPP::t_pppMain* _pppMain;
 };
 

trunk/BNC/src/bncgetthread.cpp

@@ -413 +413 @@
           cout << "no more data" << endl;
           BNC_CORE->stopCombination();
+          BNC_CORE->pppMain()->deleteLater();
           emit finished();
           this->deleteLater();

trunk/BNC/src/bncmain.cpp

@@ -192 +192 @@
     // PPP Client(s) (in separate threads)
     // -----------------------------------    
-    BNC_PPP::t_pppMain* pppMain = new BNC_PPP::t_pppMain();
-    pppMain->start();
+    BNC_CORE->pppMain()->start();
 
     // Normal case - data from Internet

trunk/BNC/src/bncwindow.cpp

@@ -97 +97 @@
   _runningRealTime           = false;
   _runningPostProcessingReqc = false;
-  _pppMain                   = new BNC_PPP::t_pppMain();
   _reqcActionComboBox        = 0; // necessary for enableStartStop()
 
@@ -1217 +1216 @@
   delete _caster; BNC_CORE->setCaster(0);
   delete _casterEph;
-  delete _pppMain;
 }
 
@@ -1655 +1653 @@
     startRealTime();
   }
-  if (_pppMain) {
-    _pppMain->start();
-  }
+  BNC_CORE->pppMain()->start();
 }
 
@@ -1730 +1726 @@
                                    QMessageBox::NoButton);
   if (iRet == QMessageBox::Yes) {
-    if (_pppMain) {
-      _pppMain->slotStop();
-    }
+    BNC_CORE->pppMain()->slotStop();
     BNC_CORE->stopCombination();
     delete _caster;    _caster    = 0; BNC_CORE->setCaster(0);
@@ -1757 +1751 @@
   }
 
-  if (_pppMain) {
-    _pppMain->slotStop();
-  }
+  BNC_CORE->pppMain()->slotStop();
 
   QMainWindow::closeEvent(event);

trunk/BNC/src/bncwindow.h

@@ -55 +55 @@
 class qtFileChooser;
 class bncMapWin;
-
-namespace BNC_PPP {
-class t_pppMain;
-}
 
 class bncWindow : public QMainWindow {
@@ -234 +230 @@
 
     t_pppWidgets         _pppWidgets;
-    BNC_PPP::t_pppMain*  _pppMain;
 };