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
7fe1c809
Commit
7fe1c809
authored
Jan 10, 2012
by
LM
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made Doxygen verbose, made sure the initialization of control widget is correct
parent
2cd005b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
Doxyfile
doc/Doxyfile
+6
-5
UASControlWidget.cc
src/ui/uas/UASControlWidget.cc
+12
-4
No files found.
doc/Doxyfile
View file @
7fe1c809
...
@@ -515,7 +515,7 @@ LAYOUT_FILE =
...
@@ -515,7 +515,7 @@ LAYOUT_FILE =
# The QUIET tag can be used to turn on/off the messages that are generated
# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET =
YES
QUIET =
NO
# The WARNINGS tag can be used to turn on/off the warning messages that are
# The WARNINGS tag can be used to turn on/off the warning messages that are
# generated by doxygen. Possible values are YES and NO. If left blank
# generated by doxygen. Possible values are YES and NO. If left blank
...
@@ -599,7 +599,8 @@ RECURSIVE = YES
...
@@ -599,7 +599,8 @@ RECURSIVE = YES
# subdirectory from a directory tree whose root is specified with the INPUT tag.
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = ../src/lib/ \
EXCLUDE = ../src/lib/ \
lib/
lib/ \
../src/libs/
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
# directories that are symbolic links (a Unix filesystem feature) are excluded
...
@@ -985,7 +986,7 @@ SEARCHENGINE = YES
...
@@ -985,7 +986,7 @@ SEARCHENGINE = YES
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
# generate Latex output.
GENERATE_LATEX =
YES
GENERATE_LATEX =
NO
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
...
@@ -1033,13 +1034,13 @@ LATEX_HEADER =
...
@@ -1033,13 +1034,13 @@ LATEX_HEADER =
# contain links (just like the HTML output) instead of page references
# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
# This makes the output suitable for online browsing using a pdf viewer.
PDF_HYPERLINKS =
YES
PDF_HYPERLINKS =
NO
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
# plain latex in the generated Makefile. Set this option to YES to get a
# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
# higher quality PDF documentation.
USE_PDFLATEX =
YES
USE_PDFLATEX =
NO
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
# command to the generated LaTeX files. This will instruct LaTeX to keep
# command to the generated LaTeX files. This will instruct LaTeX to keep
...
...
src/ui/uas/UASControlWidget.cc
View file @
7fe1c809
...
@@ -44,6 +44,7 @@ This file is part of the PIXHAWK project
...
@@ -44,6 +44,7 @@ This file is part of the PIXHAWK project
UASControlWidget
::
UASControlWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
),
UASControlWidget
::
UASControlWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
),
uas
(
0
),
uas
(
0
),
uasMode
(
0
),
engineOn
(
false
)
engineOn
(
false
)
{
{
ui
.
setupUi
(
this
);
ui
.
setupUi
(
this
);
...
@@ -59,6 +60,8 @@ UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
...
@@ -59,6 +60,8 @@ UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
connect
(
ui
.
modeComboBox
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
setMode
(
int
)));
connect
(
ui
.
modeComboBox
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
setMode
(
int
)));
connect
(
ui
.
setModeButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
transmitMode
()));
connect
(
ui
.
setModeButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
transmitMode
()));
uasMode
=
ui
.
modeComboBox
->
itemData
(
ui
.
modeComboBox
->
currentIndex
()).
toInt
();
ui
.
modeComboBox
->
setCurrentIndex
(
0
);
ui
.
modeComboBox
->
setCurrentIndex
(
0
);
ui
.
gridLayout
->
setAlignment
(
Qt
::
AlignTop
);
ui
.
gridLayout
->
setAlignment
(
Qt
::
AlignTop
);
...
@@ -67,7 +70,8 @@ UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
...
@@ -67,7 +70,8 @@ UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent),
void
UASControlWidget
::
setUAS
(
UASInterface
*
uas
)
void
UASControlWidget
::
setUAS
(
UASInterface
*
uas
)
{
{
if
(
this
->
uas
!=
0
)
{
if
(
this
->
uas
!=
0
)
{
UASInterface
*
oldUAS
=
UASManager
::
instance
()
->
getUASForId
(
this
->
uas
);
UASInterface
*
oldUAS
=
UASManager
::
instance
()
->
getUASForId
(
this
->
uas
);
disconnect
(
ui
.
controlButton
,
SIGNAL
(
clicked
()),
oldUAS
,
SLOT
(
armSystem
()));
disconnect
(
ui
.
controlButton
,
SIGNAL
(
clicked
()),
oldUAS
,
SLOT
(
armSystem
()));
disconnect
(
ui
.
liftoffButton
,
SIGNAL
(
clicked
()),
oldUAS
,
SLOT
(
launch
()));
disconnect
(
ui
.
liftoffButton
,
SIGNAL
(
clicked
()),
oldUAS
,
SLOT
(
launch
()));
...
@@ -101,9 +105,12 @@ UASControlWidget::~UASControlWidget()
...
@@ -101,9 +105,12 @@ UASControlWidget::~UASControlWidget()
void
UASControlWidget
::
updateStatemachine
()
void
UASControlWidget
::
updateStatemachine
()
{
{
if
(
engineOn
)
{
if
(
engineOn
)
{
ui
.
controlButton
->
setText
(
tr
(
"DISARM SYSTEM"
));
ui
.
controlButton
->
setText
(
tr
(
"DISARM SYSTEM"
));
}
else
{
}
else
{
ui
.
controlButton
->
setText
(
tr
(
"ARM SYSTEM"
));
ui
.
controlButton
->
setText
(
tr
(
"ARM SYSTEM"
));
}
}
}
}
...
@@ -139,7 +146,8 @@ void UASControlWidget::updateMode(int uas,QString mode,QString description)
...
@@ -139,7 +146,8 @@ void UASControlWidget::updateMode(int uas,QString mode,QString description)
void
UASControlWidget
::
updateState
(
int
state
)
void
UASControlWidget
::
updateState
(
int
state
)
{
{
switch
(
state
)
{
switch
(
state
)
{
case
(
int
)
MAV_STATE_ACTIVE
:
case
(
int
)
MAV_STATE_ACTIVE
:
engineOn
=
true
;
engineOn
=
true
;
ui
.
controlButton
->
setText
(
tr
(
"DISARM SYSTEM"
));
ui
.
controlButton
->
setText
(
tr
(
"DISARM SYSTEM"
));
...
...
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