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
a58e3995
Commit
a58e3995
authored
May 28, 2016
by
Don Gagne
Browse files
Merge pull request #3426 from DonLakeFlyer/LoggingOptions
Move logging option setup to correct place
parents
276b19e4
28555c80
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/QGCApplication.cc
View file @
a58e3995
...
...
@@ -268,9 +268,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
ParseCmdLineOptions
(
argc
,
argv
,
rgCmdLineOptions
,
sizeof
(
rgCmdLineOptions
)
/
sizeof
(
rgCmdLineOptions
[
0
]),
false
);
// Set up our logging filters
QGCLoggingCategoryRegister
::
instance
()
->
setFilterRulesFromSettings
(
loggingOptions
);
// Set up timer for delayed missing fact display
_missingParamsDelayedDisplayTimer
.
setSingleShot
(
true
);
_missingParamsDelayedDisplayTimer
.
setInterval
(
_missingParamsDelayedDisplayTimerTimeout
);
...
...
@@ -325,6 +322,9 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
paramDir
.
mkpath
(
paramDir
.
absolutePath
());
}
// Set up our logging filters
QGCLoggingCategoryRegister
::
instance
()
->
setFilterRulesFromSettings
(
loggingOptions
);
_lastKnownHomePosition
.
setLatitude
(
settings
.
value
(
_lastKnownHomePositionLatKey
,
37.803784
).
toDouble
());
_lastKnownHomePosition
.
setLongitude
(
settings
.
value
(
_lastKnownHomePositionLonKey
,
-
122.462276
).
toDouble
());
_lastKnownHomePosition
.
setAltitude
(
settings
.
value
(
_lastKnownHomePositionAltKey
,
0.0
).
toDouble
());
...
...
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