Author: kn
Date: Mon Jan 7 11:06:00 2008
New Revision: 7084
Log:
- Fixed issue #12326: Per datapoint colors not used with bar charts
Added:
trunk/Graph/tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg
(with props)
Modified:
trunk/Graph/ChangeLog
trunk/Graph/src/charts/line.php
trunk/Graph/tests/line_test.php
Modified: trunk/Graph/ChangeLog
==============================================================================
--- trunk/Graph/ChangeLog [iso-8859-1] (original)
+++ trunk/Graph/ChangeLog [iso-8859-1] Mon Jan 7 11:06:00 2008
@@ -6,6 +6,7 @@
- Fixed issue #12295: Broken automatic scaling with manually set min value,
not divisible by major step
- Fixed issue #11777: Optionally independent axis font configuration
+- Fixed issue #12326: Per datapoint colors not used with bar charts
1.2 - Monday 17 December 2007
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Modified: trunk/Graph/src/charts/line.php
==============================================================================
--- trunk/Graph/src/charts/line.php [iso-8859-1] (original)
+++ trunk/Graph/src/charts/line.php [iso-8859-1] Mon Jan 7 11:06:00 2008
@@ -367,7 +367,7 @@
$renderer->drawBar(
$boundings,
new ezcGraphContext( $datasetName, $key,
$data->url[$key] ),
- $data->color->default,
+ $data->color[$key],
$point,
$width,
$nr[$data->displayType->default],
Added:
trunk/Graph/tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg
==============================================================================
---
trunk/Graph/tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg
(added)
+++
trunk/Graph/tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg
[iso-8859-1] Mon Jan 7 11:06:00 2008
@@ -1,0 +1,2 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="500" height="200" version="1.0"
id="ezcGraph"><defs/><g id="ezcGraphChart" color-rendering="optimizeQuality"
shape-rendering="geometricPrecision" text-rendering="optimizeLegibility"><path
d=" M 0.0000,200.0000 L 0.0000,0.0000 L 500.0000,0.0000 L 500.0000,200.0000 L
0.0000,200.0000 z " style="fill: #eeeeec; fill-opacity: 1.00; stroke: none;"
id="ezcGraphPolygon_1"/><path d=" M 0.0000,200.0000 L 0.0000,0.0000 L
100.0000,0.0000 L 100.0000,200.0000 L 0.0000,200.0000 z " style="fill: #000000;
fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_2"/><path d=" M
2.0000,16.0000 L 2.0000,2.0000 L 16.0000,2.0000 L 16.0000,16.0000 L
2.0000,16.0000 z " style="fill: #3465a4; fill-opacity: 1.00; stroke: none;"
id="ezcGraphPolygon_3"/><path d=" M 100.0000,182.0000 L 120.0000,162.0000 L
500.0000,162.0000 L 480.0000,182.0000 L 100.0000,182.0000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_5"/><path d=" M
120.0000,162.0000 L 500.0000,162.0000" style="fill: none; stroke: #2e3436;
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_6"/><path d=" M 492.0000,158.0000 L 500.0000,162.0000
L 492.0000,166.0000 L 492.0000,158.0000 z " style="fill: #2e3436; fill-opacity:
1.00; stroke: none;" id="ezcGraphPolygon_7"/><path d=" M 138.0000,200.0000 L
158.0000,180.0000 L 158.0000,0.0000 L 138.0000,20.0000 L 138.0000,200.0000 z "
style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_8"/><path d=" M 158.0000,180.0000 L 158.0000,0.0000"
style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_9"/><path d="
M 155.5000,5.0000 L 158.0000,0.0000 L 160.5000,5.0000 L 155.5000,5.0000 z "
style="fill: #2e3436; fill-opacity: 1.00; stroke: none;"
id="ezcGraphPolygon_10"/><path d=" M 218.8000,162.0000 L 218.8000,18.0000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_12"/><path d="
M 198.8000,179.3000 L 218.8000,159.3000 L 218.8000,164.7000 L 198.8000,184.7000
L 198.8000,179.3000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke:
none;" id="ezcGraphPolygon_13"/><path d=" M 218.3000,160.5071 L
218.3000,164.4929 L 199.3000,183.4929 L 199.3000,179.5071 L 218.3000,160.5071 z
" style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphPolygon_14"/><path
d=" M 279.6000,162.0000 L 279.6000,18.0000" style="fill: none; stroke: #000000;
stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_16"/><path d=" M 259.6000,179.3000 L 279.6000,159.3000
L 279.6000,164.7000 L 259.6000,184.7000 L 259.6000,179.3000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_17"/><path d="
M 279.1000,160.5071 L 279.1000,164.4929 L 260.1000,183.4929 L 260.1000,179.5071
L 279.1000,160.5071 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_18"/><path d=" M 340.4000,162.0000 L 340.4000,18.0000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_20"/><path d="
M 320.4000,179.3000 L 340.4000,159.3000 L 340.4000,164.7000 L 320.4000,184.7000
L 320.4000,179.3000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke:
none;" id="ezcGraphPolygon_21"/><path d=" M 339.9000,160.5071 L
339.9000,164.4929 L 320.9000,183.4929 L 320.9000,179.5071 L 339.9000,160.5071 z
" style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphPolygon_22"/><path
d=" M 401.2000,162.0000 L 401.2000,18.0000" style="fill: none; stroke: #000000;
stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_24"/><path d=" M 381.2000,179.3000 L 401.2000,159.3000
L 401.2000,164.7000 L 381.2000,184.7000 L 381.2000,179.3000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_25"/><path d="
M 400.7000,160.5071 L 400.7000,164.4929 L 381.7000,183.4929 L 381.7000,179.5071
L 400.7000,160.5071 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_26"/><path d=" M 462.0000,162.0000 L 462.0000,18.0000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_28"/><path d="
M 442.0000,179.3000 L 462.0000,159.3000 L 462.0000,164.7000 L 442.0000,184.7000
L 442.0000,179.3000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke:
none;" id="ezcGraphPolygon_29"/><path d=" M 461.5000,160.5071 L
461.5000,164.4929 L 442.5000,183.4929 L 442.5000,179.5071 L 461.5000,160.5071 z
" style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphPolygon_30"/><path
d=" M 462.0000,154.8000 L 158.0000,154.8000" style="fill: none; stroke:
#000000; stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphLine_32"/><path d=" M 138.0000,174.8000 L
158.0000,154.8000 L 158.9500,154.8000 L 138.9500,174.8000 L 138.0000,174.8000 z
" style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_33"/><path d=" M 158.2071,155.3000 L 157.7429,155.3000 L
138.7429,174.3000 L 139.2071,174.3000 L 158.2071,155.3000 z " style="fill:
none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap:
round; stroke-linejoin: round;" id="ezcGraphPolygon_34"/><path d=" M
462.0000,147.6000 L 158.0000,147.6000" style="fill: none; stroke: #000000;
stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_35"/><path d=" M 138.0000,167.6000 L 158.0000,147.6000
L 158.9500,147.6000 L 138.9500,167.6000 L 138.0000,167.6000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_36"/><path d="
M 158.2071,148.1000 L 157.7429,148.1000 L 138.7429,167.1000 L 139.2071,167.1000
L 158.2071,148.1000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_37"/><path d=" M 462.0000,140.4000 L 158.0000,140.4000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_38"/><path d="
M 138.0000,160.4000 L 158.0000,140.4000 L 158.9500,140.4000 L 138.9500,160.4000
L 138.0000,160.4000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke:
none;" id="ezcGraphPolygon_39"/><path d=" M 158.2071,140.9000 L
157.7429,140.9000 L 138.7429,159.9000 L 139.2071,159.9000 L 158.2071,140.9000 z
" style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphPolygon_40"/><path
d=" M 462.0000,133.2000 L 158.0000,133.2000" style="fill: none; stroke:
#000000; stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphLine_41"/><path d=" M 138.0000,153.2000 L
158.0000,133.2000 L 160.8500,133.2000 L 140.8500,153.2000 L 138.0000,153.2000 z
" style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_42"/><path d=" M 158.2071,133.7000 L 159.6429,133.7000 L
140.6429,152.7000 L 139.2071,152.7000 L 158.2071,133.7000 z " style="fill:
none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap:
round; stroke-linejoin: round;" id="ezcGraphPolygon_43"/><path d=" M
462.0000,126.0000 L 158.0000,126.0000" style="fill: none; stroke: #000000;
stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_45"/><path d=" M 138.0000,146.0000 L 158.0000,126.0000
L 158.9500,126.0000 L 138.9500,146.0000 L 138.0000,146.0000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_46"/><path d="
M 158.2071,126.5000 L 157.7429,126.5000 L 138.7429,145.5000 L 139.2071,145.5000
L 158.2071,126.5000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_47"/><path d=" M 462.0000,118.8000 L 158.0000,118.8000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_48"/><path d="
M 138.0000,138.8000 L 158.0000,118.8000 L 158.9500,118.8000 L 138.9500,138.8000
L 138.0000,138.8000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke:
none;" id="ezcGraphPolygon_49"/><path d=" M 158.2071,119.3000 L
157.7429,119.3000 L 138.7429,138.3000 L 139.2071,138.3000 L 158.2071,119.3000 z
" style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphPolygon_50"/><path
d=" M 462.0000,111.6000 L 158.0000,111.6000" style="fill: none; stroke:
#000000; stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphLine_51"/><path d=" M 138.0000,131.6000 L
158.0000,111.6000 L 158.9500,111.6000 L 138.9500,131.6000 L 138.0000,131.6000 z
" style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_52"/><path d=" M 158.2071,112.1000 L 157.7429,112.1000 L
138.7429,131.1000 L 139.2071,131.1000 L 158.2071,112.1000 z " style="fill:
none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap:
round; stroke-linejoin: round;" id="ezcGraphPolygon_53"/><path d=" M
462.0000,104.4000 L 158.0000,104.4000" style="fill: none; stroke: #000000;
stroke-width: 1; stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_54"/><path d=" M 138.0000,124.4000 L 158.0000,104.4000
L 160.8500,104.4000 L 140.8500,124.4000 L 138.0000,124.4000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_55"/><path d="
M 158.2071,104.9000 L 159.6429,104.9000 L 140.6429,123.9000 L 139.2071,123.9000
L 158.2071,104.9000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_56"/><path d=" M 462.0000,97.2000 L 158.0000,97.2000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_58"/><path d="
M 138.0000,117.2000 L 158.0000,97.2000 L 158.9500,97.2000 L 138.9500,117.2000 L
138.0000,117.2000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_59"/><path d=" M 158.2071,97.7000 L 157.7429,97.7000 L
138.7429,116.7000 L 139.2071,116.7000 L 158.2071,97.7000 z " style="fill: none;
stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphPolygon_60"/><path d=" M 462.0000,90.0000
L 158.0000,90.0000" style="fill: none; stroke: #000000; stroke-width: 1;
stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_61"/><path d=" M 138.0000,110.0000 L 158.0000,90.0000 L
158.9500,90.0000 L 138.9500,110.0000 L 138.0000,110.0000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_62"/><path d="
M 158.2071,90.5000 L 157.7429,90.5000 L 138.7429,109.5000 L 139.2071,109.5000 L
158.2071,90.5000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_63"/><path d=" M 462.0000,82.8000 L 158.0000,82.8000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_64"/><path d="
M 138.0000,102.8000 L 158.0000,82.8000 L 158.9500,82.8000 L 138.9500,102.8000 L
138.0000,102.8000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_65"/><path d=" M 158.2071,83.3000 L 157.7429,83.3000 L
138.7429,102.3000 L 139.2071,102.3000 L 158.2071,83.3000 z " style="fill: none;
stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphPolygon_66"/><path d=" M 462.0000,75.6000
L 158.0000,75.6000" style="fill: none; stroke: #000000; stroke-width: 1;
stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_67"/><path d=" M 138.0000,95.6000 L 158.0000,75.6000 L
160.8500,75.6000 L 140.8500,95.6000 L 138.0000,95.6000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_68"/><path d="
M 158.2071,76.1000 L 159.6429,76.1000 L 140.6429,95.1000 L 139.2071,95.1000 L
158.2071,76.1000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_69"/><path d=" M 462.0000,68.4000 L 158.0000,68.4000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_71"/><path d="
M 138.0000,88.4000 L 158.0000,68.4000 L 158.9500,68.4000 L 138.9500,88.4000 L
138.0000,88.4000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_72"/><path d=" M 158.2071,68.9000 L 157.7429,68.9000 L
138.7429,87.9000 L 139.2071,87.9000 L 158.2071,68.9000 z " style="fill: none;
stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphPolygon_73"/><path d=" M 462.0000,61.2000
L 158.0000,61.2000" style="fill: none; stroke: #000000; stroke-width: 1;
stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_74"/><path d=" M 138.0000,81.2000 L 158.0000,61.2000 L
158.9500,61.2000 L 138.9500,81.2000 L 138.0000,81.2000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_75"/><path d="
M 158.2071,61.7000 L 157.7429,61.7000 L 138.7429,80.7000 L 139.2071,80.7000 L
158.2071,61.7000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_76"/><path d=" M 462.0000,54.0000 L 158.0000,54.0000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_77"/><path d="
M 138.0000,74.0000 L 158.0000,54.0000 L 158.9500,54.0000 L 138.9500,74.0000 L
138.0000,74.0000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_78"/><path d=" M 158.2071,54.5000 L 157.7429,54.5000 L
138.7429,73.5000 L 139.2071,73.5000 L 158.2071,54.5000 z " style="fill: none;
stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphPolygon_79"/><path d=" M 462.0000,46.8000
L 158.0000,46.8000" style="fill: none; stroke: #000000; stroke-width: 1;
stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_80"/><path d=" M 138.0000,66.8000 L 158.0000,46.8000 L
160.8500,46.8000 L 140.8500,66.8000 L 138.0000,66.8000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_81"/><path d="
M 158.2071,47.3000 L 159.6429,47.3000 L 140.6429,66.3000 L 139.2071,66.3000 L
158.2071,47.3000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_82"/><path d=" M 462.0000,39.6000 L 158.0000,39.6000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_84"/><path d="
M 138.0000,59.6000 L 158.0000,39.6000 L 158.9500,39.6000 L 138.9500,59.6000 L
138.0000,59.6000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_85"/><path d=" M 158.2071,40.1000 L 157.7429,40.1000 L
138.7429,59.1000 L 139.2071,59.1000 L 158.2071,40.1000 z " style="fill: none;
stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphPolygon_86"/><path d=" M 462.0000,32.4000
L 158.0000,32.4000" style="fill: none; stroke: #000000; stroke-width: 1;
stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_87"/><path d=" M 138.0000,52.4000 L 158.0000,32.4000 L
158.9500,32.4000 L 138.9500,52.4000 L 138.0000,52.4000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_88"/><path d="
M 158.2071,32.9000 L 157.7429,32.9000 L 138.7429,51.9000 L 139.2071,51.9000 L
158.2071,32.9000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_89"/><path d=" M 462.0000,25.2000 L 158.0000,25.2000"
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 0.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_90"/><path d="
M 138.0000,45.2000 L 158.0000,25.2000 L 158.9500,25.2000 L 138.9500,45.2000 L
138.0000,45.2000 z " style="fill: #2e3436; fill-opacity: 0.20; stroke: none;"
id="ezcGraphPolygon_91"/><path d=" M 158.2071,25.7000 L 157.7429,25.7000 L
138.7429,44.7000 L 139.2071,44.7000 L 158.2071,25.7000 z " style="fill: none;
stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round;
stroke-linejoin: round;" id="ezcGraphPolygon_92"/><path d=" M 462.0000,18.0000
L 158.0000,18.0000" style="fill: none; stroke: #000000; stroke-width: 1;
stroke-opacity: 0.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_93"/><path d=" M 138.0000,38.0000 L 158.0000,18.0000 L
160.8500,18.0000 L 140.8500,38.0000 L 138.0000,38.0000 z " style="fill:
#2e3436; fill-opacity: 0.20; stroke: none;" id="ezcGraphPolygon_94"/><path d="
M 158.2071,18.5000 L 159.6429,18.5000 L 140.6429,37.5000 L 139.2071,37.5000 L
158.2071,18.5000 z " style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphPolygon_95"/><path d=" M 160.5196,38.0000 L 144.5196,54.0000 L
196.2804,54.0000 L 212.2804,38.0000 L 160.5196,38.0000 z " style="fill:
#132c51; fill-opacity: 0.69; stroke: none;" id="ezcGraphPolygon_97"/><path d="
M 196.2804,180.0000 L 144.5196,180.0000 L 144.5196,54.0000 L 196.2804,54.0000 L
196.2804,180.0000 z " style="fill: #204a87; fill-opacity: 0.69; stroke: none;"
id="ezcGraphPolygon_98"/><path d=" M 212.2804,38.0000 L 196.2804,54.0000 L
196.2804,180.0000 L 212.2804,164.0000 L 212.2804,38.0000 z " style="fill:
#1a3b6c; fill-opacity: 0.69; stroke: none;" id="ezcGraphPolygon_99"/><path d="
M 221.3196,154.0640 L 205.3196,170.0640 L 257.0804,170.0640 L 273.0804,154.0640
L 221.3196,154.0640 z " style="fill: #1f3d62; fill-opacity: 1.00; stroke:
none;" id="ezcGraphPolygon_100"/><path d=" M 257.0804,180.0000 L
205.3196,180.0000 L 205.3196,170.0640 L 257.0804,170.0640 L 257.0804,180.0000 z
" style="fill: #3465a4; fill-opacity: 1.00; stroke: none;"
id="ezcGraphPolygon_101"/><path d=" M 273.0804,154.0640 L 257.0804,170.0640 L
257.0804,180.0000 L 273.0804,164.0000 L 273.0804,154.0640 z " style="fill:
#2a5183; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_102"/><path d="
M 282.1196,129.3248 L 266.1196,145.3248 L 317.8804,145.3248 L 333.8804,129.3248
L 282.1196,129.3248 z " style="fill: #2f5c04; fill-opacity: 0.69; stroke:
none;" id="ezcGraphPolygon_103"/><path d=" M 317.8804,180.0000 L
266.1196,180.0000 L 266.1196,145.3248 L 317.8804,145.3248 L 317.8804,180.0000 z
" style="fill: #4e9a06; fill-opacity: 0.69; stroke: none;"
id="ezcGraphPolygon_104"/><path d=" M 333.8804,129.3248 L 317.8804,145.3248 L
317.8804,180.0000 L 333.8804,164.0000 L 333.8804,129.3248 z " style="fill:
#3e7b05; fill-opacity: 0.69; stroke: none;" id="ezcGraphPolygon_105"/><path d="
M 342.9196,157.3472 L 326.9196,173.3472 L 378.6804,173.3472 L 394.6804,157.3472
L 342.9196,157.3472 z " style="fill: #1f3d62; fill-opacity: 1.00; stroke:
none;" id="ezcGraphPolygon_106"/><path d=" M 378.6804,180.0000 L
326.9196,180.0000 L 326.9196,173.3472 L 378.6804,173.3472 L 378.6804,180.0000 z
" style="fill: #3465a4; fill-opacity: 1.00; stroke: none;"
id="ezcGraphPolygon_107"/><path d=" M 394.6804,157.3472 L 378.6804,173.3472 L
378.6804,180.0000 L 394.6804,164.0000 L 394.6804,157.3472 z " style="fill:
#2a5183; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_108"/><path d="
M 403.7196,135.5744 L 387.7196,151.5744 L 439.4804,151.5744 L 455.4804,135.5744
L 403.7196,135.5744 z " style="fill: #1f3d62; fill-opacity: 1.00; stroke:
none;" id="ezcGraphPolygon_109"/><path d=" M 439.4804,180.0000 L
387.7196,180.0000 L 387.7196,151.5744 L 439.4804,151.5744 L 439.4804,180.0000 z
" style="fill: #3465a4; fill-opacity: 1.00; stroke: none;"
id="ezcGraphPolygon_110"/><path d=" M 455.4804,135.5744 L 439.4804,151.5744 L
439.4804,180.0000 L 455.4804,164.0000 L 455.4804,135.5744 z " style="fill:
#2a5183; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_111"/><path d="
M 500.0000,162.0000 L 480.0000,182.0000" style="fill: none; stroke: #2e3436;
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_112"/><path d=" M 480.0000,182.0000 L
100.0000,182.0000" style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_113"/><path d=" M 100.0000,182.0000 L 120.0000,162.0000"
style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_114"/><path
d=" M 158.0000,0.0000 L 138.0000,20.0000" style="fill: none; stroke: #2e3436;
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin:
round;" id="ezcGraphLine_115"/><path d=" M 138.0000,20.0000 L
138.0000,200.0000" style="fill: none; stroke: #2e3436; stroke-width: 1;
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;"
id="ezcGraphLine_116"/><path d=" M 138.0000,200.0000 L 158.0000,180.0000"
style="fill: none; stroke: #2e3436; stroke-width: 1; stroke-opacity: 1.00;
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_117"/><g
id="ezcGraphTextBox_4"><path d=" M 16.5000,17.0000 L 16.5000,1.5000 L
62.5200,1.5000 L 62.5200,17.0000 L 16.5000,17.0000 z " style="fill: #ffffff;
fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_118"/><text
id="ezcGraphTextBox_4_text" x="17.0000" text-length="44.5200px" y="13.9000"
style="font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity:
1.00; stroke: none;">sample</text></g><g id="ezcGraphTextBox_11"><path d=" M
147.8660,195.6000 L 147.8660,183.3000 L 189.4340,183.3000 L 189.4340,195.6000 L
147.8660,195.6000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;"
id="ezcGraphPolygon_119"/><text id="ezcGraphTextBox_11_text" x="148.3660"
text-length="40.0680px" y="192.9800" style="font-size: 10px; font-family:
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke:
none;">Mozilla</text></g><g id="ezcGraphTextBox_15"><path d=" M
222.9760,195.6000 L 222.9760,183.3000 L 235.9240,183.3000 L 235.9240,195.6000 L
222.9760,195.6000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;"
id="ezcGraphPolygon_120"/><text id="ezcGraphTextBox_15_text" x="223.4760"
text-length="11.4480px" y="192.9800" style="font-size: 10px; font-family:
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">IE</text></g><g
id="ezcGraphTextBox_19"><path d=" M 275.1900,195.6000 L 275.1900,183.3000 L
305.3100,183.3000 L 305.3100,195.6000 L 275.1900,195.6000 z " style="fill:
#ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_121"/><text
id="ezcGraphTextBox_19_text" x="275.6900" text-length="28.6200px" y="192.9800"
style="font-size: 10px; font-family: sans-serif; fill: #2e3436; fill-opacity:
1.00; stroke: none;">Opera</text></g><g id="ezcGraphTextBox_23"><path d=" M
338.8520,195.6000 L 338.8520,183.3000 L 363.2480,183.3000 L 363.2480,195.6000 L
338.8520,195.6000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;"
id="ezcGraphPolygon_122"/><text id="ezcGraphTextBox_23_text" x="339.3520"
text-length="22.8960px" y="192.9800" style="font-size: 10px; font-family:
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">wget</text></g><g
id="ezcGraphTextBox_27"><path d=" M 393.9280,195.6000 L 393.9280,183.3000 L
429.7720,183.3000 L 429.7720,195.6000 L 393.9280,195.6000 z " style="fill:
#ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_123"/><text
id="ezcGraphTextBox_27_text" x="394.4280" text-length="34.3440px" y="192.9800"
style="font-size: 10px; font-family: sans-serif; fill: #2e3436; fill-opacity:
1.00; stroke: none;">Safari</text></g><g id="ezcGraphTextBox_31"><path d=" M
128.9040,181.2000 L 128.9040,168.9000 L 137.1000,168.9000 L 137.1000,181.2000 L
128.9040,181.2000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;"
id="ezcGraphPolygon_124"/><text id="ezcGraphTextBox_31_text" x="129.4040"
text-length="6.6960px" y="178.5800" style="font-size: 10px; font-family:
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">0</text></g><g
id="ezcGraphTextBox_44"><path d=" M 108.8160,152.4000 L 108.8160,140.1000 L
137.1000,140.1000 L 137.1000,152.4000 L 108.8160,152.4000 z " style="fill:
#ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_125"/><text
id="ezcGraphTextBox_44_text" x="109.3160" text-length="26.7840px" y="149.7800"
style="font-size: 10px; font-family: sans-serif; fill: #2e3436; fill-opacity:
1.00; stroke: none;">1000</text></g><g id="ezcGraphTextBox_57"><path d=" M
108.8160,123.6000 L 108.8160,111.3000 L 137.1000,111.3000 L 137.1000,123.6000 L
108.8160,123.6000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;"
id="ezcGraphPolygon_126"/><text id="ezcGraphTextBox_57_text" x="109.3160"
text-length="26.7840px" y="120.9800" style="font-size: 10px; font-family:
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">2000</text></g><g
id="ezcGraphTextBox_70"><path d=" M 108.8160,94.8000 L 108.8160,82.5000 L
137.1000,82.5000 L 137.1000,94.8000 L 108.8160,94.8000 z " style="fill:
#ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_127"/><text
id="ezcGraphTextBox_70_text" x="109.3160" text-length="26.7840px" y="92.1800"
style="font-size: 10px; font-family: sans-serif; fill: #2e3436; fill-opacity:
1.00; stroke: none;">3000</text></g><g id="ezcGraphTextBox_83"><path d=" M
108.8160,66.0000 L 108.8160,53.7000 L 137.1000,53.7000 L 137.1000,66.0000 L
108.8160,66.0000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;"
id="ezcGraphPolygon_128"/><text id="ezcGraphTextBox_83_text" x="109.3160"
text-length="26.7840px" y="63.3800" style="font-size: 10px; font-family:
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">4000</text></g><g
id="ezcGraphTextBox_96"><path d=" M 108.8160,51.6000 L 108.8160,39.3000 L
137.1000,39.3000 L 137.1000,51.6000 L 108.8160,51.6000 z " style="fill:
#ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_129"/><text
id="ezcGraphTextBox_96_text" x="109.3160" text-length="26.7840px" y="48.9800"
style="font-size: 10px; font-family: sans-serif; fill: #2e3436; fill-opacity:
1.00; stroke: none;">5000</text></g></g></svg>
Propchange:
trunk/Graph/tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
trunk/Graph/tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg
------------------------------------------------------------------------------
svn:mimetype = application/octet-stream
Modified: trunk/Graph/tests/line_test.php
==============================================================================
--- trunk/Graph/tests/line_test.php [iso-8859-1] (original)
+++ trunk/Graph/tests/line_test.php [iso-8859-1] Mon Jan 7 11:06:00 2008
@@ -956,11 +956,11 @@
);
}
- public function testLineChartUnsyncedFonts()
+ public function testBarChartDataPointColors()
{
$filename = $this->tempDir . __FUNCTION__ . '.svg';
- $chart = new ezcGraphLineChart();
+ $chart = new ezcGraphBarChart();
$chart->data['sample'] = new ezcGraphArrayDataSet( array(
'Mozilla' => 4375,
'IE' => 345,
@@ -969,8 +969,10 @@
'Safari' => 987,
) );
- $chart->renderer->options->syncAxisFonts = false;
-
+ $chart->data['sample']->color['Mozilla'] = '#204a874F';
+ $chart->data['sample']->color['Opera'] = '#4e9a064F';
+
+ $chart->renderer = new ezcGraphRenderer3d();
$chart->driver = new ezcGraphSvgDriver();
$chart->render( 500, 200, $filename );
@@ -980,7 +982,7 @@
);
}
- public function testLineChartUnsyncedFonts3d()
+ public function testLineChartUnsyncedFonts()
{
$filename = $this->tempDir . __FUNCTION__ . '.svg';
@@ -993,7 +995,6 @@
'Safari' => 987,
) );
- $chart->renderer = new ezcGraphRenderer3d();
$chart->renderer->options->syncAxisFonts = false;
$chart->driver = new ezcGraphSvgDriver();
@@ -1005,14 +1006,11 @@
);
}
- public function testStackedBarChart()
+ public function testLineChartUnsyncedFonts3d()
{
$filename = $this->tempDir . __FUNCTION__ . '.svg';
- $chart = new ezcGraphBarChart();
-
- $chart->options->stackBars = true;
-
+ $chart = new ezcGraphLineChart();
$chart->data['sample'] = new ezcGraphArrayDataSet( array(
'Mozilla' => 4375,
'IE' => 345,
@@ -1021,6 +1019,34 @@
'Safari' => 987,
) );
+ $chart->renderer = new ezcGraphRenderer3d();
+ $chart->renderer->options->syncAxisFonts = false;
+
+ $chart->driver = new ezcGraphSvgDriver();
+ $chart->render( 500, 200, $filename );
+
+ $this->compare(
+ $filename,
+ $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ .
'.svg'
+ );
+ }
+
+ public function testStackedBarChart()
+ {
+ $filename = $this->tempDir . __FUNCTION__ . '.svg';
+
+ $chart = new ezcGraphBarChart();
+
+ $chart->options->stackBars = true;
+
+ $chart->data['sample'] = new ezcGraphArrayDataSet( array(
+ 'Mozilla' => 4375,
+ 'IE' => 345,
+ 'Opera' => 1204,
+ 'wget' => 231,
+ 'Safari' => 987,
+ ) );
+
$chart->data['sample 2'] = new ezcGraphArrayDataSet( array(
'Mozilla' => 4352,
'IE' => 745,
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
![[svn-components] 7084 - in /trunk/Graph: ChangeLog src/charts/line.php tests/data/compare/ezcGraphLineChartTest_testBarChartDataPointColors.svg tests/line_test.php](/search?l=svn-components@lists.ez.no&q=subject:%22%5C%5Bsvn%5C-components%5C%5D+7084+%5C-+in+%5C%2Ftrunk%5C%2FGraph%5C%3A+ChangeLog+src%5C%2Fcharts%5C%2Fline.php+tests%5C%2Fdata%5C%2Fcompare%5C%2FezcGraphLineChartTest_testBarChartDataPointColors.svg+tests%5C%2Fline_test.php%22&o=newest){kind=link}
