Corvus Corax
2f2cff3dc6
uncrustification
2013-12-07 15:25:15 +01:00
Fredrik Arvidsson
07c7faa144
Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next
...
Conflicts:
artwork/PFD/pfd.svg
2013-12-03 22:47:12 +01:00
Corvus Corax
04b7fbbf35
uncrustification for ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
2013-11-16 17:34:41 +01:00
Alessio Morale
bac4f96d1c
OP-1109: port plugins/pfdqml
2013-11-14 00:48:00 +01:00
Dmytro Poplavskiy
cab2d22bbb
PFD: Display altitude vector bar
2013-11-13 16:30:11 +01:00
Dmytro Poplavskiy
ecbbfd0891
PFD view: added Warning and incomplete Info views
...
Only GPS info is implemented
2013-11-13 16:30:03 +01:00
Dmytro Poplavskiy
c51ea68621
Reload PFD qml widget on the middle mouse click
...
Makes qml files modifications and result check much faster
2013-11-13 16:30:00 +01:00
Philippe Renon
f85498e7c5
[OP-1085] Qt5.1.1 - a bit of manual uncrustifying
2013-10-24 00:12:35 +02:00
Philippe Renon
a2ba33f28a
[OP-835] Qt 5.1.0 - migrated GCS plugins
2013-09-15 23:37:20 +02:00
Corvus Corax
00a603c88f
more bugfixes related to UAVObject renaming
2013-06-23 00:10:00 +02:00
Corvus Corax
6163c5f53a
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
...
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
ground/openpilotgcs/share/openpilotgcs/pfd/default/AltitudeScale.qml
ground/openpilotgcs/share/openpilotgcs/pfd/default/PfdIndicators.qml
ground/openpilotgcs/share/openpilotgcs/pfd/default/SpeedScale.qml
ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp
2013-06-22 18:44:03 +02:00
Oleg Semyonov
8325cc3be7
Uncrustify
2013-06-22 14:24:47 +03:00
Fredrik Arvidsson
68b2b28594
OP-1005 Removes 'old' PFD (non qml based one).
2013-06-18 07:45:44 +02:00
Fredrik Arvidsson
a6ac956127
OP-1005 Adds configurable units for velocity/speed and altitude in QML PFD. Units are configured in settings panel.
...
OP-1015 Reduces precision of the PDOP value in the PFD display to 3 decimals.
2013-06-18 00:52:27 +02:00
Corvus Corax
9b95af2006
refaktored GPS Sensor UAVObjects
2013-05-22 22:36:23 +02:00
Sexy Pony
900f643bbd
Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES
2013-05-19 17:37:30 +03:00
Corvus Corax
5284195c29
Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState
2013-05-18 19:36:45 +02:00
Corvus Corax
80caceb984
make uncrustify_all;make uncrustify_all;
2013-05-18 14:17:26 +02:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
chris pember
bb2637054b
hopefully fixed any conflicts
2012-10-07 10:57:53 -07:00
Fredrik Arvidsson
3b9e50ad51
Merge branch 'next' into thread/OP-39
2012-09-29 09:43:50 +02:00
Fredrik Arvidsson
f42085f6ac
Merge branch 'next' into thread/OP-39
2012-09-26 00:44:34 +02:00
James Cotton
f77df97699
OSGEarth: Remove function definition without implementation.
2012-09-25 13:24:08 -05:00
James Cotton
7d8c61d33d
OSGEarth: Remove reference to caching. Uses old API.
2012-09-25 13:19:18 -05:00
Dmytro Poplavskiy
28f028064a
Fixed the osgearth cache only configuration
...
osgEarth enables it even if OSGEARTH_CACHE_ONLY is set to false
it's necessary to unset it instead
2012-09-23 19:13:05 +10:00
Dmytro Poplavskiy
6174fa2d7f
PFD: display the side-slip indicator
2012-09-20 09:17:10 +10:00
Fredrik Arvidsson
bd3d3708eb
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
2012-09-16 15:14:47 +02:00
Dmytro Poplavskiy
6049f47296
Merge branch 'next' into dmytro/pfd_qml
2012-09-16 13:31:06 +10:00
Dmytro Poplavskiy
a8e6f4991b
Added "use OpenGL" option to qml based PFD
2012-09-14 08:50:02 +10:00
James Cotton
42213b21f7
Make OSG selection a QMake config option (OSG)
...
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
2012-09-13 09:46:03 -05:00
Dmytro Poplavskiy
a140c76a6f
Hide terrain related options if compiled without OSG
2012-08-01 00:35:21 +10:00
Dmytro Poplavskiy
ce00c0bc4d
Fixed compilation with OSG enabled
...
trivial .pro file fix
2012-08-01 00:34:25 +10:00
Dmytro Poplavskiy
4e28a529db
Merge branch 'CC3D_Release' into dmytro/pfd_qml
2012-07-31 23:43:16 +10:00
Mike LaBranche
b490fdb6e9
Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider;
...
change unsetenv to qputenv.
2012-07-30 14:30:03 -07:00
PT_Dreamer
b15091fead
GCS - Made the GCS compile without OSG support
2012-07-30 16:11:36 +01:00
Dmytro Poplavskiy
c7b8fe9efd
Moved terrain rendering to background thread
...
osgEarth may block the main thread during network io,
the rendering is moved to OsgEarthItemRenderer
class, running in the bg thread.
May require Qt 4.8.0+ to work correctly.
2012-07-29 22:15:24 +10:00
Dmytro Poplavskiy
9d884ca12c
PFD terrain view: switch between GPS and predefined positions.
2012-07-29 16:05:59 +10:00
Dmytro Poplavskiy
ec3919d2b7
Enabled osgEarth caching
2012-07-29 12:17:10 +10:00
Dmytro Poplavskiy
999e5e9cc5
Fixed uninitialized terrainEnabled property
2012-07-28 21:00:02 +10:00
Dmytro Poplavskiy
f95bd8bc1b
Initial implementation of QML based PFD widget
...
It uses the same pfd.svg file as original PFD widget;
depends on osgearth for terrain rendering
2012-07-23 17:19:24 +10:00