Browse Source

change RemoteCtrl_Wide.

yuchuli 2 years ago
parent
commit
b7f9f79771

+ 55 - 0
src/common/common/xodr/OpenDrive/ObjectSignal.cpp

@@ -67,6 +67,61 @@ int Object_borders_border::Getoutlineid()
 }
 
 
+vector<Object_markings_marking_cornerReference> * Object_borders_border::GetcornerReferenceVector()
+{
+    return &mcornerReference;
+}
+
+Object_markings_marking_cornerReference * Object_borders_border::GetcornerReference(unsigned int i)
+{
+    if(mcornerReference.size() == 0)return NULL;
+    if(i>= mcornerReference.size())return NULL;
+    return &mcornerReference[i];
+}
+
+unsigned int Object_borders_border::GetcornerReferenceCount()
+{
+    return mcornerReference.size();
+}
+
+Object_markings_marking_cornerReference *	Object_borders_border::GetLastcornerReference()
+{
+    if(mcornerReference.size() == 0)return NULL;
+    return &mcornerReference[mcornerReference.size() -1];
+}
+
+unsigned int Object_borders_border::AddcornerReference(unsigned int id)
+{
+    unsigned int index = mcornerReference.size();
+    mcornerReference.push_back(Object_markings_marking_cornerReference(id));
+    mnLastAddedcornerReference = index;
+    return index;
+}
+
+unsigned int Object_borders_border::ClonecornerReference(unsigned int index)
+{
+    if(index>=mcornerReference.size())
+    {
+        std::cout<<" Object_markings_marking::ClonecornerReference fail index: "
+                <<index<<" size: "<<mcornerReference.size()<<std::endl;
+        return index;
+    }
+    if(index<(mcornerReference.size()-1))
+        mcornerReference.insert(mcornerReference.begin()+index+1, mcornerReference[index]);
+    else if(index==mcornerReference.size()-1)
+        mcornerReference.push_back(mcornerReference[index]);
+    mnLastAddedcornerReference=index+1;
+    return mnLastAddedcornerReference;
+}
+
+void Object_borders_border::DeletecornerReference(unsigned int index)
+{
+    mcornerReference.erase(mcornerReference.begin()+index);
+}
+
+
+
+
 Object_borders::Object_borders(Object_borders_border xborder)
 {
     mvectorborder.push_back(xborder);

+ 15 - 0
src/common/common/xodr/OpenDrive/ObjectSignal.h

@@ -8,6 +8,7 @@ using std::vector;
 using std::string;
 
 
+class Object_markings_marking_cornerReference;
 
 class Object_borders_border
 {
@@ -17,6 +18,12 @@ private:
     int moutlineid;
     std::vector<bool> muserCompleteOutline;
 
+    vector<Object_markings_marking_cornerReference> mcornerReference;
+
+
+private:
+    unsigned int mnLastAddedcornerReference = 0;
+
 public:
     Object_borders_border(double width,std::string borderType,int outlineid);
 
@@ -31,6 +38,14 @@ public:
     double Getwidth();
     std::string GetborderType();
     int Getoutlineid();
+
+    vector<Object_markings_marking_cornerReference> * GetcornerReferenceVector();
+    Object_markings_marking_cornerReference * GetcornerReference(unsigned int i);
+    unsigned int GetcornerReferenceCount();
+    Object_markings_marking_cornerReference *			GetLastcornerReference();
+    unsigned int AddcornerReference(unsigned int id);
+    unsigned int ClonecornerReference(unsigned int index);
+    void DeletecornerReference(unsigned int index);
 };
 
 class Object_borders

+ 2 - 0
src/plugin/baidumapshow/mainwindow.cpp

@@ -15,6 +15,8 @@ MainWindow::MainWindow(QString strcid,QWidget *parent)
     mMapview->load(QUrl(QString("file:///%1/%2").arg(QApplication::applicationDirPath()).arg("BaiDuMap.html")));
     mMapview->setGeometry(1000,100,500,500);
 
+//    mMapview->setGeometry(0,0,500,500);
+
     connect(this,SIGNAL(signalupdategpsimu()),this,SLOT(ProcUpdateGPSIMU()));
 
     ModuleFun fungpsimu = std::bind(&MainWindow::UpdateGPSIMU,this,std::placeholders::_1,std::placeholders::_2,std::placeholders::_3,std::placeholders::_4,std::placeholders::_5);

+ 4 - 1
src/tool/RemoteCtrl_Wide/mainwindow.cpp

@@ -158,6 +158,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 
 
+
 //    mppicdlg = new DialogPic(this);
 //    mppicdlg->setModal(false);
 //    connect(mppicdlg,SIGNAL(finished(int)),this,SLOT(onCloseDlg()));
@@ -282,9 +283,10 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
-    if(event->key() == Qt::Key_Escape)
+    if((event->key() == Qt::Key_Escape)||(event->key() == Qt::Key_F11))
     {
         showNormal();
+        ui->menubar->setVisible(true);
     }
     if(!event->isAutoRepeat())mPressKeys.remove(event->key());
     qDebug("key count is %d",mPressKeys.count());
@@ -1242,6 +1244,7 @@ void MainWindow::onCamUpdate(int ncampos)
 void MainWindow::on_actionFullScreem_triggered()
 {
     showFullScreen();
+    ui->menubar->setVisible(false);
 }
 
 void MainWindow::on_actionNormal_triggered()

+ 4 - 0
src/tool/map_lanetoxodr/ndsproc.pro

@@ -12,6 +12,10 @@ CONFIG -= app_bundle
 
 QMAKE_LFLAGS += -no-pie
 
+
+#QMAKE_LFLAGS += -static
+#QMAKE_LFLAGS += -static-libgcc -static-libstdc++
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the