Changeset 6318 in ntrip for trunk

Timestamp:

Nov 10, 2014, 4:22:47 PM (9 years ago)

Author:

stuerze

Message:

small changes to allow to disable the QC plot generation on request

Location:

trunk/BNC/src

Files:

• bncwindow.cpp (modified) (3 diffs)
• rinex/reqcanalyze.cpp (modified) (2 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -1007 +1007 @@
   _reqcSkyPlotSystems = new QComboBox();
   _reqcSkyPlotSystems->setEditable(false);
-  _reqcSkyPlotSystems->addItems(QString("ALL,GPS,GLONASS,Galileo").split(","));
+  _reqcSkyPlotSystems->addItems(QString(",ALL,GPS,GLONASS,Galileo").split(","));
   ik = _reqcSkyPlotSystems->findText(settings.value("reqcSkyPlotSystems").toString());
   if (ik != -1) {
     _reqcSkyPlotSystems->setCurrentIndex(ik);
   }
+  connect(_reqcSkyPlotSystems, SIGNAL(currentIndexChanged(const QString &)),
+          this, SLOT(slotBncTextChanged()));
 
   _reqcLogSummaryOnly = new QCheckBox();
@@ -2166 +2168 @@
   // QC
   // --
-  if (sender() == 0 || sender() == _reqcActionComboBox) {
+  if (sender() == 0 || sender() == _reqcActionComboBox || sender() == _reqcSkyPlotSystems) {
     enable = !_reqcActionComboBox->currentText().isEmpty();
     bool enable10 = _reqcActionComboBox->currentText() == "Edit/Concatenate";
+    bool enablePlot = !_reqcSkyPlotSystems->currentText().isEmpty();
     enableWidget(enable &&  enable10, _reqcEditOptionButton);
     enableWidget(enable,              _reqcObsFileChooser);
@@ -2175 +2178 @@
     enableWidget(enable &&  enable10, _reqcOutNavLineEdit);
     enableWidget(enable,              _reqcOutLogLineEdit);
-    enableWidget(enable && !enable10, _reqcPlotDirLineEdit);
+    enableWidget(enable && !enable10 && enablePlot, _reqcPlotDirLineEdit);
     enableWidget(enable && !enable10, _reqcSkyPlotSystems);
     enableWidget(enable && !enable10, _reqcLogSummaryOnly);

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -492 +492 @@
 void t_reqcAnalyze::preparePlotData(const t_rnxObsFile* obsFile) {
 
-  QVector<t_polarPoint*>* dataMP1  = new QVector<t_polarPoint*>;
-  QVector<t_polarPoint*>* dataMP2  = new QVector<t_polarPoint*>;
-  QVector<t_polarPoint*>* dataSNR1 = new QVector<t_polarPoint*>;
-  QVector<t_polarPoint*>* dataSNR2 = new QVector<t_polarPoint*>;
-
   bncSettings settings;
   QString reqSkyPlotSystems = settings.value("reqcSkyPlotSystems").toString();
@@ -511 +506 @@
     plotGal = true;
   }
-  else {
+  else if (reqSkyPlotSystems == "ALL") {
     plotGPS = true;
     plotGlo = true;
     plotGal = true;
   }
+  else {
+          return;
+  }
+
+  QVector<t_polarPoint*>* dataMP1  = new QVector<t_polarPoint*>;
+  QVector<t_polarPoint*>* dataMP2  = new QVector<t_polarPoint*>;
+  QVector<t_polarPoint*>* dataSNR1 = new QVector<t_polarPoint*>;
+  QVector<t_polarPoint*>* dataSNR2 = new QVector<t_polarPoint*>;
 
   // Loop over all observations