Changeset 2226 in ntrip

Timestamp:

Jan 12, 2010, 9:40:34 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncpppclient.cpp (modified) (3 diffs)
• bncpppclient.h (modified) (1 diff)
• bncwindow.cpp (modified) (2 diffs)

trunk/BNC/bncpppclient.cpp

@@ -44 +44 @@
 #include "bncconst.h"
 #include "bncmodel.h"
+#include "bncsettings.h"
 
 extern "C" {
@@ -54 +55 @@
 ////////////////////////////////////////////////////////////////////////////
 bncPPPclient::bncPPPclient(QByteArray staID) {
+
+  bncSettings settings;
+
+  if ( Qt::CheckState(settings.value("pppGLONASS").toInt()) == Qt::Checked) {
+    _useGlonass = true;
+  }
+  else {
+    _useGlonass = false;
+  }
 
   connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
@@ -99 +109 @@
   t_obsInternal* obs = &(pp->_o);
 
-  if (obs->satSys != 'G') {
+  if (obs->satSys != 'G' && !_useGlonass) {
     return;
   }

trunk/BNC/bncpppclient.h

@@ -117 +117 @@
   t_epoData*             _epoData;
   bncModel*              _model;
+  bool                   _useGlonass;
 };
 

trunk/BNC/bncwindow.cpp

@@ -1560 +1560 @@
       _pppUsePhaseCheckBox->setPalette(palette_white);
       _pppEstTropoCheckBox->setPalette(palette_white);
-//    _pppGLONASSCheckBox->setPalette(palette_white);
+      _pppGLONASSCheckBox->setPalette(palette_white);
       _pppGLONASSCheckBox->setPalette(palette_gray);
       _pppNMEALineEdit->setEnabled(true);
@@ -1570 +1570 @@
       _pppUsePhaseCheckBox->setEnabled(true);
       _pppEstTropoCheckBox->setEnabled(true);
-//    _pppGLONASSCheckBox->setEnabled(true);
+      _pppGLONASSCheckBox->setEnabled(true);
       _pppGLONASSCheckBox->setEnabled(false);
     } else {