Changeset 8231 in ntrip for trunk/BNC


Ignore:
Timestamp:
Jan 4, 2018, 10:23:05 AM (7 years ago)
Author:
wiese
Message:

CHANGE: #105 QT5

Location:
trunk/BNC
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/ChangeLog.txt

    r8168 r8231  
    1111                          during PPP analysis
    1212    Added   (18.05.2016): expected observations in RINEX QC
     13    Changed (04.01.2018): Transition from Qt 4.x to Qt5, see #105
     14    Changed (04.01.2018): Use c++11, see #105
    1315    Changed (15.02.2017): SIRGAS2000 transformation parameters adjusted to IGb14
    1416    Changed (10.04.2017): Transformation parameters for ITRF2005 to GDA94 removed

  • trunk/BNC/bnc.pro

    r4293 r8231  
    22TEMPLATE = subdirs
    33
     4CONFIG += c++11
    45CONFIG += ordered
    56

  • trunk/BNC/src/app.h

    r5072 r8231  
    22#define GnssCenter_APP_H
    33
    4 #include <QtGui>
     4#include <QtWidgets>
    55
    66class t_app : public QApplication {

  • trunk/BNC/src/bncbytescounter.h

    r4278 r8231  
    2626#define BNCBYTESCOUNTER_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929
    3030class bncBytesCounter : public QLabel {

  • trunk/BNC/src/bnccore.h

    r7976 r8231  
    2626#define BNCAPP_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929
    3030#include "bnctime.h"

  • trunk/BNC/src/bncfigure.h

    r4278 r8231  
    2626#define BNCFIGURE_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929
    3030class bncFigure : public QWidget {

  • trunk/BNC/src/bncfigurelate.h

    r4278 r8231  
    2626#define BNCFIGURELATE_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929
    3030class bncFigureLate : public QWidget {

  • trunk/BNC/src/bncfigureppp.h

    r8127 r8231  
    2626#define BNCFIGUREPPP_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929#include "bnctime.h"
    3030

  • trunk/BNC/src/bnchlpdlg.h

    r8203 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030
    3131#include <QDialog>

  • trunk/BNC/src/bncipport.h

    r7230 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030#include <QWhatsThis>
    3131

  • trunk/BNC/src/bncmain.cpp

    r8171 r8231  
    467467    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
    468468
    469     BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION" ("BNC_OS") ==========", true);
     469    BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " (" BNC_OS ") ==========", true);
    470470
    471471    // Normal case - data from Internet

  • trunk/BNC/src/bncmap.h

    r4711 r8231  
    2626#define BNCMAP_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929#include <QWhatsThis>
    3030

  • trunk/BNC/src/bncmap_svg.cpp

    r8127 r8231  
    4040
    4141#include <QtSvg>
     42#include <QtPrintSupport/QPrinter>
     43#include <QtPrintSupport/QPrintDialog>
    4244
    4345#include <qwt_symbol.h>
    … …  
    8486
    8587  _buttonWhatsThis = new QPushButton(tr("Help=Shift+F1"), this);
    86   _buttonWhatsThis->setMaximumWidth(14*ww); 
     88  _buttonWhatsThis->setMaximumWidth(14*ww);
    8789  connect(_buttonWhatsThis, SIGNAL(clicked()), this, SLOT(slotWhatsThis()));
    8890
    … …  
    117119// Destructor
    118120/////////////////////////////////////////////////////////////////////////////
    119 t_bncMap::~t_bncMap() { 
     121t_bncMap::~t_bncMap() {
    120122  delete _mapPlot;
    121123  delete _buttonWhatsThis;
    122124}
    123125
    124 // 
     126//
    125127/////////////////////////////////////////////////////////////////////////////
    126128void t_bncMap::slotNewPoint(const QString& name, double latDeg, double lonDeg) {
    … …  
    129131
    130132  QColor red(220,20,60);
    131   QwtSymbol* symbol = new QwtSymbol(QwtSymbol::Rect, QBrush(red), 
     133  QwtSymbol* symbol = new QwtSymbol(QwtSymbol::Rect, QBrush(red),
    132134                                    QPen(red), QSize(2,2));
    133135  QwtPlotMarker* marker = new QwtPlotMarker();
    … …  
    184186}
    185187
    186 // 
     188//
    187189////////////////////////////////////////////////////////////////////////////
    188190void t_bncMap::showEvent(QShowEvent* event) {

  • trunk/BNC/src/bncnetqueryrtp.cpp

    r8203 r8231  
    1111 * Created:    27-Dec-2008
    1212 *
    13  * Changes:   
     13 * Changes:
    1414 *
    1515 * -----------------------------------------------------------------------*/
    … …  
    4141}
    4242
    43 // 
     43//
    4444////////////////////////////////////////////////////////////////////////////
    4545void bncNetQueryRtp::stop() {
    … …  
    5555}
    5656
    57 // 
     57//
    5858////////////////////////////////////////////////////////////////////////////
    5959void bncNetQueryRtp::slotKeepAlive() {
    … …  
    6868}
    6969
    70 // 
     70//
    7171////////////////////////////////////////////////////////////////////////////
    7272void bncNetQueryRtp::waitForRequestResult(const QUrl&, QByteArray&) {
    7373}
    7474
    75 // 
     75//
    7676////////////////////////////////////////////////////////////////////////////
    7777void bncNetQueryRtp::waitForReadyRead(QByteArray& outData) {
    … …  
    115115  QString proxyHost = settings.value("proxyHost").toString();
    116116  int     proxyPort = settings.value("proxyPort").toInt();
    117  
     117
    118118  if ( proxyHost.isEmpty() ) {
    119119    _socket->connectToHost(_url.host(), _url.port());
    … …  
    129129    QString passW = QUrl::fromPercentEncoding(_url.password().toLatin1());
    130130    QByteArray userAndPwd;
    131    
     131
    132132    if(!uName.isEmpty() || !passW.isEmpty()) {
    133133      userAndPwd = "Authorization: Basic " + (uName.toLatin1() + ":" +
    … …  
    157157
    158158    _socket->write(reqStr, reqStr.length());
    159    
     159
    160160    // Read Server Answer 1
    161161    // --------------------
    … …  
    175175          line = in.readLine();
    176176        }
    177    
     177
    178178        // Send Request 2
    179179        // --------------
    180         if (!_session.isEmpty()) { 
     180        if (!_session.isEmpty()) {
    181181
    182182          // Send initial RTP packet for firewall handling
    … …  
    198198            rtpbuffer[11] = (sessInt      ) & 0xFF;
    199199
    200             _udpSocket->writeDatagram(rtpbuffer, 12, 
     200            _udpSocket->writeDatagram(rtpbuffer, 12,
    201201                              _socket->peerAddress(), serverPort.toInt());
    202202          }
    … …  
    207207                 + "\r\n";
    208208          _socket->write(reqStr, reqStr.length());
    209    
     209
    210210          // Read Server Answer 2
    211211          // --------------------
    … …  
    216216              while (!line.isEmpty()) {
    217217                if (line.indexOf("200 OK") != -1) {
    218                   emit newMessage(_url.encodedPath().replace(0,1,"")
     218                  emit newMessage(_url.toEncoded().replace(0,1,"")
    219219                            + ": UDP connection established", true);
    220220                  slotKeepAlive();
    … …  
    233233  _socket = 0;
    234234  _status = error;
    235   emit newMessage(_url.encodedPath().replace(0,1,"")
     235  emit newMessage(_url.toEncoded().replace(0,1,"")
    236236                  + ": NetQuery, waiting for connect", true);
    237237}

  • trunk/BNC/src/bncserialport.h

    r7230 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030#include <QWhatsThis>
    3131

  • trunk/BNC/src/bnctabledlg.h

    r8127 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030#include <QComboBox>
    3131#include <QDialog>

  • trunk/BNC/src/bnctableitem.h

    r8203 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030
    3131#include <QTableWidgetItem>

  • trunk/BNC/src/bncudpport.h

    r7230 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030#include <QWhatsThis>
    3131

  • trunk/BNC/src/bncwindow.h

    r8127 r8231  
    2626#define BNCWINDOW_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929#include <QMainWindow>
    3030#include <QWhatsThis>

  • trunk/BNC/src/map/bncmapwin.h

    r6446 r8231  
    2626#define BNCMAPWIN_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929#include <QtWebKit>
    3030#include <QNetworkProxy>

  • trunk/BNC/src/pppWidgets.cpp

    r8010 r8231  
    171171  _staTable->setSelectionMode(QAbstractItemView::ExtendedSelection);
    172172  _staTable->setSelectionBehavior(QAbstractItemView::SelectRows);
    173   _staTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
     173  _staTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
    174174  _staTable->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
    175175

  • trunk/BNC/src/pppWidgets.h

    r7961 r8231  
    2626#define PPPWIDGETS_H
    2727
    28 #include <QtGui>
     28#include <QtWidgets>
    2929
    3030class qtFileChooser;

  • trunk/BNC/src/qtfilechooser.h

    r4278 r8231  
    33#define QTFILECHOOSER
    44
    5 #include <QtGui>
     5#include <QtWidgets>
    66
    77class qtFileChooser : public QWidget {

  • trunk/BNC/src/reqcdlg.h

    r6795 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
    3030
    3131#include "bncconst.h"

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

    r8127 r8231  
    3535 * Created:    23-Jun-2012
    3636 *
    37  * Changes:   
     37 * Changes:
    3838 *
    3939 * -----------------------------------------------------------------------*/
    … …  
    4949// Constructor
    5050////////////////////////////////////////////////////////////////////////////
    51 t_graphWin::t_graphWin(QWidget* parent, const QString& fileName, 
     51t_graphWin::t_graphWin(QWidget* parent, const QString& fileName,
    5252                       const QVector<QWidget*>& plots,
    5353                       const QByteArray* scaleTitle,
    … …  
    7979    _colorScale->setAlignment( QwtScaleDraw::RightScale );
    8080    _colorScale->setColorBarEnabled( true );
    81    
     81
    8282     QwtText title(*scaleTitle);
    8383     QFont font = _colorScale->font();
    … …  
    8585     title.setFont( font );
    8686     _colorScale->setTitle( title );
    87    
     87
    8888     _colorScale->setColorMap(*scaleInterval, new t_colorMap());
    89    
     89
    9090     QwtLinearScaleEngine scaleEngine;
    9191     _colorScale->setTransformation(scaleEngine.transformation());

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

    r4579 r8231  
    2727
    2828#include <QtCore>
    29 #include <QtGui>
     29#include <QtWidgets>
     30#include <QtPrintSupport/QPrinter>
     31#include <QtPrintSupport/QPrintDialog>
    3032#include <qwt_color_map.h>
    3133#include <qwt_plot.h>
    … …  
    5355
    5456 public:
    55   t_graphWin(QWidget* parent, const QString& fileName, 
     57  t_graphWin(QWidget* parent, const QString& fileName,
    5658             const QVector<QWidget*>& plots, const QByteArray* scaleTitle,
    5759             const QwtInterval* scaleInterval);

  • trunk/BNC/src/src.pri

    r7858 r8231  
    66
    77QT += svg
     8QT += printsupport
     9greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    810
    911unix:QMAKE_CFLAGS_RELEASE   -= -O2

  • trunk/BNC/src/upload/bnccustomtrafo.h

    r3237 r8231  
    33
    44#include <QtCore>
    5 #include <QtGui>
     5#include <QtWidgets>
    66#include <QWhatsThis>
    77
Note: See TracChangeset for help on using the changeset viewer.