Index: trunk/BNC/src/GPSS/gpssDecoder.cpp =================================================================== --- trunk/BNC/src/GPSS/gpssDecoder.cpp (revision 5067) +++ trunk/BNC/src/GPSS/gpssDecoder.cpp (revision 5068) @@ -51,5 +51,5 @@ gpssDecoder::gpssDecoder() : GPSDecoder() { connect(this, SIGNAL(newGPSEph(gpsephemeris*)), - PGM_CORE, SLOT(slotNewGPSEph(gpsephemeris*))); + BNC_CORE, SLOT(slotNewGPSEph(gpsephemeris*))); } Index: trunk/BNC/src/GPSS/hassDecoder.cpp =================================================================== --- trunk/BNC/src/GPSS/hassDecoder.cpp (revision 5067) +++ trunk/BNC/src/GPSS/hassDecoder.cpp (revision 5068) @@ -47,5 +47,5 @@ connect(this, SIGNAL(newCorrLine(QString, QString, long)), - PGM_CORE, SLOT(slotNewCorrLine(QString, QString, long))); + BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long))); } Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (revision 5067) +++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (revision 5068) @@ -75,9 +75,9 @@ connect(this, SIGNAL(newGPSEph(gpsephemeris*)), - PGM_CORE, SLOT(slotNewGPSEph(gpsephemeris*))); + BNC_CORE, SLOT(slotNewGPSEph(gpsephemeris*))); connect(this, SIGNAL(newGlonassEph(glonassephemeris*)), - PGM_CORE, SLOT(slotNewGlonassEph(glonassephemeris*))); + BNC_CORE, SLOT(slotNewGlonassEph(glonassephemeris*))); connect(this, SIGNAL(newGalileoEph(galileoephemeris*)), - PGM_CORE, SLOT(slotNewGalileoEph(galileoephemeris*))); + BNC_CORE, SLOT(slotNewGalileoEph(galileoephemeris*))); // Mode can be either observations or corrections @@ -149,5 +149,5 @@ // Get Glonass Slot Numbers from Global Array // ------------------------------------------ - PGM_CORE->getGlonassSlotNums(parser.GLOFreq); + BNC_CORE->getGlonassSlotNums(parser.GLOFreq); // Remaining part decodes the Observations @@ -377,5 +377,5 @@ if (decoded) { - PGM_CORE->storeGlonassSlotNums(parser.GLOFreq); + BNC_CORE->storeGlonassSlotNums(parser.GLOFreq); return success; } Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 5067) +++ trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 5068) @@ -73,8 +73,8 @@ connect(this, SIGNAL(newCorrLine(QString, QString, long)), - PGM_CORE, SLOT(slotNewCorrLine(QString, QString, long))); + BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long))); connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); memset(&_co, 0, sizeof(_co)); Index: trunk/BNC/src/RTCM3/ephemeris.cpp =================================================================== --- trunk/BNC/src/RTCM3/ephemeris.cpp (revision 5067) +++ trunk/BNC/src/RTCM3/ephemeris.cpp (revision 5068) @@ -416,5 +416,5 @@ } - if (timeChanged && PGM_CORE->mode() == t_pgmCore::batchPostProcessing) { + if (timeChanged && BNC_CORE->mode() == t_pgmCore::batchPostProcessing) { bncTime newHTime(ww, (double) tow); cout << "GLONASS " << ee->almanac_number << " Time Changed at " Index: trunk/BNC/src/RTRover/bncrtrover.cpp =================================================================== --- trunk/BNC/src/RTRover/bncrtrover.cpp (revision 5067) +++ trunk/BNC/src/RTRover/bncrtrover.cpp (revision 5068) @@ -5,5 +5,5 @@ #include "bncrtrover.h" -#include "bncapp.h" +#include "bnccore.h" #include "bncsettings.h" #include "bnctime.h" @@ -93,14 +93,14 @@ // Connect to BNC Signals // ---------------------- - connect(PGM_CORE, SIGNAL(newCorrections(QList)), + connect(BNC_CORE, SIGNAL(newCorrections(QList)), this, SLOT(slotNewCorrections(QList))); - connect(PGM_CORE, SIGNAL(newEphGPS(gpsephemeris)), + connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)), this, SLOT(slotNewEphGPS(gpsephemeris))); - connect(PGM_CORE, SIGNAL(newEphGlonass(glonassephemeris)), + connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)), this, SLOT(slotNewEphGlonass(glonassephemeris))); - connect(PGM_CORE, SIGNAL(newEphGalileo(galileoephemeris)), + connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)), this, SLOT(slotNewEphGalileo(galileoephemeris))); Index: trunk/BNC/src/app.cpp =================================================================== --- trunk/BNC/src/app.cpp (revision 5067) +++ trunk/BNC/src/app.cpp (revision 5068) @@ -22,5 +22,5 @@ // Global Variable //////////////////////////////////////////////////////////////////////////// -t_pgmCore* PGM_CORE = 0; +t_pgmCore* BNC_CORE = 0; // Constructor @@ -28,5 +28,5 @@ t_app::t_app(int& argc, char* argv[], bool GUIenabled) : QApplication(argc, argv, GUIenabled) { - PGM_CORE = new t_pgmCore(argc, argv, GUIenabled); + BNC_CORE = new t_pgmCore(argc, argv, GUIenabled); } @@ -43,5 +43,5 @@ if (ev->type() == QEvent::FileOpen) { // currently happens on Mac only QString fileName = static_cast(ev)->file(); - PGM_CORE->setConfFileName(fileName); + BNC_CORE->setConfFileName(fileName); return true; } Index: trunk/BNC/src/app.h =================================================================== --- trunk/BNC/src/app.h (revision 5067) +++ trunk/BNC/src/app.h (revision 5068) @@ -17,5 +17,5 @@ }; -extern t_pgmCore* PGM_CORE; +extern t_pgmCore* BNC_CORE; #endif Index: trunk/BNC/src/bncapp.h =================================================================== --- trunk/BNC/src/bncapp.h (revision 5067) +++ trunk/BNC/src/bncapp.h (revision 5068) @@ -142,5 +142,5 @@ }; -extern t_pgmCore* PGM_CORE; +extern t_pgmCore* BNC_CORE; #endif Index: trunk/BNC/src/bnccaster.cpp =================================================================== --- trunk/BNC/src/bnccaster.cpp (revision 5067) +++ trunk/BNC/src/bnccaster.cpp (revision 5068) @@ -65,5 +65,5 @@ connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); if ( !outFileName.isEmpty() ) { @@ -483,5 +483,5 @@ emit mountPointsRead(_threads); emit( newMessage(QString("Configuration read: " - + PGM_CORE->confFileName() + + BNC_CORE->confFileName() + ", %1 stream(s)") .arg(_threads.count()).toAscii(), true) ); Index: trunk/BNC/src/bncephuser.cpp =================================================================== --- trunk/BNC/src/bncephuser.cpp (revision 5067) +++ trunk/BNC/src/bncephuser.cpp (revision 5068) @@ -51,11 +51,11 @@ if (connectSlots) { - connect(PGM_CORE, SIGNAL(newEphGPS(gpsephemeris)), + connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)), this, SLOT(slotNewEphGPS(gpsephemeris)), Qt::DirectConnection); - connect(PGM_CORE, SIGNAL(newEphGlonass(glonassephemeris)), + connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)), this, SLOT(slotNewEphGlonass(glonassephemeris)), Qt::DirectConnection); - connect(PGM_CORE, SIGNAL(newEphGalileo(galileoephemeris)), + connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)), this, SLOT(slotNewEphGalileo(galileoephemeris)), Qt::DirectConnection); } Index: trunk/BNC/src/bncgetthread.cpp =================================================================== --- trunk/BNC/src/bncgetthread.cpp (revision 5067) +++ trunk/BNC/src/bncgetthread.cpp (revision 5068) @@ -122,5 +122,5 @@ connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); _isToBeDeleted = false; @@ -331,5 +331,5 @@ settings.value("pppMount").toString() == _staID) { _PPPclient = new bncPPPclient(_staID); - PGM_CORE->_bncPPPclient = _PPPclient; + BNC_CORE->_bncPPPclient = _PPPclient; qRegisterMetaType("bncTime"); connect(_PPPclient, SIGNAL(newPosition(bncTime, double, double, double)), @@ -440,5 +440,5 @@ if (data.isEmpty()) { cout << "no more data" << endl; - PGM_CORE->stopCombination(); + BNC_CORE->stopCombination(); QThread::exit(0); delete this; @@ -465,5 +465,5 @@ // ----------- if (_rawOutput) { - PGM_CORE->writeRawData(data, _staID, _format); + BNC_CORE->writeRawData(data, _staID, _format); } Index: trunk/BNC/src/bncmain.cpp =================================================================== --- trunk/BNC/src/bncmain.cpp (revision 5067) +++ trunk/BNC/src/bncmain.cpp (revision 5068) @@ -122,5 +122,5 @@ app.setOrganizationName("BKG"); app.setOrganizationDomain("www.bkg.bund.de"); - PGM_CORE->setConfFileName( confFileName ); + BNC_CORE->setConfFileName( confFileName ); bncSettings settings; @@ -138,5 +138,5 @@ if (interactive) { - PGM_CORE->setMode(t_pgmCore::interactive); + BNC_CORE->setMode(t_pgmCore::interactive); QString fontString = settings.value("font").toString(); @@ -151,5 +151,5 @@ bncWindow* bncWin = new bncWindow(); - PGM_CORE->setMainWindow(bncWin); + BNC_CORE->setMainWindow(bncWin); bncWin->show(); } @@ -160,5 +160,5 @@ // ------------------- else if (settings.value("pppSPP").toString() == "Post-Processing") { - PGM_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_pgmCore::batchPostProcessing); t_postProcessing* postProcessing = new t_postProcessing(0); postProcessing->start(); @@ -168,5 +168,5 @@ // ------------------------- else if (settings.value("reqcAction").toString() == "Edit/Concatenate") { - PGM_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_pgmCore::batchPostProcessing); t_reqcEdit* reqcEdit = new t_reqcEdit(0); reqcEdit->start(); @@ -176,5 +176,5 @@ // ---------------------------- else if (settings.value("reqcAction").toString() == "Analyze") { - PGM_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_pgmCore::batchPostProcessing); t_reqcAnalyze* reqcAnalyze = new t_reqcAnalyze(0); reqcAnalyze->start(); @@ -194,17 +194,17 @@ settings.value("outPort").toInt()); - PGM_CORE->setCaster(caster); - PGM_CORE->setPort(settings.value("outEphPort").toInt()); - PGM_CORE->setPortCorr(settings.value("corrPort").toInt()); - PGM_CORE->initCombination(); - - PGM_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit())); - - PGM_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true); + BNC_CORE->setCaster(caster); + BNC_CORE->setPort(settings.value("outEphPort").toInt()); + BNC_CORE->setPortCorr(settings.value("corrPort").toInt()); + BNC_CORE->initCombination(); + + BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit())); + + BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true); // Normal case - data from Internet // -------------------------------- if ( rawFileName.isEmpty() ) { - PGM_CORE->setMode(t_pgmCore::nonInteractive); + BNC_CORE->setMode(t_pgmCore::nonInteractive); caster->readMountPoints(); if (caster->numStations() == 0) { @@ -216,5 +216,5 @@ // ----------------------------- else { - PGM_CORE->setMode(t_pgmCore::batchPostProcessing); + BNC_CORE->setMode(t_pgmCore::batchPostProcessing); bncRawFile* rawFile = new bncRawFile(rawFileName, "", bncRawFile::input); Index: trunk/BNC/src/bncnetquery.h =================================================================== --- trunk/BNC/src/bncnetquery.h (revision 5067) +++ trunk/BNC/src/bncnetquery.h (revision 5068) @@ -14,5 +14,5 @@ bncNetQuery() { connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); } virtual ~bncNetQuery() {} Index: trunk/BNC/src/bncnetqueryv2.cpp =================================================================== --- trunk/BNC/src/bncnetqueryv2.cpp (revision 5067) +++ trunk/BNC/src/bncnetqueryv2.cpp (revision 5068) @@ -42,5 +42,5 @@ if (_secure && !QSslSocket::supportsSsl()) { - PGM_CORE->slotMessage("No SSL support, install OpenSSL run-time libraries", true); + BNC_CORE->slotMessage("No SSL support, install OpenSSL run-time libraries", true); stop(); } @@ -219,5 +219,5 @@ } - PGM_CORE->slotMessage(msg.toAscii(), true); + BNC_CORE->slotMessage(msg.toAscii(), true); if (_ignoreSslErrors) { Index: trunk/BNC/src/bncpppclient.cpp =================================================================== --- trunk/BNC/src/bncpppclient.cpp (revision 5067) +++ trunk/BNC/src/bncpppclient.cpp (revision 5068) @@ -72,7 +72,7 @@ if (connectSlots) { connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); - - connect(PGM_CORE, SIGNAL(newCorrections(QList)), + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); + + connect(BNC_CORE, SIGNAL(newCorrections(QList)), this, SLOT(slotNewCorrections(QList))); } Index: trunk/BNC/src/bncrawfile.cpp =================================================================== --- trunk/BNC/src/bncrawfile.cpp (revision 5067) +++ trunk/BNC/src/bncrawfile.cpp (revision 5068) @@ -136,6 +136,6 @@ QStringList lst = line.split(' '); - delete PGM_CORE->_currentDateAndTimeGPS; - PGM_CORE->_currentDateAndTimeGPS = + delete BNC_CORE->_currentDateAndTimeGPS; + BNC_CORE->_currentDateAndTimeGPS = new QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate)); Index: trunk/BNC/src/bncsettings.cpp =================================================================== --- trunk/BNC/src/bncsettings.cpp (revision 5067) +++ trunk/BNC/src/bncsettings.cpp (revision 5068) @@ -29,5 +29,5 @@ // First fill the options // ---------------------- - if (PGM_CORE->_settings.size() == 0) { + if (BNC_CORE->_settings.size() == 0) { reRead(); } @@ -43,7 +43,7 @@ void bncSettings::reRead() { - PGM_CORE->_settings.clear(); - - QSettings settings(PGM_CORE->confFileName(), QSettings::IniFormat); + BNC_CORE->_settings.clear(); + + QSettings settings(BNC_CORE->confFileName(), QSettings::IniFormat); // Read from File @@ -53,5 +53,5 @@ while (it.hasNext()) { QString key = it.next(); - PGM_CORE->_settings[key] = settings.value(key); + BNC_CORE->_settings[key] = settings.value(key); } } @@ -218,6 +218,6 @@ QMutexLocker locker(&_mutex); - if (PGM_CORE->_settings.contains(key)) { - return PGM_CORE->_settings[key]; + if (BNC_CORE->_settings.contains(key)) { + return BNC_CORE->_settings[key]; } else { @@ -236,5 +236,5 @@ //////////////////////////////////////////////////////////////////////////// void bncSettings::setValue_p(const QString &key, const QVariant& value) { - PGM_CORE->_settings[key] = value; + BNC_CORE->_settings[key] = value; } @@ -243,5 +243,5 @@ void bncSettings::remove(const QString& key ) { QMutexLocker locker(&_mutex); - PGM_CORE->_settings.remove(key); + BNC_CORE->_settings.remove(key); } @@ -250,7 +250,7 @@ void bncSettings::sync() { QMutexLocker locker(&_mutex); - QSettings settings(PGM_CORE->confFileName(), QSettings::IniFormat); + QSettings settings(BNC_CORE->confFileName(), QSettings::IniFormat); settings.clear(); - QMapIterator it(PGM_CORE->_settings); + QMapIterator it(BNC_CORE->_settings); while (it.hasNext()) { it.next(); Index: trunk/BNC/src/bncutils.cpp =================================================================== --- trunk/BNC/src/bncutils.cpp (revision 5067) +++ trunk/BNC/src/bncutils.cpp (revision 5068) @@ -91,6 +91,6 @@ QDateTime currDateTimeGPS; - if ( PGM_CORE->_currentDateAndTimeGPS ) { - currDateTimeGPS = *(PGM_CORE->_currentDateAndTimeGPS); + if ( BNC_CORE->_currentDateAndTimeGPS ) { + currDateTimeGPS = *(BNC_CORE->_currentDateAndTimeGPS); } else { @@ -116,6 +116,6 @@ //////////////////////////////////////////////////////////////////////////// QDateTime currentDateAndTimeGPS() { - if ( PGM_CORE->_currentDateAndTimeGPS ) { - return *(PGM_CORE->_currentDateAndTimeGPS); + if ( BNC_CORE->_currentDateAndTimeGPS ) { + return *(BNC_CORE->_currentDateAndTimeGPS); } else { Index: trunk/BNC/src/bncwindow.cpp =================================================================== --- trunk/BNC/src/bncwindow.cpp (revision 5067) +++ trunk/BNC/src/bncwindow.cpp (revision 5068) @@ -101,5 +101,5 @@ setWindowTitle(tr("BKG Ntrip Client (BNC) Version " BNCVERSION)); - connect(PGM_CORE, SIGNAL(newMessage(QByteArray,bool)), + connect(BNC_CORE, SIGNAL(newMessage(QByteArray,bool)), this, SLOT(slotWindowMessage(QByteArray,bool))); @@ -1921,5 +1921,5 @@ //////////////////////////////////////////////////////////////////////////// void bncWindow::slotGetThreadsFinished() { - PGM_CORE->slotMessage("All Get Threads Terminated", true); + BNC_CORE->slotMessage("All Get Threads Terminated", true); delete _caster; _caster = 0; delete _casterEph; _casterEph = 0; @@ -1957,7 +1957,7 @@ _outPortLineEdit->text().toInt()); - PGM_CORE->setPort(_outEphPortLineEdit->text().toInt()); - PGM_CORE->setPortCorr(_corrPortLineEdit->text().toInt()); - PGM_CORE->initCombination(); + BNC_CORE->setPort(_outEphPortLineEdit->text().toInt()); + BNC_CORE->setPortCorr(_corrPortLineEdit->text().toInt()); + BNC_CORE->initCombination(); connect(_caster, SIGNAL(getThreadsFinished()), @@ -1967,27 +1967,27 @@ this, SLOT(slotMountPointsRead(QList))); - PGM_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true); + BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true); bncSettings settings; QDir rnxdir(settings.value("rnxPath").toString()); - if (!rnxdir.exists()) PGM_CORE->slotMessage("Cannot find RINEX Observations directory", true); + if (!rnxdir.exists()) BNC_CORE->slotMessage("Cannot find RINEX Observations directory", true); QString rnx_file = settings.value("rnxScript").toString(); if ( !rnx_file.isEmpty() ) { QFile rnxfile(settings.value("rnxScript").toString()); - if (!rnxfile.exists()) PGM_CORE->slotMessage("Cannot find RINEX Observations script", true); + if (!rnxfile.exists()) BNC_CORE->slotMessage("Cannot find RINEX Observations script", true); } QDir ephdir(settings.value("ephPath").toString()); - if (!ephdir.exists()) PGM_CORE->slotMessage("Cannot find RINEX Ephemeris directory", true); + if (!ephdir.exists()) BNC_CORE->slotMessage("Cannot find RINEX Ephemeris directory", true); QDir corrdir(settings.value("corrPath").toString()); - if (!corrdir.exists()) PGM_CORE->slotMessage("Cannot find Broadcast Corrections directory", true); + if (!corrdir.exists()) BNC_CORE->slotMessage("Cannot find Broadcast Corrections directory", true); QString advise_file = settings.value("adviseScript").toString(); if ( !advise_file.isEmpty() ) { QFile advisefile(settings.value("adviseScript").toString()); - if (!advisefile.exists()) PGM_CORE->slotMessage("Cannot find Outages script", true); + if (!advisefile.exists()) BNC_CORE->slotMessage("Cannot find Outages script", true); } @@ -1995,5 +1995,5 @@ if ( !ant_file.isEmpty() ) { QFile anxfile(settings.value("pppAntex").toString()); - if (!anxfile.exists()) PGM_CORE->slotMessage("Cannot find IGS ANTEX file", true); + if (!anxfile.exists()) BNC_CORE->slotMessage("Cannot find IGS ANTEX file", true); } @@ -2012,5 +2012,5 @@ QMessageBox::NoButton); if (iRet == QMessageBox::Yes) { - PGM_CORE->stopCombination(); + BNC_CORE->stopCombination(); delete _caster; _caster = 0; delete _casterEph; _casterEph = 0; @@ -2584,5 +2584,5 @@ bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable); _uploadTable->setItem(iRow, iCol, bncIt); - PGM_CORE->_uploadTableItems[iRow] = bncIt; + BNC_CORE->_uploadTableItems[iRow] = bncIt; } else { @@ -2595,5 +2595,5 @@ //////////////////////////////////////////////////////////////////////////// void bncWindow::slotDelUploadRow() { - PGM_CORE->_uploadTableItems.clear(); + BNC_CORE->_uploadTableItems.clear(); int nRows = _uploadTable->rowCount(); bool flg[nRows]; @@ -2612,5 +2612,5 @@ } for (int iRow = 0; iRow < _uploadTable->rowCount(); iRow++) { - PGM_CORE->_uploadTableItems[iRow] = + BNC_CORE->_uploadTableItems[iRow] = (bncTableItem*) _uploadTable->item(iRow, 11); } @@ -2668,5 +2668,5 @@ bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable); _uploadTable->setItem(iRow, iCol, bncIt); - PGM_CORE->_uploadTableItems[iRow] = bncIt; + BNC_CORE->_uploadTableItems[iRow] = bncIt; } else { Index: trunk/BNC/src/combination/bnccomb.cpp =================================================================== --- trunk/BNC/src/combination/bnccomb.cpp (revision 5067) +++ trunk/BNC/src/combination/bnccomb.cpp (revision 5068) @@ -163,5 +163,5 @@ connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); // Combination Method @@ -750,6 +750,6 @@ // Optionally send new Corrections to PPP // -------------------------------------- - if (PGM_CORE->_bncPPPclient) { - PGM_CORE->_bncPPPclient->slotNewCorrections(corrLines); + if (BNC_CORE->_bncPPPclient) { + BNC_CORE->_bncPPPclient->slotNewCorrections(corrLines); } } Index: trunk/BNC/src/latencychecker.cpp =================================================================== --- trunk/BNC/src/latencychecker.cpp (revision 5067) +++ trunk/BNC/src/latencychecker.cpp (revision 5068) @@ -61,5 +61,5 @@ connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); bncSettings settings; Index: trunk/BNC/src/rinex/bncpostprocess.cpp =================================================================== --- trunk/BNC/src/rinex/bncpostprocess.cpp (revision 5067) +++ trunk/BNC/src/rinex/bncpostprocess.cpp (revision 5068) @@ -98,5 +98,5 @@ } else { - PGM_CORE->slotMessage(msg, false); + BNC_CORE->slotMessage(msg, false); } } @@ -222,5 +222,5 @@ } - if (PGM_CORE->mode() != t_pgmCore::interactive) { + if (BNC_CORE->mode() != t_pgmCore::interactive) { qApp->exit(0); } Index: trunk/BNC/src/rinex/reqcanalyze.cpp =================================================================== --- trunk/BNC/src/rinex/reqcanalyze.cpp (revision 5067) +++ trunk/BNC/src/rinex/reqcanalyze.cpp (revision 5068) @@ -101,5 +101,5 @@ delete _log; _log = 0; delete _logFile; _logFile = 0; - if (PGM_CORE->mode() != t_pgmCore::interactive) { + if (BNC_CORE->mode() != t_pgmCore::interactive) { qApp->exit(0); } @@ -116,5 +116,5 @@ double maxValue) { - if (PGM_CORE->GUIenabled()) { + if (BNC_CORE->GUIenabled()) { if (maxValue == 0.0) { @@ -142,5 +142,5 @@ if (data1) { t_polarPlot* plot1 = new t_polarPlot(QwtText(title1), scaleInterval, - PGM_CORE->mainWindow()); + BNC_CORE->mainWindow()); plot1->addCurve(data1); plots << plot1; @@ -148,5 +148,5 @@ if (data2) { t_polarPlot* plot2 = new t_polarPlot(QwtText(title2), scaleInterval, - PGM_CORE->mainWindow()); + BNC_CORE->mainWindow()); plot2->addCurve(data2); plots << plot2; @@ -296,5 +296,5 @@ // Show the plots // -------------- - if (PGM_CORE->GUIenabled()) { + if (BNC_CORE->GUIenabled()) { QFileInfo fileInfo(obsFile->fileName()); QByteArray title = fileInfo.fileName().toAscii(); @@ -651,5 +651,5 @@ const QByteArray& title) { - if (PGM_CORE->GUIenabled()) { + if (BNC_CORE->GUIenabled()) { t_availPlot* plotA = new t_availPlot(0, &_availDataMap); plotA->setTitle(title); Index: trunk/BNC/src/rinex/reqcedit.cpp =================================================================== --- trunk/BNC/src/rinex/reqcedit.cpp (revision 5067) +++ trunk/BNC/src/rinex/reqcedit.cpp (revision 5068) @@ -108,7 +108,7 @@ *_log << QByteArray("Program").leftJustified(15) << ": " - << PGM_CORE->pgmName() << endl; + << BNC_CORE->pgmName() << endl; *_log << QByteArray("Run by").leftJustified(15) << ": " - << PGM_CORE->userName() << endl; + << BNC_CORE->userName() << endl; *_log << QByteArray("Date").leftJustified(15) << ": " << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << endl; @@ -146,5 +146,5 @@ // Exit (thread) // ------------- - if (PGM_CORE->mode() != t_pgmCore::interactive) { + if (BNC_CORE->mode() != t_pgmCore::interactive) { qApp->exit(0); } Index: trunk/BNC/src/rinex/rnxnavfile.cpp =================================================================== --- trunk/BNC/src/rinex/rnxnavfile.cpp (revision 5067) +++ trunk/BNC/src/rinex/rnxnavfile.cpp (revision 5068) @@ -241,5 +241,5 @@ void t_rnxNavFile::writeHeader(const QMap* txtMap) { - QString runBy = PGM_CORE->userName(); + QString runBy = BNC_CORE->userName(); QStringList comments; @@ -275,5 +275,5 @@ : "yyyyMMdd hhmmss UTC"; *_stream << QString("%1%2%3") - .arg(PGM_CORE->pgmName(), -20) + .arg(BNC_CORE->pgmName(), -20) .arg(runBy.trimmed().left(20), -20) .arg(QDateTime::currentDateTime().toUTC().toString(fmtDate), -20) Index: trunk/BNC/src/rinex/rnxobsfile.cpp =================================================================== --- trunk/BNC/src/rinex/rnxobsfile.cpp (revision 5067) +++ trunk/BNC/src/rinex/rnxobsfile.cpp (revision 5068) @@ -213,5 +213,5 @@ QStringList newComments; - QString runBy = PGM_CORE->userName(); + QString runBy = BNC_CORE->userName(); if (txtMap) { @@ -236,5 +236,5 @@ : "yyyyMMdd hhmmss UTC"; *stream << QString("%1%2%3") - .arg(PGM_CORE->pgmName(), -20) + .arg(BNC_CORE->pgmName(), -20) .arg(runBy.trimmed().left(20), -20) .arg(QDateTime::currentDateTime().toUTC().toString(fmtDate), -20) Index: trunk/BNC/src/upload/bncuploadcaster.cpp =================================================================== --- trunk/BNC/src/upload/bncuploadcaster.cpp (revision 5067) +++ trunk/BNC/src/upload/bncuploadcaster.cpp (revision 5068) @@ -46,9 +46,9 @@ connect(this, SIGNAL(newMessage(QByteArray,bool)), - PGM_CORE, SLOT(slotMessage(const QByteArray,bool))); + BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); - if (PGM_CORE->_uploadTableItems.find(_iRow) != PGM_CORE->_uploadTableItems.end()){ + if (BNC_CORE->_uploadTableItems.find(_iRow) != BNC_CORE->_uploadTableItems.end()){ connect(this, SIGNAL(newBytes(QByteArray,double)), - PGM_CORE->_uploadTableItems.value(iRow), + BNC_CORE->_uploadTableItems.value(iRow), SLOT(slotNewBytes(const QByteArray,double))); }