Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
ae162cec
Commit
ae162cec
authored
Jul 26, 2011
by
lm
Browse files
Minor fixes, settings store / load not working yet as expected for map trail options.
parent
a90ceccb
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/ui/map/QGCMapToolBar.cc
View file @
ae162cec
...
@@ -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.0
f
)
?
"s"
:
""
));
}
}
}
}
}
...
...
src/ui/map/QGCMapWidget.cc
View file @
ae162cec
...
@@ -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
}
}
...
...
src/ui/map/QGCMapWidget.h
View file @
ae162cec
...
@@ -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
=
fals
e
);
void
loadSettings
(
bool
changePosition
=
tru
e
);
/** @brief Store the settings for this widget to disk */
/** @brief Store the settings for this widget to disk */
void
storeSettings
();
void
storeSettings
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment