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
ed323bbe
Commit
ed323bbe
authored
Jan 28, 2011
by
Alejandro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
white space
parent
8d32f1da
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6315 additions
and
6302 deletions
+6315
-6302
win_qextserialport.cpp
src/lib/qextserialport/win_qextserialport.cpp
+1072
-1070
UAS.cc
src/uas/UAS.cc
+1829
-1823
UASManager.cc
src/uas/UASManager.cc
+252
-252
MainWindow.cc
src/ui/MainWindow.cc
+1910
-1909
WaypointList.cc
src/ui/WaypointList.cc
+485
-485
QGCActionButton.cc
src/ui/designer/QGCActionButton.cc
+139
-139
UASView.cc
src/ui/uas/UASView.cc
+628
-624
No files found.
src/lib/qextserialport/win_qextserialport.cpp
View file @
ed323bbe
...
...
@@ -1005,12 +1005,14 @@ void Win_QextSerialPort::monitorCommEvent()
_bytesToWrite
=
0
;
bytesToWriteLock
->
unlock
();
}
if
(
eventMask
&
EV_DSR
)
if
(
eventMask
&
EV_DSR
)
{
if
(
lineStatus
()
&
LS_DSR
)
emit
dsrChanged
(
true
);
else
}
else
{
emit
dsrChanged
(
false
);
}
}
}
void
Win_QextSerialPort
::
terminateCommWait
()
...
...
src/uas/UAS.cc
View file @
ed323bbe
...
...
@@ -388,6 +388,12 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
// emit valueChanged(uasId, "roll IMU", mavlink_msg_attitude_get_roll(&message), time);
// emit valueChanged(uasId, "pitch IMU", mavlink_msg_attitude_get_pitch(&message), time);
// emit valueChanged(uasId, "yaw IMU", mavlink_msg_attitude_get_yaw(&message), time);
//emit batteryChanged(this, 25, 15, time*1000);
//emit thrustChanged(this, 30);
//emit modeChanged(1, "miModo", "Descripcion");
emit
valueChanged
(
uasId
,
"roll"
,
"rad"
,
mavlink_msg_attitude_get_roll
(
&
message
),
time
);
emit
valueChanged
(
uasId
,
"pitch"
,
"rad"
,
mavlink_msg_attitude_get_pitch
(
&
message
),
time
);
emit
valueChanged
(
uasId
,
"yaw"
,
"rad"
,
mavlink_msg_attitude_get_yaw
(
&
message
),
time
);
...
...
src/uas/UASManager.cc
View file @
ed323bbe
src/ui/MainWindow.cc
View file @
ed323bbe
...
...
@@ -997,6 +997,7 @@ void MainWindow::createCustomWidget()
QDockWidget
*
dock
=
new
QDockWidget
(
"Unnamed Tool"
,
this
);
connect
(
tool
,
SIGNAL
(
destroyed
()),
dock
,
SLOT
(
deleteLater
()));
dock
->
setWidget
(
tool
);
QAction
*
showAction
=
new
QAction
(
"Show Unnamed Tool"
,
this
);
connect
(
dock
,
SIGNAL
(
visibilityChanged
(
bool
)),
showAction
,
SLOT
(
setChecked
(
bool
)));
connect
(
showAction
,
SIGNAL
(
triggered
(
bool
)),
dock
,
SLOT
(
setVisible
(
bool
)));
...
...
@@ -1547,17 +1548,17 @@ void MainWindow::UASCreated(UASInterface* uas)
connectSlugsActions
();
// FIXME: This type checking might be redundant
// if (slugsDataWidget) {
// SlugsDataSensorView* dataWidget = dynamic_cast<SlugsDataSensorView*>(slugsDataWidget->widget());
// if (dataWidget) {
// SlugsMAV* mav2 = dynamic_cast<SlugsMAV*>(uas);
// if (mav2) {
(
dynamic_cast
<
SlugsDataSensorView
*>
(
slugsDataWidget
->
widget
()))
->
addUAS
(
uas
);
// //loadSlugsView();
// loadGlobalOperatorView();
// }
// }
// }
// // if (slugsDataWidget) {
// // SlugsDataSensorView* dataWidget = dynamic_cast<SlugsDataSensorView*>(slugsDataWidget->widget());
// // if (dataWidget) {
// // SlugsMAV* mav2 = dynamic_cast<SlugsMAV*>(uas);
// // if (mav2) {
// (dynamic_cast<SlugsDataSensorView*>(slugsDataWidget->widget()))->addUAS(uas);
// // //loadSlugsView();
// // loadGlobalOperatorView();
// // }
// // }
// // }
}
break
;
...
...
src/ui/WaypointList.cc
View file @
ed323bbe
...
...
@@ -175,7 +175,7 @@ void WaypointList::add()
{
if
(
uas
)
{
const
QVector
<
Waypoint
*>
&
waypoints
=
uas
->
getWaypointManager
()
.
getWaypointList
();
const
QVector
<
Waypoint
*>
&
waypoints
=
uas
->
getWaypointManager
()
->
getWaypointList
();
Waypoint
*
wp
;
...
...
src/ui/designer/QGCActionButton.cc
View file @
ed323bbe
src/ui/uas/UASView.cc
View file @
ed323bbe
...
...
@@ -193,7 +193,11 @@ void UASView::updateActiveUAS(UASInterface* uas, bool active)
void
UASView
::
updateMode
(
int
sysId
,
QString
status
,
QString
description
)
{
Q_UNUSED
(
description
);
int
aa
=
this
->
uas
->
getUASID
();
if
(
sysId
==
this
->
uas
->
getUASID
())
m_ui
->
modeLabel
->
setText
(
status
);
m_ui
->
modeLabel
->
setText
(
status
);
}
void
UASView
::
mouseDoubleClickEvent
(
QMouseEvent
*
event
)
...
...
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