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
PT_Dreamer
d4cd0a9f89
GCS- Config fix and new copy method for data collections
2012-09-12 13:39:35 +01:00
PT_Dreamer
7b1f9bf14e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-09-12 11:10:15 +01:00
PT_Dreamer
c11958c9b6
GCS-Review comments changes
...
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
2012-09-12 11:09:30 +01:00
David Ankers
a4729ea27c
Changes to default config, make UAVOB fill left side, add logging as it
...
fits on system better, add GPS desplay gadget also.
2012-09-12 07:49:16 +10:00
chris pember
26b682122b
fixed the text on the mixer, need mike or someone to hook up the reverse button for the yaw mixer, as well as change the range on the slider
2012-09-01 11:11:44 -07:00
chris pember
77ea0277d0
made some more adjustments to the stylesheet for osx, sliders in particular
2012-09-01 01:20:51 -07:00
chris pember
777bad5708
fixed the vertical sliders, fixed input/output header spacing over the config sliders, switched around the progress bar in stabi ui, more to come
2012-08-30 23:00:25 -07:00
chris pember
528cea9418
almost done fixing any spacing isues, changed the font so its bigger, added some new stylesheet properties to linux and osx
2012-08-28 23:27:36 -07:00
David Ankers
ca7827e0cd
Monkey work!!
2012-08-17 09:21:46 +10:00
PT_Dreamer
525dec1748
GCS-Added gradient to edit gadgets bar
2012-08-16 23:30:31 +01:00
PT_Dreamer
b91afc2c12
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-16 19:37:55 +01:00
PT_Dreamer
254f98aad5
GCS-Updated configuration file with the latest changes
2012-08-09 22:47:48 +01:00
PT_Dreamer
3df35b933c
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-09 22:42:35 +01:00
PT_Dreamer
e2d7e824ed
GCS-Created new wide and default stylesheets and configurations just as an example.
...
Currently they are the same.
2012-08-09 22:30:31 +01:00
PT_Dreamer
9da1372e54
GCS-Change the way the stylesheets are copied (was not working for me)
...
Also copy the default configuration xml files. These are now on
the shared folder together with the stylesheet instead of being
inside a resource file.
Stylesheets and configuration files are now copied from SRC/SHARED to
APP/SHARED
2012-08-09 22:25:34 +01:00
PT_Dreamer
821f954276
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-08 23:32:07 +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
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
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
faee578010
GCS- Fixes from Dmytro to new PFD qml file.
2012-08-01 09:47:11 +01: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
9d884ca12c
PFD terrain view: switch between GPS and predefined positions.
2012-07-29 16:05:59 +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
David Willis
14708a2e45
Updated to use html file as source of popup text. Updated to latest system health svg file. Support popup for actuator critical.
2012-06-26 22:14:56 +01:00
Laura Sebesta
c6526a07a4
Modified svg text field sizes to be a bit more aesthetic.
2012-04-28 11:11:57 -04:00
David Ankers
4a0d101f12
Start adding Dado's artwork and GUI changes
2012-02-19 18:05:33 +11:00
David Ankers
a5ffdb7306
Merge branch 'master' into next
2012-01-31 05:32:49 +11:00
David Ankers
0a1645587c
Update deluxe dials
2012-01-29 04:30:43 +11:00
Stacey Sheldon
b9eecadbe2
alarms: add BootFault alarm to system health SVG files
...
Original changes provided by Jose, text was slightly
modified to match alarm name.
2012-01-02 23:35:39 -05:00
dankers
7892f9699d
Add minus for notify as requested
2011-12-29 22:25:17 +11:00
Oleg Semyonov
b2887a25a7
New 3D model: Ricoo (by muralha)
2011-11-14 16:05:10 +02:00
dankers
61e5d14d0d
Add Joe's frame renders to the ModelView configuration.
2011-07-13 23:57:59 +10:00
dankers
eecacc57f6
Update deluxe dials from London Flyer, added deluxe horizontal dial
...
Note: these are not used by default, commiting to master directly
2011-06-19 02:34:12 +10:00
dankers
9c6f2e0aea
New deluxe linear dials, new files and not used by default so commiting to master.
2011-06-11 23:24:59 +10:00
dankers
d9607c44d8
Minor update from London flyer, readability on smaller screens improvement
2011-06-10 23:51:01 +10:00
dankers
314f596940
Update to Ed's PFD from London Flyer, adds slight look and feel improvments and removes the orange look.
...
Uses some look and feel from Guy's work also.
2011-06-10 21:40:30 +10:00
elafargue
4f248172a3
Fix flight mode dial SVG to show the complete status.
2011-06-07 13:50:24 +02:00
dankers
d3ae9113d9
Update file names
2011-06-03 10:31:45 +10:00
dankers
62c172f280
Add Nuno's wonderful CC model
2011-06-03 09:46:59 +10:00
David Carlson
b1ec27bd75
Add help buttons to the config gadget UI. Also connect all signals to its slot in configgadgetwidget.cpp. Also some very trivial .html help files.
2011-05-16 21:54:23 -07:00
dankers
2c1caa957c
Add some more sounds to the complete sound set
2011-05-15 22:13:21 +10:00
elafargue
61007fd0eb
Update Arm status dial to reflect changes too.
2011-05-08 09:44:23 +02:00
dankers
5e355e82bf
Default background less crowded and cleaner
2011-05-04 13:07:22 +10:00
Oleg Semyonov
2ca0dc72cc
No more .svn r/o subdirectories, no need to remove them
2011-04-24 20:17:44 +03:00
edouard
7f445c8a08
OP-375 Also update in share directory for GCS installation.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3144 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-04-10 08:37:52 +00:00
edouard
89fc8141fc
OP-228 Make System Heal gadget aware of link status (autopilot connected/disconnected). A new version of the diagram is bundled which displays the status, you will have to update your configuration to use it.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3033 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-13 15:08:02 +00:00
edouard
cc1a53417d
Barometer in High-contrast theme was missing from the share directory. Added.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2991 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-06 17:34:28 +00:00
osnwt
52643dd6c6
OP-305: remove r/o attributes from copied .svn/* files (share.pro)
...
Those files are copied to make built GCS self-contained, but share.pro also
copies hidden and r/o SVN files. With them on Windows cp -rp can't copy over
old build, and rm -rf can't remove them.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2928 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-01 22:23:12 +00:00
edouard
dc9efb4d55
Added the Guidance and Attitude system alarms to the system health diagram.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2891 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-26 14:01:20 +00:00
