diff --git a/artwork/Dials/PFD - GM.svg b/artwork/Dials/PFD - GM.svg deleted file mode 100644 index e1d8e7b2a..000000000 --- a/artwork/Dials/PFD - GM.svg +++ /dev/null @@ -1,688 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ° - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - 10 - 10 - - - - - - - - - - - 20 - 20 - - - - - -10 - -10 - - - - - - - - - - - - - - - - - - - -20 - -20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 300 - 310 - 320 - 290 - m - 280 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 120 - 130 - 140 - 110 - 100 - km/h - - - - - - - - - - - - 260 - 240 - 280 - 300 - ° - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 250 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 290 - - - - - - - - - - - - 270 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/artwork/Dials/PFD-1.svg b/artwork/Dials/PFD-1.svg deleted file mode 100644 index 2ba415dc5..000000000 --- a/artwork/Dials/PFD-1.svg +++ /dev/null @@ -1,469 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - 10 - 20 - 20 - 10 - 10 - 10 - 20 - 20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/artwork/Dials/PFD-2.svg b/artwork/Dials/PFD-2.svg deleted file mode 100644 index 9206be64a..000000000 --- a/artwork/Dials/PFD-2.svg +++ /dev/null @@ -1,4049 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - 20 - 20 - - - - 10 - 10 - - - - 10 - 10 - - - - 20 - 20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Link - - - - Bat. - - - - GPS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GPS: 12HDP: 0.7 - 2300 mAh - 11231 mV - 3.43 A - - - - - - - - - - 1250m - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/artwork/Dials/README.txt b/artwork/Dials/README.txt index 54d0f7c90..8eb61eb4c 100644 --- a/artwork/Dials/README.txt +++ b/artwork/Dials/README.txt @@ -1,17 +1,18 @@ How to use the Dials artwork: -- The file 'dials-master.svg' is the master file, as its name suggests. This means that it is the reference, and that all other SVG files in the directory are extracts from the master. +- The file 'default-wip/dials-master.svg' is the master file, as its name suggests. This means that it is the reference, and that all other SVG files in the directory are extracts from the master. The master SVG contains layers for all elements: background, rotating/moving elements, and fixed elements. -extracts directory: +default directory: - - Dial background is contained in dials-dark-background.svg + All the dials used in the GCS today, but with all text elements still as "text". This means that depending on whether the target platform knows the font, the dial might render differently. For this reason, the dials which are used by the GCS are located in ground/share/dials/default and all text elements there are converted to "path" - - Then for each dial type, there are several SVG files, one for each element: ELEMENT-00N-R or ELEMENT-00N-F depending on whether the layer should be fixed or rotating, and the order number hinting at the order by which it should be displayed. +default-wip directory: - TODO: ideally, extracting the layers from the master SVG should be automated, but for now we are doing it manually. + All the work in progress for the default dials set. -defaultset directory: - This directory contains dials which are ready for use in the GCS. \ No newline at end of file +guymc and guymc-wip directory: + + Same thing as "default" but for the "guymc" dials set. diff --git a/artwork/Dials/attitude-001.png b/artwork/Dials/attitude-001.png deleted file mode 100644 index b09340116..000000000 Binary files a/artwork/Dials/attitude-001.png and /dev/null differ diff --git a/artwork/Dials/defaultset/attitude.svg b/artwork/Dials/default-wip/attitude-nogradient.svg similarity index 100% rename from artwork/Dials/defaultset/attitude.svg rename to artwork/Dials/default-wip/attitude-nogradient.svg diff --git a/artwork/Dials/defaultset/battery-horizontal.svg b/artwork/Dials/default-wip/battery-horizontal.svg similarity index 100% rename from artwork/Dials/defaultset/battery-horizontal.svg rename to artwork/Dials/default-wip/battery-horizontal.svg diff --git a/artwork/Dials/dials-master-linear-vertical.svg b/artwork/Dials/default-wip/dials-master-linear-vertical.svg similarity index 100% rename from artwork/Dials/dials-master-linear-vertical.svg rename to artwork/Dials/default-wip/dials-master-linear-vertical.svg diff --git a/artwork/Dials/dials-master-linear.svg b/artwork/Dials/default-wip/dials-master-linear.svg similarity index 100% rename from artwork/Dials/dials-master-linear.svg rename to artwork/Dials/default-wip/dials-master-linear.svg diff --git a/artwork/Dials/dials-master.svg b/artwork/Dials/default-wip/dials-master.svg similarity index 100% rename from artwork/Dials/dials-master.svg rename to artwork/Dials/default-wip/dials-master.svg diff --git a/artwork/Dials/default-wip/readme.txt b/artwork/Dials/default-wip/readme.txt new file mode 100644 index 000000000..79a7d8343 --- /dev/null +++ b/artwork/Dials/default-wip/readme.txt @@ -0,0 +1,11 @@ +Credits: + +Artwork (c) Edouard Lafargue 2010, CC-BY-SA License + +Battery icon on the battery dial: GPL, from http://gnome-look.org/content/show.php/Battery?content=84200 + +This directory contains the "WIP" (Work in Progress) for the default dials set. Once a dial is finished, it is moved into the "default" directory: + - With all text elements converted to a path, in the ground/share/dials/default directory + - With all text elements still as text, in artwork/Dials/default + + diff --git a/artwork/Dials/simpledial-vertical.svg b/artwork/Dials/default-wip/simpledial-vertical.svg similarity index 100% rename from artwork/Dials/simpledial-vertical.svg rename to artwork/Dials/default-wip/simpledial-vertical.svg diff --git a/artwork/Dials/defaultset/thermometer.svg b/artwork/Dials/default-wip/thermometer.svg similarity index 100% rename from artwork/Dials/defaultset/thermometer.svg rename to artwork/Dials/default-wip/thermometer.svg diff --git a/artwork/Dials/default/Readme.txt b/artwork/Dials/default/Readme.txt new file mode 100644 index 000000000..ace71aea2 --- /dev/null +++ b/artwork/Dials/default/Readme.txt @@ -0,0 +1,5 @@ +All dials artwork (c) 2010 Edouard Lafargue, Licence CC-BY-SA. + +Those dials are the same as in the "share" directory of the GCS, except for one thing: the text elements are still of type 'Text' and have not been converted to Paths, so that they can be modified/updated at a later stage. + +Converting to path means that rendering is the same on every target platform, but at the expense of not being able to edit the text. diff --git a/artwork/Dials/defaultset/altimeter.svg b/artwork/Dials/default/altimeter.svg similarity index 99% rename from artwork/Dials/defaultset/altimeter.svg rename to artwork/Dials/default/altimeter.svg index c6b0a5c98..a74dee8bf 100644 --- a/artwork/Dials/defaultset/altimeter.svg +++ b/artwork/Dials/default/altimeter.svg @@ -1,5 +1,7 @@ + + + transform="translate(217.93242,361.4652)"> + transform="translate(2,136)"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/artwork/Dials/extracts/heading-001-r.svg b/artwork/Dials/extracts/heading-001-r.svg deleted file mode 100644 index 330fbc911..000000000 --- a/artwork/Dials/extracts/heading-001-r.svg +++ /dev/null @@ -1,760 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - N - 33 - 30 - W - 24 - 21 - S - 15 - 12 - E - 6 - 3 - - - diff --git a/artwork/Dials/extracts/heading-002-f.svg b/artwork/Dials/extracts/heading-002-f.svg deleted file mode 100644 index 169e01195..000000000 --- a/artwork/Dials/extracts/heading-002-f.svg +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/artwork/Dials/extracts/speed-001-f.svg b/artwork/Dials/extracts/speed-001-f.svg deleted file mode 100644 index 54c3361d7..000000000 --- a/artwork/Dials/extracts/speed-001-f.svg +++ /dev/null @@ -1,734 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - 100 - 90 - 80 - 70 - 60 - 50 - 40 - 30 - 20 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - km/h - - - diff --git a/artwork/Dials/extracts/speed-002-r.svg b/artwork/Dials/extracts/speed-002-r.svg deleted file mode 100644 index 34b3af6a8..000000000 --- a/artwork/Dials/extracts/speed-002-r.svg +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/artwork/Dials/extracts/vario-001-f.svg b/artwork/Dials/extracts/vario-001-f.svg deleted file mode 100644 index 62a47bbbf..000000000 --- a/artwork/Dials/extracts/vario-001-f.svg +++ /dev/null @@ -1,563 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - VERTICALSPEED - M/S - 5 - 10 - 15 - 5 - 10 - 15 - - diff --git a/artwork/Dials/extracts/vario-002-r.svg b/artwork/Dials/extracts/vario-002-r.svg deleted file mode 100644 index 491f80a1d..000000000 --- a/artwork/Dials/extracts/vario-002-r.svg +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/artwork/Dials/ASI-GM.ai b/artwork/Dials/guymc-wip/ASI-GM.ai similarity index 100% rename from artwork/Dials/ASI-GM.ai rename to artwork/Dials/guymc-wip/ASI-GM.ai diff --git a/artwork/Dials/Altimeter-GM.ai b/artwork/Dials/guymc-wip/Altimeter-GM.ai similarity index 100% rename from artwork/Dials/Altimeter-GM.ai rename to artwork/Dials/guymc-wip/Altimeter-GM.ai diff --git a/artwork/Dials/VSI-GM.ai b/artwork/Dials/guymc-wip/VSI-GM.ai similarity index 100% rename from artwork/Dials/VSI-GM.ai rename to artwork/Dials/guymc-wip/VSI-GM.ai diff --git a/artwork/Dials/heading-001.png b/artwork/Dials/heading-001.png deleted file mode 100644 index cd545e121..000000000 Binary files a/artwork/Dials/heading-001.png and /dev/null differ diff --git a/artwork/Dials/speed-001.png b/artwork/Dials/speed-001.png deleted file mode 100644 index 0cac9e7be..000000000 Binary files a/artwork/Dials/speed-001.png and /dev/null differ diff --git a/artwork/Dials/vario-001.png b/artwork/Dials/vario-001.png deleted file mode 100644 index 94a61ef2b..000000000 Binary files a/artwork/Dials/vario-001.png and /dev/null differ