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
fad0c692
Commit
fad0c692
authored
Jun 28, 2013
by
Michael Carpenter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implementation of Camera Gimbal configuration
parent
7f13132c
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
924 additions
and
7 deletions
+924
-7
Shutter.png
files/images/devices/Shutter.png
+0
-0
cameraGimalPitch1.png
files/images/devices/cameraGimalPitch1.png
+0
-0
cameraGimalRoll1.png
files/images/devices/cameraGimalRoll1.png
+0
-0
cameraGimalYaw.png
files/images/devices/cameraGimalYaw.png
+0
-0
qgroundcontrol.qrc
qgroundcontrol.qrc
+4
-0
QGCParamWidget.cc
src/ui/QGCParamWidget.cc
+5
-0
CameraGimbalConfig.cc
src/ui/configuration/CameraGimbalConfig.cc
+209
-2
CameraGimbalConfig.h
src/ui/configuration/CameraGimbalConfig.h
+9
-2
CameraGimbalConfig.ui
src/ui/configuration/CameraGimbalConfig.ui
+697
-3
No files found.
files/images/devices/Shutter.png
0 → 100644
View file @
fad0c692
14.4 KB
files/images/devices/cameraGimalPitch1.png
0 → 100644
View file @
fad0c692
10.5 KB
files/images/devices/cameraGimalRoll1.png
0 → 100644
View file @
fad0c692
10.9 KB
files/images/devices/cameraGimalYaw.png
0 → 100644
View file @
fad0c692
11 KB
qgroundcontrol.qrc
View file @
fad0c692
...
@@ -115,6 +115,10 @@
...
@@ -115,6 +115,10 @@
<file>files/images/devices/BR-0004-03-2.jpg</file>
<file>files/images/devices/BR-0004-03-2.jpg</file>
<file>files/images/devices/BR-0016-01-3T.jpg</file>
<file>files/images/devices/BR-0016-01-3T.jpg</file>
<file>files/images/devices/MinimOSD.jpg</file>
<file>files/images/devices/MinimOSD.jpg</file>
<file>files/images/devices/cameraGimalPitch1.png</file>
<file>files/images/devices/cameraGimalRoll1.png</file>
<file>files/images/devices/cameraGimalYaw.png</file>
<file>files/images/devices/Shutter.png</file>
</qresource>
</qresource>
<qresource prefix="/general">
<qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file>
<file alias="vera.ttf">files/styles/Vera.ttf</file>
...
...
src/ui/QGCParamWidget.cc
View file @
fad0c692
...
@@ -1017,6 +1017,11 @@ void QGCParamWidget::setParameter(int component, QString parameterName, QVariant
...
@@ -1017,6 +1017,11 @@ void QGCParamWidget::setParameter(int component, QString parameterName, QVariant
statusLabel
->
setText
(
tr
(
"REJ. %1 > max"
).
arg
(
value
.
toDouble
()));
statusLabel
->
setText
(
tr
(
"REJ. %1 > max"
).
arg
(
value
.
toDouble
()));
return
;
return
;
}
}
if
(
parameters
.
value
(
component
)
->
value
(
parameterName
)
==
value
)
{
qDebug
()
<<
"Value not changed, not sending:"
<<
parameterName
<<
value
;
return
;
}
switch
(
parameters
.
value
(
component
)
->
value
(
parameterName
).
type
())
switch
(
parameters
.
value
(
component
)
->
value
(
parameterName
).
type
())
{
{
...
...
src/ui/configuration/CameraGimbalConfig.cc
View file @
fad0c692
This diff is collapsed.
Click to expand it.
src/ui/configuration/CameraGimbalConfig.h
View file @
fad0c692
...
@@ -2,15 +2,22 @@
...
@@ -2,15 +2,22 @@
#define CAMERAGIMBALCONFIG_H
#define CAMERAGIMBALCONFIG_H
#include <QWidget>
#include <QWidget>
#include "AP2ConfigWidget.h"
#include "ui_CameraGimbalConfig.h"
#include "ui_CameraGimbalConfig.h"
class
CameraGimbalConfig
:
public
Q
Widget
class
CameraGimbalConfig
:
public
AP2Config
Widget
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
CameraGimbalConfig
(
QWidget
*
parent
=
0
);
explicit
CameraGimbalConfig
(
QWidget
*
parent
=
0
);
~
CameraGimbalConfig
();
~
CameraGimbalConfig
();
private
slots
:
void
parameterChanged
(
int
uas
,
int
component
,
QString
parameterName
,
QVariant
value
);
void
updateTilt
();
void
updateRoll
();
void
updatePan
();
void
updateShutter
();
private:
private:
Ui
::
CameraGimbalConfig
ui
;
Ui
::
CameraGimbalConfig
ui
;
...
...
src/ui/configuration/CameraGimbalConfig.ui
View file @
fad0c692
This diff is collapsed.
Click to expand it.
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