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
29c9afb3
Commit
29c9afb3
authored
Feb 12, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2783 from DonLakeFlyer/ConnectSlot
Fix bad connection
parents
427ad724
660272a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
UASQuickView.cc
src/ui/uas/UASQuickView.cc
+2
-2
UASQuickView.h
src/ui/uas/UASQuickView.h
+1
-1
No files found.
src/ui/uas/UASQuickView.cc
View file @
29c9afb3
...
...
@@ -41,7 +41,7 @@ UASQuickView::UASQuickView(QWidget *parent) : QWidget(parent),
QAction
*
action
=
new
QAction
(
"Add/Remove Items"
,
this
);
action
->
setCheckable
(
false
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
static_cast
<
void
(
UASQuickView
::*
)(
bool
)
>
(
&
UASQuickView
::
actionTriggered
)
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
UASQuickView
::
addActionTriggered
);
this
->
addAction
(
action
);
QAction
*
columnaction
=
new
QAction
(
"Set Column Count"
,
this
);
...
...
@@ -75,7 +75,7 @@ void UASQuickView::columnActionTriggered()
saveSettings
();
}
void
UASQuickView
::
actionTriggered
()
void
UASQuickView
::
a
ddA
ctionTriggered
()
{
if
(
quickViewSelectDialog
)
{
...
...
src/ui/uas/UASQuickView.h
View file @
29c9afb3
...
...
@@ -61,7 +61,7 @@ signals:
public
slots
:
void
valueChanged
(
const
int
uasid
,
const
QString
&
name
,
const
QString
&
unit
,
const
QVariant
&
value
,
const
quint64
msecs
);
void
actionTriggered
(
bool
checked
);
void
actionTriggered
();
void
a
ddA
ctionTriggered
();
void
updateTimerTick
();
void
selectDialogClosed
();
void
valueEnabled
(
QString
value
);
...
...
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