James Cotton
13cabd2ea4
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-04 16:38:08 -05:00
Laura Sebesta
35f7b4903f
Several files still needed to have comments removed.
...
Missed merge in git. Retry.
2012-10-03 15:10:58 -05:00
Fredrik Arvidsson
7363a2a266
OP-39 Unmade the mistake :)
2012-09-17 07:12:30 +02: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
James Cotton
386a9d41ef
Merge branch 'next' into test2
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
2012-09-10 14:29:26 -05:00
James Cotton
6bfb2a5e45
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/coordinateconversions.h
ground/openpilotgcs/src/plugins/opmap/opmap.pro
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
Kenz Dale
0ff46af74c
Changes requested in review.
...
All cosmetic (removing comments or fixing whitespaces), so does not affect functionality.
2012-08-23 18:10:27 +02:00
Kenz Dale
9ebc32da3d
Eliminated several (dozen) compiler warnings.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-23 18:03:17 +02: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
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
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
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 ca4fbd5102a742132369da9f7a62e3c26423730f.
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
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
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
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
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
Laura Sebesta
62041f40ad
Changed variable from static to class static.
2012-08-12 23:36:27 +02:00
PT_Dreamer
1a22eef491
GCS-Several changes according to review comments
2012-08-11 23:36:00 +01:00
PT_Dreamer
619b4ffa8c
GCS-Prevent the map from being dragged beyond the available imagery.
...
Previous way seemed broken, looked ugly and like a bug.
2012-08-11 19:58:14 +01:00
Laura Sebesta
3e23163dde
Improved static and update behavior.
2012-08-02 20:21:29 +02:00
Kenz Dale
3e4f2e21ce
Added context menu for switching UAV text output off.
2012-08-02 19:13:54 +02:00
Kenz Dale
e26e996734
Added in time rings, using proper scaling.
2012-08-02 14:43:26 +02:00
Kenz Dale
d30da01ca8
Added additional message. Improved significant digit formatting.
2012-08-02 11:36:36 +02:00
Kenz Dale
3b9e3c0054
Added support for trend lines and text info on map.
2012-08-02 10:58:55 +02:00
PT_Dreamer
1d42b64965
GCS-Kenz arrow and text request - 5$ please
2012-08-01 13:41:22 +01:00
PT_Dreamer
42d06ef7d9
GCS/OPMap-fixes math error which was causing wrong wp location
...
and high processor usage
2012-07-07 16:05:28 +01:00
PT_Dreamer
61dea64a76
GCS/OPMap-Increase several value limits and added
...
missing label on the wp editor.
2012-07-06 23:02:56 +01:00
PT_Dreamer
71a35b2dd8
GCS/OPMap-make the waypoint numbers start with 1.
...
This is only visual, internal implementation is still zero based
2012-07-06 21:57:43 +01:00
PT_Dreamer
96fb46b38d
GCS/OPMap-comment cleaning
2012-07-06 11:26:27 +01:00
PT_Dreamer
de633d1bcc
GCS/OPMap-Give lines of different colors different widths and z orders.
2012-07-06 11:25:35 +01:00
Laura Sebesta
9938f221e1
GCS/OPMap-Improved dialog message in mac ripper. We might also want to rename module, as "rip" is a somewhat loaded word. Pre-cache might be more neutral.
2012-07-05 19:52:08 +01:00
Laura Sebesta
fa643e8dbb
GCS/OPMap-Added tooltip to home location in waypoint editor.
2012-07-05 19:50:16 +01:00
PT_Dreamer
d2d4d4dabd
GCS/OPMap-Move line path arrow to the midle of the line.
2012-07-05 19:24:41 +01:00
PT_Dreamer
8bc83d49a5
GCS/OPMap-Make the overlays opacity user selectable and persistent.
2012-06-29 01:20:38 +01:00
PT_Dreamer
70bdbf49c3
GCS/OPMap- Fixes bad coordinate calculation on home drag.
2012-06-28 20:17:16 +01:00
PT_Dreamer
6a85da9b46
GCS/OPMap-Fixes relative altitude refresh issue.
2012-06-27 00:25:40 +01:00
PT_Dreamer
96a8ff3a34
GCS/OPMap-Added relative altitude info to waypoint tooltip.
2012-06-26 20:47:14 +01:00
PT_Dreamer
2074889c9d
GCS/OPMap-Clean commented out code. Delete some qDebugs
2012-06-26 20:22:55 +01:00
PT_Dreamer
e34fc5be71
GCS - OPMap - allow different colors for overlays.
...
This is so we can use a different color for each kind
of route ex:error destination, jump destination, next destination
2012-06-24 19:57:02 +01:00
