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
b8a41f1f
Commit
b8a41f1f
authored
Aug 27, 2012
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a number of compile warnings
parent
b965a4b8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
48 additions
and
28 deletions
+48
-28
LogCompressor.cc
src/LogCompressor.cc
+2
-2
DebugConsole.cc
src/ui/DebugConsole.cc
+1
-1
HSIDisplay.cc
src/ui/HSIDisplay.cc
+21
-6
HSIDisplay.h
src/ui/HSIDisplay.h
+16
-15
QGCDataPlot2D.cc
src/ui/QGCDataPlot2D.cc
+2
-1
QGCWaypointListMulti.cc
src/ui/QGCWaypointListMulti.cc
+2
-2
WaypointList.cc
src/ui/WaypointList.cc
+1
-0
WaypointViewOnlyView.cc
src/ui/WaypointViewOnlyView.cc
+1
-0
QGCMAVLinkMessageSender.cc
src/ui/mavlink/QGCMAVLinkMessageSender.cc
+2
-1
No files found.
src/LogCompressor.cc
View file @
b8a41f1f
...
...
@@ -46,8 +46,8 @@ LogCompressor::LogCompressor(QString logFileName, QString outFileName, QString d
outFileName
(
outFileName
),
running
(
true
),
currentDataLine
(
0
),
holeFillingEnabled
(
true
),
delimiter
(
delimiter
)
delimiter
(
delimiter
),
holeFillingEnabled
(
true
)
{
}
...
...
src/ui/DebugConsole.cc
View file @
b8a41f1f
...
...
@@ -395,7 +395,7 @@ void DebugConsole::receiveBytes(LinkInterface* link, QByteArray bytes)
{
if
(
escReceived
)
{
if
(
escIndex
<
s
izeof
(
escBytes
))
if
(
escIndex
<
s
tatic_cast
<
int
>
(
sizeof
(
escBytes
)
))
{
escBytes
[
escIndex
]
=
byte
;
//qDebug() << "GOT BYTE ESC:" << byte;
...
...
src/ui/HSIDisplay.cc
View file @
b8a41f1f
...
...
@@ -49,6 +49,13 @@ This file is part of the QGROUNDCONTROL project
HSIDisplay
::
HSIDisplay
(
QWidget
*
parent
)
:
HDDisplay
(
NULL
,
"HSI"
,
parent
),
dragStarted
(
false
),
leftDragStarted
(
false
),
mouseHasMoved
(
false
),
startX
(
0.0
f
),
startY
(
0.0
f
),
actionPending
(
false
),
directSending
(
false
),
gpsSatellites
(),
satellitesUsed
(
0
),
attXSet
(
0.0
f
),
...
...
@@ -88,6 +95,8 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
uiZSetCoordinate
(
0.0
f
),
uiYawSet
(
0.0
f
),
metricWidth
(
4.0
),
xCenterPos
(
0
),
yCenterPos
(
0
),
positionLock
(
false
),
attControlEnabled
(
false
),
xyControlEnabled
(
false
),
...
...
@@ -97,14 +106,20 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
gpsFix
(
0
),
visionFix
(
0
),
laserFix
(
0
),
iruFix
(
0
),
mavInitialized
(
false
),
bottomMargin
(
10.0
f
),
dragStarted
(
false
),
topMargin
(
12.0
f
),
leftDragStarted
(
false
),
mouseHasMoved
(
false
),
actionPending
(
false
),
directSending
(
false
),
bottomMargin
(
10.0
f
),
attControlKnown
(
false
),
xyControlKnown
(
false
),
zControlKnown
(
false
),
yawControlKnown
(
false
),
positionFixKnown
(
false
),
visionFixKnown
(
false
),
gpsFixKnown
(
false
),
iruFixKnown
(
false
),
setPointKnown
(
false
),
positionSetPointKnown
(
false
),
userSetPointSet
(
false
),
userXYSetPointSet
(
false
),
userZSetPointSet
(
false
),
...
...
src/ui/HSIDisplay.h
View file @
b8a41f1f
...
...
@@ -162,20 +162,6 @@ protected:
double
refToMetric
(
double
ref
);
/** @brief Metric body coordinates to screen coordinates */
QPointF
metricBodyToScreen
(
QPointF
metric
);
QMap
<
int
,
QString
>
objectNames
;
QMap
<
int
,
int
>
objectTypes
;
QMap
<
int
,
float
>
objectQualities
;
QMap
<
int
,
float
>
objectBearings
;
QMap
<
int
,
float
>
objectDistances
;
bool
dragStarted
;
bool
leftDragStarted
;
bool
mouseHasMoved
;
float
startX
;
float
startY
;
QTimer
statusClearTimer
;
QString
statusMessage
;
bool
actionPending
;
bool
directSending
;
/**
* @brief Private data container class to be used within the HSI widget
...
...
@@ -212,6 +198,21 @@ protected:
friend
class
HSIDisplay
;
};
QMap
<
int
,
QString
>
objectNames
;
QMap
<
int
,
int
>
objectTypes
;
QMap
<
int
,
float
>
objectQualities
;
QMap
<
int
,
float
>
objectBearings
;
QMap
<
int
,
float
>
objectDistances
;
bool
dragStarted
;
bool
leftDragStarted
;
bool
mouseHasMoved
;
float
startX
;
float
startY
;
QTimer
statusClearTimer
;
QString
statusMessage
;
bool
actionPending
;
bool
directSending
;
QMap
<
int
,
GPSSatellite
*>
gpsSatellites
;
unsigned
int
satellitesUsed
;
...
...
@@ -275,8 +276,8 @@ protected:
int
laserFix
;
///< Localization dimensions based on laser
int
iruFix
;
///< Localization dimensions based on ultrasound
bool
mavInitialized
;
///< The MAV is initialized once the setpoint has been received
float
bottomMargin
;
///< Margin on the bottom of the page, in virtual coordinates
float
topMargin
;
///< Margin on top of the page, in virtual coordinates
float
bottomMargin
;
///< Margin on the bottom of the page, in virtual coordinates
bool
attControlKnown
;
///< Attitude control status known flag
bool
xyControlKnown
;
///< XY control status known flag
...
...
src/ui/QGCDataPlot2D.cc
View file @
b8a41f1f
...
...
@@ -613,7 +613,8 @@ bool QGCDataPlot2D::calculateRegression(QString xName, QString yName, QString me
function
=
tr
(
"Regression method %1 not found"
).
arg
(
method
);
}
delete
x
,
y
;
delete
x
;
delete
y
;
}
else
{
// xName == yName
function
=
tr
(
"Please select different X and Y dimensions, not %1 = %2"
).
arg
(
xName
,
yName
);
...
...
src/ui/QGCWaypointListMulti.cc
View file @
b8a41f1f
...
...
@@ -4,8 +4,8 @@
QGCWaypointListMulti
::
QGCWaypointListMulti
(
QWidget
*
parent
)
:
QWidget
(
parent
),
ui
(
new
Ui
::
QGCWaypointListMulti
),
offline_uas_id
(
0
)
offline_uas_id
(
0
),
ui
(
new
Ui
::
QGCWaypointListMulti
)
{
ui
->
setupUi
(
this
);
setMinimumSize
(
600
,
80
);
...
...
src/ui/WaypointList.cc
View file @
b8a41f1f
...
...
@@ -338,6 +338,7 @@ int WaypointList::addCurrentPositionWaypoint()
return
1
;
}
}
return
1
;
}
void
WaypointList
::
updateStatusLabel
(
const
QString
&
string
)
...
...
src/ui/WaypointViewOnlyView.cc
View file @
b8a41f1f
...
...
@@ -28,6 +28,7 @@ void WaypointViewOnlyView::changedAutoContinue(int state)
void
WaypointViewOnlyView
::
changedCurrent
(
int
state
)
//This is a slot receiving signals from QCheckBox m_ui->current. The state given here is whatever the user has clicked and not the true "current" value onboard.
{
Q_UNUSED
(
state
);
//qDebug() << "Trof: WaypointViewOnlyView::changedCurrent(" << state << ") ID:" << wp->getId();
m_ui
->
current
->
blockSignals
(
true
);
...
...
src/ui/mavlink/QGCMAVLinkMessageSender.cc
View file @
b8a41f1f
...
...
@@ -44,7 +44,8 @@ bool QGCMAVLinkMessageSender::sendMessage()
bool
QGCMAVLinkMessageSender
::
sendMessage
(
unsigned
int
msgid
)
{
if
(
msgid
==
0
||
msgid
>
255
||
messageInfo
[
msgid
].
name
==
""
||
messageInfo
[
msgid
].
name
==
"EMPTY"
)
QString
msgname
(
messageInfo
[
msgid
].
name
);
if
(
msgid
==
0
||
msgid
>
255
||
messageInfo
[
msgid
].
name
==
NULL
||
msgname
.
compare
(
QString
(
"EMPTY"
)))
{
return
false
;
}
...
...
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