Changeset 4613 in ntrip

Timestamp:

Aug 31, 2012, 12:24:55 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• rinex/availplot.cpp (modified) (9 diffs)
• rinex/availplot.h (modified) (1 diff)
• src.pro (modified) (1 diff)

trunk/BNC/src/rinex/availplot.cpp

@@ -51 +51 @@
   QColor green(150,200,50);
   QColor blue(60,100,200);
-  QwtSymbol* symbolRed   = new QwtSymbol(QwtSymbol::Rect, QBrush(red),
-                                         QPen(red), QSize(2,2));
-  QwtSymbol* symbolGreen = new QwtSymbol(QwtSymbol::Rect, QBrush(green),
-                                         QPen(green), QSize(2,2));
-  QwtSymbol* symbolBlue  = new QwtSymbol(QwtSymbol::Rect, QBrush(blue),
-                                         QPen(blue), QSize(2,2));
+  QwtSymbol symbRed(QwtSymbol::Rect, QBrush(red), QPen(red), QSize(2,2));
+  QwtSymbol symbGreen(QwtSymbol::Rect, QBrush(green), QPen(green), QSize(2,2));
+  QwtSymbol symbBlue (QwtSymbol::Rect, QBrush(blue), QPen(blue), QSize(2,2));
 
   // Legend
@@ -65 +62 @@
   QVector<double> xData0(0);
   QVector<double> yData0(0);
-  addCurve("OK  ", symbolGreen, xData0, yData0);
-  addCurve("Gap ", symbolBlue,  xData0, yData0);
-  addCurve("Slip", symbolRed,   xData0, yData0);
+  addCurve("OK  ", symbGreen, xData0, yData0);
+  addCurve("Gap ", symbBlue,  xData0, yData0);
+  addCurve("Slip", symbRed,   xData0, yData0);
  
   // Curves
@@ -88 +85 @@
       const QVector<double>& xData = availData._L1ok;
       QVector<double>        yData(xData.size(), double(iC)+eps);
-      QwtPlotCurve* curve = addCurve(prn, symbolGreen, xData, yData);
+      QwtPlotCurve* curve = addCurve(prn, symbGreen, xData, yData);
       curve->setItemAttribute(QwtPlotItem::Legend, false);
     }
@@ -97 +94 @@
       const QVector<double>& xData = availData._L2ok;
       QVector<double>        yData(xData.size(), double(iC)-eps);
-      QwtPlotCurve* curve = addCurve(prn, symbolGreen, xData, yData);
+      QwtPlotCurve* curve = addCurve(prn, symbGreen, xData, yData);
       curve->setItemAttribute(QwtPlotItem::Legend, false);
     }
@@ -106 +103 @@
       const QVector<double>& xData = availData._L1gap;
       QVector<double>        yData(xData.size(), double(iC)+eps);
-      QwtPlotCurve* curve = addCurve(prn, symbolBlue, xData, yData);
+      QwtPlotCurve* curve = addCurve(prn, symbBlue, xData, yData);
       curve->setItemAttribute(QwtPlotItem::Legend, false);
     }
@@ -115 +112 @@
       const QVector<double>& xData = availData._L2gap;
       QVector<double>        yData(xData.size(), double(iC)-eps);
-      QwtPlotCurve* curve = addCurve(prn, symbolBlue, xData, yData);
+      QwtPlotCurve* curve = addCurve(prn, symbBlue, xData, yData);
       curve->setItemAttribute(QwtPlotItem::Legend, false);
     }
@@ -124 +121 @@
       const QVector<double>& xData = availData._L1slip;
       QVector<double>        yData(xData.size(), double(iC)+eps);
-      QwtPlotCurve* curve = addCurve(prn, symbolRed, xData, yData);
+      QwtPlotCurve* curve = addCurve(prn, symbRed, xData, yData);
       curve->setItemAttribute(QwtPlotItem::Legend, false);
     }
@@ -133 +130 @@
       const QVector<double>& xData = availData._L2slip;
       QVector<double>        yData(xData.size(), double(iC)-eps);
-      QwtPlotCurve* curve = addCurve(prn, symbolRed, xData, yData);
+      QwtPlotCurve* curve = addCurve(prn, symbRed, xData, yData);
       curve->setItemAttribute(QwtPlotItem::Legend, false);
     }
@@ -156 +153 @@
 //////////////////////////////////////////////////////////////////////////////
 QwtPlotCurve* t_availPlot::addCurve(const QString& name, 
-                                    const QwtSymbol* symbol,
+                                    const QwtSymbol& symbol,
                                     const QVector<double>& xData,
                                     const QVector<double>& yData) {
   QwtPlotCurve* curve = new QwtPlotCurve(name);
-  curve->setSymbol(symbol);
+  curve->setSymbol(new QwtSymbol(symbol));
   curve->setStyle(QwtPlotCurve::NoCurve);
   curve->setXAxis(QwtPlot::xBottom);

trunk/BNC/src/rinex/availplot.h

@@ -16 +16 @@
 
 private:
-  QwtPlotCurve* addCurve(const QString& name, const QwtSymbol* symbol,
+  QwtPlotCurve* addCurve(const QString& name, const QwtSymbol& symbol,
                          const QVector<double>& xData, 
                          const QVector<double>& yData);

trunk/BNC/src/src.pro

@@ -4 +4 @@
 # Switch to debug configuration
 # -----------------------------
-CONFIG -= debug
-CONFIG += release
+CONFIG -= release
+CONFIG += debug
 
 DEFINES += NO_RTCM3_MAIN