退回前一个版本

App/mainwindow.cpp

@@ -39,8 +39,9 @@ MainWindow::MainWindow(QWidget *parent)
 
 
     map = new mapcontrol::OPMapWidget(this);
-    map->SetShowHome(false);
-    map->SetShowCompass(false);
+
+    map->SetShowHome(true);
+    map->SetShowCompass(true);
     map->SetUseOpenGL(true);
 
     map->setAttribute(Qt::WA_AlwaysStackOnTop);
@@ -49,7 +50,6 @@ MainWindow::MainWindow(QWidget *parent)
     map->SetMapType(mapcontrol::Helper::MapTypeFromString("BingSatellite"));
 
     map->setFocus();
-    map->SetShowCompass(false);
     map->setMouseTracking(true);
 
     //=========初始化UAV=========
@@ -75,6 +75,10 @@ MainWindow::MainWindow(QWidget *parent)
 
     QIcon icon;
 
+    nav1 = new QNavigationWidget(this);
+    //nav1->seto
+
+
     nav = new QNavigationWidget(this);
 
     nav->setGeometry(0,0,50,this->height());
@@ -175,6 +179,9 @@ void MainWindow::resizeEvent(QResizeEvent *event)
                      this->width()- copk->width() - nav->width(),
                      this->height());
 
+
+    nav1->setGeometry(nav->width(),0,nav->width(),this->height());
+
     nav->setGeometry(0,0,nav->width(),this->height());
     copk->setGeometry(this->width() - copk->width(),0,copk->width(),copk->height());
     quick->setGeometry(this->width() - quick->width(),copk->height(),quick->width(),this->height() - copk->height());