Changeset 4579 in ntrip for trunk

Timestamp:

Aug 29, 2012, 4:48:42 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• availplot.cpp (modified) (5 diffs)
• graphwin.cpp (modified) (3 diffs)
• graphwin.h (modified) (1 diff)
• reqcanalyze.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/availplot.cpp

@@ -3 +3 @@
 #include <qwt_symbol.h>
 #include <qwt_plot_curve.h>
+#include <qwt_plot_grid.h>
 #include <qwt_legend.h>
 
@@ -11 +12 @@
 : QwtPlot(parent) {
 
-  setTitle("Availability Plot");
+  setTitle("Availability Plot");  
+
+  setCanvasBackground(QColor(Qt::white));
 
   // Legend
@@ -17 +20 @@
   QwtLegend* legend = new QwtLegend;
   insertLegend(legend, QwtPlot::RightLegend);
+
+
+    // grid 
+    QwtPlotGrid *grid = new QwtPlotGrid;
+    grid->enableXMin(true);
+    grid->setMajPen(QPen(Qt::gray, 0, Qt::DotLine));
+    grid->setMinPen(QPen(Qt::gray, 0 , Qt::DotLine));
+    grid->attach(this);
 
   // Axes
@@ -36 +47 @@
     double yData[epochs.size()];
     for (int ii = 0; ii < epochs.size(); ii++) {
-      xData[ii] = epochs[ii]/1.e5;
+      xData[ii] = epochs[ii];
       yData[ii] = iC;
     }
@@ -45 +56 @@
     QwtPlotCurve* curve = new QwtPlotCurve(prn);
     curve->setSymbol( symbol );
-    ///    curve->setStyle( QwtPlotCurve::NoCurve );
+    curve->setStyle( QwtPlotCurve::NoCurve );
     curve->setLegendAttribute( QwtPlotCurve::LegendShowSymbol );
     curve->setXAxis(QwtPlot::xBottom);

trunk/BNC/src/rinex/graphwin.cpp

@@ -138 +138 @@
 void t_graphWin::slotPrint() {
 
+  savePNG("./", ".PNG");
+
   QPrinter printer;
   QPrintDialog* dialog = new QPrintDialog(&printer, this);
@@ -160 +162 @@
 // Save the Widget as PNG Files
 ////////////////////////////////////////////////////////////////////////////
-void t_graphWin::savePNG(const QString& dirName, QByteArray ext,
-                         QwtPlot* plot) {
+void t_graphWin::savePNG(const QString& dirName, QByteArray ext) {
+
   if (dirName.isEmpty()) {
     return;
@@ -174 +176 @@
                    + fileInfo.completeBaseName() + ext;
 
-  if (plot) {        
-    QwtPlotRenderer renderer;
-    renderer.setDiscardFlag(QwtPlotRenderer::DiscardBackground, false);
-    renderer.setLayoutFlag(QwtPlotRenderer::KeepFrames, true);
-    renderer.renderDocument(plot, fileName, QSizeF(300, 200), 85);
-  }
-  else {
-    QImage image(_canvas->size(), QImage::Format_RGB32);
-    QPainter painter(&image);
-    _canvas->render(&painter);
-    image.save(fileName,"PNG");
-  }
+  QImage image(_canvas->size(), QImage::Format_RGB32);
+  QPainter painter(&image);
+  _canvas->render(&painter);
+  image.save(fileName,"PNG");
 }

trunk/BNC/src/rinex/graphwin.h

@@ -58 +58 @@
   ~t_graphWin();
 
-  void savePNG(const QString& dirName, QByteArray ext, QwtPlot* plot);
+  void savePNG(const QString& dirName, QByteArray ext);
 
  signals:

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -41 +41 @@
 #include <iostream>
 #include <iomanip>
+#include <qwt_plot_renderer.h>
 
 #include "reqcanalyze.h"
@@ -166 +167 @@
     if (!dirName.isEmpty()) {
       QByteArray ext = scaleTitle.isEmpty() ? "_SNR.png" : "_MP.png";
-      graphWin->savePNG(dirName, ext, 0);
+      graphWin->savePNG(dirName, ext);
     }
   }
@@ -524 +525 @@
     if (!dirName.isEmpty()) {
       QByteArray ext = "_AVAIL.png";
-      graphWin->savePNG(dirName, ext, plot);
-    }
-  }
-}
+      graphWin->savePNG(dirName, ext);
+    }
+  }
+}