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
55c1c67d
Commit
55c1c67d
authored
Nov 12, 2019
by
olliw42
Browse files
3 comments by DonLakeFlyer adopted, compiled and tested
parent
5c9a40f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/FactSystem/ParameterManager.cc
View file @
55c1c67d
...
@@ -641,7 +641,7 @@ void ParameterManager::_setupComponentCategoryMap(int componentId)
...
@@ -641,7 +641,7 @@ void ParameterManager::_setupComponentCategoryMap(int componentId)
if
(
i
>
0
)
{
if
(
i
>
0
)
{
componentCategoryMap
[
category
][
paramName
.
left
(
i
)]
+=
paramName
;
componentCategoryMap
[
category
][
paramName
.
left
(
i
)]
+=
paramName
;
}
else
{
}
else
{
componentCategoryMap
[
category
][
"Misc"
]
+=
paramName
;
componentCategoryMap
[
category
][
tr
(
"Misc"
)
]
+=
paramName
;
}
}
}
}
...
@@ -667,7 +667,7 @@ void ParameterManager::_setupDefaultComponentCategoryMap(void)
...
@@ -667,7 +667,7 @@ void ParameterManager::_setupDefaultComponentCategoryMap(void)
QString
ParameterManager
::
getComponentCategory
(
int
componentId
)
QString
ParameterManager
::
getComponentCategory
(
int
componentId
)
{
{
if
(
_mavlinkCompIdHash
.
contains
(
componentId
))
{
if
(
_mavlinkCompIdHash
.
contains
(
componentId
))
{
return
QString
(
"Component %1 (%2)"
).
arg
(
_mavlinkCompIdHash
.
value
(
componentId
)).
arg
(
componentId
);
return
tr
(
"Component %1 (%2)"
).
arg
(
_mavlinkCompIdHash
.
value
(
componentId
)).
arg
(
componentId
);
}
}
QString
componentCategoryPrefix
=
tr
(
"Component "
);
QString
componentCategoryPrefix
=
tr
(
"Component "
);
return
QString
(
"%1%2"
).
arg
(
componentCategoryPrefix
).
arg
(
componentId
);
return
QString
(
"%1%2"
).
arg
(
componentCategoryPrefix
).
arg
(
componentId
);
...
@@ -1590,7 +1590,7 @@ void ParameterManager::_loadOfflineEditingParams(void)
...
@@ -1590,7 +1590,7 @@ void ParameterManager::_loadOfflineEditingParams(void)
}
}
_addMetaDataToDefaultComponent
();
_addMetaDataToDefaultComponent
();
_setupDefaultComponentCategoryMap
();
//TODO: check if this is really only for the default, or needs to be done for all components !!
_setupDefaultComponentCategoryMap
();
_parametersReady
=
true
;
_parametersReady
=
true
;
_initialLoadComplete
=
true
;
_initialLoadComplete
=
true
;
_debugCacheCRC
.
clear
();
_debugCacheCRC
.
clear
();
...
...
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