439 Commits

Author	SHA1	Message	Date
James Cotton	c1f9948a81	Merge branch 'master' into next	2012-10-16 14:26:35 -05:00
David Ankers	2db1bcdaf8	Wide Screen config, added UAVOB and some resizes. Synced normal and ... widescreen so they are basically the same except for ID and splitters.	2012-10-16 09:08:47 +11:00
Laura Sebesta	36087b1339	Changed new config files to include new HiTL settings.	2012-10-12 08:53:13 +02:00
James Cotton	3110678321	Merge branch 'dynamic_uavo_next' into revo ... Conflicts: androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp	2012-10-10 08:27:11 -05:00
Laura Sebesta	c2b49b6ef3	Merge branch 'kenz/cc_hitl_merge' into next ... Conflicts: ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui	2012-10-08 15:30:27 +02:00
PT_Dreamer	d664ec9705	GCS-Try to fix linux file copy without braking Win	2012-10-07 16:50:04 +01:00
PT_Dreamer	5c879d5238	GCS-Fix file copying on linux ... It got reverted on a merge	2012-10-06 23:41:14 +01:00
David Ankers	bcc39b7fad	Make options window taller, turn on OpenGL by default on the map, we ... already use this for the QML PFD and no issues reported.	2012-10-05 18:47:00 +10:00
James Cotton	82efb91fad	Add developer GCS config layout	2012-10-04 20:44:00 -05:00
David Ankers	aaea66a5d0	Fix splitter on Scopes screen	2012-10-05 11:18:16 +10:00
James Cotton	13cabd2ea4	Merge branch 'next' into revo ... Conflicts: flight/PiOS/Common/pios_rfm22b.c	2012-10-04 16:38:08 -05:00
PT_Dreamer	ac8d399d8d	GCS-Fixes Flight data tab icon not being displayed	2012-10-04 12:15:20 +01:00
David Ankers	af7fffdab6	Add Gadgets to HiTL screen	2012-10-04 13:09:54 +10:00
David Ankers	6b2ac1cf39	Spelling on browser config, add size settings to options so things don't ... get scrunched.	2012-10-04 12:52:36 +10:00
PT_Dreamer	a1ebdc38fa	Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into next	2012-10-03 14:13:28 +01:00
PT_Dreamer	399fc7fe85	Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next	2012-09-28 11:55:33 +01:00
chris pember	e2389af30d	fixed the stylesheets vertical sliders. pushing to correct branch	2012-09-27 21:06:19 -07:00
James Cotton	26408e286f	GCS Stabilization: Force the apply button to always be there as I can't find expert mode	2012-09-26 09:49:33 -05:00
Fredrik Arvidsson	f42085f6ac	Merge branch 'next' into thread/OP-39	2012-09-26 00:44:34 +02:00
PT_Dreamer	af36409e80	Merge branch 'dmytro/pfd_qml' of ssh://git.openpilot.org/OpenPilot into next	2012-09-24 19:02:51 +01:00
Dmytro Poplavskiy	dbbdb62173	Added the readymap based earth files	2012-09-23 19:30:10 +10:00
Fredrik Arvidsson	81efc2a931	Merge branch 'next' into thread/OP-39 ... Conflicts: ground/openpilotgcs/src/plugins/config/configinputwidget.cpp	2012-09-22 10:58:55 +02:00
David Ankers	570917f331	Remove old versions from source, however, they are still in the Artwork ... folder.	2012-09-22 10:47:10 +10:00
Nuno Guedes	432642952c	Test Quad updated with CC3D ... - Old Test Quad versions (OP Pro+AHRS+GPS) renamed to "old". - New Test Quad versions updated with CC3D	2012-09-22 10:43:23 +10:00
Fredrik Arvidsson	69621ba2f8	Merge branch 'next' into thread/OP-39 ... Conflicts: ground/openpilotgcs/src/plugins/config/configinputwidget.cpp	2012-09-20 23:53:33 +02:00
David Ankers	7f71769c5b	Add Nuno's new models	2012-09-20 13:17:18 +10:00
David Ankers	b921e3213f	Minor tweak to make top row splitters better on smaller screens	2012-09-20 12:55:42 +10:00
Dmytro Poplavskiy	6174fa2d7f	PFD: display the side-slip indicator	2012-09-20 09:17:10 +10:00
Dmytro Poplavskiy	608297fbd3	Changed the default PFD widget to qml based one	2012-09-20 09:14:49 +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	150314ff98	PFD qml: align elements to pixels grid ... It improves the rendering quality, sub pixels accuracy gives no benefits in placing PFD elements	2012-09-16 10:03:28 +10: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
Dmytro Poplavskiy	02c00fabb2	GCS/PFDqml: split the world view to smaller parts ... Ground and sky is rendered as QML Rectangle with gradients; Pitch scale and center line are rendered separately from the world element, so they always fit the maximum texture size.	2012-09-11 15:25:13 +10:00
Dmytro Poplavskiy	288cb40c92	Updated the pfd.svg file ... compass-band has a hidden vertical square to make the vertical limit. New IDs: world-bg (group of sky and ground) sky (blue part of the world) ground (orange part of the world) pitch_scale (the center scale) world-centerline (the centerline in the center of the world and in the middle of the sky and ground) By muralha	2012-09-11 15:22:04 +10:00
Dmytro Poplavskiy	18a9ad3aa8	PFD: split the compass band to parts to fit the texture limit ... On older graphics cards the texture size limit may be smaller than the compass band width, QML downscales the element to fit the texture. To avoid this, split compass band to tiles. Added parameter like hslice=2:8 to svg image provider and SvgElementImage.	2012-09-11 15:16:58 +10:00
Dmytro Poplavskiy	4cc13c9eea	GCS/PFDqml: use the correct sceneSize for svg element images ... Pass the element source size instead of the scene source size to ensure the element is not downscalled.	2012-09-09 16:58:54 +10:00
Dmytro Poplavskiy	1102587570	GCS/PFDqml: fixed compass rendering ... Converted AttitudeActual.Yaw to -180..180 range, so the whole compass band is always filled	2012-09-03 15:23:51 +10:00
Dmytro Poplavskiy	99b898c5c2	GCS/PFDqml: display the VSI bar ... updated pfd.svg file with new compass and VSI bar	2012-09-02 13:33:29 +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
osnwt	3787787404	Windows installer and build scripts: few minor changes (listed below), no code change. ... - Fixed unescaped backslashes in openpilotgcs.pro, translations.pro, glc_lib.pro (don't like warnings). - Fixed comments in Windows installer batch file. - Changed Windows uninstaller section names for better readability. - Changed Windows installer executable properties (makes sense if you use SubWCRev). - temporary disabled Windows installer Spanish language until someone helps with translation (no changes for GCS itself). - small beautification of winx86.pro. - some changes in the top Makefile.cmd (more changeable parameters for batch build) git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2609 ebee16cc-31ac-478f-84a7-5cbb03baadba	2011-01-28 18:18:08 +00:00
stac	7195862d77	build: Move openpilotgcs into its own subdirectory ... This will allow us to build a parent project for qt-creator that sits above both openpilotgcs and uavobjgenerator so that we can build both projects at the same time. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2528 ebee16cc-31ac-478f-84a7-5cbb03baadba	2011-01-22 17:40:26 +00:00