Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a68f6b33
Commit
a68f6b33
authored
Sep 15, 2014
by
ndousse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the freeing of the newed pointers
parent
642be64c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
60 additions
and
5 deletions
+60
-5
QGCMAVLinkInspector.cc
src/ui/QGCMAVLinkInspector.cc
+60
-5
No files found.
src/ui/QGCMAVLinkInspector.cc
View file @
a68f6b33
...
...
@@ -113,6 +113,7 @@ void QGCMAVLinkInspector::addComponent(int uas, int component, const QString& na
{
Q_UNUSED
(
component
);
Q_UNUSED
(
name
);
if
(
uas
!=
selectedSystemID
)
return
;
rebuildComponentList
();
...
...
@@ -124,23 +125,75 @@ void QGCMAVLinkInspector::addComponent(int uas, int component, const QString& na
*/
void
QGCMAVLinkInspector
::
clearView
()
{
uasTreeWidgetItems
.
clear
();
uasMsgTreeItems
.
clear
();
QMap
<
int
,
mavlink_message_t
*
>::
iterator
ite
;
for
(
ite
=
uasMessageStorage
.
begin
();
ite
!=
uasMessageStorage
.
end
();
++
ite
)
{
delete
ite
.
value
();
ite
.
value
()
=
NULL
;
}
uasMessageStorage
.
clear
();
QMap
<
int
,
QMap
<
int
,
QTreeWidgetItem
*>*
>::
iterator
iteMsg
;
for
(
iteMsg
=
uasMsgTreeItems
.
begin
();
iteMsg
!=
uasMsgTreeItems
.
end
();
++
iteMsg
)
{
QMap
<
int
,
QTreeWidgetItem
*>*
msgTreeItems
=
iteMsg
.
value
();
QList
<
int
>
groupKeys
=
msgTreeItems
->
uniqueKeys
();
QList
<
int
>::
iterator
listKeys
;
for
(
listKeys
=
groupKeys
.
begin
();
listKeys
!=
groupKeys
.
end
();
++
listKeys
)
{
delete
msgTreeItems
->
take
(
*
listKeys
);
}
}
uasMsgTreeItems
.
clear
();
QMap
<
int
,
QTreeWidgetItem
*
>::
iterator
iteTree
;
for
(
iteTree
=
uasTreeWidgetItems
.
begin
();
iteTree
!=
uasTreeWidgetItems
.
end
();
++
iteTree
)
{
delete
iteTree
.
value
();
iteTree
.
value
()
=
NULL
;
}
uasTreeWidgetItems
.
clear
();
QMap
<
int
,
QMap
<
int
,
float
>*
>::
iterator
iteHz
;
for
(
iteHz
=
uasMessageHz
.
begin
();
iteHz
!=
uasMessageHz
.
end
();
++
iteHz
)
{
iteHz
.
value
()
->
clear
();
delete
iteHz
.
value
();
iteHz
.
value
()
=
NULL
;
}
uasMessageHz
.
clear
();
QMap
<
int
,
QMap
<
int
,
unsigned
int
>*
>::
iterator
iteCount
;
for
(
iteCount
=
uasMessageCount
.
begin
();
iteCount
!=
uasMessageCount
.
end
();
++
iteCount
)
{
iteCount
.
value
()
->
clear
();
delete
iteCount
.
value
();
iteCount
.
value
()
=
NULL
;
}
uasMessageCount
.
clear
();
QMap
<
int
,
QMap
<
int
,
quint64
>*
>::
iterator
iteLast
;
for
(
iteLast
=
uasLastMessageUpdate
.
begin
();
iteLast
!=
uasLastMessageUpdate
.
end
();
++
iteLast
)
{
iteLast
.
value
()
->
clear
();
delete
iteLast
.
value
();
iteLast
.
value
()
=
NULL
;
}
uasLastMessageUpdate
.
clear
();
onboardMessageInterval
.
clear
();
ui
->
treeWidget
->
clear
();
ui
->
rateTreeWidget
->
clear
();
}
void
QGCMAVLinkInspector
::
refreshView
()
{
QMap
<
int
,
mavlink_message_t
*
>::
const_iterator
ite
;
for
(
ite
=
uasMessageStorage
.
constBegin
();
ite
!=
uasMessageStorage
.
constEnd
();
++
ite
)
{
...
...
@@ -170,6 +223,7 @@ void QGCMAVLinkInspector::refreshView()
float
msgCount
=
0
;
QMap
<
int
,
QMap
<
int
,
unsigned
int
>
*
>::
const_iterator
iter
=
uasMessageCount
.
find
(
msg
->
sysid
);
QMap
<
int
,
unsigned
int
>*
uasMsgCount
=
iter
.
value
();
while
((
iter
!=
uasMessageCount
.
end
())
&&
(
iter
.
key
()
==
msg
->
sysid
))
{
if
(
iter
.
value
()
->
contains
(
msg
->
msgid
))
...
...
@@ -302,7 +356,6 @@ void QGCMAVLinkInspector::receiveMessage(LinkInterface* link,mavlink_message_t m
Q_UNUSED
(
link
);
quint64
receiveTime
;
if
(
selectedSystemID
!=
0
&&
selectedSystemID
!=
message
.
sysid
)
return
;
if
(
selectedComponentID
!=
0
&&
selectedComponentID
!=
message
.
compid
)
return
;
...
...
@@ -421,7 +474,8 @@ void QGCMAVLinkInspector::receiveMessage(LinkInterface* link,mavlink_message_t m
}
}
void
QGCMAVLinkInspector
::
changeStreamInterval
(
int
msgid
,
int
interval
)
{
void
QGCMAVLinkInspector
::
changeStreamInterval
(
int
msgid
,
int
interval
)
{
//REQUEST_DATA_STREAM
if
(
selectedSystemID
==
0
||
selectedComponentID
==
0
)
{
return
;
...
...
@@ -456,6 +510,7 @@ void QGCMAVLinkInspector::rateTreeItemChanged(QTreeWidgetItem* paramItem, int co
QGCMAVLinkInspector
::~
QGCMAVLinkInspector
()
{
clearView
();
delete
ui
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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