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
c2b2b3c0
Commit
c2b2b3c0
authored
Dec 13, 2010
by
tecnosapiens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change slugs camera control
parent
9af0bb6c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1531 additions
and
1542 deletions
+1531
-1542
SlugsMAV.cc
src/uas/SlugsMAV.cc
+3
-3
SlugsDataSensorView.cc
src/ui/SlugsDataSensorView.cc
+2
-2
SlugsDataSensorView.ui
src/ui/SlugsDataSensorView.ui
+1510
-1522
SlugsPadCameraControl.cpp
src/ui/SlugsPadCameraControl.cpp
+1
-0
SlugsPadCameraControl.h
src/ui/SlugsPadCameraControl.h
+4
-0
SlugsVideoCamControl.ui
src/ui/SlugsVideoCamControl.ui
+11
-15
No files found.
src/uas/SlugsMAV.cc
View file @
c2b2b3c0
...
@@ -137,7 +137,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
...
@@ -137,7 +137,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
case
MAVLINK_MSG_ID_PID
:
//182
case
MAVLINK_MSG_ID_PID
:
//182
memset
(
&
mlSinglePid
,
0
,
sizeof
(
mavlink_pid_t
));
memset
(
&
mlSinglePid
,
0
,
sizeof
(
mavlink_pid_t
));
mavlink_msg_pid_decode
(
&
message
,
&
mlSinglePid
);
mavlink_msg_pid_decode
(
&
message
,
&
mlSinglePid
);
qDebug
()
<<
"
\n
SLUGS RECEIVED PID Message = "
<<
mlSinglePid
.
idx
;
//
qDebug() << "\nSLUGS RECEIVED PID Message = "<<mlSinglePid.idx;
emit
slugsPidValues
(
uasId
,
mlSinglePid
);
emit
slugsPidValues
(
uasId
,
mlSinglePid
);
...
@@ -220,7 +220,7 @@ void SlugsMAV::emitSignals (void){
...
@@ -220,7 +220,7 @@ void SlugsMAV::emitSignals (void){
#ifdef MAVLINK_ENABLED_SLUGS
#ifdef MAVLINK_ENABLED_SLUGS
void
SlugsMAV
::
emitGpsSignals
(
void
){
void
SlugsMAV
::
emitGpsSignals
(
void
){
qDebug
()
<<
"After Emit GPS Signal"
<<
mlGpsData
.
fix_type
;
//
qDebug()<<"After Emit GPS Signal"<<mlGpsData.fix_type;
//ToDo Uncomment if. it was comment only to test
//ToDo Uncomment if. it was comment only to test
...
@@ -248,7 +248,7 @@ void SlugsMAV::emitGpsSignals (void){
...
@@ -248,7 +248,7 @@ void SlugsMAV::emitGpsSignals (void){
void
SlugsMAV
::
emitPidSignal
()
void
SlugsMAV
::
emitPidSignal
()
{
{
qDebug
()
<<
"
\n
SLUGS RECEIVED PID Message"
;
//
qDebug() << "\nSLUGS RECEIVED PID Message";
emit
slugsPidValues
(
uasId
,
mlSinglePid
);
emit
slugsPidValues
(
uasId
,
mlSinglePid
);
}
}
...
...
src/ui/SlugsDataSensorView.cc
View file @
c2b2b3c0
...
@@ -104,7 +104,7 @@ void SlugsDataSensorView::slugsGlobalPositionChanged(UASInterface *uas,
...
@@ -104,7 +104,7 @@ void SlugsDataSensorView::slugsGlobalPositionChanged(UASInterface *uas,
ui
->
m_GpsLongitude
->
setText
(
QString
::
number
(
lon
));
ui
->
m_GpsLongitude
->
setText
(
QString
::
number
(
lon
));
ui
->
m_GpsHeight
->
setText
(
QString
::
number
(
alt
));
ui
->
m_GpsHeight
->
setText
(
QString
::
number
(
alt
));
qDebug
()
<<
"GPS Position = "
<<
lat
<<
" - "
<<
lon
<<
" - "
<<
alt
;
//
qDebug()<<"GPS Position = "<<lat<<" - "<<lon<<" - "<<alt;
}
}
...
@@ -154,7 +154,7 @@ void SlugsDataSensorView::slugAttitudeChanged(UASInterface* uas,
...
@@ -154,7 +154,7 @@ void SlugsDataSensorView::slugAttitudeChanged(UASInterface* uas,
ui
->
m_Pitch
->
setPlainText
(
QString
::
number
(
slugpitch
));
ui
->
m_Pitch
->
setPlainText
(
QString
::
number
(
slugpitch
));
ui
->
m_Yaw
->
setPlainText
(
QString
::
number
(
slugyaw
));
ui
->
m_Yaw
->
setPlainText
(
QString
::
number
(
slugyaw
));
qDebug
()
<<
"Attitude change = "
<<
slugroll
<<
" - "
<<
slugpitch
<<
" - "
<<
slugyaw
;
//
qDebug()<<"Attitude change = "<<slugroll<<" - "<<slugpitch<<" - "<<slugyaw;
}
}
...
...
src/ui/SlugsDataSensorView.ui
View file @
c2b2b3c0
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/ui/SlugsPadCameraControl.cpp
View file @
c2b2b3c0
...
@@ -27,6 +27,7 @@ SlugsPadCameraControl::~SlugsPadCameraControl()
...
@@ -27,6 +27,7 @@ SlugsPadCameraControl::~SlugsPadCameraControl()
void
SlugsPadCameraControl
::
mouseMoveEvent
(
QMouseEvent
*
event
)
void
SlugsPadCameraControl
::
mouseMoveEvent
(
QMouseEvent
*
event
)
{
{
//emit mouseMoveCoord(event->x(),event->y());
//emit mouseMoveCoord(event->x(),event->y());
if
(
dragging
)
if
(
dragging
)
{
{
...
...
src/ui/SlugsPadCameraControl.h
View file @
c2b2b3c0
...
@@ -19,12 +19,16 @@ public:
...
@@ -19,12 +19,16 @@ public:
public
slots
:
public
slots
:
void
getDeltaPositionPad
(
int
x
,
int
y
);
void
getDeltaPositionPad
(
int
x
,
int
y
);
double
getDistPixel
(
int
x1
,
int
y1
,
int
x2
,
int
y2
);
double
getDistPixel
(
int
x1
,
int
y1
,
int
x2
,
int
y2
);
QPointF
ObtenerMarcacionDistanciaPixel
(
double
lon1
,
double
lat1
,
double
lon2
,
double
lat2
);
QPointF
ObtenerMarcacionDistanciaPixel
(
double
lon1
,
double
lat1
,
double
lon2
,
double
lat2
);
QPointF
getPointBy_BearingDistance
(
double
lat1
,
double
lon1
,
double
rumbo
,
double
distancia
);
QPointF
getPointBy_BearingDistance
(
double
lat1
,
double
lon1
,
double
rumbo
,
double
distancia
);
signals:
signals:
void
mouseMoveCoord
(
int
x
,
int
y
);
void
mouseMoveCoord
(
int
x
,
int
y
);
void
mousePressCoord
(
int
x
,
int
y
);
void
mousePressCoord
(
int
x
,
int
y
);
...
...
src/ui/SlugsVideoCamControl.ui
View file @
c2b2b3c0
...
@@ -22,10 +22,10 @@
...
@@ -22,10 +22,10 @@
<property
name=
"windowTitle"
>
<property
name=
"windowTitle"
>
<string>
Form
</string>
<string>
Form
</string>
</property>
</property>
<layout
class=
"Q
GridLayout"
name=
"grid
Layout"
>
<layout
class=
"Q
VBoxLayout"
name=
"vertical
Layout"
>
<item
row=
"0"
column=
"0"
>
<item>
<layout
class=
"Q
VBoxLayout"
name=
"vertical
Layout"
>
<layout
class=
"Q
GridLayout"
name=
"grid
Layout"
>
<item>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_x"
>
<widget
class=
"QLabel"
name=
"label_x"
>
<property
name=
"mouseTracking"
>
<property
name=
"mouseTracking"
>
<bool>
true
</bool>
<bool>
true
</bool>
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QLabel"
name=
"label_y"
>
<widget
class=
"QLabel"
name=
"label_y"
>
<property
name=
"mouseTracking"
>
<property
name=
"mouseTracking"
>
<bool>
true
</bool>
<bool>
true
</bool>
...
@@ -45,21 +45,17 @@
...
@@ -45,21 +45,17 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"Q
Label"
name=
"label_dir
"
>
<widget
class=
"Q
CheckBox"
name=
"viewCamBordeatMap_checkBox
"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Camera
Pos
</string>
<string>
Camera
at Map
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
</layout>
<item
row=
"1"
column=
"0"
>
</item>
<widget
class=
"QLabel"
name=
"label_dir"
>
<item
row=
"1"
column=
"0"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QCheckBox"
name=
"viewCamBordeatMap_checkBox"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Camera
at Map
</string>
<string>
Camera
Pos
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
...
...
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