hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

退回前一个版本

Browse Source
This commit is contained in:
Company
2020-04-17 18:19:08 +08:00
parent 5b7b11d8b6
commit 33bd1f37a8
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/mainwindow.cpp
+10 -3
View File
@@ -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());
App/mainwindow.h
+1
View File
@@ -94,6 +94,7 @@ protected:
QNavigationWidget *nav;
QNavigationWidget *nav1;
mapcontrol::OPMapWidget *map;
DLink *dlink = nullptr;
opmap/mapwidget/waypointline.cpp
+6 -6
View File
@@ -38,11 +38,11 @@ WayPointLine::WayPointLine(WayPointItem *from, WayPointItem *to, MapGraphicItem
connect(from, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
connect(to, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
if (myColor == Qt::green) {
this->setZValue(10);
this->setZValue(2);
} else if (myColor == Qt::yellow) {
this->setZValue(9);
this->setZValue(2);
} else if (myColor == Qt::red) {
this->setZValue(8);
this->setZValue(2);
}
connect(map, SIGNAL(childSetOpacity(qreal)), this, SLOT(setOpacitySlot(qreal)));
}
@@ -55,11 +55,11 @@ WayPointLine::WayPointLine(HomeItem *from, WayPointItem *to, MapGraphicItem *map
connect(to, SIGNAL(localPositionChanged(QPointF, WayPointItem *)), this, SLOT(refreshLocations()));
connect(to, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
if (myColor == Qt::green) {
this->setZValue(10);
this->setZValue(2);
} else if (myColor == Qt::yellow) {
this->setZValue(9);
this->setZValue(2);
} else if (myColor == Qt::red) {
this->setZValue(8);
this->setZValue(2);
}
connect(map, SIGNAL(childSetOpacity(qreal)), this, SLOT(setOpacitySlot(qreal)));
}