David Ankers
c673e5c586
Merge remote-tracking branch 'origin/CC3D_Release' into pt/CC3D_Release
2012-08-03 15:38:09 +10:00
Chris Pember
4de9cd89f7
micro GCs layout, redesigned layouts again for stabi screen
2012-08-02 22:14:39 -07:00
Mike LaBranche
5320a73adc
TelemetryWidget: tweeks and bugfixes.
2012-08-02 21:19:25 -07:00
Mike LaBranche
f5bd860be1
TelemetryWidget: tweek datarate text locations.
2012-08-02 20:32:55 -07:00
Mike LaBranche
9ebf6d916a
TelemetryMonitorWidget: tx/rx labels, 7 nodes, tx/rx rate text.
2012-08-02 19:33:20 -07:00
Mike LaBranche
63e5fc80ce
TelemetryMonitorWidget: Alpha version with 12 dots.
2012-08-02 16:11:18 -07:00
PT_Dreamer
352f18bec0
GCS-Allow for more than 1 limit per index
2012-08-02 23:56:02 +01:00
David Ankers
4357f092a9
Remove a couple of artifact numbers from the PFD, start work on spacing
...
and layout.
2012-08-03 08:15:57 +10:00
David Ankers
64ab589c1b
Fix from Berkely to the Uploader.ui
2012-08-03 06:28:08 +10:00
David Ankers
38e392d49e
Update status bargraphs, stab mode is no longer hidden. Soem work to go on
...
other SVGs yet but these looks better than they did.
Removed GPS Staus from the top status bar, this will be intergraded in to
the PFD
2012-08-03 05:59:20 +10:00
PT_Dreamer
cb26100d65
GCS - Dummy commit to see if crucible notices this branch
2012-08-02 16:48:37 +01:00
PT_Dreamer
205d370eec
GCS-Made the UI limits board specific
2012-08-02 16:34:48 +01:00
PT_Dreamer
f0d6f78ba3
GCS- Fixes compile under Win.
2012-08-02 12:32:43 +01:00
PT_Dreamer
c4d11c40bd
GCS-Fixes some value not being reloaded when reload button is pressed
...
on stab screen.
2012-08-01 17:50:48 +01:00
PT_Dreamer
8c69fff234
GCS - More fixes to the dirty status of the config widgets
2012-08-01 15:17:05 +01:00
PT_Dreamer
06455d7bfb
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-01 14:42:53 +01:00
PT_Dreamer
0553534318
GCS - Fixed dynamic loaded widgets (according to board type) not
...
alerting for unsaved changes
2012-08-01 14:42:21 +01:00
PT_Dreamer
599d46b8fa
GCS - Fixed nasty memory leak
2012-08-01 14:41:00 +01:00
David Ankers
44b13a19ee
Move to the QML PFD by default! Yay
2012-08-01 20:59:44 +10:00
Richard Flay (Hyper)
6d34795494
Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module
2012-08-01 19:53:59 +09:30
PT_Dreamer
af98f4c2a6
GCS- Fixed board rotation being overwriten when calibrating.
2012-08-01 10:12:52 +01:00
PT_Dreamer
faee578010
GCS- Fixes from Dmytro to new PFD qml file.
2012-08-01 09:47:11 +01:00
PT_Dreamer
4f2522cd0a
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-01 09:32:59 +01:00
Mike LaBranche
84c7325eb9
SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT
2012-08-01 09:40:33 +10:00
Mike LaBranche
4c3c94eba5
SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT
2012-07-31 16:15:58 -07:00
Ryan Hunter
4d257860c8
Moved the matlab files to matlab folder for GCS plugin
2012-07-31 13:26:35 -05:00
David Ankers
5da204f4b7
Change welcome plugin to use Steve's system icons
2012-08-01 02:51:34 +10:00
David Ankers
67ba889659
Swap icons for firmware and system tabs, matches Steve's icons better and
...
makes more sense
2012-08-01 02:45:15 +10:00
David Ankers
a8fd51985a
Add Steve's system icons for the Welcome Plugin
2012-08-01 02:44:06 +10:00
PT_Dreamer
68740940de
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
2012-07-31 16:17:29 +01: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
68652ef643
PFD qml: Load Terrain and World views dynamicaly
...
Moved them to separate qml files
loaded by reqest using Loader.
This allows to keep PFD working even if one of views
can't be loaded and avoids the cost of loading expensive
views like camera.
2012-08-01 00:32:46 +10:00
Dmytro Poplavskiy
4e28a529db
Merge branch 'CC3D_Release' into dmytro/pfd_qml
2012-07-31 23:43:16 +10:00
PT_Dreamer
1f7b95805e
GCS-Added Hyper's fix to glc crashes under certain systems.
2012-07-31 12:18:05 +01:00
David Ankers
f5a2591d81
Correct default paths for qml pfd files
2012-07-31 09:03:24 +10:00
Mike LaBranche
a306b31c9c
Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider;
...
change unsetenv to qputenv.
2012-07-31 08:44:59 +10:00
Mike LaBranche
5cab871ac6
PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from;
...
keeps it from oversetting neighbors when the dialog is closed.
2012-07-31 08:44:34 +10:00
Werner Backes
b8450d4a07
Fixed World Magnetic Model to accept altitude in meters instead of kilometers
2012-07-31 00:18:10 +02:00
Mike LaBranche
5398d96839
PopupWidget: Start the dialog at twice the size of the embedded widget.
2012-07-30 15:02:18 -07:00
Mike LaBranche
6adafbc4bf
PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from;
...
keeps it from oversetting neighbors when the dialog is closed.
2012-07-30 14:45:56 -07: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
David Ankers
c93cfc5d50
Fixed qmake copy of qss by borrowing code from Oleg who has a better
...
handle on qmake than I guess I ever will.
2012-07-31 04:11:33 +10:00
David Ankers
f00874efa2
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-31 02:51:55 +10:00
David Ankers
574fbe2fd9
Copy one file at a time with cp
2012-07-31 02:50:41 +10:00
PT_Dreamer
b15091fead
GCS - Made the GCS compile without OSG support
2012-07-30 16:11:36 +01:00
PT_Dreamer
d8c2bb3292
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-30 15:25:59 +01:00
PT_Dreamer
7884b7002e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
HISTORY.txt
2012-07-30 15:24:36 +01:00
PT_Dreamer
1927e8bce9
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-30 14:55:24 +01:00
PT_Dreamer
bb66dc9535
GCS- Made the importexport dialog close when GCS closes.
2012-07-30 14:53:57 +01:00
David Ankers
31a788e44e
Change the icon to go to the system page, icon is still wrong but now at
...
least the button works.
2012-07-30 22:28:28 +10:00
David Ankers
0b055d61fd
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-30 22:00:20 +10:00
David Ankers
b997a4a7fe
Make connect button use onclicked() signal rather than onpressed()
2012-07-30 21:58:36 +10:00
Kenz Dale
0874b3db62
Fixed GPS position to include gps heading.
2012-07-30 13:37:56 +02:00
PT_Dreamer
c6088b5417
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/camerastabilization.ui
ground/openpilotgcs/src/plugins/config/stabilization.ui
ground/openpilotgcs/src/plugins/config/txpid.ui
2012-07-30 00:12:15 +01:00
PT_Dreamer
9ab86f7c7e
GCS-Changed "wiki" help buttons to the standard ones.
...
Updated the links to tiny links.
2012-07-29 23:29:39 +01:00
Chris Pember
ef04025d05
couple small sizing issues in stabi, and spacer in hw settings
2012-07-29 15:14:40 -07:00
Chris Pember
ddf04abc5e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-29 14:54:19 -07:00
Chris Pember
005f08cbc2
added help buttons, removed wiki buttons, fixed input spacing, misc text fixes, tooltips, removed headings from input chan form
2012-07-29 14:51:39 -07:00
Oleg Semyonov
51b7e11160
AeroSimRC: remove unused MSVC options
2012-07-30 00:08:43 +03:00
Oleg Semyonov
dcf68c2359
AeroSimRC: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
2012-07-30 00:03:01 +03:00
Oleg Semyonov
e75a2718f1
Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
2012-07-29 23:59:54 +03:00
David Ankers
ca22b54b86
Change dates on copyright
2012-07-30 06:28:40 +10:00
Oleg Semyonov
fc51680e6c
Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
2012-07-29 23:08:59 +03:00
PT_Dreamer
62bbe208af
GCS-Fixes wrong flight mode settings
2012-07-29 15:10:30 +01:00
PT_Dreamer
4dc5e4580d
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
2012-07-29 14:28:59 +01:00
David Ankers
cc512715b9
Update icon to a better one
2012-07-29 22:25:06 +10: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
David Ankers
19b101bc4b
Make a start on the new layout
2012-07-29 21:28:32 +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
PT_Dreamer
6b84b58bfe
GCS-Moved the wizard and calibration widgets to the stacked widget
...
so that they disapear during the wizard
2012-07-29 00:53:05 +01:00
PT_Dreamer
14b7666c1b
GCS-disabled the reload board data button while it is doing its work.
...
minimized uavo transactions when button is pressed.
2012-07-29 00:44:08 +01:00
PT_Dreamer
4530a13f93
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-28 19:08:28 +01:00
David Ankers
27fca079d8
Change language used per David J's suggestion
2012-07-29 04:07:55 +10:00
PT_Dreamer
5f8c6dc7af
Remove unwanted file
2012-07-28 19:06:54 +01:00
David Ankers
9395df6d2d
Make size of labels consistant
2012-07-29 03:27:51 +10:00
David Ankers
1fca385fc4
Change RPY to Roll,Pitch and Yaw for the mixer on the aircraft screen, as
...
per mikes suggestion
2012-07-29 03:00:17 +10:00
David Ankers
deefe31546
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into jose5
2012-07-29 01:54:51 +10:00
David Ankers
fef831ec2b
Add stylesheets and ensure they are copied on build
2012-07-29 01:53:45 +10:00
PT_Dreamer
c8e94ed874
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release
2012-07-28 15:06:26 +01:00
PT_Dreamer
dc4254d7d8
GCS-Several UI fixes according to beta testers reports.
2012-07-28 15:04:55 +01:00
Dmytro Poplavskiy
999e5e9cc5
Fixed uninitialized terrainEnabled property
2012-07-28 21:00:02 +10:00
David Ankers
83ae672533
Gonfig gadget now gets the whole of the screen.
2012-07-28 17:26:43 +10:00
James Cotton
eae94b2188
Use setField instead of setData in SetConfigData because that doesn't trigger a
...
transaction immediately before the smartSaveButton tries to trigger one.
2012-07-28 00:00:50 -05:00
James Cotton
bd3ebe5b61
Undo the previous patch to abort transactions if one is pending, but throw a
...
warning still
2012-07-27 21:09:58 -05:00
James Cotton
cddabf76cf
Remove some debugging output that was a bit verbose
2012-07-27 21:09:58 -05:00
James Cotton
542483beec
Rephrase "SUCCESS: Mixer saved ok" to Configuration OK since it does not
...
reflect if the save succeeded and the button does.
2012-07-27 21:09:58 -05:00
James Cotton
12192ae0cd
Remove commented and debugging code
2012-07-27 21:09:57 -05:00
James Cotton
150139b711
Don't need to call updated() in the SetConfigData because the ConfigTaskWidget
...
architecture will call that
2012-07-27 20:38:50 -05:00
James Cotton
a75ed21012
Fix tab indentation to be consistent with QT Creator
2012-07-27 20:15:00 -05:00
James Cotton
9f1a8416f5
Treat the tricopter yaw channel like the other motor channels
2012-07-27 20:14:19 -05:00
James Cotton
9d82538a09
If we set FirmwareIAPObj to update on change then initial object retrieval will
...
force it to be fetched before emitting the autopilotConnected signal.
2012-07-27 16:16:16 -05:00
James Cotton
6ba8f3ca9e
Fix from hyper to catch when multiple object requests stack up
2012-07-27 16:16:12 -05:00
PT_Dreamer
bf6790f554
GCS-Made the changes to vehicleconfig final and reenabled the
...
system settings update call.
2012-07-27 16:12:15 -05:00
PT_Dreamer
1955e8b842
GCS-Comment out the updated statements on vehicleconfig.cpp
...
TODO check if this brings other problems. REVERT commit if it does
2012-07-27 16:12:12 -05:00
James Cotton
330fd26f4a
If we set FirmwareIAPObj to update on change then initial object retrieval will
...
force it to be fetched before emitting the autopilotConnected signal.
2012-07-27 20:57:23 +01:00
James Cotton
1803f26e9a
Fix from hyper to catch when multiple object requests stack up
2012-07-27 20:55:45 +01:00
PT_Dreamer
c375d2e79d
GCS-Made the changes to vehicleconfig final and reenabled the
...
system settings update call.
2012-07-27 18:42:20 +01:00
PT_Dreamer
4003cd70a8
GCS-Made rate Kd roll and pitch link when checkbox is checked.
2012-07-27 09:13:53 -05:00