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
f96c178c
Commit
f96c178c
authored
Jun 24, 2014
by
Bryant Mairs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QString::toAscii() doesn't exist in Qt5, using toLatin1() instead.
parent
2e4ac6be
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
16 additions
and
16 deletions
+16
-16
GAudioOutput.cc
src/GAudioOutput.cc
+1
-1
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+1
-1
QGCJSBSimLink.cc
src/comm/QGCJSBSimLink.cc
+1
-1
QGCParamID.h
src/comm/QGCParamID.h
+1
-1
QGCXPlaneLink.cc
src/comm/QGCXPlaneLink.cc
+2
-2
XbeeLink.cpp
src/comm/XbeeLink.cpp
+1
-1
UAS.cc
src/uas/UAS.cc
+3
-3
MainWindow.cc
src/ui/MainWindow.cc
+1
-1
Q3DWidget.cc
src/ui/map3D/Q3DWidget.cc
+2
-2
QGCMAVLinkMessageSender.cc
src/ui/mavlink/QGCMAVLinkMessageSender.cc
+3
-3
No files found.
src/GAudioOutput.cc
View file @
f96c178c
...
...
@@ -223,7 +223,7 @@ bool GAudioOutput::say(QString text, int severity)
text
=
"
\\
"
+
text
;
QStdWString
str
=
text
.
toStdWString
();
unsigned
char
str2
[
1024
]
=
{};
memcpy
(
str2
,
text
.
to
Ascii
().
data
(),
str
.
length
());
memcpy
(
str2
,
text
.
to
Latin1
().
data
(),
str
.
length
());
SpeakString
(
str2
);
res
=
true
;
#endif // Q_OS_MAC
...
...
src/comm/QGCFlightGearLink.cc
View file @
f96c178c
...
...
@@ -236,7 +236,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p
{
QString
state
(
"%1
\t
%2
\t
%3
\t
%4
\t
%5
\n
"
);
state
=
state
.
arg
(
rollAilerons
).
arg
(
pitchElevator
).
arg
(
yawRudder
).
arg
(
true
).
arg
(
throttle
);
writeBytes
(
state
.
to
Ascii
().
constData
(),
state
.
length
());
writeBytes
(
state
.
to
Latin1
().
constData
(),
state
.
length
());
//qDebug() << "Updated controls" << rollAilerons << pitchElevator << yawRudder << throttle;
//qDebug() << "Updated controls" << state;
}
...
...
src/comm/QGCJSBSimLink.cc
View file @
f96c178c
...
...
@@ -257,7 +257,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch
{
QString
state
(
"%1
\t
%2
\t
%3
\t
%4
\t
%5
\n
"
);
state
=
state
.
arg
(
rollAilerons
).
arg
(
pitchElevator
).
arg
(
yawRudder
).
arg
(
true
).
arg
(
throttle
);
writeBytes
(
state
.
to
Ascii
().
constData
(),
state
.
length
());
writeBytes
(
state
.
to
Latin1
().
constData
(),
state
.
length
());
}
else
{
...
...
src/comm/QGCParamID.h
View file @
f96c178c
...
...
@@ -72,7 +72,7 @@ public:
return
static_cast
<
const
QString
>
(
data
);
}
int8_t
*
toInt8_t
()
const
{
return
(
int8_t
*
)
data
.
to
Ascii
().
data
();
return
(
int8_t
*
)
data
.
to
Latin1
().
data
();
}
protected:
...
...
src/comm/QGCXPlaneLink.cc
View file @
f96c178c
...
...
@@ -226,8 +226,8 @@ void QGCXPlaneLink::run()
}
ip
.
index
=
0
;
strncpy
(
ip
.
str_ipad_them
,
localAddrStr
.
to
Ascii
(),
qMin
((
int
)
sizeof
(
ip
.
str_ipad_them
),
16
));
strncpy
(
ip
.
str_port_them
,
localPortStr
.
to
Ascii
(),
qMin
((
int
)
sizeof
(
ip
.
str_port_them
),
6
));
strncpy
(
ip
.
str_ipad_them
,
localAddrStr
.
to
Latin1
(),
qMin
((
int
)
sizeof
(
ip
.
str_ipad_them
),
16
));
strncpy
(
ip
.
str_port_them
,
localPortStr
.
to
Latin1
(),
qMin
((
int
)
sizeof
(
ip
.
str_port_them
),
6
));
ip
.
use_ip
=
1
;
writeBytes
((
const
char
*
)
&
ip
,
sizeof
(
ip
));
...
...
src/comm/XbeeLink.cpp
View file @
f96c178c
...
...
@@ -73,7 +73,7 @@ bool XbeeLink::setPortName(QString portName)
m_portName
=
new
char
[
this
->
m_portNameLength
];
for
(
int
i
=
0
;
i
<
list
[
0
].
size
();
i
++
)
{
this
->
m_portName
[
i
]
=
list
[
0
][
i
].
to
Ascii
();
this
->
m_portName
[
i
]
=
list
[
0
][
i
].
to
Latin1
();
}
this
->
m_portName
[
list
[
0
].
size
()]
=
'\0'
;
}
...
...
src/uas/UAS.cc
View file @
f96c178c
...
...
@@ -2563,7 +2563,7 @@ void UAS::setParameter(const int compId, const QString& paramId, const QVariant&
switch
((
int
)
value
.
type
())
{
case
QVariant
:
:
Char
:
union_value
.
param_float
=
(
unsigned
char
)
value
.
toChar
().
to
Ascii
();
union_value
.
param_float
=
(
unsigned
char
)
value
.
toChar
().
to
Latin1
();
p
.
param_type
=
MAV_PARAM_TYPE_INT8
;
break
;
case
QVariant
:
:
Int
:
...
...
@@ -2588,7 +2588,7 @@ void UAS::setParameter(const int compId, const QString& paramId, const QVariant&
switch
((
int
)
value
.
type
())
{
case
QVariant
:
:
Char
:
union_value
.
param_int8
=
(
unsigned
char
)
value
.
toChar
().
to
Ascii
();
union_value
.
param_int8
=
(
unsigned
char
)
value
.
toChar
().
to
Latin1
();
p
.
param_type
=
MAV_PARAM_TYPE_INT8
;
break
;
case
QVariant
:
:
Int
:
...
...
@@ -2621,7 +2621,7 @@ void UAS::setParameter(const int compId, const QString& paramId, const QVariant&
// String characters
if
((
int
)
i
<
paramId
.
length
())
{
p
.
param_id
[
i
]
=
paramId
.
to
Ascii
()[
i
];
p
.
param_id
[
i
]
=
paramId
.
to
Latin1
()[
i
];
}
else
{
...
...
src/ui/MainWindow.cc
View file @
f96c178c
...
...
@@ -1185,7 +1185,7 @@ void MainWindow::saveScreen()
if
(
!
screenFileName
.
isEmpty
())
{
window
.
save
(
screenFileName
,
format
.
to
Ascii
());
window
.
save
(
screenFileName
,
format
.
to
Latin1
());
}
}
void
MainWindow
::
enableDockWidgetTitleBars
(
bool
enabled
)
...
...
src/ui/map3D/Q3DWidget.cc
View file @
f96c178c
...
...
@@ -254,7 +254,7 @@ Q3DWidget::handleKeyPressEvent(QKeyEvent* event)
{
mOsgGW
->
getEventQueue
()
->
keyPress
(
static_cast
<
osgGA
::
GUIEventAdapter
::
KeySymbol
>
(
*
(
event
->
text
().
to
Ascii
().
data
())));
*
(
event
->
text
().
to
Latin1
().
data
())));
}
}
...
...
@@ -274,7 +274,7 @@ Q3DWidget::handleKeyReleaseEvent(QKeyEvent* event)
{
mOsgGW
->
getEventQueue
()
->
keyRelease
(
static_cast
<
osgGA
::
GUIEventAdapter
::
KeySymbol
>
(
*
(
event
->
text
().
to
Ascii
().
data
())));
*
(
event
->
text
().
to
Latin1
().
data
())));
}
}
...
...
src/ui/mavlink/QGCMAVLinkMessageSender.cc
View file @
f96c178c
...
...
@@ -81,7 +81,7 @@ bool QGCMAVLinkMessageSender::sendMessage(unsigned int msgid)
{
// Single char
char
*
b
=
((
char
*
)(
m
+
messageInfo
[
msgid
].
fields
[
fieldid
].
wire_offset
));
*
b
=
field
->
data
(
1
,
Qt
::
DisplayRole
).
toChar
().
to
Ascii
();
*
b
=
field
->
data
(
1
,
Qt
::
DisplayRole
).
toChar
().
to
Latin1
();
}
break
;
case
MAVLINK_TYPE_UINT8_T
:
...
...
@@ -100,7 +100,7 @@ bool QGCMAVLinkMessageSender::sendMessage(unsigned int msgid)
{
// Single value
uint8_t
*
u
=
(
m
+
messageInfo
[
msgid
].
fields
[
fieldid
].
wire_offset
);
*
u
=
field
->
data
(
1
,
Qt
::
DisplayRole
).
toChar
().
to
Ascii
();
*
u
=
field
->
data
(
1
,
Qt
::
DisplayRole
).
toChar
().
to
Latin1
();
}
break
;
case
MAVLINK_TYPE_INT8_T
:
...
...
@@ -119,7 +119,7 @@ bool QGCMAVLinkMessageSender::sendMessage(unsigned int msgid)
{
// Single value
int8_t
*
u
=
reinterpret_cast
<
int8_t
*>
(
m
+
messageInfo
[
msgid
].
fields
[
fieldid
].
wire_offset
);
*
u
=
field
->
data
(
1
,
Qt
::
DisplayRole
).
toChar
().
to
Ascii
();
*
u
=
field
->
data
(
1
,
Qt
::
DisplayRole
).
toChar
().
to
Latin1
();
}
break
;
case
MAVLINK_TYPE_INT16_T
:
...
...
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