change tool/tool_ntripbroadcast. change ui and change gga sentence.

src/tool/tool_ntripbroadcast/mainwindow.cpp

@@ -22,20 +22,23 @@ MainWindow::MainWindow(QWidget *parent)
     mmodel = model;
 
     /* 设置列数 */
-    model->setColumnCount(3);
+    model->setColumnCount(4);
     model->setHeaderData(0, Qt::Horizontal, "ip");
     model->setHeaderData(1, Qt::Horizontal, "port");
 
     model->setHeaderData(2, Qt::Horizontal, "state");
+    model->setHeaderData(3, Qt::Horizontal, "GPGGA");
+
 
     /* 设置行数 */
     model->setRowCount(100);
 
     ui->tableView->setModel(model);
 
-    ui->tableView->horizontalHeader()->resizeSection(0,360);
+    ui->tableView->horizontalHeader()->resizeSection(0,200);
     ui->tableView->horizontalHeader()->resizeSection(1,100);
-    ui->tableView->horizontalHeader()->resizeSection(2,100);
+    ui->tableView->horizontalHeader()->resizeSection(2,60);
+    ui->tableView->horizontalHeader()->resizeSection(3,600);
 //    /* 设置列宽在可视界面自适应宽度 */
 //    ui->tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
     /* 行颜色交替显示 */
@@ -90,7 +93,16 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::resizeEvent(QResizeEvent *event)
+{
+    qDebug("resize");
+    QSize sizemain = ui->centralwidget->size();
+    qDebug("size x = %d y=%d",sizemain.width(),sizemain.height());
+
+    ui->plainTextEdit_NTIPMSG->setGeometry(80,390,sizemain.width()-160,sizemain.height() - 450);
+    ui->tableView->setGeometry(650,30,sizemain.width()-730,350);
 
+}
 
 void MainWindow::on_pushButton_Start_clicked()
 {
@@ -159,6 +171,7 @@ void MainWindow::onTimer()
         mmodel->setItem(i,0,new QStandardItem(mvectorNC[i]->mpSocket->peerAddress().toString().toLatin1().data()));
         mmodel->setItem(i,1,new QStandardItem(QString::number(mvectorNC[i]->mpSocket->peerPort()).toLatin1().data()));
         mmodel->setItem(i,2,new QStandardItem(QString::number(mvectorNC[i]->mnState).toLatin1().data()));
+        mmodel->setItem(i,3,new QStandardItem(mvectorNC[i]->mstrGGA.toLatin1().data()));
         char strout[1000];
         snprintf(strout,1000,"IP:%s Port:%d  State:%d\n",
                  mvectorNC[i]->mpSocket->peerAddress().toString().toLatin1().data(),
@@ -172,8 +185,14 @@ void MainWindow::onTimer()
         mmodel->setItem(i,0,new QStandardItem(""));
         mmodel->setItem(i,1,new QStandardItem(""));
         mmodel->setItem(i,2,new QStandardItem(""));
+        mmodel->setItem(i,3,new QStandardItem(""));
     }
 
+    ui->tableView->horizontalHeader()->resizeSection(0,230);
+    ui->tableView->horizontalHeader()->resizeSection(1,100);
+    ui->tableView->horizontalHeader()->resizeSection(2,60);
+    ui->tableView->horizontalHeader()->resizeSection(3,680);
+
 
     mMutex.unlock();
 //    if(nNCSize > 0)
@@ -301,6 +320,7 @@ void MainWindow::readNtripMessage()
             if(strstr(str,"$GPGGA") > 0)
             {
                 qDebug(str);
+                mvectorNC.at(i)->mstrGGA = str;
  //               SetNCLatLon(str,mListNC.at(i));
             }
             }

src/tool/tool_ntripbroadcast/mainwindow.h

@@ -20,6 +20,7 @@ class NtripClient
 public:
     int mnState;
     QTcpSocket * mpSocket;
+    QString mstrGGA = "";
 };
 
 class MainWindow : public QMainWindow
@@ -30,7 +31,8 @@ public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
-
+public:
+     void resizeEvent(QResizeEvent *event);
 
 private slots:
     void on_pushButton_Start_clicked();

src/tool/tool_ntripbroadcast/ntrip_client.cpp

@@ -184,9 +184,11 @@ void ntrip_client::SendGPGGA()
 
     char strgga[1000];
 
-    QDateTime dt = QDateTime::currentDateTime();
-    snprintf(strgga,1000,"$GPGGA,%02d%02d%02d.%03d,%11.7f,N,%11.7f,E,1,13,1.5,46.4085,M,-9.452,M,99,AAAA",
-             dt.time().hour(),dt.time().minute(),dt.time().second(),dt.time().msec(),flat,flon);
+    qint64 curms = QDateTime::currentMSecsSinceEpoch();
+    curms = curms - 8*3600*1000;
+    QDateTime dt = QDateTime::fromMSecsSinceEpoch(curms);
+    snprintf(strgga,1000,"$GPGGA,%02d%02d%02d.%02d,%11.7f,N,%11.7f,E,4,45,0.4,1.3683,M,-7.6340,M,01,2926",
+             dt.time().hour(),dt.time().minute(),dt.time().second(),dt.time().msec()/10,flat,flon);
     char check = calccheck(strgga);
     snprintf(strSend,1000,"%s*%02X\r\n",strgga,check);
     qDebug(strSend);

src/tool/view_ivchart/mainwindow.cpp

@@ -213,7 +213,10 @@ void MainWindow::onTimer()
         for(j=0;j<xvectorcu.size();j++)
         {
 
-            xListPoint.push_back(QPointF(xvectorcu[j].timex() - nnow,xvectorcu[j].fvalue()));
+            double fvalue = xvectorcu[j].fvalue();
+//            if(fvalue<0)fvalue = 0;
+//            if(fvalue>1000)fvalue = 1000.0;
+            xListPoint.push_back(QPointF(xvectorcu[j].timex() - nnow,fvalue));
  //           qDebug("%f %f ",xListPoint[0].x(),xListPoint[0].y());
         }