rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

LP-572 Update context menu from configuration settings, max update rate user-configurable

Browse Source
This commit is contained in:
Laurent Lalanne 2018-01-06 13:55:47 +01:00
parent 16cca00f21
commit 411512fa62
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/gcs/src/plugins/opmap/opmapgadget.cpp
View File

@ -59,6 +59,7 @@ void OPMapGadget::loadConfiguration(IUAVGadgetConfiguration *config)
{ {
m_config = qobject_cast<OPMapGadgetConfiguration *>(config); m_config = qobject_cast<OPMapGadgetConfiguration *>(config);
m_widget->setMapProvider(m_config->mapProvider()); m_widget->setMapProvider(m_config->mapProvider());
m_widget->setMaxUpdateRate(m_config->maxUpdateRate());
m_widget->setUseOpenGL(m_config->useOpenGL()); m_widget->setUseOpenGL(m_config->useOpenGL());
m_widget->setShowTileGridLines(m_config->showTileGridLines()); m_widget->setShowTileGridLines(m_config->showTileGridLines());
m_widget->setAccessMode(m_config->accessMode()); m_widget->setAccessMode(m_config->accessMode());

20
ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -1100,6 +1100,15 @@ void OPMapGadgetWidget::setMaxUpdateRate(int update_rate)
m_updateTimer->setInterval(m_maxUpdateRate); m_updateTimer->setInterval(m_maxUpdateRate);
} }
// Update context menu selection
int max_rate_list_size = sizeof(max_update_rate_list) / sizeof(max_update_rate_list[0]);
for (int i = 0; i < max_rate_list_size; i++) {
int maxUpdateRate = max_update_rate_list[i];
if (maxUpdateRate == update_rate) {
maxUpdateRateAct.at(i)->setChecked(true);
}
}
// if (m_statusUpdateTimer) // if (m_statusUpdateTimer)
// m_statusUpdateTimer->setInterval(m_maxUpdateRate); // m_statusUpdateTimer->setInterval(m_maxUpdateRate);
} }
@ -1112,6 +1121,15 @@ void OPMapGadgetWidget::setSafeAreaRadius(int safe_area_radius)
m_map->Home->SetSafeArea(safe_area_radius); m_map->Home->SetSafeArea(safe_area_radius);
m_map->Home->SetToggleRefresh(true); m_map->Home->SetToggleRefresh(true);
// Update context menu selection
int safe_area_list_size = sizeof(safe_area_radius_list) / sizeof(safe_area_radius_list[0]);
for (int i = 0; i < safe_area_list_size; i++) {
int safeArea = safe_area_radius_list[i];
if (safeArea == safe_area_radius) {
safeAreaAct.at(i)->setChecked(true);
}
}
} }
void OPMapGadgetWidget::setShowSafeArea(bool showSafeArea) void OPMapGadgetWidget::setShowSafeArea(bool showSafeArea)
@ -1122,6 +1140,8 @@ void OPMapGadgetWidget::setShowSafeArea(bool showSafeArea)
m_map->Home->SetShowSafeArea(showSafeArea); m_map->Home->SetShowSafeArea(showSafeArea);
m_map->Home->SetToggleRefresh(true); m_map->Home->SetToggleRefresh(true);
showSafeAreaAct->setChecked(showSafeArea);
} }
void OPMapGadgetWidget::setZoom(int zoom) void OPMapGadgetWidget::setZoom(int zoom)