Changeset 6141 in ntrip for trunk/BNC/src/bnccore.cpp

Timestamp:

Sep 13, 2014, 5:08:22 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bnccore.cpp (modified) (8 diffs)

trunk/BNC/src/bnccore.cpp

@@ -118 +118 @@
   _userName = _userName.leftJustified(20, ' ', true);
 
-  _corrs = new QMultiMap<bncTime, QString>;
+  _corrs = new QMultiMap<bncTime, t_clkCorr>;
 
   _dateAndTimeGPS = 0;
@@ -633 +633 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotQuit() {
-  cout << "t_bncCore::slotQuit" << endl;
   delete _caster; _caster = 0;
   qApp->quit();
@@ -640 +639 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::slotNewCorrLine(QString line, QString staID, bncTime coTime) {
-
+void t_bncCore::slotNewOrbCorrections(QList<t_orbCorr> orbCorrections) {
+  emit newOrbCorrections(orbCorrections);
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::slotNewClkCorrections(QList<t_clkCorr> clkCorrections) {
   QMutexLocker locker(&_mutex);
+
+  if (clkCorrections.size() == 0) {
+    return;
+  }
+  bncTime coTime = clkCorrections[0]._time;
+  QString staID(clkCorrections[0]._staID.c_str());
 
   // Combination of Corrections
@@ -648 +658 @@
 #ifdef USE_COMBINATION
   if (_bncComb) {
-    _bncComb->processCorrLine(staID, line);
+    _bncComb->processClkCorrections(clkCorrections);
   }
 #endif
@@ -677 +687 @@
   }
 
-  _corrs->insert(coTime, QString(line + " " + staID));
+  for (int ii = 0; ii < clkCorrections.size(); ii++) {
+    _corrs->insert(coTime, clkCorrections[ii]);
+  }
 
   // Dump Corrections
@@ -693 +705 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::dumpCorrs(bncTime minTime, bncTime maxTime) {
-  QStringList allCorrs;
-  QMutableMapIterator<bncTime, QString> it(*_corrs);
+  QList<t_clkCorr> allCorrs;
+  QMutableMapIterator<bncTime, t_clkCorr> it(*_corrs);
   while (it.hasNext()) {
     it.next();
@@ -709 +721 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::dumpCorrs() {
-  QStringList allCorrs;
-  QMutableMapIterator<bncTime, QString> it(*_corrs);
+  QList<t_clkCorr> allCorrs;
+  QMutableMapIterator<bncTime, t_clkCorr> it(*_corrs);
   while (it.hasNext()) {
     allCorrs << it.next().value();
@@ -720 +732 @@
 // Dump List of Corrections 
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::dumpCorrs(const QStringList& allCorrs) {
-  emit newCorrections(allCorrs);
+void t_bncCore::dumpCorrs(const QList<t_clkCorr>& allCorrs) {
+  emit newClkCorrections(allCorrs);
   if (_socketsCorr) {
-    QListIterator<QString> it(allCorrs);
+    QListIterator<t_clkCorr> it(allCorrs);
     while (it.hasNext()) {
-      QString corrLine = it.next() + "\n";
-    
+      const t_clkCorr& corr = it.next();
       QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
       while (is.hasNext()) {
         QTcpSocket* sock = is.next();
         if (sock->state() == QAbstractSocket::ConnectedState) {
-          if (sock->write(corrLine.toAscii()) == -1) {
+          if (sock->write(corr.toString().c_str()) == -1) {
             delete sock;
             is.remove();