Changeset 6405 in ntrip for trunk/BNC/src/bncantex.h

Timestamp:

Dec 22, 2014, 6:09:12 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncantex.h (modified) (2 diffs)

trunk/BNC/src/bncantex.h

@@ -37 +37 @@
   bncAntex();
   ~bncAntex();
-  t_irc readFile(const QString& fileName);  
-  void print() const;
-  double pco(const QString& antName, double eleSat, bool& found) const;
-  double rcvCorr(const std::string& antName, double eleSat, bool& found) const;
+  t_irc  readFile(const QString& fileName);  
+  void   print() const;
+  double rcvCorr(const std::string& antName, t_frequency::type frqType,
+                 double eleSat, double azSat, bool& found) const;
   t_irc  satCoMcorrection(const QString& prn, double Mjd, 
                           const ColumnVector& xSat, ColumnVector& dx);
 
  private:
-
   class t_frqMap {
    public:
@@ -54 +53 @@
   class t_antMap {
    public:
-    t_antMap() {
-      frqMapL1 = 0;
-      frqMapL2 = 0;
+    t_antMap() {}
+    ~t_antMap() {
+      QMapIterator<t_frequency::type, t_frqMap*> it(frqMap);
+      while (it.hasNext()) {
+        it.next();
+        delete it.value();
+      }
     }
-    ~t_antMap() {
-      delete frqMapL1;
-      delete frqMapL2;
-    }
-    QString   antName;
-    double       zen1;
-    double       zen2;
-    double       dZen;
-    t_frqMap* frqMapL1;
-    t_frqMap* frqMapL2;
-    bncTime   validFrom;
-    bncTime   validTo;
+    QString                            antName;
+    double                             zen1;
+    double                             zen2;
+    double                             dZen;
+    QMap<t_frequency::type, t_frqMap*> frqMap;
+    bncTime                            validFrom;
+    bncTime                            validTo;
   };