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
90177fac
Commit
90177fac
authored
Apr 11, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Splashscreen fixes
parent
1b380af8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
mavground.pri
mavground.pri
+3
-4
Core.cc
src/Core.cc
+4
-8
No files found.
mavground.pri
View file @
90177fac
...
...
@@ -63,8 +63,7 @@ macx {
message(Building for Mac OS X 32/64bit)
#CONFIG += x86
CONFIG += x86_64 cocoa
CONFIG += x86 cocoa #x86_64 cocoa
CONFIG -= static
DESTDIR = $$BASEDIR/bin/mac
...
...
@@ -79,8 +78,8 @@ macx {
# Enable function-profiling with the OS X saturn tool
debug {
#
QMAKE_CXXFLAGS += -finstrument-functions
#
LIBS += -lSaturn
QMAKE_CXXFLAGS += -finstrument-functions
LIBS += -lSaturn
}
#ICON = $$BASEDIR/img/icons/empty.png
...
...
src/Core.cc
View file @
90177fac
...
...
@@ -58,9 +58,10 @@ This file is part of the PIXHAWK project
Core
::
Core
(
int
&
argc
,
char
*
argv
[])
:
QApplication
(
argc
,
argv
)
{
this
->
setApplicationName
(
"
OpenMAV Ground Control Station
"
);
this
->
setApplicationName
(
"
QGroundControl
"
);
this
->
setApplicationVersion
(
"v. 0.0.5"
);
this
->
setOrganizationName
(
QLatin1String
(
"OpenMAV Association"
));
this
->
setOrganizationName
(
QLatin1String
(
"PIXHAWK Project"
));
this
->
setOrganizationDomain
(
"http://pixhawk.ethz.ch"
);
QSettings
::
setDefaultFormat
(
QSettings
::
IniFormat
);
// Exit main application when last window is closed
connect
(
this
,
SIGNAL
(
lastWindowClosed
()),
this
,
SLOT
(
quit
()));
...
...
@@ -79,21 +80,16 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
splashScreen
->
show
();
// Start the comm link manager
splashScreen
->
showMessage
(
tr
(
"
Starting Communication Links"
)
);
splashScreen
->
showMessage
(
tr
(
"
QGroundControl (c) 2009-"
)
+
QString
(
QDate
::
currentDate
().
year
())
+
"PIXHAWK PROJECT"
,
Qt
::
AlignLeft
|
Qt
::
AlignBottom
);
startLinkManager
();
// Start the UAS Manager
splashScreen
->
showMessage
(
tr
(
"Starting UAS Manager"
));
startUASManager
();
// Start audio output
//GAudioOutput::instance()->say("Ground Control Station started", 1);
//tarsus = new ViconTarsusProtocol();
//tarsus->start();
// Start the user interface
splashScreen
->
showMessage
(
tr
(
"Starting User Interface"
));
startUI
();
// Remove splash screen
...
...
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