Changeset 8127 in ntrip for trunk/BNC/src/rinex


Ignore:
Timestamp:
May 10, 2017, 3:20:54 PM (7 years ago)
Author:
stoecker
Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

Location:
trunk/BNC/src/rinex
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/rinex/availplot.cpp

    r6542 r8127  
    7575
    7676  setCanvasBackground(QColor(Qt::white));
    77   canvas()->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
     77  ((QwtPlotCanvas *)canvas())->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
    7878
    7979  // Axes
    … …  
    203203                                    const QVector<double>& yData) {
    204204  QwtPlotCurve* curve = new QwtPlotCurve(name);
    205   curve->setSymbol(new QwtSymbol(symbol));
     205  QwtSymbol *s = new QwtSymbol(symbol.style());
     206  s->setSize(symbol.size());
     207  s->setBrush(symbol.brush());
     208  s->setPen(symbol.pen());
     209  curve->setSymbol(s);
    206210  curve->setStyle(QwtPlotCurve::NoCurve);
    207211  curve->setXAxis(QwtPlot::xBottom);

  • trunk/BNC/src/rinex/dopplot.cpp

    r6537 r8127  
    6565
    6666  setCanvasBackground(QColor(Qt::white));
    67   canvas()->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
     67  ((QwtPlotCanvas *)canvas())->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
    6868
    6969  // Axes

  • trunk/BNC/src/rinex/eleplot.cpp

    r6537 r8127  
    6565
    6666  setCanvasBackground(QColor(Qt::white));
    67   canvas()->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
     67  ((QwtPlotCanvas *)canvas())->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
    6868
    6969  // Axes
    … …  
    115115                                    const QVector<double>& yData) {
    116116  QwtPlotCurve* curve = new QwtPlotCurve(name);
    117   curve->setSymbol(new QwtSymbol(symbol));
     117  QwtSymbol *s = new QwtSymbol(symbol.style());
     118  s->setSize(symbol.size());
     119  s->setBrush(symbol.brush());
     120  s->setPen(symbol.pen());
     121  curve->setSymbol(s);
    118122  curve->setStyle(QwtPlotCurve::NoCurve);
    119123  curve->setXAxis(QwtPlot::xBottom);

  • trunk/BNC/src/rinex/graphwin.cpp

    r6262 r8127  
    8989   
    9090     QwtLinearScaleEngine scaleEngine;
    91      _colorScale->setScaleDiv(scaleEngine.transformation(),
    92                               scaleEngine.divideScale(scaleInterval->minValue(),
     91     _colorScale->setTransformation(scaleEngine.transformation());
     92     _colorScale->setScaleDiv(scaleEngine.divideScale(scaleInterval->minValue(),
    9393                                                      scaleInterval->maxValue(),
    9494                                                      8, 5));

  • trunk/BNC/src/rinex/polarplot.cpp

    r6262 r8127  
    3232  t_colorMap colorMap;
    3333  for (int ii = from; ii <= to; ii++) {
    34     QwtSymbol ss(symbol);
     34    QwtSymbol ss(symbol.style());
     35    ss.setSize(symbol.size());
    3536    const QwtPointPolar& point = sample(ii);
    3637    const QColor color = colorMap.color(_scaleInterval, point._value);

  • trunk/BNC/src/rinex/polarplot.h

    r4356 r8127  
    5151  virtual QwtPointPolar sample(size_t ii) const {
    5252    const t_polarPoint* point = _data->at(ii);
    53     QwtPointPolar qp(point->_az, point->_zen); qp._value = point->_value;
     53    QwtPointPolar qp(point->_az, point->_zen);  qp._value = point->_value;
    5454    return qp;
    5555  }

  • trunk/BNC/src/rinex/reqcedit.cpp

    r7999 r8127  
    6464  int version     = settings.value("reqcRnxVersion").toInt();
    6565  if (version < 3) {
    66     _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion2;
     66    _rnxVersion = defaultRnxObsVersion2;
    6767  }
    6868  else {
    69     _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion3;
     69    _rnxVersion = defaultRnxObsVersion3;
    7070  }
    7171  _samplingRate   = settings.value("reqcSampling").toInt();
    … …  
    578578
    579579  if ( (haveGPS && haveGlonass) || _rnxVersion >= 3.0) {
    580     outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion3);
     580    outNavFile.setVersion(defaultRnxNavVersion3);
    581581  }
    582582  else {
    583     outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion2);
     583    outNavFile.setVersion(defaultRnxNavVersion2);
    584584  }
    585585

  • trunk/BNC/src/rinex/rnxnavfile.h

    r7999 r8127  
    3535class t_eph;
    3636
     37#define defaultRnxNavVersion2 2.11
     38#define defaultRnxNavVersion3 3.03
     39
    3740class t_rnxNavFile {
    3841
    3942 public:
    4043  enum e_inpOut {input, output};
    41   static const double defaultRnxNavVersion2 = 2.11;
    42   static const double defaultRnxNavVersion3 = 3.03;
    43 
    4444 private:
    4545  class t_rnxNavHeader {

  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r8112 r8127  
    166166    else if (key == "# / TYPES OF OBSERV") {
    167167      if (_version == 0.0) {
    168         _version = t_rnxObsHeader::defaultRnxObsVersion2;
     168        _version = defaultRnxObsVersion2;
    169169      }
    170170      QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
    … …  
    190190    else if (key == "SYS / # / OBS TYPES") {
    191191      if (_version == 0.0) {
    192         _version = t_rnxObsHeader::defaultRnxObsVersion3;
     192        _version = defaultRnxObsVersion3;
    193193      }
    194194      QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
    … …  
    307307
    308308  if (version <= 2) {
    309     _version = t_rnxObsHeader::defaultRnxObsVersion2;
     309    _version = defaultRnxObsVersion2;
    310310  }
    311311  else {
    312     _version = t_rnxObsHeader::defaultRnxObsVersion3;
     312    _version = defaultRnxObsVersion3;
    313313  }
    314314
    … …  
    371371
    372372  if (version <= 2) {
    373     _version = t_rnxObsHeader::defaultRnxObsVersion2;
     373    _version = defaultRnxObsVersion2;
    374374  }
    375375  else {
    376     _version = t_rnxObsHeader::defaultRnxObsVersion3;
     376    _version = defaultRnxObsVersion3;
    377377  }
    378378  _interval        = header._interval;

  • trunk/BNC/src/rinex/rnxobsfile.h

    r7980 r8127  
    3838#include "satObs.h"
    3939
     40#define defaultRnxObsVersion2 2.11
     41#define defaultRnxObsVersion3 3.03
     42
    4043class t_rnxObsHeader {
    4144
    … …  
    4346
    4447 public:
    45   static const double  defaultRnxObsVersion2 = 2.11;
    46   static const double  defaultRnxObsVersion3 = 3.03;
    4748  static const QString defaultSystems;
    4849
Note: See TracChangeset for help on using the changeset viewer.