Index: trunk/BNC/src/RTCM3/ephemeris.cpp =================================================================== --- trunk/BNC/src/RTCM3/ephemeris.cpp (revision 5071) +++ trunk/BNC/src/RTCM3/ephemeris.cpp (revision 5072) @@ -416,5 +416,5 @@ } - if (timeChanged && BNC_CORE->mode() == t_pgmCore::batchPostProcessing) { + if (timeChanged && BNC_CORE->mode() == t_bncCore::batchPostProcessing) { bncTime newHTime(ww, (double) tow); cout << "GLONASS " << ee->almanac_number << " Time Changed at " Index: trunk/BNC/src/app.cpp =================================================================== --- trunk/BNC/src/app.cpp (revision 5071) +++ trunk/BNC/src/app.cpp (revision 5072) @@ -22,5 +22,5 @@ // Global Variable //////////////////////////////////////////////////////////////////////////// -t_pgmCore* BNC_CORE = 0; +t_bncCore* BNC_CORE = 0; // Constructor @@ -28,5 +28,5 @@ t_app::t_app(int& argc, char* argv[], bool GUIenabled) : QApplication(argc, argv, GUIenabled) { - BNC_CORE = new t_pgmCore(argc, argv, GUIenabled); + BNC_CORE = new t_bncCore(argc, argv, GUIenabled); } Index: trunk/BNC/src/app.h =================================================================== --- trunk/BNC/src/app.h (revision 5071) +++ trunk/BNC/src/app.h (revision 5072) @@ -3,6 +3,4 @@ #include - -class t_pgmCore; class t_app : public QApplication { @@ -14,5 +12,4 @@ virtual bool event(QEvent* ev); private: - t_pgmCore* _pgmCore; }; Index: trunk/BNC/src/bnccore.cpp =================================================================== --- trunk/BNC/src/bnccore.cpp (revision 5071) +++ trunk/BNC/src/bnccore.cpp (revision 5072) @@ -27,5 +27,5 @@ * ------------------------------------------------------------------------- * - * Class: t_pgmCore + * Class: t_bncCore * * Purpose: This class implements the main application @@ -58,5 +58,5 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -t_pgmCore::t_pgmCore(int& argc, char* argv[], bool GUIenabled) { +t_bncCore::t_bncCore(int& argc, char* argv[], bool GUIenabled) { _GUIenabled = GUIenabled; _logFileFlag = 0; @@ -125,5 +125,5 @@ // Destructor //////////////////////////////////////////////////////////////////////////// -t_pgmCore::~t_pgmCore() { +t_bncCore::~t_bncCore() { delete _logStream; delete _logFile; @@ -161,5 +161,5 @@ // Write a Program Message //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotMessage(QByteArray msg, bool showOnScreen) { +void t_bncCore::slotMessage(QByteArray msg, bool showOnScreen) { QMutexLocker locker(&_mutexMessage); @@ -171,5 +171,5 @@ // Write a Program Message (private, no lock) //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::messagePrivate(const QByteArray& msg) { +void t_bncCore::messagePrivate(const QByteArray& msg) { // First time resolve the log file name @@ -213,5 +213,5 @@ // New GPS Ephemeris //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotNewGPSEph(gpsephemeris* gpseph) { +void t_bncCore::slotNewGPSEph(gpsephemeris* gpseph) { QMutexLocker locker(&_mutex); @@ -244,5 +244,5 @@ // New Glonass Ephemeris //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotNewGlonassEph(glonassephemeris* glonasseph) { +void t_bncCore::slotNewGlonassEph(glonassephemeris* glonasseph) { QMutexLocker locker(&_mutex); @@ -290,5 +290,5 @@ // New Galileo Ephemeris //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotNewGalileoEph(galileoephemeris* galileoeph) { +void t_bncCore::slotNewGalileoEph(galileoephemeris* galileoeph) { QMutexLocker locker(&_mutex); @@ -325,5 +325,5 @@ // Print Header of the output File(s) //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::printEphHeader() { +void t_bncCore::printEphHeader() { bncSettings settings; @@ -497,5 +497,5 @@ // Print One GPS Ephemeris //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::printGPSEph(gpsephemeris* ep, bool printFile) { +void t_bncCore::printGPSEph(gpsephemeris* ep, bool printFile) { t_ephGPS eph; @@ -510,5 +510,5 @@ // Print One Glonass Ephemeris //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::printGlonassEph(glonassephemeris* ep, bool printFile) { +void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile) { t_ephGlo eph; @@ -524,5 +524,5 @@ // Print One Galileo Ephemeris //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::printGalileoEph(galileoephemeris* ep, bool printFile) { +void t_bncCore::printGalileoEph(galileoephemeris* ep, bool printFile) { t_ephGal eph; @@ -537,5 +537,5 @@ // Output //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::printOutput(bool printFile, QTextStream* stream, +void t_bncCore::printOutput(bool printFile, QTextStream* stream, const QString& strV2, const QString& strV3) { @@ -574,5 +574,5 @@ // Set Port Number //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::setPort(int port) { +void t_bncCore::setPort(int port) { _port = port; if (_port != 0) { @@ -580,5 +580,5 @@ _server = new QTcpServer; if ( !_server->listen(QHostAddress::Any, _port) ) { - slotMessage("t_pgmCore: Cannot listen on ephemeris port", true); + slotMessage("t_bncCore: Cannot listen on ephemeris port", true); } connect(_server, SIGNAL(newConnection()), this, SLOT(slotNewConnection())); @@ -590,5 +590,5 @@ // Set Port Number //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::setPortCorr(int port) { +void t_bncCore::setPortCorr(int port) { _portCorr = port; if (_portCorr != 0) { @@ -596,5 +596,5 @@ _serverCorr = new QTcpServer; if ( !_serverCorr->listen(QHostAddress::Any, _portCorr) ) { - slotMessage("t_pgmCore: Cannot listen on correction port", true); + slotMessage("t_bncCore: Cannot listen on correction port", true); } connect(_serverCorr, SIGNAL(newConnection()), this, SLOT(slotNewConnectionCorr())); @@ -606,5 +606,5 @@ // New Connection //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotNewConnection() { +void t_bncCore::slotNewConnection() { _sockets->push_back( _server->nextPendingConnection() ); } @@ -612,5 +612,5 @@ // New Connection //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotNewConnectionCorr() { +void t_bncCore::slotNewConnectionCorr() { _socketsCorr->push_back( _serverCorr->nextPendingConnection() ); } @@ -618,6 +618,6 @@ // //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotQuit() { - cout << "t_pgmCore::slotQuit" << endl; +void t_bncCore::slotQuit() { + cout << "t_bncCore::slotQuit" << endl; delete _caster; qApp->quit(); @@ -626,5 +626,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::slotNewCorrLine(QString line, QString staID, long coTime) { +void t_bncCore::slotNewCorrLine(QString line, QString staID, long coTime) { QMutexLocker locker(&_mutex); @@ -678,5 +678,5 @@ // Dump Complete Correction Epochs //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::dumpCorrs(long minTime, long maxTime) { +void t_bncCore::dumpCorrs(long minTime, long maxTime) { for (long sec = minTime; sec <= maxTime; sec++) { QList allCorrs = _corrs->values(sec); @@ -688,5 +688,5 @@ // Dump all corrections //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::dumpCorrs() { +void t_bncCore::dumpCorrs() { QList allCorrs; QMutableMapIterator it(*_corrs); @@ -700,5 +700,5 @@ // Dump List of Corrections //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::dumpCorrs(const QList& allCorrs) { +void t_bncCore::dumpCorrs(const QList& allCorrs) { emit newCorrections(allCorrs); if (_socketsCorr) { @@ -727,5 +727,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::setConfFileName(const QString& confFileName) { +void t_bncCore::setConfFileName(const QString& confFileName) { if (confFileName.isEmpty()) { _confFileName = QDir::homePath() + QDir::separator() @@ -741,5 +741,5 @@ // Raw Output //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::writeRawData(const QByteArray& data, const QByteArray& staID, +void t_bncCore::writeRawData(const QByteArray& data, const QByteArray& staID, const QByteArray& format) { @@ -761,5 +761,5 @@ // Get Glonass Slot Numbers from Global Array //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::getGlonassSlotNums(int GLOFreq[]) { +void t_bncCore::getGlonassSlotNums(int GLOFreq[]) { QMutexLocker locker(&_mutex); @@ -774,5 +774,5 @@ // Store Glonass Slot Numbers to Global Array //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::storeGlonassSlotNums(const int GLOFreq[]) { +void t_bncCore::storeGlonassSlotNums(const int GLOFreq[]) { QMutexLocker locker(&_mutex); @@ -787,5 +787,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::initCombination() { +void t_bncCore::initCombination() { #ifdef USE_COMBINATION _bncComb = new bncComb(); @@ -799,5 +799,5 @@ // //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::stopCombination() { +void t_bncCore::stopCombination() { #ifdef USE_COMBINATION delete _bncComb; @@ -808,5 +808,5 @@ // Check Ephemeris Consistency //////////////////////////////////////////////////////////////////////////// -void t_pgmCore::checkEphemeris(gpsephemeris* oldEph, gpsephemeris* newEph) { +void t_bncCore::checkEphemeris(gpsephemeris* oldEph, gpsephemeris* newEph) { if (oldEph->clock_bias != newEph->clock_bias || oldEph->clock_drift != newEph->clock_drift || Index: trunk/BNC/src/bnccore.h =================================================================== --- trunk/BNC/src/bnccore.h (revision 5071) +++ trunk/BNC/src/bnccore.h (revision 5072) @@ -36,5 +36,5 @@ class bncTableItem; -class t_pgmCore : public QObject { +class t_bncCore : public QObject { Q_OBJECT @@ -44,6 +44,6 @@ public: enum e_mode {interactive, nonInteractive, batchPostProcessing}; - t_pgmCore(int& argc, char* argv[], bool GUIenabled); - virtual ~t_pgmCore(); + t_bncCore(int& argc, char* argv[], bool GUIenabled); + virtual ~t_bncCore(); e_mode mode() const {return _mode;} void setMode(e_mode mode) {_mode = mode;} @@ -142,5 +142,5 @@ }; -extern t_pgmCore* BNC_CORE; +extern t_bncCore* BNC_CORE; #endif Index: trunk/BNC/src/bncmain.cpp =================================================================== --- trunk/BNC/src/bncmain.cpp (revision 5071) +++ trunk/BNC/src/bncmain.cpp (revision 5072) @@ -138,5 +138,5 @@ if (interactive) { - BNC_CORE->setMode(t_pgmCore::interactive); + BNC_CORE->setMode(t_bncCore::interactive); QString fontString = settings.value("font").toString(); @@ -160,5 +160,5 @@ // ------------------- else if (settings.value("pppSPP").toString() == "Post-Processing") { - BNC_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_bncCore::batchPostProcessing); t_postProcessing* postProcessing = new t_postProcessing(0); postProcessing->start(); @@ -168,5 +168,5 @@ // ------------------------- else if (settings.value("reqcAction").toString() == "Edit/Concatenate") { - BNC_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_bncCore::batchPostProcessing); t_reqcEdit* reqcEdit = new t_reqcEdit(0); reqcEdit->start(); @@ -176,5 +176,5 @@ // ---------------------------- else if (settings.value("reqcAction").toString() == "Analyze") { - BNC_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_bncCore::batchPostProcessing); t_reqcAnalyze* reqcAnalyze = new t_reqcAnalyze(0); reqcAnalyze->start(); @@ -206,5 +206,5 @@ // -------------------------------- if ( rawFileName.isEmpty() ) { - BNC_CORE->setMode(t_pgmCore::nonInteractive); + BNC_CORE->setMode(t_bncCore::nonInteractive); caster->readMountPoints(); if (caster->numStations() == 0) { @@ -216,5 +216,5 @@ // ----------------------------- else { - BNC_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_bncCore::batchPostProcessing); bncRawFile* rawFile = new bncRawFile(rawFileName, "", bncRawFile::input); Index: trunk/BNC/src/rinex/bncpostprocess.cpp =================================================================== --- trunk/BNC/src/rinex/bncpostprocess.cpp (revision 5071) +++ trunk/BNC/src/rinex/bncpostprocess.cpp (revision 5072) @@ -222,5 +222,5 @@ } - if (BNC_CORE->mode() != t_pgmCore::interactive) { + if (BNC_CORE->mode() != t_bncCore::interactive) { qApp->exit(0); } Index: trunk/BNC/src/rinex/reqcanalyze.cpp =================================================================== --- trunk/BNC/src/rinex/reqcanalyze.cpp (revision 5071) +++ trunk/BNC/src/rinex/reqcanalyze.cpp (revision 5072) @@ -101,5 +101,5 @@ delete _log; _log = 0; delete _logFile; _logFile = 0; - if (BNC_CORE->mode() != t_pgmCore::interactive) { + if (BNC_CORE->mode() != t_bncCore::interactive) { qApp->exit(0); } Index: trunk/BNC/src/rinex/reqcedit.cpp =================================================================== --- trunk/BNC/src/rinex/reqcedit.cpp (revision 5071) +++ trunk/BNC/src/rinex/reqcedit.cpp (revision 5072) @@ -146,5 +146,5 @@ // Exit (thread) // ------------- - if (BNC_CORE->mode() != t_pgmCore::interactive) { + if (BNC_CORE->mode() != t_bncCore::interactive) { qApp->exit(0); }