Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c9a863b7
Commit
c9a863b7
authored
Dec 16, 2010
by
lm
Browse files
Minor bugfixes and compile fixes
parent
a7688a04
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/uas/UASManager.cc
View file @
c9a863b7
...
...
@@ -85,6 +85,11 @@ void UASManager::addUAS(UASInterface* uas)
}
}
QList
<
UASInterface
*>
UASManager
::
getUASList
()
{
return
systems
.
values
();
}
UASInterface
*
UASManager
::
getActiveUAS
()
{
if
(
!
activeUAS
)
...
...
src/uas/UASManager.h
View file @
c9a863b7
...
...
@@ -69,6 +69,8 @@ public:
**/
UASInterface
*
getUASForId
(
int
id
);
QList
<
UASInterface
*>
getUASList
();
public
slots
:
...
...
src/ui/MainWindow.cc
View file @
c9a863b7
...
...
@@ -504,10 +504,6 @@ void MainWindow::connectPxWidgets()
{
if
(
linechartWidget
)
{
connect
(
UASManager
::
instance
(),
SIGNAL
(
UASCreated
(
UASInterface
*
)),
linechartWidget
,
SLOT
(
addSystem
(
UASInterface
*
)));
connect
(
UASManager
::
instance
(),
SIGNAL
(
activeUASSet
(
int
)),
linechartWidget
,
SLOT
(
selectSystem
(
int
)));
connect
(
linechartWidget
,
SIGNAL
(
logfileWritten
(
QString
)),
this
,
SLOT
(
loadDataView
(
QString
)));
}
...
...
src/ui/ParameterInterface.cc
View file @
c9a863b7
...
...
@@ -51,6 +51,15 @@ ParameterInterface::ParameterInterface(QWidget *parent) :
// Setup UI connections
connect
(
m_ui
->
vehicleComboBox
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
selectUAS
(
int
)));
// Get current MAV list
QList
<
UASInterface
*>
systems
=
UASManager
::
instance
()
->
getUASList
();
// Add each of them
foreach
(
UASInterface
*
sys
,
systems
)
{
addUAS
(
sys
);
}
// Setup MAV connections
connect
(
UASManager
::
instance
(),
SIGNAL
(
UASCreated
(
UASInterface
*
)),
this
,
SLOT
(
addUAS
(
UASInterface
*
)));
this
->
setVisible
(
false
);
...
...
src/ui/linechart/LinechartPlot.cc
View file @
c9a863b7
...
...
@@ -56,7 +56,7 @@ maxInterval(MAX_STORAGE_INTERVAL),
timeScaleStep
(
DEFAULT_SCALE_INTERVAL
),
// 10 seconds
automaticScrollActive
(
false
),
m_active
(
true
),
m_groundTime
(
fals
e
),
m_groundTime
(
tru
e
),
d_data
(
NULL
),
d_curve
(
NULL
)
{
...
...
src/ui/linechart/Linecharts.cc
View file @
c9a863b7
#include
"Linecharts.h"
#include
"UASManager.h"
Linecharts
::
Linecharts
(
QWidget
*
parent
)
:
QStackedWidget
(
parent
),
...
...
@@ -6,6 +7,18 @@ Linecharts::Linecharts(QWidget *parent) :
active
(
true
)
{
this
->
setVisible
(
false
);
// Get current MAV list
QList
<
UASInterface
*>
systems
=
UASManager
::
instance
()
->
getUASList
();
// Add each of them
foreach
(
UASInterface
*
sys
,
systems
)
{
addSystem
(
sys
);
}
connect
(
UASManager
::
instance
(),
SIGNAL
(
UASCreated
(
UASInterface
*
)),
this
,
SLOT
(
addSystem
(
UASInterface
*
)));
connect
(
UASManager
::
instance
(),
SIGNAL
(
activeUASSet
(
int
)),
this
,
SLOT
(
selectSystem
(
int
)));
}
...
...
src/ui/map3D/GCManipulator.cc
View file @
c9a863b7
...
...
@@ -30,6 +30,7 @@ This file is part of the QGROUNDCONTROL project
*/
#include
"GCManipulator.h"
#include
<osg/Version>
GCManipulator
::
GCManipulator
()
{
...
...
@@ -254,10 +255,10 @@ GCManipulator::calcMovement(void)
if
(
buttonMask
==
GUIEventAdapter
::
LEFT_MOUSE_BUTTON
)
{
// rotate camera
#ifdef __WIN32__
osg
::
Vec3
axis
;
#else
#if ((OPENSCENEGRAPH_MAJOR_VERSION == 2) & (OPENSCENEGRAPH_MINOR_VERSION > 8)) | (OPENSCENEGRAPH_MAJOR_VERSION > 2)
osg
::
Vec3d
axis
;
#else
osg
::
Vec3
axis
;
#endif
float
angle
;
...
...
src/ui/map3D/QMap3D.cc
View file @
c9a863b7
...
...
@@ -39,7 +39,11 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
QWidget
(
parent
,
f
)
{
setupUi
(
this
);
#if ((OPENSCENEGRAPH_MAJOR_VERSION == 2) & (OPENSCENEGRAPH_MINOR_VERSION > 8)) | (OPENSCENEGRAPH_MAJOR_VERSION > 2)
graphicsView
->
setCameraManipulator
(
new
osgEarth
::
Util
::
EarthManipulator
);
#else
graphicsView
->
setCameraManipulator
(
new
osgEarthUtil
::
EarthManipulator
);
#endif
graphicsView
->
setSceneData
(
new
osg
::
Group
);
graphicsView
->
updateCamera
();
show
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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