From 4e50ab6291dc2430ef9ce4cc42c100c021e1a3b0 Mon Sep 17 00:00:00 2001 From: Kore Nordmann Date: Fri, 25 Aug 2006 01:20:36 +0000 Subject: - Pimped pie charts Look at Graph/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadow.svg # Caused by a 25h travel from Dortmund to Vancover and commited on an open # WLAN in Osoyoos in Okanagan Valley, Canada --- ...cGraphGdDriverTest_testDrawCircularArcAcute.png | Bin 740 -> 697 bytes ...GdDriverTest_testDrawCircularArcAcuteBorder.png | Bin 0 -> 491 bytes ...dDriverTest_testDrawCircularArcAcuteReverse.png | Bin 740 -> 697 bytes ...GraphGdDriverTest_testDrawCircularArcObtuse.png | Bin 1889 -> 1747 bytes ...Renderer2dTest_testRenderFilledLineBarChart.svg | 2 +- ...aphRenderer2dTest_testRenderFilledLineChart.svg | 2 +- ...stRenderFilledLineChartWithAxisIntersection.svg | 2 +- .../ezcGraphRenderer2dTest_testRenderLineChart.svg | 2 +- .../ezcGraphRenderer2dTest_testRenderPieChart.svg | 2 +- ...testRenderPieChartWithBackgroundBottomRight.svg | 2 +- ...rer2dTest_testRenderPieChartWithLegendTitle.svg | 2 +- ...Renderer2dTest_testRenderPieChartWithOffset.svg | 2 +- ...est_testRenderPieChartWithTextureBackground.svg | 2 +- ...hRenderer3dTest_testRender3dFilledLineChart.svg | 2 +- ...st_testRender3dFilledLineChartNonFilledAxis.svg | 2 +- ...st_testRender3dFilledLineChartNonFilledGrid.svg | 2 +- ...Render3dFilledLineChartWithAxisIntersection.svg | 2 +- ...estRender3dFilledLineChartWithoutDataBorder.svg | 2 +- ...zcGraphRenderer3dTest_testRender3dLineChart.svg | 2 +- ...r3dTest_testRender3dLineChartBigMaxFontSize.svg | 2 +- ...dTest_testRender3dLineChartSmallMaxFontSize.svg | 2 +- .../ezcGraphRenderer3dTest_testRenderBarChart.svg | 2 +- ...aphRenderer3dTest_testRenderBarChartSymbols.svg | 2 +- ...hRenderer3dTest_testRenderLabeledPieSegment.svg | 2 +- ...est_testRenderLabeledPieSegmentPolygonOrder.svg | 2 +- ...testRenderLabeledPieSegmentWithCustomHeight.svg | 2 +- ...stRenderLabeledPieSegmentWithCustomRotation.svg | 2 +- ...stRenderLabeledPieSegmentWithGleamAndShadow.svg | 2 + ...RenderLabeledPieSegmentWithGleamAndShadowGD.png | Bin 0 -> 73870 bytes ...RenderLabeledPieSegmentWithIncreasedMoveOut.svg | 2 +- ...3dTest_testRenderLabeledPieSegmentWithTitle.svg | 2 +- ...estRenderLabeledPieSegmentWithoutDataBorder.svg | 2 +- ...t_testRenderLabeledPieSegmentWithoutSymbols.svg | 2 +- ...rer3dTest_testRenderNegativeBarChartSymbols.svg | 2 +- ...estRenderPieChartWithBackgroundBottomCenter.svg | 2 +- ...nderPieChartWithHorizontalTextureBackground.svg | 2 +- ...er3dTest_testRenderPieChartWithLotsOfLabels.svg | 2 +- ...Renderer3dTest_testRenderPieChartWithOffset.svg | 2 +- ...cGraphSvgDriverTest_testDrawChartInTemplate.svg | 4 +- ...iverTest_testDrawChartInTemplateCustomGroup.svg | 4 +- ...cGraphSvgDriverTest_testDrawCircleNonFilled.svg | 2 +- ...raphSvgDriverTest_testDrawCircleSectorAcute.svg | 2 +- ...iverTest_testDrawCircleSectorAcuteNonFilled.svg | 2 +- ...DriverTest_testDrawCircleSectorAcuteReverse.svg | 2 +- ...aphSvgDriverTest_testDrawCircleSectorObtuse.svg | 2 +- ...GraphSvgDriverTest_testDrawCircularArcAcute.svg | 2 +- ...vgDriverTest_testDrawCircularArcAcuteBorder.svg | 2 + ...gDriverTest_testDrawCircularArcAcuteReverse.svg | 2 +- ...raphSvgDriverTest_testDrawCircularArcObtuse.svg | 2 +- .../compare/ezcGraphSvgDriverTest_testDrawLine.svg | 2 +- ...verTest_testDrawPolygonThreePointsNotFilled.svg | 2 +- tests/driver_gd_test.php | 35 +++++++++- tests/driver_svg_test.php | 23 +++++++ tests/renderer_3d_test.php | 71 +++++++++++++++++++++ 54 files changed, 178 insertions(+), 47 deletions(-) create mode 100644 tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteBorder.png create mode 100644 tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadow.svg create mode 100644 tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadowGD.png create mode 100644 tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteBorder.svg (limited to 'tests') diff --git a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcute.png b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcute.png index 37be54d..c5d2838 100644 Binary files a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcute.png and b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcute.png differ diff --git a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteBorder.png b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteBorder.png new file mode 100644 index 0000000..68c50a1 Binary files /dev/null and b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteBorder.png differ diff --git a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteReverse.png b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteReverse.png index 37be54d..c5d2838 100644 Binary files a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteReverse.png and b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcAcuteReverse.png differ diff --git a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcObtuse.png b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcObtuse.png index f29aca4..d819856 100644 Binary files a/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcObtuse.png and b/tests/data/compare/ezcGraphGdDriverTest_testDrawCircularArcObtuse.png differ diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineBarChart.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineBarChart.svg index 87d8d38..671b73c 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineBarChart.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineBarChart.svg @@ -1,2 +1,2 @@ -Line 0Line 1Line 2sample 1sample 2sample 3sample 4sample 50250500750 +Line 0Line 1Line 2sample 1sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChart.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChart.svg index 4ffc6ba..e16e48e 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChart.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChart.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 50250500750 +Line 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChartWithAxisIntersection.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChartWithAxisIntersection.svg index 0ce4183..aeb99ee 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChartWithAxisIntersection.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderFilledLineChartWithAxisIntersection.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 5-2500250500750 +Line 1Line 2sample 2sample 3sample 4sample 5-2500250500750 diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderLineChart.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderLineChart.svg index 0856e85..24d2bbe 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderLineChart.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderLineChart.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 50250500750 +Line 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChart.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChart.svg index 12bfbb7..5d30a25 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChart.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChart.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithBackgroundBottomRight.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithBackgroundBottomRight.svg index cac4fe5..3c9b408 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithBackgroundBottomRight.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithBackgroundBottomRight.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithLegendTitle.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithLegendTitle.svg index 89f41b0..ccd476a 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithLegendTitle.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithLegendTitle.svg @@ -1,2 +1,2 @@ -LegendaMozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +LegendaMozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithOffset.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithOffset.svg index 517b80c..701382f 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithOffset.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithOffset.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariMozilla: 4375 (61.3%)Safari: 987 (13.8%)wget: 231 (3.2%)IE: 345 (4.8%)Opera: 1204 (16.9%) +MozillaIEOperawgetSafariMozilla: 4375 (61.3%)Safari: 987 (13.8%)wget: 231 (3.2%)IE: 345 (4.8%)Opera: 1204 (16.9%) diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithTextureBackground.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithTextureBackground.svg index 707a0f3..bd507ee 100644 --- a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithTextureBackground.svg +++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartWithTextureBackground.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChart.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChart.svg index ac26679..84a158e 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChart.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChart.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 50250500750 +Line 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledAxis.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledAxis.svg index af5b21e..6cf24ff 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledAxis.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledAxis.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 50250500750 +Line 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledGrid.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledGrid.svg index 478c788..d122409 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledGrid.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartNonFilledGrid.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 50250500750 +Line 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithAxisIntersection.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithAxisIntersection.svg index 39a1385..09fece1 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithAxisIntersection.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithAxisIntersection.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 5-2500250500750 +Line 1Line 2sample 2sample 3sample 4sample 5-2500250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithoutDataBorder.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithoutDataBorder.svg index 0aaf971..2ed95a6 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithoutDataBorder.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dFilledLineChartWithoutDataBorder.svg @@ -1,2 +1,2 @@ -Line 1Line 2sample 2sample 3sample 4sample 50250500750 +Line 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChart.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChart.svg index c5fe0b2..b42c04b 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChart.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChart.svg @@ -1,2 +1,2 @@ -Line chart titleLine 1Line 2sample 2sample 3sample 4sample 50250500750 +Line chart titleLine 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartBigMaxFontSize.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartBigMaxFontSize.svg index 91e8825..f57b840 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartBigMaxFontSize.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartBigMaxFontSize.svg @@ -1,2 +1,2 @@ -Line chart titleLine 1Line 2sample 2sample 3sample 4sample 50250500750 +Line chart titleLine 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartSmallMaxFontSize.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartSmallMaxFontSize.svg index 2dee21c..45c0b13 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartSmallMaxFontSize.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRender3dLineChartSmallMaxFontSize.svg @@ -1,2 +1,2 @@ -Line chart titleLine 1Line 2sample 2sample 3sample 4sample 50250500750 +Line chart titleLine 1Line 2sample 2sample 3sample 4sample 50250500750 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChart.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChart.svg index 4e6e96d..056dc51 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChart.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChart.svg @@ -1,2 +1,2 @@ -Line 0Line 1sample 1sample 2sample 3sample 4sample 50100200300400500 +Line 0Line 1sample 1sample 2sample 3sample 4sample 50100200300400500 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChartSymbols.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChartSymbols.svg index 21a6f1e..426ab14 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChartSymbols.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderBarChartSymbols.svg @@ -1,2 +1,2 @@ -RectangleCircleBulletDiamondsample 1sample 2sample 3sample 4sample 50100200300400500 +RectangleCircleBulletDiamondsample 1sample 2sample 3sample 4sample 50100200300400500 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegment.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegment.svg index bd99a9e..202c604 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegment.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegment.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentPolygonOrder.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentPolygonOrder.svg index af07280..b24e29d 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentPolygonOrder.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentPolygonOrder.svg @@ -1,2 +1,2 @@ -label 8label 7label 6label 5label 4label 3label 9label 10label 1label 2 +label 8label 7label 6label 5label 4label 3label 9label 10label 1label 2 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomHeight.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomHeight.svg index cf2225b..a94324c 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomHeight.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomHeight.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomRotation.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomRotation.svg index eb83ced..e9c4de2 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomRotation.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithCustomRotation.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadow.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadow.svg new file mode 100644 index 0000000..e6334cf --- /dev/null +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadow.svg @@ -0,0 +1,2 @@ + +MozillaIEOperawgetSafariSafari: 987 (13.8%)wget: 231 (3.2%)Mozilla: 4375 (61.3%)IE: 345 (4.8%)Opera: 1204 (16.9%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadowGD.png b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadowGD.png new file mode 100644 index 0000000..4ceceba Binary files /dev/null and b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithGleamAndShadowGD.png differ diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithIncreasedMoveOut.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithIncreasedMoveOut.svg index 7a6e778..5e4dff3 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithIncreasedMoveOut.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithIncreasedMoveOut.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithTitle.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithTitle.svg index 7626ad6..f953a70 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithTitle.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithTitle.svg @@ -1,2 +1,2 @@ -Pie chart titleMozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla: 4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +Pie chart titleMozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla: 4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutDataBorder.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutDataBorder.svg index ab7bcb2..d735124 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutDataBorder.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutDataBorder.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutSymbols.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutSymbols.svg index f4f9bd4..c591cb5 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutSymbols.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderLabeledPieSegmentWithoutSymbols.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderNegativeBarChartSymbols.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderNegativeBarChartSymbols.svg index b67490a..d736ba8 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderNegativeBarChartSymbols.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderNegativeBarChartSymbols.svg @@ -1,2 +1,2 @@ -RectangleCircleBulletDiamondsample -1sample -2sample -3sample -4sample -5-500-400-300-200-1000 +RectangleCircleBulletDiamondsample -1sample -2sample -3sample -4sample -5-500-400-300-200-1000 diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithBackgroundBottomCenter.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithBackgroundBottomCenter.svg index b163e69..350dae2 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithBackgroundBottomCenter.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithBackgroundBottomCenter.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithHorizontalTextureBackground.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithHorizontalTextureBackground.svg index f270c93..56b4d24 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithHorizontalTextureBackground.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithHorizontalTextureBackground.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithLotsOfLabels.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithLotsOfLabels.svg index ac643d5..9cb0cb1 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithLotsOfLabels.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithLotsOfLabels.svg @@ -1,2 +1,2 @@ -NorwegianDutchGermanFrenchHindiTaiwaneseBrazilianVenezuelanJapaneseCzechHungarianRomanianTaiwanese: 1 (4.0%)Hindi: 1 (4.0%)French: 2 (8.0%)German: 2 (8.0%)Dutch: 3 (12.0%)Brazilian: 1 (4.0%)Venezuelan: 1 (4.0%)Japanese: 1 (4.0%)Czech: 1 (4.0%)Hungarian: 1 (4.0%)Romanian: 1 (4.0%)Norwegian: 10 (40.0%) +NorwegianDutchGermanFrenchHindiTaiwaneseBrazilianVenezuelanJapaneseCzechHungarianRomanianTaiwanese: 1 (4.0%)Hindi: 1 (4.0%)French: 2 (8.0%)German: 2 (8.0%)Dutch: 3 (12.0%)Brazilian: 1 (4.0%)Venezuelan: 1 (4.0%)Japanese: 1 (4.0%)Czech: 1 (4.0%)Hungarian: 1 (4.0%)Romanian: 1 (4.0%)Norwegian: 10 (40.0%) diff --git a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithOffset.svg b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithOffset.svg index 0f0fa58..f540131 100644 --- a/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithOffset.svg +++ b/tests/data/compare/ezcGraphRenderer3dTest_testRenderPieChartWithOffset.svg @@ -1,2 +1,2 @@ -MozillaIEOperawgetSafariMozilla: 4375 (61.3%)Safari: 987 (13.8%)wget: 231 (3.2%)IE: 345 (4.8%)Opera: 1204 (16.9%) +MozillaIEOperawgetSafariMozilla: 4375 (61.3%)Safari: 987 (13.8%)wget: 231 (3.2%)IE: 345 (4.8%)Opera: 1204 (16.9%) diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplate.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplate.svg index 887a199..c2e8363 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplate.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplate.svg @@ -15,7 +15,7 @@ - + @@ -35,4 +35,4 @@ -MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) +MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplateCustomGroup.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplateCustomGroup.svg index fe92cd3..a427060 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplateCustomGroup.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawChartInTemplateCustomGroup.svg @@ -15,7 +15,7 @@ - + @@ -33,6 +33,6 @@ Graph in a template Graph in a template - MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) + MozillaIEOperawgetSafariOpera: 1204 (16.9%)IE: 345 (4.8%)Mozilla:4375 (61.3%)wget: 231 (3.2%)Safari: 987 (13.8%) diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleNonFilled.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleNonFilled.svg index 1975640..36e963f 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleNonFilled.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleNonFilled.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcute.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcute.svg index 4fc15bb..b9ba57e 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcute.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcute.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteNonFilled.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteNonFilled.svg index 7922681..27b5e31 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteNonFilled.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteNonFilled.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteReverse.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteReverse.svg index 4fc15bb..b9ba57e 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteReverse.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorAcuteReverse.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorObtuse.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorObtuse.svg index cdea425..7f27640 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorObtuse.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircleSectorObtuse.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcute.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcute.svg index 5b643ad..5c699ca 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcute.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcute.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteBorder.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteBorder.svg new file mode 100644 index 0000000..0a7f5c9 --- /dev/null +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteBorder.svg @@ -0,0 +1,2 @@ + + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteReverse.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteReverse.svg index 5b643ad..5c699ca 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteReverse.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcAcuteReverse.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcObtuse.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcObtuse.svg index d56dc89..41bf9bb 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcObtuse.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawCircularArcObtuse.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawLine.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawLine.svg index 280bb01..fec4769 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawLine.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawLine.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/data/compare/ezcGraphSvgDriverTest_testDrawPolygonThreePointsNotFilled.svg b/tests/data/compare/ezcGraphSvgDriverTest_testDrawPolygonThreePointsNotFilled.svg index de5f160..6dd3cfc 100644 --- a/tests/data/compare/ezcGraphSvgDriverTest_testDrawPolygonThreePointsNotFilled.svg +++ b/tests/data/compare/ezcGraphSvgDriverTest_testDrawPolygonThreePointsNotFilled.svg @@ -1,2 +1,2 @@ - + diff --git a/tests/driver_gd_test.php b/tests/driver_gd_test.php index 15d0d13..30c4f22 100644 --- a/tests/driver_gd_test.php +++ b/tests/driver_gd_test.php @@ -60,7 +60,10 @@ class ezcGraphGdDriverTest extends ezcImageTestCase public function tearDown() { unset( $this->driver ); - $this->removeTempDir(); + if ( !$this->hasFailed() ) + { + $this->removeTempDir(); + } } public function testDrawLine() @@ -406,6 +409,36 @@ class ezcGraphGdDriverTest extends ezcImageTestCase ); } + public function testDrawCircularArcAcuteBorder() + { + $filename = $this->tempDir . __FUNCTION__ . '.png'; + + $this->driver->drawCircularArc( + new ezcGraphCoordinate( 100, 50 ), + 150, + 80, + 10, + 12.5, + 55, + ezcGraphColor::fromHex( '#3465A4' ), + false + ); + + $this->driver->render( $filename ); + + $this->assertTrue( + file_exists( $filename ), + 'No image was generated.' + ); + + $this->assertImageSimilar( + $filename, + $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.png', + 'Image does not look as expected.', + 0 + ); + } + public function testDrawCircleFilled() { $filename = $this->tempDir . __FUNCTION__ . '.png'; diff --git a/tests/driver_svg_test.php b/tests/driver_svg_test.php index ce4c870..0722ef4 100644 --- a/tests/driver_svg_test.php +++ b/tests/driver_svg_test.php @@ -284,6 +284,29 @@ class ezcGraphSvgDriverTest extends ezcTestCase ); } + public function testDrawCircularArcAcuteBorder() + { + $filename = $this->tempDir . __FUNCTION__ . '.svg'; + + $this->driver->drawCircularArc( + new ezcGraphCoordinate( 100, 50 ), + 150, + 80, + 10, + 12.5, + 55, + ezcGraphColor::fromHex( '#3465A4' ), + false + ); + + $this->driver->render( $filename ); + + $this->compare( + $filename, + $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.svg' + ); + } + public function testDrawCircularArcAcuteReverse() { $filename = $this->tempDir . __FUNCTION__ . '.svg'; diff --git a/tests/renderer_3d_test.php b/tests/renderer_3d_test.php index 908026a..e7b99f3 100644 --- a/tests/renderer_3d_test.php +++ b/tests/renderer_3d_test.php @@ -351,6 +351,77 @@ class ezcGraphRenderer3dTest extends ezcTestCase ); } + public function testRenderLabeledPieSegmentWithGleamAndShadow() + { + $filename = $this->tempDir . __FUNCTION__ . '.svg'; + + $chart = new ezcGraphPieChart(); + $chart->data['sample'] = new ezcGraphArrayDataSet( array( + 'Mozilla' => 4375, + 'IE' => 345, + 'Opera' => 1204, + 'wget' => 231, + 'Safari' => 987, + ) ); + + $chart->data['sample']->highlight['Safari'] = true; + $chart->data['sample']->color['Safari'] = '#000000'; + $chart->data['sample']->highlight['IE'] = true; + + $chart->renderer = new ezcGraphRenderer3d(); + + $chart->renderer->options->pieChartShadowSize = 10; + $chart->renderer->options->pieChartGleam = .5; + $chart->renderer->options->dataBorder = false; + $chart->renderer->options->pieChartHeight = 16; + + $chart->renderer->options->pieChartOffset = 180; + + $chart->driver = new ezcGraphSvgDriver(); + $chart->render( 500, 200, $filename ); + + $this->compare( + $filename, + $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.svg' + ); + } + + public function testRenderLabeledPieSegmentWithGleamAndShadowGD() + { + $filename = $this->tempDir . __FUNCTION__ . '.png'; + + $chart = new ezcGraphPieChart(); + $chart->data['sample'] = new ezcGraphArrayDataSet( array( + 'Mozilla' => 4375, + 'IE' => 345, + 'Opera' => 1204, + 'wget' => 231, + 'Safari' => 987, + ) ); + $chart->options->font->path = dirname( __FILE__ ) . '/data/font.ttf'; + + $chart->data['sample']->highlight['Safari'] = true; + $chart->data['sample']->color['Safari'] = '#000000'; + $chart->data['sample']->highlight['IE'] = true; + + $chart->renderer = new ezcGraphRenderer3d(); + + $chart->renderer->options->pieChartShadowSize = 10; + $chart->renderer->options->pieChartGleam = .5; + $chart->renderer->options->dataBorder = false; + $chart->renderer->options->pieChartHeight = 16; + + $chart->renderer->options->pieChartOffset = 180; + + $chart->driver = new ezcGraphGdDriver(); + $chart->render( 500, 200, $filename ); + + $this->compare( + $filename, + $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.png' + ); + } + public function testRenderLabeledPieSegmentWithTitle() { $filename = $this->tempDir . __FUNCTION__ . '.svg'; -- cgit v1.1