Changeset 11158 in ntrip for trunk/BNC/src

Timestamp:

Nov 3, 2026, 10:53:35 AM (4 days ago)

Author:

stuerze

Message:

deprecated functions exchanged libs updated

Location:

trunk/BNC/src

Files:

• bncmain.cpp (modified) (4 diffs)
• bncmap_svg.cpp (modified) (1 diff)
• bncserialport.cpp (modified) (2 diffs)
• bncutils.cpp (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (2 diffs)
• ephemeris.cpp (modified) (4 diffs)
• map/bncmapwin.cpp (modified) (1 diff)
• orbComp/sp3Comp.cpp (modified) (3 diffs)
• qtfilechooser.cpp (modified) (1 diff)
• rinex/graphwin.cpp (modified) (2 diffs)
• rinex/polarplot.cpp (modified) (1 diff)
• rinex/polarplot.h (modified) (1 diff)
• rinex/reqcanalyze.cpp (modified) (2 diffs)
• rinex/reqcedit.cpp (modified) (6 diffs)
• rinex/rnxnavfile.cpp (modified) (2 diffs)
• serial/qextserialbase.cpp (modified) (2 diffs)
• serial/qextserialbase.h (modified) (1 diff)
• src.pri (modified) (2 diffs)

trunk/BNC/src/bncmain.cpp

@@ -47 +47 @@
 #include <QApplication>
 #include <QFile>
+#include <QRegularExpression>
 #include <iostream>
 #include <QNetworkProxyFactory>
@@ -100 +101 @@
 // Main Program
 /////////////////////////////////////////////////////////////////////////////
+// Command line argument matches the option pattern, e.g. "--?conf"
+////////////////////////////////////////////////////////////////////////////
+static bool isOption(const char* arg, const char* pattern) {
+  return QRegularExpression(QRegularExpression::anchoredPattern(pattern)).match(arg).hasMatch();
+}
+
 int main(int argc, char* argv[]) {
 
@@ -405 +412 @@
 
     for (int ii = 1; ii < argc; ii++) {
-        if (QRegExp("--?help").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?help")) {
             cout << printHelp.data();
             exit(0);
         }
-        if (QRegExp("--?nw").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?nw")) {
             interactive = false;
         }
-        if (QRegExp("--?version").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?version")) {
             cout << BNCPGMNAME << endl;
             exit(0);
         }
-        if (QRegExp("--?display").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?display")) {
             displaySet = true;
             strcpy(argv[ii], "-display"); // make it "-display" not "--display"
         }
         if (ii + 1 < argc) {
-            if (QRegExp("--?conf").exactMatch(argv[ii])) {
+            if (isOption(argv[ii], "--?conf")) {
                 confFileName = QString(argv[ii + 1]);
             }
-            if (QRegExp("--?file").exactMatch(argv[ii])) {
+            if (isOption(argv[ii], "--?file")) {
                 interactive = false;
                 rawFileName = QByteArray(argv[ii + 1]);
@@ -479 +486 @@
 
     for (int ii = 1; ii < argc - 2; ii++) {
-        if (QRegExp("--?key").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?key")) {
             QString key(argv[ii + 1]);
             QString val(argv[ii + 2]);

trunk/BNC/src/bncmap_svg.cpp

@@ -44 +44 @@
 #include <QPushButton>
 
+#include <qwt_text.h>
 #include <qwt_symbol.h>
 #include <qwt_plot.h>

trunk/BNC/src/bncserialport.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <QRegularExpression>
 #include <iostream>
 
@@ -184 +185 @@
        !_serialLonLineEdit->text().isEmpty() ) {
     mountPoints->push_back("//"
-      + _serialPortLineEdit->text().replace("/","-").replace(QRegExp("^[-]"), "") + "@"
+      + _serialPortLineEdit->text().replace("/","-").replace(QRegularExpression("^[-]"), "") + "@"
       + _serialDataBits + "-"
       + _serialParity + "-"

trunk/BNC/src/bncutils.cpp

@@ -43 +43 @@
 #include <math.h>
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QDateTime>
@@ -156 +156 @@
 }
 
-//
+// Replace each ${NAME} by the environment variable NAME (empty if not set);
+// BNC's own file name placeholders are kept
 ////////////////////////////////////////////////////////////////////////////
 void expandEnvVar(QString& str) {
 
-  QRegExp rx("(\\$\\{.+\\})");
-
-  if (rx.indexIn(str) != -1) {
-    QStringListIterator it(rx.capturedTexts());
-    if (it.hasNext()) {
-      QString rxStr  = it.next();
-      QString envVar = rxStr.mid(2,rxStr.length()-3);
-      str.replace(rxStr, qgetenv(envVar.toLatin1()));
-    }
-  }
+  static const QStringList placeholders = QStringList() << "GPSWD" << "V3OBS" << "V3PROD";
+
+  QString result;
+  int     last = 0;
+  QRegularExpressionMatchIterator it = QRegularExpression("\\$\\{([^}]+)\\}").globalMatch(str);
+  while (it.hasNext()) {
+    QRegularExpressionMatch match = it.next();
+    QString name = match.captured(1);
+    result += str.mid(last, match.capturedStart() - last);
+    result += placeholders.contains(name) ? match.captured(0)
+                                          : QString::fromUtf8(qgetenv(name.toLatin1()));
+    last = match.capturedEnd();
+  }
+  str = result + str.mid(last);
 }
 

trunk/BNC/src/combination/bnccomb.cpp

@@ -15 +15 @@
  * -----------------------------------------------------------------------*/
 
+#include <QRegularExpression>
 #include <newmatio.h>
 #include <iomanip>
@@ -188 +189 @@
       newAC->name           = hlp[1];
       newAC->weightFactor   = hlp[2].toDouble();
-      newAC->excludeSats    = hlp[3].split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
+      newAC->excludeSats    = hlp[3].split(QRegularExpression("[ ,]"), Qt::SkipEmptyParts);
       newAC->isAPC          = bool(newAC->mountPoint.mid(0,4) == "SSRA");
       newAC->attitudeSource = (hlp.size() > 4) ? hlp[4] : "Computed";

trunk/BNC/src/ephemeris.cpp

@@ -305 +305 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_ephGPS::t_ephGPS(double rnxVersion, const QStringList &lines, QString typeStr) {
+t_ephGPS::t_ephGPS(double rnxVersion, const QStringList &lines, QString typeStr)
+  : t_ephGPS() { // all members initialized, also those not in the record type
 
   setType(typeStr);
@@ -1862 +1863 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_ephGal::t_ephGal(double rnxVersion, const QStringList &lines, const QString typeStr) {
+t_ephGal::t_ephGal(double rnxVersion, const QStringList &lines, const QString typeStr)
+  : t_ephGal() { // all members initialized, also those not in the record type
 
   setType(typeStr);
@@ -2325 +2327 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_ephSBAS::t_ephSBAS(double rnxVersion, const QStringList &lines, const QString typeStr) {
+t_ephSBAS::t_ephSBAS(double rnxVersion, const QStringList &lines, const QString typeStr)
+  : t_ephSBAS() { // all members initialized, also those not in the record type
 
   setType(typeStr);
@@ -2571 +2574 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_ephBDS::t_ephBDS(double rnxVersion, const QStringList &lines, const QString typeStr) {
+t_ephBDS::t_ephBDS(double rnxVersion, const QStringList &lines, const QString typeStr)
+  : t_ephBDS() { // all members initialized, also those not in the record type
 
   setType(typeStr);

trunk/BNC/src/map/bncmapwin.cpp

@@ -49 +49 @@
   _initMap = false;
 
-  const int ww = QFontMetrics(font()).width('w');
+  const int ww = QFontMetrics(font()).horizontalAdvance('w');
 
   setWindowTitle("BNC: Map View");

trunk/BNC/src/orbComp/sp3Comp.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <QRegularExpression>
 #include <iostream>
 #include <iomanip>
@@ -54 +55 @@
 
   bncSettings settings;
-  _sp3FileNames = settings.value("sp3CompFile").toString().split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
+  _sp3FileNames = settings.value("sp3CompFile").toString().split(QRegularExpression("[ ,]"), Qt::SkipEmptyParts);
   for (int ii = 0; ii < _sp3FileNames.size(); ii++) {
     expandEnvVar(_sp3FileNames[ii]);
@@ -62 +63 @@
   _log         = 0;
 
-  _excludeSats = settings.value("sp3CompExclude").toString().split(QRegExp("[ ,]"), Qt::SkipEmptyParts);
+  _excludeSats = settings.value("sp3CompExclude").toString().split(QRegularExpression("[ ,]"), Qt::SkipEmptyParts);
 
   _summaryOnly = (Qt::CheckState(settings.value("sp3CompSummaryOnly").toInt()) == Qt::Checked);

trunk/BNC/src/qtfilechooser.cpp

@@ -28 +28 @@
 
   QHBoxLayout* layout = new QHBoxLayout( this );
-  layout->setMargin(0);
+  layout->setContentsMargins(0, 0, 0, 0);
 
   _lineEdit = new QLineEdit(this);

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);
 

trunk/BNC/src/serial/qextserialbase.cpp

@@ -10 +10 @@
 */
 #ifdef QT_THREAD_SUPPORT
-QMutex* QextSerialBase::mutex=NULL;
+QRecursiveMutex* QextSerialBase::mutex=NULL;
 unsigned long QextSerialBase::refCount=0;
 #endif
@@ -92 +92 @@
 #ifdef QT_THREAD_SUPPORT
     if (!mutex) {
-        mutex=new QMutex( QMutex::Recursive );
+        mutex=new QRecursiveMutex();
     }
     refCount++;

trunk/BNC/src/serial/qextserialbase.h

@@ -185 +185 @@
 
 #ifdef QT_THREAD_SUPPORT
-    static QMutex* mutex;
+    static QRecursiveMutex* mutex;
     static ulong refCount;
 #endif

trunk/BNC/src/src.pri

@@ -39 +39 @@
 #debug:DEFINES   += BNC_DEBUG_SSR
 #debug:DEFINES   += BNC_DEBUG_CMB
-#debug:DEFINES   += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
+# Deprecated Qt APIs (up to Qt 5.15) are not available, using one is an error
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
 
 !versionAtLeast(QT_VERSION, 5.15.0):error("Use at least Qt version 5.15.0")
@@ -46 +47 @@
 # ------------
 INCLUDEPATH += . ../newmat ./RTCM3 ./RTCM3/clock_and_orbit ./RTCM \
-               ../qwt ../qwtpolar
+               ../qwt
 
 # Additional Libraries
 # --------------------
-unix:LIBS  += -L../newmat -lnewmat -L../qwt -L../qwtpolar -lqwtpolar -lqwt
-win32:LIBS += -L../newmat/release -L../qwt/release -L../qwtpolar/release \
-              -lnewmat -lqwtpolar -lqwt
+unix:LIBS  += -L../newmat -lnewmat -L../qwt -lqwt
+win32:LIBS += -L../newmat/release -L../qwt/release \
+              -lnewmat -lqwt
 
 HEADERS = bnchelp.html bncgetthread.h ssrQc.h ssrRefSig.h bncwindow.h   bnctabledlg.h  \