Changeset 5846 in ntrip

Timestamp:

Aug 7, 2014, 10:43:33 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (3 diffs)
• bnccore.h (modified) (2 diffs)
• bncrawfile.cpp (modified) (1 diff)
• bncutils.cpp (modified) (2 diffs)

trunk/BNC/src/bnccore.cpp

@@ -119 +119 @@
   _corrs = new QMultiMap<bncTime, QString>;
 
-  _currentDateAndTimeGPS = 0;
+  _dateAndTimeGPS = 0;
 
   for (int ii = 0; ii < PRN_GLONASS_NUM; ++ii) {
@@ -157 +157 @@
   delete _corrs;
 
-  delete _currentDateAndTimeGPS;
+  delete _dateAndTimeGPS;
 
   delete _rawFile;
@@ -835 +835 @@
 }
 
+
+//
+////////////////////////////////////////////////////////////////////////////
+bool t_bncCore::dateAndTimeGPSSet() const {
+  QMutexLocker locker(&_mutexDateAndTimeGPS);
+  if (_dateAndTimeGPS) {
+    return true;
+  }
+  else {
+    return false;
+  }
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+QDateTime t_bncCore::dateAndTimeGPS() const {
+  QMutexLocker locker(&_mutexDateAndTimeGPS);
+  if (_dateAndTimeGPS) {
+    return *_dateAndTimeGPS;
+  }
+  else {
+    return QDateTime();
+  }
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::setDateAndTimeGPS(QDateTime dateTime) {
+  QMutexLocker locker(&_mutexDateAndTimeGPS);
+  delete _dateAndTimeGPS;
+  _dateAndTimeGPS = new QDateTime(dateTime);
+}

trunk/BNC/src/bnccore.h

@@ -53 +53 @@
     void setCaster(bncCaster* caster) {_caster = caster;}
     const bncCaster* caster() const {return _caster;}
-    QDateTime* _currentDateAndTimeGPS;
+    bool      dateAndTimeGPSSet() const;
+    QDateTime dateAndTimeGPS() const;
+    void      setDateAndTimeGPS(QDateTime dateTime);
     void setConfFileName(const QString& confFileName);
     QString confFileName() const {return _confFileName;}
@@ -140 +142 @@
     QWidget*            _mainWindow;
     bool                _GUIenabled;
+    QDateTime*          _dateAndTimeGPS;
+    mutable QMutex      _mutexDateAndTimeGPS;
  public:
     bncPPPclient*       _bncPPPclient;

trunk/BNC/src/bncrawfile.cpp

@@ -136 +136 @@
       QStringList lst  = line.split(' ');
       
-      delete BNC_CORE->_currentDateAndTimeGPS;
-      BNC_CORE->_currentDateAndTimeGPS = 
-        new QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate));
+      BNC_CORE->setDateAndTimeGPS(QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate)));
       
       _staID  = lst.value(1).toAscii();

trunk/BNC/src/bncutils.cpp

@@ -93 +93 @@
   QDateTime currDateTimeGPS;
 
-  if ( BNC_CORE->_currentDateAndTimeGPS ) {
-    currDateTimeGPS = *(BNC_CORE->_currentDateAndTimeGPS);
+  if ( BNC_CORE->dateAndTimeGPSSet() ) {
+    currDateTimeGPS = BNC_CORE->dateAndTimeGPS();
   }
   else {
@@ -118 +118 @@
 ////////////////////////////////////////////////////////////////////////////
 QDateTime currentDateAndTimeGPS() {
-  if ( BNC_CORE->_currentDateAndTimeGPS ) {
-    return *(BNC_CORE->_currentDateAndTimeGPS);
+  if ( BNC_CORE->dateAndTimeGPSSet() ) {
+    return BNC_CORE->dateAndTimeGPS();
   }
   else {