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

Timestamp:

Nov 3, 2026, 10:53:35 AM (18 hours ago)

Author:

stuerze

Message:

deprecated functions exchanged libs updated

Location:

trunk/BNC/src/rinex

Files:

• graphwin.cpp (modified) (2 diffs)
• polarplot.cpp (modified) (1 diff)
• polarplot.h (modified) (1 diff)
• reqcanalyze.cpp (modified) (2 diffs)
• reqcedit.cpp (modified) (6 diffs)
• rnxnavfile.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/graphwin.cpp

@@ -41 +41 @@
 #include <qwt_scale_widget.h>
 #include <qwt_scale_engine.h>
+#include <qwt_interval.h>
 
 #include <QDir>
 #include <QFileInfo>
+#include <QPainter>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -174 +176 @@
     QPainter painter;
     painter.begin(&printer);
-    double xscale = printer.pageRect().width()/double(_canvas->width());
-    double yscale = printer.pageRect().height()/double(_canvas->height());
+    QRect pageRect  = printer.pageLayout().paintRectPixels(printer.resolution());
+    QRect paperRect = printer.pageLayout().fullRectPixels(printer.resolution());
+    double xscale = pageRect.width()/double(_canvas->width());
+    double yscale = pageRect.height()/double(_canvas->height());
     double scale  = qMin(xscale, yscale);
-    painter.translate(printer.paperRect().x() + printer.pageRect().width()/2,
-                      printer.paperRect().y() + printer.pageRect().height()/2);
+    painter.translate(paperRect.x() + pageRect.width()/2,
+                      paperRect.y() + pageRect.height()/2);
     painter.scale(scale, scale);
     painter.translate(-width()/2, -height()/2);

trunk/BNC/src/rinex/polarplot.cpp

@@ -31 +31 @@
                                const QPointF& pole, int from, int to) const {
   t_colorMap colorMap;
+  const t_polarData* polarData = dynamic_cast<const t_polarData*>(data());
   for (int ii = from; ii <= to; ii++) {
     QwtSymbol ss(symbol.style());
     ss.setSize(symbol.size());
-    const QwtPointPolar& point = sample(ii);
-    const QColor color = colorMap.color(_scaleInterval, point._value);
+    double value = polarData ? polarData->value(ii) : 0.0;
+    const QColor color = colorMap.color(_scaleInterval, value);
     ss.setBrush(QBrush(color));
     ss.setPen(QPen(color));

trunk/BNC/src/rinex/polarplot.h

@@ -51 +51 @@
   virtual QwtPointPolar sample(size_t ii) const {
     const t_polarPoint* point = _data->at(ii);
-    QwtPointPolar qp(point->_az, point->_zen);  qp._value = point->_value;
-    return qp;
+    return QwtPointPolar(point->_az, point->_zen);
   }
+  double value(size_t ii) const {return _data->at(ii)->_value;} // symbol color
   virtual size_t size() const {return _size;}
-  virtual QRectF boundingRect() const {return d_boundingRect;}
+  virtual QRectF boundingRect() const {return cachedBoundingRect;}
  protected:
   size_t _size;

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <QRegularExpression>
 #include <iostream>
 #include <iomanip>
@@ -152 +153 @@
 
   for (int ii = 0; ii < signalsOpt.size(); ii++) {
-    QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), Qt::SkipEmptyParts);
+    QStringList input = signalsOpt.at(ii).split(QRegularExpression("[:&]"), Qt::SkipEmptyParts);
     if (input.size() > 1 && input[0].length() == 1) {
       char        system   = input[0].toLatin1().constData()[0];

trunk/BNC/src/rinex/reqcedit.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <QRegularExpression>
 #include <iostream>
 #include "reqcedit.h"
@@ -412 +413 @@
   if (!newMarkerName.isEmpty()) {
     if (oldMarkerName.isEmpty() ||
-        QRegExp(oldMarkerName).exactMatch(obsFile.markerName())) {
+        QRegularExpression(QRegularExpression::anchoredPattern(oldMarkerName)).match(obsFile.markerName()).hasMatch()) {
       obsFile.setMarkerName(newMarkerName);
     }
@@ -421 +422 @@
   if (!newAntennaName.isEmpty()) {
     if (oldAntennaName.isEmpty() ||
-        QRegExp(oldAntennaName).exactMatch(obsFile.antennaName())) {
+        QRegularExpression(QRegularExpression::anchoredPattern(oldAntennaName)).match(obsFile.antennaName()).hasMatch()) {
       obsFile.setAntennaName(newAntennaName);
     }
@@ -430 +431 @@
   if (!newAntennaNumber.isEmpty()) {
     if (oldAntennaNumber.isEmpty() ||
-        QRegExp(oldAntennaNumber).exactMatch(obsFile.antennaNumber())) {
+        QRegularExpression(QRegularExpression::anchoredPattern(oldAntennaNumber)).match(obsFile.antennaNumber()).hasMatch()) {
       obsFile.setAntennaNumber(newAntennaNumber);
     }
@@ -465 +466 @@
   if (!newReceiverType.isEmpty()) {
     if (oldReceiverType.isEmpty() ||
-        QRegExp(oldReceiverType).exactMatch(obsFile.receiverType())) {
+        QRegularExpression(QRegularExpression::anchoredPattern(oldReceiverType)).match(obsFile.receiverType()).hasMatch()) {
       obsFile.setReceiverType(newReceiverType);
     }
@@ -474 +475 @@
   if (!newReceiverNumber.isEmpty()) {
     if (oldReceiverNumber.isEmpty() ||
-        QRegExp(oldReceiverNumber).exactMatch(obsFile.receiverNumber())) {
+        QRegularExpression(QRegularExpression::anchoredPattern(oldReceiverNumber)).match(obsFile.receiverNumber()).hasMatch()) {
       obsFile.setReceiverNumber(newReceiverNumber);
     }

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <QRegularExpression>
 #include <iostream>
 #include <newmatio.h>
@@ -159 +160 @@
     }
 
-    QStringList hlp = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts);
+    QStringList hlp = line.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
     QString firstStr = hlp.at(0);