修改航点选中,和表格选中问题

This commit is contained in:
hm
2022-05-06 14:34:09 +08:00
parent 8aab14dc74
commit e5a843d8ab
5 changed files with 74 additions and 29 deletions
+22 -10
View File
@@ -820,6 +820,8 @@ WayPointItem *OPMapWidget::WPCreate()
item->SetMissionType(currentGroup);
int position = item->Number();
emit WPCreated(position, item);
setSelectedWP(item);
item->emitWPProperty();
return item;
}
WayPointItem *OPMapWidget::magicWPCreate()
@@ -832,6 +834,8 @@ WayPointItem *OPMapWidget::magicWPCreate()
item->SetShowNumber(false);
item->setParentItem(map);
item->SetMissionType(currentGroup);
setSelectedWP(item);
item->emitWPProperty();
return item;
}
void OPMapWidget::WPCreate(WayPointItem *item)
@@ -842,6 +846,8 @@ void OPMapWidget::WPCreate(WayPointItem *item)
int position = item->Number();
emit WPCreated(position, item);
setOverlayOpacity(overlayOpacity);
setSelectedWP(item);
item->emitWPProperty();
}
WayPointItem *OPMapWidget::WPCreate(internals::PointLatLng const & coord, int const & altitude)
{
@@ -856,6 +862,8 @@ WayPointItem *OPMapWidget::WPCreate(internals::PointLatLng const & coord, int co
int position = item->Number();
emit WPCreated(position, item);
setOverlayOpacity(overlayOpacity);
setSelectedWP(item);
item->emitWPProperty();
return item;
}
WayPointItem *OPMapWidget::WPCreate(internals::PointLatLng const & coord, int const & altitude, QString const & description)
@@ -871,6 +879,8 @@ WayPointItem *OPMapWidget::WPCreate(internals::PointLatLng const & coord, int co
int position = item->Number();
emit WPCreated(position, item);
setOverlayOpacity(overlayOpacity);
setSelectedWP(item);
item->emitWPProperty();
return item;
}
WayPointItem *OPMapWidget::WPCreate(const distBearingAltitude &relativeCoord, const QString &description)
@@ -886,6 +896,8 @@ WayPointItem *OPMapWidget::WPCreate(const distBearingAltitude &relativeCoord, co
int position = item->Number();
emit WPCreated(position, item);
setOverlayOpacity(overlayOpacity);
setSelectedWP(item);
item->emitWPProperty();
return item;
}
@@ -1329,10 +1341,8 @@ void OPMapWidget::ConnectWP(WayPointItem *item)
//生成后立即选中,并且把信息发给ui界面
setSelectedWP(item);
item->emitWPProperty();
setSelectedWP(item);
}
@@ -1390,7 +1400,7 @@ void OPMapWidget::SetRotate(qreal const & value)
}
}
void OPMapWidget::RipMap()
{
{
new MapRipper(core, map->SelectedArea());
}
@@ -1411,14 +1421,16 @@ void OPMapWidget::setSelectedWP(int number)
{
this->scene()->clearSelection();
WayPointItem *wp = WPFind(currentGroup,number);
wp->setSelected(true);
if(altitudeitem)
if(wp)
{
if(!wp->FollowPrevious())
altitudeitem->setCurrentPoint(wp->Number());
}
wp->setSelected(true);
if(altitudeitem)
{
if(!wp->FollowPrevious())
altitudeitem->setCurrentPoint(wp->Number());
}
}
}
void OPMapWidget::setSelectedWP(WayPointItem *item)