Changeset 2882 in ntrip for trunk/BNC

Timestamp:

Jan 26, 2011, 11:22:21 AM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncantex.cpp (modified) (2 diffs)
• bncantex.h (modified) (3 diffs)

trunk/BNC/bncantex.cpp

@@ -53 +53 @@
 ////////////////////////////////////////////////////////////////////////////
 bncAntex::~bncAntex() {
+  QMapIterator<QString, t_antMap*> it(_maps);
+  while (it.hasNext()) {
+    it.next();
+    delete it.value();
+  }
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncAntex::readFile(const QString& fileName) {
+t_irc bncAntex::readFile(const QString& fileName) {
 
   QFile inFile(fileName);
@@ -66 +71 @@
   while ( !in.atEnd() ) {
     QString line = in.readLine();
+  
+    t_antMap* newMap = 0;
+    if      (line.indexOf("START OF ANTENNA") == 60) {
+      if (newMap) {
+        delete newMap;
+        return failure;
+      }
+      else {
+        newMap = new t_antMap();
+      }
+    } 
 
+    else if (line.indexOf("END OF ANTENNA") == 60) {
+      if (newMap) {
+        _maps[newMap->antName] = newMap;
+        newMap = 0;
+      }
+      else {
+        return failure;
+      }
+    }
   }
+
+  return success;
 }

trunk/BNC/bncantex.h

@@ -28 +28 @@
 #include <QtCore>
 #include <newmat.h>
+#include "bncconst.h"
 #include "bnctime.h"
 
@@ -34 +35 @@
   bncAntex();
   ~bncAntex();
-  void readFile(const QString& fileName);
+  t_irc readFile(const QString& fileName);
 
  private:
@@ -48 +49 @@
   class t_antMap {
    public:
-    QString  antName;
-    double   phaseCenterL1[3];
-    double   phaseCenterL2[3];
-    t_frqMap frqMapL1;
-    t_frqMap frqMapL2;
-    bncTime  validFrom;
-    bncTime  validTo;
+    t_antMap() {
+      frqMapL1 = 0;
+      frqMapL2 = 0;
+    }
+    ~t_antMap() {
+      delete frqMapL1;
+      delete frqMapL2;
+    }
+    QString   antName;
+    double    phaseCenterL1[3];
+    double    phaseCenterL2[3];
+    t_frqMap* frqMapL1;
+    t_frqMap* frqMapL2;
+    bncTime   validFrom;
+    bncTime   validTo;
   };
 
-  QMap<QString, t_antMap> _maps;
+  QMap<QString, t_antMap*> _maps;
 };