소스 검색

change decition_braion. change not cirlemode to end point 20 points set angle to 0.

yuchuli 3 년 전
부모
커밋
9001b87a31

+ 1 - 1
src/decition/decition_brain/decition/decide_gps_00.cpp

@@ -1130,7 +1130,7 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
 
 
     controlAng= getAngle(gpsTraceNow,now_gps_ins,gps_decition);
-    if(!circleMode && PathPoint>(gpsMapLine.size()-3)){
+    if(!circleMode && PathPoint>(gpsMapLine.size()-20)){
         controlAng=0;
     }
 

+ 1 - 0
src/tool/map_lanetoxodr/dialogroadobject.h

@@ -12,6 +12,7 @@
 #include <OpenDrive/OpenDrive.h>
 
 #include "dialogroadobject_material.h"
+#include "dialogroadobject_repeat.h"
 
 namespace Ui {
 class DialogRoadObject;

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

@@ -7,6 +7,8 @@ DialogRoadObject_repeat::DialogRoadObject_repeat(Object * pObject,QWidget *paren
 {
     ui->setupUi(this);
 
+    CreateView();
+
     mpObject = pObject;
 }
 
@@ -19,3 +21,20 @@ void DialogRoadObject_repeat::UpdateList()
 {
 
 }
+
+void DialogRoadObject_repeat::CreateView()
+{
+    int startpos_x = 30;
+    int startpos_y = 150;
+    int nSpace = 300;
+    int nLabelWidth = 100;
+    int nLEWidth = 150;
+    int nHeight = 30;
+    int nVSpace = 50;
+    int nVIndex = 0;
+
+    mpLEs = ViewCreate::CreateLE(startpos_x+0*nSpace,startpos_y+nVIndex*nVSpace,nLabelWidth,nLEWidth,nHeight,"s",this);
+    mpLElength = ViewCreate::CreateLE(startpos_x+1*nSpace,startpos_y+nVIndex*nVSpace,nLabelWidth,nLEWidth,nHeight,"length",this);
+    mpLEdistance = ViewCreate::CreateLE(startpos_x+2*nSpace,startpos_y+nVIndex*nVSpace,nLabelWidth,nLEWidth,nHeight,"distance",this);
+    nVIndex++;
+}

+ 27 - 0
src/tool/map_lanetoxodr/dialogroadobject_repeat.h

@@ -3,6 +3,14 @@
 
 #include <QDialog>
 
+#include <QDialog>
+#include <QLineEdit>
+#include <QLabel>
+#include <QComboBox>
+#include <QPushButton>
+
+#include "viewcreate.h"
+
 #include <OpenDrive/OpenDrive.h>
 
 namespace Ui {
@@ -23,6 +31,25 @@ private:
     Object * mpObject = 0;
 
     void UpdateList();
+
+    void CreateView();
+
+private:
+    QLineEdit * mpLEs;
+    QLineEdit * mpLElength;
+    QLineEdit * mpLEdistance;
+    QLineEdit * mpLEtStart;
+    QLineEdit * mpLEtEnd;
+    QLineEdit * mpLEheightStart;
+    QLineEdit * mpLEheightEnd;
+    QLineEdit * mpLEzOffsetStart;
+    QLineEdit * mpLEzOffsetEnd;
+    QLineEdit * mpLEwidthStart;
+    QLineEdit * mpLEwidthEnd;
+    QLineEdit * mpLElengthStart;
+    QLineEdit * mpLElengthEnd;
+    QLineEdit * mpLEradiusStart;
+    QLineEdit * mpLEradiusEnd;
 };
 
 #endif // DIALOGROADOBJECT_REPEAT_H

+ 2 - 2
src/tool/map_lanetoxodr/dialogroadobject_repeat.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <widget class="QComboBox" name="comboBox_material">
+  <widget class="QComboBox" name="comboBox_repeat">
    <property name="geometry">
     <rect>
      <x>150</x>
@@ -33,7 +33,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>material</string>
+    <string>repeate</string>
    </property>
   </widget>
  </widget>