From 204baa0e04990a008118cb8e1ece08e10c44bd5d Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Sat, 30 Aug 2014 23:06:08 +0200 Subject: [PATCH 1/2] Move planet symbols to xi:include files --- src/ag.gresource.xml | 19 ++++ src/resources/default-icons/planet-ceres.xml | 4 + src/resources/default-icons/planet-chiron.xml | 4 + src/resources/default-icons/planet-juno.xml | 4 + .../default-icons/planet-jupiter.xml | 4 + src/resources/default-icons/planet-mars.xml | 4 + .../default-icons/planet-mercury.xml | 4 + .../default-icons/planet-moon-apogee.xml | 4 + .../default-icons/planet-moon-node.xml | 4 + src/resources/default-icons/planet-moon.xml | 4 + .../default-icons/planet-neptune.xml | 4 + src/resources/default-icons/planet-pallas.xml | 4 + src/resources/default-icons/planet-pluto.xml | 4 + src/resources/default-icons/planet-saturn.xml | 4 + src/resources/default-icons/planet-sun.xml | 4 + src/resources/default-icons/planet-uranus.xml | 4 + src/resources/default-icons/planet-venus.xml | 4 + src/resources/default-icons/planet-vesta.xml | 4 + src/resources/default-icons/point-vertex.xml | 4 + src/resources/ui/chart-default.css | 2 +- src/resources/ui/chart-default.xsl | 97 +++++-------------- 21 files changed, 114 insertions(+), 76 deletions(-) create mode 100644 src/resources/default-icons/planet-ceres.xml create mode 100644 src/resources/default-icons/planet-chiron.xml create mode 100644 src/resources/default-icons/planet-juno.xml create mode 100644 src/resources/default-icons/planet-jupiter.xml create mode 100644 src/resources/default-icons/planet-mars.xml create mode 100644 src/resources/default-icons/planet-mercury.xml create mode 100644 src/resources/default-icons/planet-moon-apogee.xml create mode 100644 src/resources/default-icons/planet-moon-node.xml create mode 100644 src/resources/default-icons/planet-moon.xml create mode 100644 src/resources/default-icons/planet-neptune.xml create mode 100644 src/resources/default-icons/planet-pallas.xml create mode 100644 src/resources/default-icons/planet-pluto.xml create mode 100644 src/resources/default-icons/planet-saturn.xml create mode 100644 src/resources/default-icons/planet-sun.xml create mode 100644 src/resources/default-icons/planet-uranus.xml create mode 100644 src/resources/default-icons/planet-venus.xml create mode 100644 src/resources/default-icons/planet-vesta.xml create mode 100644 src/resources/default-icons/point-vertex.xml diff --git a/src/ag.gresource.xml b/src/ag.gresource.xml index cd06124..0f4bf0c 100644 --- a/src/ag.gresource.xml +++ b/src/ag.gresource.xml @@ -20,5 +20,24 @@ default-icons/sign-aquarius.xml default-icons/sign-pisces.xml default-icons/planet-sun.svg + + default-icons/planet-sun.xml + default-icons/planet-moon.xml + default-icons/planet-mercury.xml + default-icons/planet-venus.xml + default-icons/planet-mars.xml + default-icons/planet-jupiter.xml + default-icons/planet-saturn.xml + default-icons/planet-uranus.xml + default-icons/planet-neptune.xml + default-icons/planet-pluto.xml + default-icons/planet-chiron.xml + default-icons/planet-ceres.xml + default-icons/planet-pallas.xml + default-icons/planet-juno.xml + default-icons/planet-vesta.xml + default-icons/planet-moon-node.xml + default-icons/planet-moon-apogee.xml + default-icons/point-vertex.xml diff --git a/src/resources/default-icons/planet-ceres.xml b/src/resources/default-icons/planet-ceres.xml new file mode 100644 index 0000000..114d96e --- /dev/null +++ b/src/resources/default-icons/planet-ceres.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-chiron.xml b/src/resources/default-icons/planet-chiron.xml new file mode 100644 index 0000000..c0dda33 --- /dev/null +++ b/src/resources/default-icons/planet-chiron.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-juno.xml b/src/resources/default-icons/planet-juno.xml new file mode 100644 index 0000000..9284aff --- /dev/null +++ b/src/resources/default-icons/planet-juno.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-jupiter.xml b/src/resources/default-icons/planet-jupiter.xml new file mode 100644 index 0000000..8ac9468 --- /dev/null +++ b/src/resources/default-icons/planet-jupiter.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-mars.xml b/src/resources/default-icons/planet-mars.xml new file mode 100644 index 0000000..32d6e77 --- /dev/null +++ b/src/resources/default-icons/planet-mars.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-mercury.xml b/src/resources/default-icons/planet-mercury.xml new file mode 100644 index 0000000..3308d3c --- /dev/null +++ b/src/resources/default-icons/planet-mercury.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-moon-apogee.xml b/src/resources/default-icons/planet-moon-apogee.xml new file mode 100644 index 0000000..fbf2615 --- /dev/null +++ b/src/resources/default-icons/planet-moon-apogee.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-moon-node.xml b/src/resources/default-icons/planet-moon-node.xml new file mode 100644 index 0000000..4379073 --- /dev/null +++ b/src/resources/default-icons/planet-moon-node.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-moon.xml b/src/resources/default-icons/planet-moon.xml new file mode 100644 index 0000000..d53ad34 --- /dev/null +++ b/src/resources/default-icons/planet-moon.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-neptune.xml b/src/resources/default-icons/planet-neptune.xml new file mode 100644 index 0000000..5070482 --- /dev/null +++ b/src/resources/default-icons/planet-neptune.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-pallas.xml b/src/resources/default-icons/planet-pallas.xml new file mode 100644 index 0000000..af1bf09 --- /dev/null +++ b/src/resources/default-icons/planet-pallas.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-pluto.xml b/src/resources/default-icons/planet-pluto.xml new file mode 100644 index 0000000..84876da --- /dev/null +++ b/src/resources/default-icons/planet-pluto.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-saturn.xml b/src/resources/default-icons/planet-saturn.xml new file mode 100644 index 0000000..d31415d --- /dev/null +++ b/src/resources/default-icons/planet-saturn.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-sun.xml b/src/resources/default-icons/planet-sun.xml new file mode 100644 index 0000000..77c9062 --- /dev/null +++ b/src/resources/default-icons/planet-sun.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-uranus.xml b/src/resources/default-icons/planet-uranus.xml new file mode 100644 index 0000000..a526ac2 --- /dev/null +++ b/src/resources/default-icons/planet-uranus.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-venus.xml b/src/resources/default-icons/planet-venus.xml new file mode 100644 index 0000000..2a2b2be --- /dev/null +++ b/src/resources/default-icons/planet-venus.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/planet-vesta.xml b/src/resources/default-icons/planet-vesta.xml new file mode 100644 index 0000000..23c13cf --- /dev/null +++ b/src/resources/default-icons/planet-vesta.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/default-icons/point-vertex.xml b/src/resources/default-icons/point-vertex.xml new file mode 100644 index 0000000..aec03d0 --- /dev/null +++ b/src/resources/default-icons/point-vertex.xml @@ -0,0 +1,4 @@ + diff --git a/src/resources/ui/chart-default.css b/src/resources/ui/chart-default.css index d7b93aa..7cbc067 100644 --- a/src/resources/ui/chart-default.css +++ b/src/resources/ui/chart-default.css @@ -65,7 +65,7 @@ line.planet-marker { stroke: #555555; } -path.planet-symbol { +.planet-symbol { stroke-width: 2; fill: none; stroke: #000080; diff --git a/src/resources/ui/chart-default.xsl b/src/resources/ui/chart-default.xsl index 2f5a818..cef1e5a 100644 --- a/src/resources/ui/chart-default.xsl +++ b/src/resources/ui/chart-default.xsl @@ -43,81 +43,28 @@ + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -547,7 +494,7 @@ - + @@ -565,7 +512,7 @@ - + @@ -589,7 +536,7 @@ - + From 5fec76d4a16a2428ea5a575ce6f3f1c29ec96d72 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Sun, 31 Aug 2014 22:37:33 +0200 Subject: [PATCH 2/2] Modify default chart XSL so its size can be set dynamically --- src/resources/ui/chart-default.css | 2 +- src/resources/ui/chart-default.xsl | 160 +++++++++++++++++++++-------- 2 files changed, 117 insertions(+), 45 deletions(-) diff --git a/src/resources/ui/chart-default.css b/src/resources/ui/chart-default.css index 7cbc067..89140d2 100644 --- a/src/resources/ui/chart-default.css +++ b/src/resources/ui/chart-default.css @@ -57,7 +57,7 @@ line.axis { } line.axis-end { - marker-end: url(#arrow_end); + marker-start: url(#arrow_end); } line.planet-marker { diff --git a/src/resources/ui/chart-default.xsl b/src/resources/ui/chart-default.xsl index cef1e5a..b1170d3 100644 --- a/src/resources/ui/chart-default.xsl +++ b/src/resources/ui/chart-default.xsl @@ -14,15 +14,17 @@ - + + + + version="1.0"> + + - - + + + - + + - - + + + + + + - - + + + + + + - + + + + @@ -91,7 +106,10 @@ - + + + + @@ -116,7 +134,10 @@ - + + + + @@ -153,7 +174,10 @@ - + + + + @@ -442,41 +466,77 @@ - - - - - - - - - - - - + + rotate(-15,0,0) translate(,-) rotate(90,,) + + + rotate(-45,0,0) translate(,-) rotate(90,,) + + + rotate(-75,0,0) translate(,-) rotate(90,,) + + + rotate(-105,0,0) translate(,-) rotate(90,,) + + + rotate(-135,0,0) translate(,-) rotate(90,,) + + + rotate(-165,0,0) translate(,-) rotate(90,,) + + + rotate(-195,0,0) translate(,-) rotate(90,,) + + + rotate(-225,0,0) translate(,-) rotate(90,,) + + + rotate(-255,0,0) translate(,-) rotate(90,,) + + + rotate(-285,0,0) translate(,-) rotate(90,,) + + + rotate(-315,0,0) translate(,-) rotate(90,,) + + + rotate(-345,0,0) translate(,-) rotate(90,,) + - + + + - + + + - - + + + + - + + + - + + + - + + + @@ -488,15 +548,19 @@ - + + + - + + + - + @@ -506,20 +570,24 @@ - + + + - + + + - + - + R @@ -530,15 +598,19 @@ - + + + - + + + - +