Просмотр исходного кода

change driver_map_xodrload. prepare add nds map data.

yuchuli 3 лет назад
Родитель
Сommit
8cee66b137

+ 1 - 1
src/driver/driver_map_xodrload/main.cpp

@@ -1108,7 +1108,7 @@ int main(int argc, char *argv[])
 
     std::string strextendmap = xp.GetParam("extendmap","false");
 
-    std::string strsideenable = xp.GetParam("sideenable","false");
+    std::string strsideenable = xp.GetParam("sideenable","true");
 
 
     glat0 = atof(strlat0.data());

+ 19 - 0
src/tool/map_lanetoxodr/dialogaddroadfromnds.cpp

@@ -0,0 +1,19 @@
+#include "dialogaddroadfromnds.h"
+#include "ui_dialogaddroadfromnds.h"
+
+DialogAddRoadFromNDS::DialogAddRoadFromNDS(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogAddRoadFromNDS)
+{
+    ui->setupUi(this);
+}
+
+DialogAddRoadFromNDS::~DialogAddRoadFromNDS()
+{
+    delete ui;
+}
+
+void DialogAddRoadFromNDS::on_pushButton_clicked()
+{
+
+}

+ 25 - 0
src/tool/map_lanetoxodr/dialogaddroadfromnds.h

@@ -0,0 +1,25 @@
+#ifndef DIALOGADDROADFROMNDS_H
+#define DIALOGADDROADFROMNDS_H
+
+#include <QDialog>
+
+namespace Ui {
+class DialogAddRoadFromNDS;
+}
+
+class DialogAddRoadFromNDS : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DialogAddRoadFromNDS(QWidget *parent = nullptr);
+    ~DialogAddRoadFromNDS();
+
+private slots:
+    void on_pushButton_clicked();
+
+private:
+    Ui::DialogAddRoadFromNDS *ui;
+};
+
+#endif // DIALOGADDROADFROMNDS_H

+ 32 - 0
src/tool/map_lanetoxodr/dialogaddroadfromnds.ui

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogAddRoadFromNDS</class>
+ <widget class="QDialog" name="DialogAddRoadFromNDS">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>557</width>
+    <height>341</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>160</y>
+     <width>191</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>From NDS</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

+ 6 - 0
src/tool/map_lanetoxodr/mainwindow.cpp

@@ -5841,3 +5841,9 @@ void MainWindow::on_actionEdit_Road_Noavoid_triggered()
 
     mpfb->SetOpenDrive(mxodr);
 }
+
+void MainWindow::on_actionAdd_Road_From_NDS_triggered()
+{
+    DialogAddRoadFromNDS rnd(this);
+    rnd.exec();
+}

+ 3 - 0
src/tool/map_lanetoxodr/mainwindow.h

@@ -50,6 +50,7 @@
 #include "dialoghideroad.h"
 #include "dialogdrawroad.h"
 #include "dialogroadnoavoid.h"
+#include "dialogaddroadfromnds.h"
 
 #include "filebackup.h"
 
@@ -225,6 +226,8 @@ private slots:
 
     void on_actionEdit_Road_Noavoid_triggered();
 
+    void on_actionAdd_Road_From_NDS_triggered();
+
 private:
 
 

+ 6 - 0
src/tool/map_lanetoxodr/mainwindow.ui

@@ -57,6 +57,7 @@
     <addaction name="actionAdd_Road_From_RTK"/>
     <addaction name="actionSummary_Road"/>
     <addaction name="actionDraw_Road"/>
+    <addaction name="actionAdd_Road_From_NDS"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -182,6 +183,11 @@
     <string>Edit Road Noavoid</string>
    </property>
   </action>
+  <action name="actionAdd_Road_From_NDS">
+   <property name="text">
+    <string>Add Road From NDS</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

+ 5 - 0
src/tool/map_lanetoxodr/map_lanetoxodr.pro

@@ -30,6 +30,7 @@ QMAKE_LFLAGS += -no-pie
 SOURCES += \
     autoconnect.cpp \
     autoroadcontact.cpp \
+    dialogaddroadfromnds.cpp \
     dialogaddroadfromrtk.cpp \
     dialogcalcs.cpp \
     dialogdrawroad.cpp \
@@ -63,6 +64,7 @@ SOURCES += \
     ivxodrtool.cpp \
         main.cpp \
         mainwindow.cpp \
+    ndsdataproc.cpp \
     roaddigit.cpp \
     roadeditdialog.cpp \
     roadviewitem.cpp \
@@ -93,6 +95,7 @@ SOURCES += \
 HEADERS += \
     autoconnect.h \
     autoroadcontact.h \
+    dialogaddroadfromnds.h \
     dialogaddroadfromrtk.h \
     dialogcalcs.h \
     dialogdrawroad.h \
@@ -125,6 +128,7 @@ HEADERS += \
     filebackup.h \
     ivxodrtool.h \
         mainwindow.h \
+    ndsdataproc.h \
     rawtype.h \
     roaddigit.h \
     roadeditdialog.h \
@@ -150,6 +154,7 @@ HEADERS += \
     xodrscenfunc.h
 
 FORMS += \
+        dialogaddroadfromnds.ui \
         dialogaddroadfromrtk.ui \
         dialogcalcs.ui \
         dialogdrawroad.ui \

+ 14 - 0
src/tool/map_lanetoxodr/ndsdataproc.cpp

@@ -0,0 +1,14 @@
+#include "ndsdataproc.h"
+
+#include <QFile>
+
+NDSDataProc::NDSDataProc()
+{
+
+}
+
+
+int NDSDataProc::ProcNDSData(std::string strlinepath,std::string strvehiclepath)
+{
+    return 0;
+}

+ 42 - 0
src/tool/map_lanetoxodr/ndsdataproc.h

@@ -0,0 +1,42 @@
+#ifndef NDSDATAPROC_H
+#define NDSDATAPROC_H
+
+#include <string>
+#include <iostream>
+#include "gnss_coordinate_convert.h"
+
+
+namespace iv {
+struct  nds_vehicle
+{
+    int64_t localtime;
+    int locationmode;
+    double lon;
+    double lat;
+    double height;
+    double heading;
+
+};
+
+struct nds_line
+{
+    int64_t localtime;
+    int feature =1; //1 left1 2 ringht1
+    double centerdeparture;
+    double lanewidth;
+    double laneheading;
+    double lanecurv;
+};
+
+}
+
+class NDSDataProc
+{
+public:
+    NDSDataProc();
+
+public:
+    static int ProcNDSData(std::string strlinepath,std::string strvehiclepath);
+};
+
+#endif // NDSDATAPROC_H