Changeset 5900 in ntrip for trunk/BNC

Timestamp:

Aug 9, 2014, 10:00:20 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppMain.cpp (modified) (3 diffs)
• PPP/pppMain.h (modified) (1 diff)
• bnccore.cpp (modified) (1 diff)
• bnccore.h (modified) (1 diff)
• bncgetthread.cpp (modified) (1 diff)
• bncmain.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/pppMain.cpp

@@ -57 +57 @@
 //////////////////////////////////////////////////////////////////////////////
 t_pppMain::~t_pppMain() {
-  slotStop();
+  stop();
 }
 
@@ -81 +81 @@
   catch (t_except exc) {
     _running = true;
-    slotStop();
+    stop();
   }
 }
@@ -87 +87 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::slotStop() {
-
-  cout << "t_pppMain::slotStop" << endl;
+void t_pppMain::stop() {
 
   if (!_running) {

trunk/BNC/src/PPP/pppMain.h

@@ -8 +8 @@
 namespace BNC_PPP {
 
-class t_pppMain : public QObject {
-Q_OBJECT
+class t_pppMain {
  public:
   t_pppMain();                                                      
   ~t_pppMain();
   void start();                                                     
- public slots:
-  void slotStop();                                                     
+  void stop();                                                     
 
  private:

trunk/BNC/src/bnccore.cpp

@@ -868 +868 @@
   _dateAndTimeGPS = new QDateTime(dateTime);
 }
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::startPPP() {
+  _pppMain->start();
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::stopPPP() {
+  _pppMain->stop();
+}

trunk/BNC/src/bnccore.h

@@ -71 +71 @@
   void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
   bool GUIenabled() const {return _GUIenabled;}
-  BNC_PPP::t_pppMain* pppMain() {return _pppMain;}
+  void startPPP();
+  void stopPPP();
 
   QMap<int, bncTableItem*> _uploadTableItems;

trunk/BNC/src/bncgetthread.cpp

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

trunk/BNC/src/bncmain.cpp

@@ -53 +53 @@
 #include "rinex/reqcedit.h"
 #include "rinex/reqcanalyze.h"
-#include "PPP/pppMain.h"
 
 using namespace std;
@@ -192 +191 @@
     // PPP Client(s) (in separate threads)
     // -----------------------------------    
-    BNC_CORE->pppMain()->start();
+    BNC_CORE->startPPP();
 
     // Normal case - data from Internet

trunk/BNC/src/bncwindow.cpp

@@ -66 +66 @@
 #include "rinex/reqcedit.h"
 #include "rinex/reqcanalyze.h"
-#include "PPP/pppMain.h"
 #ifdef QT_WEBKIT
 #  include "map/bncmapwin.h"
@@ -1653 +1652 @@
     startRealTime();
   }
-  BNC_CORE->pppMain()->start();
+  BNC_CORE->startPPP();
 }
 
@@ -1726 +1725 @@
                                    QMessageBox::NoButton);
   if (iRet == QMessageBox::Yes) {
-    BNC_CORE->pppMain()->slotStop();
+    BNC_CORE->stopPPP();
     BNC_CORE->stopCombination();
     delete _caster;    _caster    = 0; BNC_CORE->setCaster(0);
@@ -1751 +1750 @@
   }
 
-  BNC_CORE->pppMain()->slotStop();
+  BNC_CORE->stopPPP();
 
   QMainWindow::closeEvent(event);