- Timestamp:
- Aug 9, 2014, 9:29:34 AM (10 years ago)
- Location:
- trunk/BNC/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bnccore.cpp
r5875 r5899 51 51 #include "rinex/rnxobsfile.h" 52 52 #include "rinex/rnxnavfile.h" 53 #include "PPP/pppMain.h" 53 54 54 55 #ifdef USE_COMBINATION … … 126 127 127 128 _mainWindow = 0; 129 130 _pppMain = new BNC_PPP::t_pppMain(); 128 131 } 129 132 -
trunk/BNC/src/bnccore.h
r5884 r5899 35 35 class bncComb; 36 36 class bncTableItem; 37 namespace BNC_PPP { 38 class t_pppMain; 39 } 37 40 38 41 class t_bncCore : public QObject { … … 68 71 void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;} 69 72 bool GUIenabled() const {return _GUIenabled;} 73 BNC_PPP::t_pppMain* pppMain() {return _pppMain;} 70 74 71 75 QMap<int, bncTableItem*> _uploadTableItems; … … 148 152 QDateTime* _dateAndTimeGPS; 149 153 mutable QMutex _mutexDateAndTimeGPS; 154 BNC_PPP::t_pppMain* _pppMain; 150 155 }; 151 156 -
trunk/BNC/src/bncgetthread.cpp
r5869 r5899 413 413 cout << "no more data" << endl; 414 414 BNC_CORE->stopCombination(); 415 BNC_CORE->pppMain()->deleteLater(); 415 416 emit finished(); 416 417 this->deleteLater(); -
trunk/BNC/src/bncmain.cpp
r5887 r5899 192 192 // PPP Client(s) (in separate threads) 193 193 // ----------------------------------- 194 BNC_PPP::t_pppMain* pppMain = new BNC_PPP::t_pppMain(); 195 pppMain->start(); 194 BNC_CORE->pppMain()->start(); 196 195 197 196 // Normal case - data from Internet -
trunk/BNC/src/bncwindow.cpp
r5896 r5899 97 97 _runningRealTime = false; 98 98 _runningPostProcessingReqc = false; 99 _pppMain = new BNC_PPP::t_pppMain();100 99 _reqcActionComboBox = 0; // necessary for enableStartStop() 101 100 … … 1217 1216 delete _caster; BNC_CORE->setCaster(0); 1218 1217 delete _casterEph; 1219 delete _pppMain;1220 1218 } 1221 1219 … … 1655 1653 startRealTime(); 1656 1654 } 1657 if (_pppMain) { 1658 _pppMain->start(); 1659 } 1655 BNC_CORE->pppMain()->start(); 1660 1656 } 1661 1657 … … 1730 1726 QMessageBox::NoButton); 1731 1727 if (iRet == QMessageBox::Yes) { 1732 if (_pppMain) { 1733 _pppMain->slotStop(); 1734 } 1728 BNC_CORE->pppMain()->slotStop(); 1735 1729 BNC_CORE->stopCombination(); 1736 1730 delete _caster; _caster = 0; BNC_CORE->setCaster(0); … … 1757 1751 } 1758 1752 1759 if (_pppMain) { 1760 _pppMain->slotStop(); 1761 } 1753 BNC_CORE->pppMain()->slotStop(); 1762 1754 1763 1755 QMainWindow::closeEvent(event); -
trunk/BNC/src/bncwindow.h
r5893 r5899 55 55 class qtFileChooser; 56 56 class bncMapWin; 57 58 namespace BNC_PPP {59 class t_pppMain;60 }61 57 62 58 class bncWindow : public QMainWindow { … … 234 230 235 231 t_pppWidgets _pppWidgets; 236 BNC_PPP::t_pppMain* _pppMain;237 232 }; 238 233
Note:
See TracChangeset
for help on using the changeset viewer.