Changeset 5068 in ntrip


Ignore:
Timestamp:
Mar 30, 2013, 11:39:46 AM (12 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/GPSS/gpssDecoder.cpp

    r5066 r5068  
    5151gpssDecoder::gpssDecoder() : GPSDecoder() {
    5252  connect(this, SIGNAL(newGPSEph(gpsephemeris*)),
    53           PGM_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
     53          BNC_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
    5454}
    5555

  • trunk/BNC/src/GPSS/hassDecoder.cpp

    r5066 r5068  
    4747
    4848  connect(this, SIGNAL(newCorrLine(QString, QString, long)),
    49           PGM_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
     49          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
    5050}
    5151

  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r5066 r5068  
    7575
    7676  connect(this, SIGNAL(newGPSEph(gpsephemeris*)),
    77           PGM_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
     77          BNC_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
    7878  connect(this, SIGNAL(newGlonassEph(glonassephemeris*)),
    79           PGM_CORE, SLOT(slotNewGlonassEph(glonassephemeris*)));
     79          BNC_CORE, SLOT(slotNewGlonassEph(glonassephemeris*)));
    8080  connect(this, SIGNAL(newGalileoEph(galileoephemeris*)),
    81           PGM_CORE, SLOT(slotNewGalileoEph(galileoephemeris*)));
     81          BNC_CORE, SLOT(slotNewGalileoEph(galileoephemeris*)));
    8282
    8383  // Mode can be either observations or corrections
    … …  
    149149  // Get Glonass Slot Numbers from Global Array
    150150  // ------------------------------------------
    151   PGM_CORE->getGlonassSlotNums(parser.GLOFreq);
     151  BNC_CORE->getGlonassSlotNums(parser.GLOFreq);
    152152
    153153  // Remaining part decodes the Observations
    … …  
    377377
    378378  if (decoded) {
    379     PGM_CORE->storeGlonassSlotNums(parser.GLOFreq);
     379    BNC_CORE->storeGlonassSlotNums(parser.GLOFreq);
    380380    return success;
    381381  }

  • trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

    r5066 r5068  
    7373
    7474  connect(this, SIGNAL(newCorrLine(QString, QString, long)),
    75           PGM_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
     75          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
    7676
    7777  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    78           PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     78          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    7979
    8080  memset(&_co, 0, sizeof(_co));

  • trunk/BNC/src/RTCM3/ephemeris.cpp

    r5066 r5068  
    416416    }
    417417
    418     if (timeChanged && PGM_CORE->mode() == t_pgmCore::batchPostProcessing) {
     418    if (timeChanged && BNC_CORE->mode() == t_pgmCore::batchPostProcessing) {
    419419      bncTime newHTime(ww, (double) tow);
    420420      cout << "GLONASS " << ee->almanac_number <<  " Time Changed at "

  • trunk/BNC/src/RTRover/bncrtrover.cpp

    r5066 r5068  
    55
    66#include "bncrtrover.h"
    7 #include "bncapp.h"
     7#include "bnccore.h"
    88#include "bncsettings.h"
    99#include "bnctime.h"
    … …  
    9393  // Connect to BNC Signals
    9494  // ----------------------
    95   connect(PGM_CORE, SIGNAL(newCorrections(QList<QString>)),
     95  connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
    9696          this, SLOT(slotNewCorrections(QList<QString>)));
    9797
    98   connect(PGM_CORE, SIGNAL(newEphGPS(gpsephemeris)),
     98  connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
    9999          this, SLOT(slotNewEphGPS(gpsephemeris)));
    100100
    101   connect(PGM_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
     101  connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
    102102          this, SLOT(slotNewEphGlonass(glonassephemeris)));
    103103
    104   connect(PGM_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
     104  connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
    105105          this, SLOT(slotNewEphGalileo(galileoephemeris)));
    106106 

  • trunk/BNC/src/app.cpp

    r5067 r5068  
    2222// Global Variable
    2323////////////////////////////////////////////////////////////////////////////
    24 t_pgmCore* PGM_CORE = 0;
     24t_pgmCore* BNC_CORE = 0;
    2525
    2626// Constructor
    … …  
    2828t_app::t_app(int& argc, char* argv[], bool GUIenabled) :
    2929  QApplication(argc, argv, GUIenabled) {
    30   PGM_CORE = new t_pgmCore(argc, argv, GUIenabled);
     30  BNC_CORE = new t_pgmCore(argc, argv, GUIenabled);
    3131}
    3232
    … …  
    4343  if (ev->type() == QEvent::FileOpen) {  // currently happens on Mac only
    4444    QString fileName = static_cast<QFileOpenEvent*>(ev)->file();
    45     PGM_CORE->setConfFileName(fileName);
     45    BNC_CORE->setConfFileName(fileName);
    4646    return true;
    4747  }

  • trunk/BNC/src/app.h

    r5067 r5068  
    1717};
    1818
    19 extern t_pgmCore* PGM_CORE;
     19extern t_pgmCore* BNC_CORE;
    2020
    2121#endif

  • trunk/BNC/src/bncapp.h

    r5066 r5068  
    142142};
    143143
    144 extern t_pgmCore* PGM_CORE;
     144extern t_pgmCore* BNC_CORE;
    145145
    146146#endif

  • trunk/BNC/src/bnccaster.cpp

    r5066 r5068  
    6565
    6666  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    67           PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     67          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    6868
    6969  if ( !outFileName.isEmpty() ) {
    … …  
    483483  emit mountPointsRead(_threads);
    484484  emit( newMessage(QString("Configuration read: "
    485                            + PGM_CORE->confFileName()
     485                           + BNC_CORE->confFileName()
    486486                           + ", %1 stream(s)")
    487487                            .arg(_threads.count()).toAscii(), true) );

  • trunk/BNC/src/bncephuser.cpp

    r5066 r5068  
    5151
    5252  if (connectSlots) {
    53     connect(PGM_CORE, SIGNAL(newEphGPS(gpsephemeris)),
     53    connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
    5454            this, SLOT(slotNewEphGPS(gpsephemeris)), Qt::DirectConnection);
    5555   
    56     connect(PGM_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
     56    connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
    5757            this, SLOT(slotNewEphGlonass(glonassephemeris)), Qt::DirectConnection);
    5858   
    59     connect(PGM_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
     59    connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
    6060            this, SLOT(slotNewEphGalileo(galileoephemeris)), Qt::DirectConnection);
    6161  }

  • trunk/BNC/src/bncgetthread.cpp

    r5066 r5068  
    122122
    123123  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    124           PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     124          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    125125
    126126  _isToBeDeleted = false;
    … …  
    331331      settings.value("pppMount").toString() == _staID) {
    332332    _PPPclient = new bncPPPclient(_staID);
    333     PGM_CORE->_bncPPPclient = _PPPclient;
     333    BNC_CORE->_bncPPPclient = _PPPclient;
    334334    qRegisterMetaType<bncTime>("bncTime");
    335335    connect(_PPPclient, SIGNAL(newPosition(bncTime, double, double, double)),
    … …  
    440440        if (data.isEmpty()) {
    441441          cout << "no more data" << endl;
    442           PGM_CORE->stopCombination();
     442          BNC_CORE->stopCombination();
    443443          QThread::exit(0);
    444444          delete this;
    … …  
    465465      // -----------
    466466      if (_rawOutput) {
    467         PGM_CORE->writeRawData(data, _staID, _format);
     467        BNC_CORE->writeRawData(data, _staID, _format);
    468468      }
    469469

  • trunk/BNC/src/bncmain.cpp

    r5066 r5068  
    122122  app.setOrganizationName("BKG");
    123123  app.setOrganizationDomain("www.bkg.bund.de");
    124   PGM_CORE->setConfFileName( confFileName );
     124  BNC_CORE->setConfFileName( confFileName );
    125125
    126126  bncSettings settings;
    … …  
    138138  if (interactive) {
    139139
    140     PGM_CORE->setMode(t_pgmCore::interactive);
     140    BNC_CORE->setMode(t_pgmCore::interactive);
    141141
    142142    QString fontString = settings.value("font").toString();
    … …  
    151151
    152152    bncWindow* bncWin = new bncWindow();
    153     PGM_CORE->setMainWindow(bncWin);
     153    BNC_CORE->setMainWindow(bncWin);
    154154    bncWin->show();
    155155  }
    … …  
    160160  // -------------------
    161161  else if (settings.value("pppSPP").toString() == "Post-Processing") {
    162     PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     162    BNC_CORE->setMode(t_pgmCore::batchPostProcessing);
    163163    t_postProcessing* postProcessing = new t_postProcessing(0);
    164164    postProcessing->start();
    … …  
    168168  // -------------------------
    169169  else if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
    170     PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     170    BNC_CORE->setMode(t_pgmCore::batchPostProcessing);
    171171    t_reqcEdit* reqcEdit = new t_reqcEdit(0);
    172172    reqcEdit->start();
    … …  
    176176  // ----------------------------
    177177  else if (settings.value("reqcAction").toString() == "Analyze") {
    178     PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     178    BNC_CORE->setMode(t_pgmCore::batchPostProcessing);
    179179    t_reqcAnalyze* reqcAnalyze = new t_reqcAnalyze(0);
    180180    reqcAnalyze->start();
    … …  
    194194                                      settings.value("outPort").toInt());
    195195   
    196     PGM_CORE->setCaster(caster);
    197     PGM_CORE->setPort(settings.value("outEphPort").toInt());
    198     PGM_CORE->setPortCorr(settings.value("corrPort").toInt());
    199     PGM_CORE->initCombination();
    200    
    201     PGM_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
    202    
    203     PGM_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
     196    BNC_CORE->setCaster(caster);
     197    BNC_CORE->setPort(settings.value("outEphPort").toInt());
     198    BNC_CORE->setPortCorr(settings.value("corrPort").toInt());
     199    BNC_CORE->initCombination();
     200   
     201    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
     202   
     203    BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
    204204   
    205205    // Normal case - data from Internet
    206206    // --------------------------------
    207207    if ( rawFileName.isEmpty() ) {
    208       PGM_CORE->setMode(t_pgmCore::nonInteractive);
     208      BNC_CORE->setMode(t_pgmCore::nonInteractive);
    209209      caster->readMountPoints();
    210210      if (caster->numStations() == 0) {
    … …  
    216216    // -----------------------------
    217217    else {
    218       PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     218      BNC_CORE->setMode(t_pgmCore::batchPostProcessing);
    219219      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "",
    220220                                               bncRawFile::input);

  • trunk/BNC/src/bncnetquery.h

    r5066 r5068  
    1414  bncNetQuery() {
    1515    connect(this,     SIGNAL(newMessage(QByteArray,bool)),
    16             PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     16            BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    1717  }
    1818  virtual ~bncNetQuery() {}

  • trunk/BNC/src/bncnetqueryv2.cpp

    r5066 r5068  
    4242
    4343  if (_secure && !QSslSocket::supportsSsl()) {
    44     PGM_CORE->slotMessage("No SSL support, install OpenSSL run-time libraries", true);
     44    BNC_CORE->slotMessage("No SSL support, install OpenSSL run-time libraries", true);
    4545    stop();
    4646  }
    … …  
    219219  }
    220220
    221   PGM_CORE->slotMessage(msg.toAscii(), true);
     221  BNC_CORE->slotMessage(msg.toAscii(), true);
    222222
    223223  if (_ignoreSslErrors) {

  • trunk/BNC/src/bncpppclient.cpp

    r5066 r5068  
    7272  if (connectSlots) {
    7373    connect(this, SIGNAL(newMessage(QByteArray,bool)),
    74             PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
    75 
    76     connect(PGM_CORE, SIGNAL(newCorrections(QList<QString>)),
     74            BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
     75
     76    connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
    7777            this, SLOT(slotNewCorrections(QList<QString>)));
    7878  }

  • trunk/BNC/src/bncrawfile.cpp

    r5066 r5068  
    136136      QStringList lst  = line.split(' ');
    137137     
    138       delete PGM_CORE->_currentDateAndTimeGPS;
    139       PGM_CORE->_currentDateAndTimeGPS =
     138      delete BNC_CORE->_currentDateAndTimeGPS;
     139      BNC_CORE->_currentDateAndTimeGPS =
    140140        new QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate));
    141141     

  • trunk/BNC/src/bncsettings.cpp

    r5066 r5068  
    2929  // First fill the options
    3030  // ----------------------
    31   if (PGM_CORE->_settings.size() == 0) {
     31  if (BNC_CORE->_settings.size() == 0) {
    3232    reRead();
    3333  }
    … …  
    4343void bncSettings::reRead() {
    4444
    45   PGM_CORE->_settings.clear();
    46 
    47   QSettings settings(PGM_CORE->confFileName(), QSettings::IniFormat);
     45  BNC_CORE->_settings.clear();
     46
     47  QSettings settings(BNC_CORE->confFileName(), QSettings::IniFormat);
    4848
    4949  // Read from File
    … …  
    5353    while (it.hasNext()) {
    5454      QString key = it.next();
    55       PGM_CORE->_settings[key] = settings.value(key);
     55      BNC_CORE->_settings[key] = settings.value(key);
    5656    }
    5757  }
    … …  
    218218  QMutexLocker locker(&_mutex);
    219219
    220   if (PGM_CORE->_settings.contains(key)) {
    221     return PGM_CORE->_settings[key];
     220  if (BNC_CORE->_settings.contains(key)) {
     221    return BNC_CORE->_settings[key];
    222222  }
    223223  else {
    … …  
    236236////////////////////////////////////////////////////////////////////////////
    237237void bncSettings::setValue_p(const QString &key, const QVariant& value) {
    238   PGM_CORE->_settings[key] = value;
     238  BNC_CORE->_settings[key] = value;
    239239}
    240240
    … …  
    243243void bncSettings::remove(const QString& key ) {
    244244  QMutexLocker locker(&_mutex);
    245   PGM_CORE->_settings.remove(key);
     245  BNC_CORE->_settings.remove(key);
    246246}
    247247
    … …  
    250250void bncSettings::sync() {
    251251  QMutexLocker locker(&_mutex);
    252   QSettings settings(PGM_CORE->confFileName(), QSettings::IniFormat);
     252  QSettings settings(BNC_CORE->confFileName(), QSettings::IniFormat);
    253253  settings.clear();
    254   QMapIterator<QString, QVariant> it(PGM_CORE->_settings);
     254  QMapIterator<QString, QVariant> it(BNC_CORE->_settings);
    255255  while (it.hasNext()) {
    256256    it.next();

  • trunk/BNC/src/bncutils.cpp

    r5066 r5068  
    9191  QDateTime currDateTimeGPS;
    9292
    93   if ( PGM_CORE->_currentDateAndTimeGPS ) {
    94     currDateTimeGPS = *(PGM_CORE->_currentDateAndTimeGPS);
     93  if ( BNC_CORE->_currentDateAndTimeGPS ) {
     94    currDateTimeGPS = *(BNC_CORE->_currentDateAndTimeGPS);
    9595  }
    9696  else {
    … …  
    116116////////////////////////////////////////////////////////////////////////////
    117117QDateTime currentDateAndTimeGPS() {
    118   if ( PGM_CORE->_currentDateAndTimeGPS ) {
    119     return *(PGM_CORE->_currentDateAndTimeGPS);
     118  if ( BNC_CORE->_currentDateAndTimeGPS ) {
     119    return *(BNC_CORE->_currentDateAndTimeGPS);
    120120  }
    121121  else {

  • trunk/BNC/src/bncwindow.cpp

    r5066 r5068  
    101101  setWindowTitle(tr("BKG Ntrip Client (BNC) Version " BNCVERSION));
    102102
    103   connect(PGM_CORE, SIGNAL(newMessage(QByteArray,bool)),
     103  connect(BNC_CORE, SIGNAL(newMessage(QByteArray,bool)),
    104104          this, SLOT(slotWindowMessage(QByteArray,bool)));
    105105
    … …  
    19211921////////////////////////////////////////////////////////////////////////////
    19221922void bncWindow::slotGetThreadsFinished() {
    1923   PGM_CORE->slotMessage("All Get Threads Terminated", true);
     1923  BNC_CORE->slotMessage("All Get Threads Terminated", true);
    19241924  delete _caster;    _caster    = 0;
    19251925  delete _casterEph; _casterEph = 0;
    … …  
    19571957                          _outPortLineEdit->text().toInt());
    19581958
    1959   PGM_CORE->setPort(_outEphPortLineEdit->text().toInt());
    1960   PGM_CORE->setPortCorr(_corrPortLineEdit->text().toInt());
    1961   PGM_CORE->initCombination();
     1959  BNC_CORE->setPort(_outEphPortLineEdit->text().toInt());
     1960  BNC_CORE->setPortCorr(_corrPortLineEdit->text().toInt());
     1961  BNC_CORE->initCombination();
    19621962
    19631963  connect(_caster, SIGNAL(getThreadsFinished()),
    … …  
    19671967           this, SLOT(slotMountPointsRead(QList<bncGetThread*>)));
    19681968
    1969   PGM_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
     1969  BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
    19701970
    19711971  bncSettings settings;
    19721972
    19731973  QDir rnxdir(settings.value("rnxPath").toString());
    1974   if (!rnxdir.exists()) PGM_CORE->slotMessage("Cannot find RINEX Observations directory", true);
     1974  if (!rnxdir.exists()) BNC_CORE->slotMessage("Cannot find RINEX Observations directory", true);
    19751975
    19761976  QString rnx_file = settings.value("rnxScript").toString();
    19771977  if ( !rnx_file.isEmpty() ) {
    19781978    QFile rnxfile(settings.value("rnxScript").toString());
    1979     if (!rnxfile.exists()) PGM_CORE->slotMessage("Cannot find RINEX Observations script", true);
     1979    if (!rnxfile.exists()) BNC_CORE->slotMessage("Cannot find RINEX Observations script", true);
    19801980  }
    19811981
    19821982  QDir ephdir(settings.value("ephPath").toString());
    1983   if (!ephdir.exists()) PGM_CORE->slotMessage("Cannot find RINEX Ephemeris directory", true);
     1983  if (!ephdir.exists()) BNC_CORE->slotMessage("Cannot find RINEX Ephemeris directory", true);
    19841984
    19851985  QDir corrdir(settings.value("corrPath").toString());
    1986   if (!corrdir.exists()) PGM_CORE->slotMessage("Cannot find Broadcast Corrections directory", true);
     1986  if (!corrdir.exists()) BNC_CORE->slotMessage("Cannot find Broadcast Corrections directory", true);
    19871987
    19881988  QString advise_file = settings.value("adviseScript").toString();
    19891989  if ( !advise_file.isEmpty() ) {
    19901990    QFile advisefile(settings.value("adviseScript").toString());
    1991     if (!advisefile.exists()) PGM_CORE->slotMessage("Cannot find Outages script", true);
     1991    if (!advisefile.exists()) BNC_CORE->slotMessage("Cannot find Outages script", true);
    19921992  }
    19931993
    … …  
    19951995  if ( !ant_file.isEmpty() ) {
    19961996    QFile anxfile(settings.value("pppAntex").toString());
    1997     if (!anxfile.exists()) PGM_CORE->slotMessage("Cannot find IGS ANTEX file", true);
     1997    if (!anxfile.exists()) BNC_CORE->slotMessage("Cannot find IGS ANTEX file", true);
    19981998  }
    19991999
    … …  
    20122012                                   QMessageBox::NoButton);
    20132013  if (iRet == QMessageBox::Yes) {
    2014     PGM_CORE->stopCombination();
     2014    BNC_CORE->stopCombination();
    20152015    delete _caster;    _caster    = 0;
    20162016    delete _casterEph; _casterEph = 0;
    … …  
    25842584      bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
    25852585      _uploadTable->setItem(iRow, iCol, bncIt);
    2586       PGM_CORE->_uploadTableItems[iRow] = bncIt;
     2586      BNC_CORE->_uploadTableItems[iRow] = bncIt;
    25872587    }
    25882588    else {
    … …  
    25952595////////////////////////////////////////////////////////////////////////////
    25962596void bncWindow::slotDelUploadRow() {
    2597   PGM_CORE->_uploadTableItems.clear();
     2597  BNC_CORE->_uploadTableItems.clear();
    25982598  int nRows = _uploadTable->rowCount();
    25992599  bool flg[nRows];
    … …  
    26122612  }
    26132613  for (int iRow = 0; iRow < _uploadTable->rowCount(); iRow++) {
    2614     PGM_CORE->_uploadTableItems[iRow] =
     2614    BNC_CORE->_uploadTableItems[iRow] =
    26152615                                (bncTableItem*) _uploadTable->item(iRow, 11);
    26162616  }
    … …  
    26682668        bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
    26692669        _uploadTable->setItem(iRow, iCol, bncIt);
    2670         PGM_CORE->_uploadTableItems[iRow] = bncIt;
     2670        BNC_CORE->_uploadTableItems[iRow] = bncIt;
    26712671      }
    26722672      else {

  • trunk/BNC/src/combination/bnccomb.cpp

    r5066 r5068  
    163163
    164164  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    165           PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     165          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    166166
    167167  // Combination Method
    … …  
    750750  // Optionally send new Corrections to PPP
    751751  // --------------------------------------
    752   if (PGM_CORE->_bncPPPclient) {
    753     PGM_CORE->_bncPPPclient->slotNewCorrections(corrLines);
     752  if (BNC_CORE->_bncPPPclient) {
     753    BNC_CORE->_bncPPPclient->slotNewCorrections(corrLines);
    754754  }
    755755}

  • trunk/BNC/src/latencychecker.cpp

    r5066 r5068  
    6161
    6262  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    63           PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     63          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    6464
    6565  bncSettings settings;

  • trunk/BNC/src/rinex/bncpostprocess.cpp

    r5066 r5068  
    9898  }
    9999  else {
    100     PGM_CORE->slotMessage(msg, false);
     100    BNC_CORE->slotMessage(msg, false);
    101101  }
    102102}
    … …  
    222222  }
    223223
    224   if (PGM_CORE->mode() != t_pgmCore::interactive) {
     224  if (BNC_CORE->mode() != t_pgmCore::interactive) {
    225225    qApp->exit(0);
    226226  }

  • trunk/BNC/src/rinex/reqcanalyze.cpp

    r5066 r5068  
    101101  delete _log;     _log     = 0;
    102102  delete _logFile; _logFile = 0;
    103   if (PGM_CORE->mode() != t_pgmCore::interactive) {
     103  if (BNC_CORE->mode() != t_pgmCore::interactive) {
    104104    qApp->exit(0);
    105105  }
    … …  
    116116                                   double maxValue) {
    117117
    118   if (PGM_CORE->GUIenabled()) {
     118  if (BNC_CORE->GUIenabled()) {
    119119
    120120    if (maxValue == 0.0) {
    … …  
    142142    if (data1) {
    143143      t_polarPlot* plot1 = new t_polarPlot(QwtText(title1), scaleInterval,
    144                                           PGM_CORE->mainWindow());
     144                                          BNC_CORE->mainWindow());
    145145      plot1->addCurve(data1);
    146146      plots << plot1;
    … …  
    148148    if (data2) {
    149149      t_polarPlot* plot2 = new t_polarPlot(QwtText(title2), scaleInterval,
    150                                            PGM_CORE->mainWindow());
     150                                           BNC_CORE->mainWindow());
    151151      plot2->addCurve(data2);
    152152      plots << plot2;
    … …  
    296296  // Show the plots
    297297  // --------------
    298   if (PGM_CORE->GUIenabled()) {
     298  if (BNC_CORE->GUIenabled()) {
    299299    QFileInfo  fileInfo(obsFile->fileName());
    300300    QByteArray title = fileInfo.fileName().toAscii();
    … …  
    651651                                     const QByteArray& title) {
    652652
    653   if (PGM_CORE->GUIenabled()) {
     653  if (BNC_CORE->GUIenabled()) {
    654654    t_availPlot* plotA = new t_availPlot(0, &_availDataMap);
    655655    plotA->setTitle(title);

  • trunk/BNC/src/rinex/reqcedit.cpp

    r5066 r5068  
    108108
    109109    *_log << QByteArray("Program").leftJustified(15) << ": "
    110           << PGM_CORE->pgmName() << endl;
     110          << BNC_CORE->pgmName() << endl;
    111111    *_log << QByteArray("Run by").leftJustified(15) << ": "
    112           << PGM_CORE->userName() << endl;
     112          << BNC_CORE->userName() << endl;
    113113    *_log << QByteArray("Date").leftJustified(15) << ": "
    114114          << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << endl;
    … …  
    146146  // Exit (thread)
    147147  // -------------
    148   if (PGM_CORE->mode() != t_pgmCore::interactive) {
     148  if (BNC_CORE->mode() != t_pgmCore::interactive) {
    149149    qApp->exit(0);
    150150  }

  • trunk/BNC/src/rinex/rnxnavfile.cpp

    r5066 r5068  
    241241void t_rnxNavFile::writeHeader(const QMap<QString, QString>* txtMap) {
    242242
    243   QString     runBy = PGM_CORE->userName();
     243  QString     runBy = BNC_CORE->userName();
    244244  QStringList comments;
    245245
    … …  
    275275                                            : "yyyyMMdd hhmmss UTC";
    276276  *_stream << QString("%1%2%3")
    277     .arg(PGM_CORE->pgmName(), -20)
     277    .arg(BNC_CORE->pgmName(), -20)
    278278    .arg(runBy.trimmed().left(20), -20)
    279279    .arg(QDateTime::currentDateTime().toUTC().toString(fmtDate), -20)

  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r5066 r5068  
    213213
    214214  QStringList newComments;
    215   QString     runBy = PGM_CORE->userName();
     215  QString     runBy = BNC_CORE->userName();
    216216
    217217  if (txtMap) {
    … …  
    236236                                                  : "yyyyMMdd hhmmss UTC";
    237237  *stream << QString("%1%2%3")
    238     .arg(PGM_CORE->pgmName(), -20)
     238    .arg(BNC_CORE->pgmName(), -20)
    239239    .arg(runBy.trimmed().left(20), -20)
    240240    .arg(QDateTime::currentDateTime().toUTC().toString(fmtDate), -20)

  • trunk/BNC/src/upload/bncuploadcaster.cpp

    r5066 r5068  
    4646
    4747  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    48           PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
     48          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    4949
    50   if (PGM_CORE->_uploadTableItems.find(_iRow) != PGM_CORE->_uploadTableItems.end()){
     50  if (BNC_CORE->_uploadTableItems.find(_iRow) != BNC_CORE->_uploadTableItems.end()){
    5151    connect(this, SIGNAL(newBytes(QByteArray,double)),
    52             PGM_CORE->_uploadTableItems.value(iRow),
     52            BNC_CORE->_uploadTableItems.value(iRow),
    5353            SLOT(slotNewBytes(const QByteArray,double)));
    5454  }
Note: See TracChangeset for help on using the changeset viewer.