Commit ae162cec authored by lm's avatar lm

Minor fixes, settings store / load not working yet as expected for map trail options.

parent a90ceccb
...@@ -152,7 +152,7 @@ void QGCMapToolBar::setUAVTrailDistance() ...@@ -152,7 +152,7 @@ void QGCMapToolBar::setUAVTrailDistance()
if (ok) if (ok)
{ {
map->setTrailModeDistance(trailDistance); map->setTrailModeDistance(trailDistance);
ui->posLabel->setText(tr("Trail mode: Every %1 meter%2").arg(trailDistance).arg((trailDistance > 1) ? "s" : "")); ui->posLabel->setText(tr("Trail mode: Every %1 meter%2").arg(trailDistance).arg((trailDistance == 1) ? "s" : ""));
} }
} }
} }
...@@ -166,7 +166,11 @@ void QGCMapToolBar::setUpdateInterval() ...@@ -166,7 +166,11 @@ void QGCMapToolBar::setUpdateInterval()
{ {
bool ok; bool ok;
float time = action->data().toFloat(&ok); float time = action->data().toFloat(&ok);
if (ok) map->setUpdateRateLimit(time); if (ok)
{
map->setUpdateRateLimit(time);
ui->posLabel->setText(tr("Map update rate limit: %1 second%2").arg(time).arg((time != 1.0f) ? "s" : ""));
}
} }
} }
......
...@@ -17,7 +17,7 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) : ...@@ -17,7 +17,7 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) :
followUAVID(0) followUAVID(0)
{ {
// Widget is inactive until shown // Widget is inactive until shown
loadSettings(false);
// Set cache mode // Set cache mode
} }
......
...@@ -100,7 +100,7 @@ public slots: ...@@ -100,7 +100,7 @@ public slots:
} }
/** @brief Load the settings for this widget from disk */ /** @brief Load the settings for this widget from disk */
void loadSettings(bool changePosition=false); void loadSettings(bool changePosition=true);
/** @brief Store the settings for this widget to disk */ /** @brief Store the settings for this widget to disk */
void storeSettings(); void storeSettings();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment