Changeset 4577 in ntrip

Timestamp:

Aug 29, 2012, 3:32:18 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• rinex/graphwin.cpp (modified) (3 diffs)
• rinex/graphwin.h (modified) (2 diffs)
• rinex/reqcanalyze.cpp (modified) (5 diffs)
• src.pro (modified) (1 diff)

trunk/BNC/src/rinex/graphwin.cpp

@@ -42 +42 @@
 #include "qwt_scale_widget.h"
 #include <qwt_scale_engine.h>
+#include <qwt_plot_renderer.h>
 
 using namespace std;
@@ -159 +160 @@
 // Save the Widget as PNG Files
 ////////////////////////////////////////////////////////////////////////////
-void t_graphWin::savePNG(const QString& dirName, QByteArray ext) {
+void t_graphWin::savePNG(const QString& dirName, QByteArray ext,
+                         QwtPlot* plot) {
   if (dirName.isEmpty()) {
     return;
   }
-  QImage image(_canvas->size(), QImage::Format_RGB32);
-  QPainter painter(&image);
-  _canvas->render(&painter);
+
   QDir dir(dirName);
   QFileInfo fileInfo(_fileName);
@@ -173 +173 @@
   QString fileName = dir.path() + QDir::separator()
                    + fileInfo.completeBaseName() + ext;
-  image.save(fileName,"PNG");
+
+  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");
+  }
 }

trunk/BNC/src/rinex/graphwin.h

@@ -29 +29 @@
 #include <QtGui>
 #include <qwt_color_map.h>
+#include <qwt_plot.h>
 
 class QwtScaleWidget;
@@ -57 +58 @@
   ~t_graphWin();
 
-  void savePNG(const QString& dirName, QByteArray ext);
+  void savePNG(const QString& dirName, QByteArray ext, QwtPlot* plot);
 
  signals:

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -42 +42 @@
 #include <iomanip>
 
-#include <qwt_plot.h>
-#include <qwt_plot_curve.h>
-#include <qwt_symbol.h>
-
 #include "reqcanalyze.h"
 #include "bncapp.h"
@@ -54 +50 @@
 #include "graphwin.h"
 #include "polarplot.h"
+#include "availplot.h"
 
 using namespace std;
@@ -169 +166 @@
     if (!dirName.isEmpty()) {
       QByteArray ext = scaleTitle.isEmpty() ? "_SNR.png" : "_MP.png";
-      graphWin->savePNG(dirName, ext);
+      graphWin->savePNG(dirName, ext, 0);
     }
   }
@@ -516 +513 @@
   if (dynamic_cast<bncApp*>(qApp)->GUIenabled()) {
 
-    QwtPlot* plot = new QwtPlot();
-
-    int iC = 0;
-    QMapIterator<QString, QVector<int> > it(*prnAvail);
-    while (it.hasNext()) {
-      it.next();
-      ++iC;
-      const QString&      prn    = it.key();
-      const QVector<int>& epochs = it.value();
-
-      QVector<QPointF> samples;
-      for (int ii = 0; ii < epochs.size(); ii++) {
-        samples << QPointF(epochs[ii], iC);
-      }
-
-      QwtPlotCurve* curve = new QwtPlotCurve(prn);
-      curve->setStyle( QwtPlotCurve::NoCurve );
-      QwtSymbol* symbol = new QwtSymbol( QwtSymbol::XCross );
-      symbol->setSize( 4 );
-      curve->setSymbol( symbol );
-      curve->setLegendAttribute( QwtPlotCurve::LegendShowSymbol );
-      curve->setSamples(samples);
-      curve->attach(plot);
-    }
+    t_availPlot* plot = new t_availPlot(0, prnAvail);
 
     QVector<QWidget*> plots;
@@ -550 +524 @@
     if (!dirName.isEmpty()) {
       QByteArray ext = "_AVAIL.png";
-      graphWin->savePNG(dirName, ext);
-    }
-  }
-}
+      graphWin->savePNG(dirName, ext, plot);
+    }
+  }
+}

trunk/BNC/src/src.pro

@@ -115 +115 @@
              rinex/rnxnavfile.h       rinex/corrfile.h     \
              rinex/reqcedit.h         rinex/reqcanalyze.h  \
-             rinex/graphwin.h         rinex/polarplot.h 
+             rinex/graphwin.h         rinex/polarplot.h    \
+             rinex/availplot.h
   SOURCES += rinex/bncpostprocess.cpp rinex/rnxobsfile.cpp \
              rinex/rnxnavfile.cpp     rinex/corrfile.cpp   \
              rinex/reqcedit.cpp       rinex/reqcanalyze.cpp \
-             rinex/graphwin.cpp       rinex/polarplot.cpp
+             rinex/graphwin.cpp       rinex/polarplot.cpp   \
+             rinex/availplot.cpp
 }