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
ef95a56b
Commit
ef95a56b
authored
Sep 16, 2011
by
oberion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaned some more signal bugs
parent
fdedaa4e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
CommConfigurationWindow.cc
src/ui/CommConfigurationWindow.cc
+4
-2
MainWindow.cc
src/ui/MainWindow.cc
+11
-5
QGCParamWidget.h
src/ui/QGCParamWidget.h
+1
-1
No files found.
src/ui/CommConfigurationWindow.cc
View file @
ef95a56b
...
...
@@ -81,7 +81,7 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
// Connect the current UAS
action
=
new
QAction
(
QIcon
(
":/images/devices/network-wireless.svg"
),
""
,
this
);
LinkManager
::
instance
()
->
add
(
link
);
action
->
setData
(
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
link
));
action
->
setData
(
link
->
getId
(
));
action
->
setEnabled
(
true
);
action
->
setVisible
(
true
);
setLinkName
(
link
->
getName
());
...
...
@@ -264,7 +264,9 @@ void CommConfigurationWindow::setLinkType(int linktype)
QList
<
QAction
*>
actions
=
MainWindow
::
instance
()
->
listLinkMenuActions
();
foreach
(
QAction
*
act
,
actions
)
{
if
(
act
->
data
().
toInt
()
==
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
tmpLink
))
const
int
&
linkIndex
(
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
tmpLink
));
const
int
&
linkID
(
LinkManager
::
instance
()
->
getLinks
()[
linkIndex
]
->
getId
());
if
(
act
->
data
().
toInt
()
==
linkID
)
{
act
->
trigger
();
break
;
...
...
src/ui/MainWindow.cc
View file @
ef95a56b
...
...
@@ -1492,8 +1492,11 @@ void MainWindow::addLink()
// Go fishing for this link's configuration window
QList
<
QAction
*>
actions
=
ui
.
menuNetwork
->
actions
();
const
int
&
linkIndex
(
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
link
));
const
int
&
linkID
(
LinkManager
::
instance
()
->
getLinks
()[
linkIndex
]
->
getId
());
foreach
(
QAction
*
act
,
actions
)
{
if
(
act
->
data
().
toInt
()
==
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
link
))
{
if
(
act
->
data
().
toInt
()
==
linkID
)
{
// LinkManager::instance()->getLinks().indexOf(link)
act
->
trigger
();
break
;
}
...
...
@@ -1512,17 +1515,20 @@ void MainWindow::addLink(LinkInterface *link)
// Go fishing for this link's configuration window
QList
<
QAction
*>
actions
=
ui
.
menuNetwork
->
actions
();
bool
found
=
false
;
bool
found
(
false
);
const
int
&
linkIndex
(
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
link
));
const
int
&
linkID
(
LinkManager
::
instance
()
->
getLinks
()[
linkIndex
]
->
getId
());
foreach
(
QAction
*
act
,
actions
)
{
if
(
act
->
data
().
toInt
()
==
LinkManager
::
instance
()
->
getLinks
().
indexOf
(
link
))
{
if
(
act
->
data
().
toInt
()
==
linkID
)
{
// LinkManager::instance()->getLinks().indexOf(link)
found
=
true
;
}
}
UDPLink
*
udp
=
dynamic_cast
<
UDPLink
*>
(
link
);
//
UDPLink* udp = dynamic_cast<UDPLink*>(link);
if
(
!
found
||
udp
)
{
if
(
!
found
)
{
// || udp
CommConfigurationWindow
*
commWidget
=
new
CommConfigurationWindow
(
link
,
mavlink
,
this
);
QAction
*
action
=
commWidget
->
getAction
();
ui
.
menuNetwork
->
addAction
(
action
);
...
...
src/ui/QGCParamWidget.h
View file @
ef95a56b
...
...
@@ -52,7 +52,7 @@ public:
UASInterface
*
getUAS
();
signals:
/** @brief A parameter was changed in the widget, NOT onboard */
void
parameterChanged
(
int
component
,
QString
parametername
,
float
value
);
//void parameterChanged(int component, QString parametername, float value); // defined in QGCUASParamManager already
/** @brief Request a single parameter */
void
requestParameter
(
int
component
,
int
parameter
);
public
slots
:
...
...
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