PT_Dreamer
|
8bb94e052b
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
Conflicts:
ground/openpilotgcs/src/plugins/config/camerastabilization.ui
ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
|
2012-08-21 17:05:36 +01:00 |
|
James Cotton
|
b9e20ad0b7
|
AndroidGCS OSG: Add the OSG view to the main launcher page
|
2012-08-21 11:02:57 -05:00 |
|
James Cotton
|
616f488c6c
|
AndroidGCS OSG: Add stub for rotating model
|
2012-08-21 10:30:20 -05:00 |
|
PT_Dreamer
|
caecc0e3ff
|
GCS- Added missing definition to h file. Something went wrong with
the merge.
|
2012-08-21 16:19:55 +01:00 |
|
Laura Sebesta
|
a94142ec30
|
Fixed several compile warning complaints.
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
|
2012-08-21 16:18:58 +01:00 |
|
PT_Dreamer
|
da41a30273
|
Merge branch 'dmytro/welcome_page_update' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
|
2012-08-21 14:56:42 +01:00 |
|
PT_Dreamer
|
adba241131
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
Conflicts:
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
|
2012-08-21 14:51:50 +01:00 |
|
PT_Dreamer
|
fa465c54a8
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
|
2012-08-21 14:46:16 +01:00 |
|
PT_Dreamer
|
e7a7a30e19
|
GCS-Created new command line option to allow choosing the config file
to use. This is a last resort option to mac problems displaying the
initial dialog.
|
2012-08-21 14:41:53 +01:00 |
|
James Cotton
|
905a81844c
|
AndroidGCS OSG: Now shows a cow. The model path is hardcoded.
|
2012-08-21 00:23:04 -05:00 |
|
James Cotton
|
129edf4398
|
AndroidGCS OSG: Get context showing
|
2012-08-21 00:04:26 -05:00 |
|
James Cotton
|
34b21bec3c
|
AndroidGCS: OSG import basic OSG code
|
2012-08-20 22:56:21 -05:00 |
|
James Cotton
|
f7751655d7
|
Merge branch 'android' into android_revo
|
2012-08-20 22:01:23 -05:00 |
|
Stacey Sheldon
|
2d0e4944d3
|
Merge remote-tracking branch 'origin/stac/actuator-task-cpu-optimization' into next
|
2012-08-20 19:13:39 -04:00 |
|
James Cotton
|
d58831d3f1
|
GCS: Add conditial flag to include OGS plugins. Must compile with qmake CONFIG+=OSG
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
|
2012-08-20 15:36:18 -05:00 |
|
PT_Dreamer
|
0c240cffa5
|
GCS/OPMap- Change one of the function names to proper camelcase
|
2012-08-20 16:21:12 +01:00 |
|
PT_Dreamer
|
56b094abab
|
GCS/OPMap - Changed the date of the license header on both the lib and plugin
|
2012-08-20 16:10:17 +01:00 |
|
Oleg Semyonov
|
f9f3d6d98c
|
Windows Installer: install also stylesheets
|
2012-08-20 12:19:21 +03:00 |
|
James Cotton
|
113a759cd9
|
Merge branch 'next' into revo
|
2012-08-19 21:22:02 -05:00 |
|
James Cotton
|
4a0d43cb54
|
GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
|
2012-08-19 21:20:18 -05:00 |
|
James Cotton
|
237ec188f9
|
GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
|
2012-08-19 21:17:37 -05:00 |
|
Oleg Semyonov
|
89e06d7a6b
|
Windows Installer: add default_configurations folder
|
2012-08-19 22:14:11 +03:00 |
|
James Cotton
|
d186069ebd
|
Update hardcoded OSG paths. Very dirty I need to fix this properly.
|
2012-08-19 12:48:48 -05:00 |
|
PT_Dreamer
|
84d55ca416
|
GCS-Added a few overloaded functions so that object and field pointers
can be used with confitaskwidget framework
|
2012-08-19 14:41:57 +01:00 |
|
PT_Dreamer
|
45e21acefd
|
GCS- Get rid of the double hwsettings update. setData triggers an
update so the other functions should be used instead.
MixerSettings should be refactored next.
|
2012-08-19 14:41:09 +01:00 |
|
PT_Dreamer
|
83097ecffb
|
GCS/OPMap- bumped up the QPixmap max cache value
|
2012-08-19 01:43:49 +01:00 |
|
PT_Dreamer
|
42119f8d67
|
GCS/OPMap- UAVItem - removed everything that doesn't belong
on the paint function
|
2012-08-19 01:40:05 +01:00 |
|
Stacey Sheldon
|
bb26f5118d
|
Merge remote-tracking branch 'origin/stac/enable-sections-gc-options' into next
|
2012-08-18 19:12:03 -04:00 |
|
PT_Dreamer
|
4b8bfcb997
|
GCS/OPMap - Changed several foreach chield methods to signal/slot
|
2012-08-18 23:04:31 +01:00 |
|
PT_Dreamer
|
2a4c54a073
|
Revert "Fixed several compile warning complaints."
These touch much more than the map lib and plugin so they should
be base on next and sent for review
This reverts commit ca4fbd5102 .
|
2012-08-18 20:09:04 +01:00 |
|
PT_Dreamer
|
c6706ce6b2
|
Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
|
2012-08-18 20:01:32 +01:00 |
|
Oleg Semyonov
|
0afd923708
|
CameraStab UI: more comments to serve as a self-documented code sample
Also disabled "module enable" checkbox reload/default actions.
|
2012-08-18 20:45:05 +03:00 |
|
PT_Dreamer
|
f56b4b8a9b
|
GCS/MapLib - Switched to a signal slot aproach on several functions which need
to be propagated.
|
2012-08-18 18:07:39 +01:00 |
|
Brian Webb
|
171f91336c
|
Removed assert that was no longer needef form PipX pios_board.c
|
2012-08-18 08:40:19 -07:00 |
|
Brian Webb
|
1335ba2636
|
Turned off compile of osgearthview plugin.
|
2012-08-18 08:40:07 -07:00 |
|
Laura Sebesta
|
ca4fbd5102
|
Fixed several compile warning complaints.
|
2012-08-18 14:18:10 +02:00 |
|
Laura Sebesta
|
b7298f890f
|
homeitem.cpp fixed to erase the safe area when turning off ShowSafeArea.
|
2012-08-18 09:28:30 +02:00 |
|
Laura Sebesta
|
375ecfb369
|
Streamlined paint function.
|
2012-08-18 09:23:09 +02:00 |
|
Laura Sebesta
|
d3daa06713
|
Improved filtered groundspeed calculation. Now the filtering rise time no longer on the refresh rate.
|
2012-08-18 09:19:59 +02:00 |
|
Laura Sebesta
|
28f382d472
|
Disabled dragging and dropping of UAV and Home icons.
|
2012-08-18 09:15:55 +02:00 |
|
Dmytro Poplavskiy
|
89023e8c41
|
Welcome page: display tooltips below buttons if necessary
Useful on low res screen, to ensure tooltips are visible
|
2012-08-18 11:30:50 +10:00 |
|
Kenz Dale
|
c484dcb1db
|
Corrected mathematics for estimating rate of turn.
|
2012-08-17 17:26:15 +02:00 |
|
Kenz Dale
|
e3a60b7677
|
Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
|
2012-08-17 16:56:44 +02:00 |
|
Laura Sebesta
|
34efc4d3b7
|
Dramatic performance gains by turning on caching for homeitem and mapgraphicitem.
|
2012-08-17 16:47:11 +02:00 |
|
David Ankers
|
5cf56ad2bc
|
Default to telem on main port, no reasons against this unless I am being
stupid (very possible).
|
2012-08-17 23:02:31 +10:00 |
|
Kenz Dale
|
e648a778db
|
Enabled caching for map widget.
|
2012-08-17 11:51:50 +02:00 |
|
Laura Sebesta
|
e52d141e3e
|
Improved bounding rect dimensioning.
|
2012-08-17 10:11:45 +02:00 |
|
Laura Sebesta
|
7e55b31ca1
|
Fixed bounding box size.
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h
|
2012-08-17 09:46:35 +02:00 |
|
Mike LaBranche
|
13e631a2e4
|
ConnectionManager: add connect/reconnect timer management into telemetryconnect/disconnect slots
|
2012-08-16 21:13:07 -07:00 |
|
David Ankers
|
ca7827e0cd
|
Monkey work!!
|
2012-08-17 09:21:46 +10:00 |
|