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
c62765eb
Commit
c62765eb
authored
Jul 21, 2011
by
LM
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compile errors and warnings for Windows.
parent
ec4d2313
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
21 deletions
+26
-21
qgroundcontrol.pri
qgroundcontrol.pri
+6
-0
QGC.h
src/QGC.h
+16
-3
MAVLinkSimulationWaypointPlanner.cc
src/comm/MAVLinkSimulationWaypointPlanner.cc
+3
-3
QGCUASParamManager.cc
src/uas/QGCUASParamManager.cc
+1
-1
HUD.cc
src/ui/HUD.cc
+0
-14
No files found.
qgroundcontrol.pri
View file @
c62765eb
...
...
@@ -320,8 +320,14 @@ win32-msvc2008 {
message(Building for Windows Visual Studio 2008 (32bit))
# QAxContainer support is needed for the Internet Control
# element showing the Google Earth window
CONFIG += qaxcontainer
# The EIGEN library needs this define
# to make the internal min/max functions work
DEFINES += NOMINMAX
# QWebkit is not needed on MS-Windows compilation environment
CONFIG -= webkit
...
...
src/QGC.h
View file @
c62765eb
...
...
@@ -33,9 +33,22 @@
/* Windows fixes */
#ifdef _MSC_VER
#include <math.h>
#define isnan(x) _isnan(x)
#define isinf(x) (!_finite(x))
/* Needed define for Eigen */
//#define NOMINMAX
#include <limits>
template
<
typename
T
>
inline
bool
isnan
(
T
value
)
{
return
value
!=
value
;
}
// requires #include <limits>
template
<
typename
T
>
inline
bool
isinf
(
T
value
)
{
return
std
::
numeric_limits
<
T
>::
has_infinity
&&
(
value
==
std
::
numeric_limits
<
T
>::
infinity
()
||
(
-
1
*
value
)
==
std
::
numeric_limits
<
T
>::
infinity
());
}
#else
#include <cmath>
#ifndef isnan
...
...
src/comm/MAVLinkSimulationWaypointPlanner.cc
View file @
c62765eb
...
...
@@ -820,7 +820,7 @@ void MAVLinkSimulationWaypointPlanner::mavlink_handler (const mavlink_message_t*
mavlink_msg_action_decode
(
msg
,
&
action
);
if
(
action
.
target
==
systemid
)
{
if
(
verbose
)
qDebug
(
"Waypoint: received message with action %d
\n
"
,
action
.
action
);
switch
(
action
.
action
)
{
//
switch (action.action) {
// case MAV_ACTION_LAUNCH:
// if (verbose) std::cerr << "Launch received" << std::endl;
// current_active_wp_id = 0;
...
...
@@ -847,10 +847,10 @@ void MAVLinkSimulationWaypointPlanner::mavlink_handler (const mavlink_message_t*
// default:
// if (verbose) std::cerr << "Unknown action received with id " << action.action << ", no action taken" << std::endl;
// break;
}
//
}
}
break
;
}
}
case
MAVLINK_MSG_ID_WAYPOINT_ACK
:
{
mavlink_waypoint_ack_t
wpa
;
...
...
src/uas/QGCUASParamManager.cc
View file @
c62765eb
...
...
@@ -20,7 +20,7 @@ QGCUASParamManager::QGCUASParamManager(UASInterface* uas, QWidget *parent) :
*/
void
QGCUASParamManager
::
requestParameterListUpdate
(
int
component
)
{
Q_UNUSED
(
component
);
}
src/ui/HUD.cc
View file @
c62765eb
...
...
@@ -51,20 +51,6 @@ This file is part of the QGROUNDCONTROL project
#define GL_MULTISAMPLE 0x809D
#endif
template
<
typename
T
>
inline
bool
isnan
(
T
value
)
{
return
value
!=
value
;
}
// requires #include <limits>
template
<
typename
T
>
inline
bool
isinf
(
T
value
)
{
return
std
::
numeric_limits
<
T
>::
has_infinity
&&
(
value
==
std
::
numeric_limits
<
T
>::
infinity
()
||
(
-
1
*
value
)
==
std
::
numeric_limits
<
T
>::
infinity
());
}
/**
* @warning The HUD widget will not start painting its content automatically
* to update the view, start the auto-update by calling HUD::start().
...
...
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