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
6069093e
Commit
6069093e
authored
Sep 27, 2011
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed strange OpenPilot startup bug - needs more investigation though.
parent
afd74003
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
22 deletions
+17
-22
configuration.h
src/configuration.h
+1
-1
pureimagecache.cpp
src/libs/opmapcontrol/src/core/pureimagecache.cpp
+15
-21
UASManager.h
src/uas/UASManager.h
+1
-0
No files found.
src/configuration.h
View file @
6069093e
...
...
@@ -12,7 +12,7 @@
#define WITH_TEXT_TO_SPEECH 1
#define QGC_APPLICATION_NAME "QGroundControl"
#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC
3
)"
#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC
16
)"
namespace
QGC
...
...
src/libs/opmapcontrol/src/core/pureimagecache.cpp
View file @
6069093e
...
...
@@ -226,9 +226,7 @@ namespace core {
qDebug
()
<<
"Cache dir="
<<
dir
<<
" Try to GET:"
<<
pos
.
X
()
+
","
+
pos
.
Y
();
#endif //DEBUG_PUREIMAGECACHE
{
QString
db
=
dir
+
"Data.qmdb"
;
{
QSqlDatabase
cn
;
cn
=
QSqlDatabase
::
addDatabase
(
"QSQLITE"
,
QString
::
number
(
id
));
...
...
@@ -236,7 +234,6 @@ namespace core {
cn
.
setDatabaseName
(
db
);
cn
.
setConnectOptions
(
"QSQLITE_ENABLE_SHARED_CACHE"
);
if
(
cn
.
open
())
{
{
QSqlQuery
query
(
cn
);
query
.
exec
(
QString
(
"SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)"
).
arg
(
pos
.
X
()).
arg
(
pos
.
Y
()).
arg
(
zoom
).
arg
((
int
)
type
));
...
...
@@ -245,11 +242,8 @@ namespace core {
{
ar
=
query
.
value
(
0
).
toByteArray
();
}
}
cn
.
close
();
}
}
}
QSqlDatabase
::
removeDatabase
(
QString
::
number
(
id
));
lock
.
unlock
();
return
ar
;
...
...
src/uas/UASManager.h
View file @
6069093e
...
...
@@ -246,6 +246,7 @@ protected:
void
initReference
(
const
double
&
latitude
,
const
double
&
longitude
,
const
double
&
altitude
);
signals:
void
UASCreated
(
UASInterface
*
UAS
);
/** @brief The UAS currently under main operator control changed */
void
activeUASSet
(
UASInterface
*
UAS
);
...
...
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