Changeset 6275 in ntrip for trunk

Timestamp:

Oct 31, 2014, 6:33:17 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (4 diffs)
• reqcanalyze.h (modified) (3 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -68 +68 @@
   _obsFileNames = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
   _navFileNames = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
+
+  connect(this, SIGNAL(dspSkyPlot(const QString&, const QByteArray&, QVector<t_polarPoint*>*, 
+                                  const QByteArray&, QVector<t_polarPoint*>*,
+                                  const QByteArray&, double)), 
+          this, SLOT(slotDspSkyPlot(const QString&, const QByteArray&, QVector<t_polarPoint*>*, 
+                                    const QByteArray&, QVector<t_polarPoint*>*,
+                                    const QByteArray&, double)));
+
+  connect(this, SIGNAL(dspAvailPlot(const QString&, const QByteArray&)),
+          this, SLOT(slotDspAvailPlot(const QString&, const QByteArray&)));
 }
 
@@ -551 +561 @@
     QFileInfo  fileInfo(obsFile->fileName());
     QByteArray title = fileInfo.fileName().toAscii();
-    dspSkyPlot(obsFile->fileName(), "MP1", dataMP1, "MP2", dataMP2, "Meters", 2.0);
-    dspSkyPlot(obsFile->fileName(), "SNR1", dataSNR1, "SNR2", dataSNR2, "dbHz", 54.0);
-    dspAvailPlot(obsFile->fileName(), title);
+    emit dspSkyPlot(obsFile->fileName(), "MP1", dataMP1, "MP2", dataMP2, "Meters", 2.0);
+    emit dspSkyPlot(obsFile->fileName(), "SNR1", dataSNR1, "SNR2", dataSNR2, "dbHz", 54.0);
+    emit dspAvailPlot(obsFile->fileName(), title);
   }
   else {
@@ -577 +587 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_reqcAnalyze::dspSkyPlot(const QString& fileName, const QByteArray& title1,
-                               QVector<t_polarPoint*>* data1, const QByteArray& title2,
-                               QVector<t_polarPoint*>* data2, const QByteArray& scaleTitle,
-                               double maxValue) {
+void t_reqcAnalyze::slotDspSkyPlot(const QString& fileName, const QByteArray& title1,
+                                   QVector<t_polarPoint*>* data1, const QByteArray& title2,
+                                   QVector<t_polarPoint*>* data2, const QByteArray& scaleTitle,
+                                   double maxValue) {
 
   if (BNC_CORE->GUIenabled()) {
@@ -635 +645 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_reqcAnalyze::dspAvailPlot(const QString& fileName, const QByteArray& title) {
+void t_reqcAnalyze::slotDspAvailPlot(const QString& fileName, const QByteArray& title) {
 
   QMap<t_prn, t_plotData> plotData;

trunk/BNC/src/rinex/reqcanalyze.h

@@ -60 +60 @@
  signals:
   void finished();
+  void dspSkyPlot(const QString&, const QByteArray&, QVector<t_polarPoint*>*, 
+                  const QByteArray&, QVector<t_polarPoint*>*, const QByteArray&, double);
+  void dspAvailPlot(const QString&, const QByteArray&);
 
  private:
@@ -132 +135 @@
   };
 
+ private slots:
+  void   slotDspSkyPlot(const QString& fileName, const QByteArray& title1, 
+                    QVector<t_polarPoint*>* data1, const QByteArray& title2, 
+                    QVector<t_polarPoint*>* data2, const QByteArray& scaleTitle, double maxValue);
+
+  void   slotDspAvailPlot(const QString& fileName, const QByteArray& title);
+
+ private:
   void   analyzeFile(t_rnxObsFile* obsFile);
 
@@ -141 +152 @@
 
   double cmpDOP(const ColumnVector& xyzSta) const;
-
-  void   dspSkyPlot(const QString& fileName, const QByteArray& title1, 
-                    QVector<t_polarPoint*>* data1, const QByteArray& title2, 
-                    QVector<t_polarPoint*>* data2, const QByteArray& scaleTitle, double maxValue);
-
-  void   dspAvailPlot(const QString& fileName, const QByteArray& title);
 
   void   printReport();