4138 - in trunk/Graph: . src/charts src/options tests tests/data/compare [eZComponents: Trunk]

Author: Kore Nordmann
Date: 2006-11-30 09:56:48 +0100 (Thu, 30 Nov 2006)
New Revision: 4138

Log:
- Fixed: Bug #9656 (Threshold option spelled wrong)

Added:
   
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteThreshold.svg
   
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageThreshold.svg
   
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageThresholdAndCustomSum.svg
Removed:
   
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteTreshHold.svg
   
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHold.svg
   
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHoldAndCustomSum.svg
Modified:
   trunk/Graph/ChangeLog
   trunk/Graph/src/charts/pie.php
   trunk/Graph/src/options/pie_chart.php
   trunk/Graph/tests/pie_test.php

Modified: trunk/Graph/ChangeLog
===================================================================
--- trunk/Graph/ChangeLog       2006-11-30 08:48:56 UTC (rev 4137)
+++ trunk/Graph/ChangeLog       2006-11-30 08:56:48 UTC (rev 4138)
@@ -2,6 +2,8 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Renamed ezcGraphMingDriver to ezcGraphFlashDriver
+- Renamed pie chart options percentTreshHold to percentThreshold and
+  absoluteTreshHold to absoluteThreshold
 
 - Fixed issue #9583: Data typecasting should only be done in axis
 - Fixed issue #9586: No data rendered with string keys on date axis.

Modified: trunk/Graph/src/charts/pie.php
===================================================================
--- trunk/Graph/src/charts/pie.php      2006-11-30 08:48:56 UTC (rev 4137)
+++ trunk/Graph/src/charts/pie.php      2006-11-30 08:56:48 UTC (rev 4138)
@@ -126,9 +126,9 @@
      * 
      * @return void
      */
-    protected function applyTreshHold()
+    protected function applyThreshold()
     {
-        if ( $this->options->percentTreshHold || 
$this->options->absoluteTreshHold )
+        if ( $this->options->percentThreshold || 
$this->options->absoluteThreshold )
         {
             $dataset = $this->data->rewind();
 
@@ -145,8 +145,8 @@
             $unset = array();
             foreach ( $dataset as $label => $value )
             {
-                if ( ( $value <= $this->options->absoluteTreshHold ) ||
-                     ( ( $value / $sum ) <= $this->options->percentTreshHold ) 
)
+                if ( ( $value <= $this->options->absoluteThreshold ) ||
+                     ( ( $value / $sum ) <= $this->options->percentThreshold ) 
)
                 {
                     if ( !isset( $dataset[$this->options->summarizeCaption] ) )
                     {
@@ -187,7 +187,7 @@
         $this->driver->options->height = $height;
 
         // Apply tresh hold
-        $this->applyTreshHold();
+        $this->applyThreshold();
 
         // Generate legend
         $this->elements['legend']->generateFromDataSet( $this->data->rewind() 
);

Modified: trunk/Graph/src/options/pie_chart.php
===================================================================
--- trunk/Graph/src/options/pie_chart.php       2006-11-30 08:48:56 UTC (rev 
4137)
+++ trunk/Graph/src/options/pie_chart.php       2006-11-30 08:56:48 UTC (rev 
4138)
@@ -22,9 +22,9 @@
  * @property float $sum
  *           Fixed sum of values. This should be used for incomplete pie 
  *           charts.
- * @property float $percentTreshHold
+ * @property float $percentThreshold
  *           Values with a lower percentage value are aggregated.
- * @property float $absoluteTreshHold
+ * @property float $absoluteThreshold
  *           Values with a lower absolute value are aggregated.
  * @property string $summarizeCaption
  *           Caption for values summarized because they are lower then the
@@ -47,8 +47,8 @@
         $this->properties['labelCallback'] = null;
         $this->properties['sum'] = false;
 
-        $this->properties['percentTreshHold'] = .0;
-        $this->properties['absoluteTreshHold'] = .0;
+        $this->properties['percentThreshold'] = .0;
+        $this->properties['absoluteThreshold'] = .0;
         $this->properties['summarizeCaption'] = 'Misc';
 
         parent::__construct( $options );
@@ -90,7 +90,7 @@
 
                 $this->properties['sum'] = (float) $propertyValue;
                 break;
-            case 'percentTreshHold':
+            case 'percentThreshold':
                 if ( !is_numeric( $propertyValue ) ||
                      ( $propertyValue < 0 ) || 
                      ( $propertyValue > 1 ) ) 
@@ -98,16 +98,16 @@
                     throw new ezcBaseValueException( $propertyName, 
$propertyValue, '0 <= float <= 1' );
                 }
 
-                $this->properties['percentTreshHold'] = (float) $propertyValue;
+                $this->properties['percentThreshold'] = (float) $propertyValue;
                 break;
-            case 'absoluteTreshHold':
+            case 'absoluteThreshold':
                 if ( !is_numeric( $propertyValue ) ||
                      ( $propertyValue <= 0 ) ) 
                 {
                     throw new ezcBaseValueException( $propertyName, 
$propertyValue, 'float > 0' );
                 }
 
-                $this->properties['absoluteTreshHold'] = (float) 
$propertyValue;
+                $this->properties['absoluteThreshold'] = (float) 
$propertyValue;
                 break;
             case 'summarizeCaption':
                 $this->properties['summarizeCaption'] = (string) 
$propertyValue;

Copied: 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteThreshold.svg
 (from rev 4136, 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteTreshHold.svg)

Deleted: 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteTreshHold.svg
===================================================================
--- 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteTreshHold.svg
     2006-11-30 08:48:56 UTC (rev 4137)
+++ 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithAbsoluteTreshHold.svg
     2006-11-30 08:56:48 UTC (rev 4138)
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="500" height="300" version="1.0" 
id="ezcGraph"><defs/><g id="ezcGraphChart" color-rendering="optimizeQuality" 
shape-rendering="geometricPrecision" text-rendering="optimizeLegibility"><path 
d=" M 0.0000,300.0000 L 0.0000,0.0000 L 500.0000,0.0000 L 500.0000,300.0000 L 
0.0000,300.0000 z " style="fill: #eeeeec; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_1"/><path d=" M 0.0000,300.0000 L 0.0000,0.0000 L 
100.0000,0.0000 L 100.0000,300.0000 L 0.0000,300.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: #4e9a06; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_3"/><path d=" M 2.0000,34.0000 L 2.0000,20.0000 L 
16.0000,20.0000 L 16.0000,34.0000 L 2.0000,34.0000 z " style="fill: #cc000
 0; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_5"/><path d=" M 
2.0000,52.0000 L 2.0000,38.0000 L 16.0000,38.0000 L 16.0000,52.0000 L 
2.0000,52.0000 z " style="fill: #edd400; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_7"/><path d=" M 2.0000,70.0000 L 2.0000,56.0000 L 
16.0000,56.0000 L 16.0000,70.0000 L 2.0000,70.0000 z " style="fill: #75505b; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_9"/><path d=" M 
2.0000,88.0000 L 2.0000,74.0000 L 16.0000,74.0000 L 16.0000,88.0000 L 
2.0000,88.0000 z " style="fill: #3465a4; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_11"/><path d="M 300.00,150.00 L 390.00,150.00 A 90.00,90.00 
0 0,1 227.19,202.90 z" style="fill: #4e9a06; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircleSector_13"/><path d="M 300.00,150.00 L 390.00,150.00 A 
90.00,90.00 0 0,1 227.19,202.90 z" style="fill: none; stroke: #274d03; 
stroke-wid
 th: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphCircleSector_14"/><path d="M 300.00,150.00 L 227.19,202.90 A 
90.00,90.00 0 0,1 210.71,138.72 z" style="fill: #cc0000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircleSector_15"/><path d="M 300.00,150.00 L 
227.19,202.90 A 90.00,90.00 0 0,1 210.71,138.72 z" style="fill: none; stroke: 
#660000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
stroke-linejoin: round;" id="ezcGraphCircleSector_16"/><path d="M 300.00,150.00 
L 210.71,138.72 A 90.00,90.00 0 0,1 227.19,97.10 z" style="fill: #edd400; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_17"/><path d="M 
300.00,150.00 L 210.71,138.72 A 90.00,90.00 0 0,1 227.19,97.10 z" style="fill: 
none; stroke: #776a00; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: 
round; stroke-linejoin: round;" id="ezcGraphCircleSector_18"/><
 path d="M 300.00,150.00 L 227.19,97.10 A 90.00,90.00 0 0,1 261.68,68.57 z" 
style="fill: #75505b; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircleSector_19"/><path d="M 300.00,150.00 L 227.19,97.10 A 
90.00,90.00 0 0,1 261.68,68.57 z" style="fill: none; stroke: #3b282e; 
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: 
round;" id="ezcGraphCircleSector_20"/><path d="M 300.00,150.00 L 261.68,68.57 A 
90.00,90.00 0 0,1 390.00,150.00 z" style="fill: #3465a4; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircleSector_21"/><path d="M 300.00,150.00 L 
261.68,68.57 A 90.00,90.00 0 0,1 390.00,150.00 z" style="fill: none; stroke: 
#1a3352; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
stroke-linejoin: round;" id="ezcGraphCircleSector_22"/><path d=" M 
257.5051,98.6325 L 231.4220,72.0000" style="fill: none; stroke: #000000; 
stroke-width: 1; stroke-opac
 ity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphLine_23"/><ellipse cx="257.50506735009" cy="98.632450481614" rx="3" 
ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_24"/><ellipse cx="231.42204861135" cy="72" rx="3" ry="3" 
style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_25"/><path d=" M 238.0149,125.4584 L 201.0968,113.0000" 
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; 
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_27"/><ellipse 
cx="238.01490094078" cy="125.45836315435" rx="3" ry="3" style="fill: #000000; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_28"/><ellipse 
cx="201.09682459679" cy="113" rx="3" ry="3" style="fill: #000000; fill-opacity: 
1.00; stroke: none;" id="ezcGraphCircle_29"/><path d=" M 235.4278,166.5793 L 
196.9227,174.0000" style="fill
 : none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; 
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_31"/><ellipse 
cx="235.42778925809" cy="166.57932581099" rx="3" ry="3" style="fill: #000000; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_32"/><ellipse 
cx="196.92271120391" cy="174" rx="3" ry="3" style="fill: #000000; fill-opacity: 
1.00; stroke: none;" id="ezcGraphCircle_33"/><path d=" M 335.7218,93.7115 L 
358.6783,65.0000" style="fill: none; stroke: #000000; stroke-width: 1; 
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphLine_35"/><ellipse cx="335.72178633193" cy="93.711471633199" rx="3" 
ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_36"/><ellipse cx="358.67826876426" cy="65" rx="3" ry="3" 
style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_37"/><path d=" M
  320.6011,213.4038 L 337.2250,245.0000" style="fill: none; stroke: #000000; 
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: 
round;" id="ezcGraphLine_39"/><ellipse cx="320.60113295833" 
cy="213.40376775301" rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircle_40"/><ellipse cx="337.22498999199" cy="245" 
rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_41"/><text id="ezcGraphTextBox_4" x="17" 
text-length="66.78px" y="13.9" style="font-size: 14px; font-family: sans-serif; 
fill: #2e3436; fill-opacity: 1.00; stroke: none;">Norwegian</text><text 
id="ezcGraphTextBox_6" x="17" text-length="37.1px" y="31.9" style="font-size: 
14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Dutch</text><text id="ezcGraphTextBox_8" x="17" text-length="44.52px" 
y="49.9" style="
 font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; 
stroke: none;">German</text><text id="ezcGraphTextBox_10" x="17" 
text-length="44.52px" y="67.9" style="font-size: 14px; font-family: sans-serif; 
fill: #2e3436; fill-opacity: 1.00; stroke: none;">French</text><text 
id="ezcGraphTextBox_12" x="17" text-length="29.68px" y="85.9" style="font-size: 
14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Misc</text><text id="ezcGraphTextBox_26" x="106.70204861135" 
text-length="118.72px" y="76.9" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">French: 2 
(8.0%)</text><text id="ezcGraphTextBox_30" x="128.31682459679" 
text-length="66.78px" y="110.85" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">German: 
2</text><text id="ezcGraphTextBox_30" x="
 150.57682459679" text-length="44.52px" y="126.25" style="font-size: 14px; 
font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">(8.0%)</text><text id="ezcGraphTextBox_34" x="131.56271120391" 
text-length="59.36px" y="171.85" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Dutch: 
3</text><text id="ezcGraphTextBox_34" x="138.98271120391" text-length="51.94px" 
y="187.25" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; 
fill-opacity: 1.00; stroke: none;">(12.0%)</text><text id="ezcGraphTextBox_38" 
x="364.67826876426" text-length="111.3px" y="69.9" style="font-size: 14px; 
font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Misc: 8 (32.0%)</text><text id="ezcGraphTextBox_42" x="343.22498999199" 
text-length="155.82px" y="249.9" style="font-size: 14px; font-family: 
sans-serif; fill: #2e
 3436; fill-opacity: 1.00; stroke: none;">Norwegian: 10 (40.0%)</text></g></svg>

Copied: 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageThreshold.svg
 (from rev 4136, 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHold.svg)

Copied: 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageThresholdAndCustomSum.svg
 (from rev 4136, 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHoldAndCustomSum.svg)

Deleted: 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHold.svg
===================================================================
--- 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHold.svg
   2006-11-30 08:48:56 UTC (rev 4137)
+++ 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHold.svg
   2006-11-30 08:56:48 UTC (rev 4138)
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="500" height="300" version="1.0" 
id="ezcGraph"><defs/><g id="ezcGraphChart" color-rendering="optimizeQuality" 
shape-rendering="geometricPrecision" text-rendering="optimizeLegibility"><path 
d=" M 0.0000,300.0000 L 0.0000,0.0000 L 500.0000,0.0000 L 500.0000,300.0000 L 
0.0000,300.0000 z " style="fill: #eeeeec; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_1"/><path d=" M 0.0000,300.0000 L 0.0000,0.0000 L 
100.0000,0.0000 L 100.0000,300.0000 L 0.0000,300.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: #4e9a06; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_3"/><path d=" M 2.0000,34.0000 L 2.0000,20.0000 L 
16.0000,20.0000 L 16.0000,34.0000 L 2.0000,34.0000 z " style="fill: #cc000
 0; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_5"/><path d=" M 
2.0000,52.0000 L 2.0000,38.0000 L 16.0000,38.0000 L 16.0000,52.0000 L 
2.0000,52.0000 z " style="fill: #edd400; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_7"/><path d=" M 2.0000,70.0000 L 2.0000,56.0000 L 
16.0000,56.0000 L 16.0000,70.0000 L 2.0000,70.0000 z " style="fill: #75505b; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_9"/><path d=" M 
2.0000,88.0000 L 2.0000,74.0000 L 16.0000,74.0000 L 16.0000,88.0000 L 
2.0000,88.0000 z " style="fill: #3465a4; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_11"/><path d="M 300.00,150.00 L 390.00,150.00 A 90.00,90.00 
0 0,1 227.19,202.90 z" style="fill: #4e9a06; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircleSector_13"/><path d="M 300.00,150.00 L 390.00,150.00 A 
90.00,90.00 0 0,1 227.19,202.90 z" style="fill: none; stroke: #274d03; 
stroke-wid
 th: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphCircleSector_14"/><path d="M 300.00,150.00 L 227.19,202.90 A 
90.00,90.00 0 0,1 210.71,138.72 z" style="fill: #cc0000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircleSector_15"/><path d="M 300.00,150.00 L 
227.19,202.90 A 90.00,90.00 0 0,1 210.71,138.72 z" style="fill: none; stroke: 
#660000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
stroke-linejoin: round;" id="ezcGraphCircleSector_16"/><path d="M 300.00,150.00 
L 210.71,138.72 A 90.00,90.00 0 0,1 227.19,97.10 z" style="fill: #edd400; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_17"/><path d="M 
300.00,150.00 L 210.71,138.72 A 90.00,90.00 0 0,1 227.19,97.10 z" style="fill: 
none; stroke: #776a00; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: 
round; stroke-linejoin: round;" id="ezcGraphCircleSector_18"/><
 path d="M 300.00,150.00 L 227.19,97.10 A 90.00,90.00 0 0,1 261.68,68.57 z" 
style="fill: #75505b; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircleSector_19"/><path d="M 300.00,150.00 L 227.19,97.10 A 
90.00,90.00 0 0,1 261.68,68.57 z" style="fill: none; stroke: #3b282e; 
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: 
round;" id="ezcGraphCircleSector_20"/><path d="M 300.00,150.00 L 261.68,68.57 A 
90.00,90.00 0 0,1 390.00,150.00 z" style="fill: #3465a4; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircleSector_21"/><path d="M 300.00,150.00 L 
261.68,68.57 A 90.00,90.00 0 0,1 390.00,150.00 z" style="fill: none; stroke: 
#1a3352; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
stroke-linejoin: round;" id="ezcGraphCircleSector_22"/><path d=" M 
257.5051,98.6325 L 231.4220,72.0000" style="fill: none; stroke: #000000; 
stroke-width: 1; stroke-opac
 ity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphLine_23"/><ellipse cx="257.50506735009" cy="98.632450481614" rx="3" 
ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_24"/><ellipse cx="231.42204861135" cy="72" rx="3" ry="3" 
style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_25"/><path d=" M 238.0149,125.4584 L 201.0968,113.0000" 
style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; 
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_27"/><ellipse 
cx="238.01490094078" cy="125.45836315435" rx="3" ry="3" style="fill: #000000; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_28"/><ellipse 
cx="201.09682459679" cy="113" rx="3" ry="3" style="fill: #000000; fill-opacity: 
1.00; stroke: none;" id="ezcGraphCircle_29"/><path d=" M 235.4278,166.5793 L 
196.9227,174.0000" style="fill
 : none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; 
stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_31"/><ellipse 
cx="235.42778925809" cy="166.57932581099" rx="3" ry="3" style="fill: #000000; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_32"/><ellipse 
cx="196.92271120391" cy="174" rx="3" ry="3" style="fill: #000000; fill-opacity: 
1.00; stroke: none;" id="ezcGraphCircle_33"/><path d=" M 335.7218,93.7115 L 
358.6783,65.0000" style="fill: none; stroke: #000000; stroke-width: 1; 
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphLine_35"/><ellipse cx="335.72178633193" cy="93.711471633199" rx="3" 
ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_36"/><ellipse cx="358.67826876426" cy="65" rx="3" ry="3" 
style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_37"/><path d=" M
  320.6011,213.4038 L 337.2250,245.0000" style="fill: none; stroke: #000000; 
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: 
round;" id="ezcGraphLine_39"/><ellipse cx="320.60113295833" 
cy="213.40376775301" rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircle_40"/><ellipse cx="337.22498999199" cy="245" 
rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_41"/><text id="ezcGraphTextBox_4" x="17" 
text-length="66.78px" y="13.9" style="font-size: 14px; font-family: sans-serif; 
fill: #2e3436; fill-opacity: 1.00; stroke: none;">Norwegian</text><text 
id="ezcGraphTextBox_6" x="17" text-length="37.1px" y="31.9" style="font-size: 
14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Dutch</text><text id="ezcGraphTextBox_8" x="17" text-length="44.52px" 
y="49.9" style="
 font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; 
stroke: none;">German</text><text id="ezcGraphTextBox_10" x="17" 
text-length="44.52px" y="67.9" style="font-size: 14px; font-family: sans-serif; 
fill: #2e3436; fill-opacity: 1.00; stroke: none;">French</text><text 
id="ezcGraphTextBox_12" x="17" text-length="44.52px" y="85.9" style="font-size: 
14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Others</text><text id="ezcGraphTextBox_26" x="106.70204861135" 
text-length="118.72px" y="76.9" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">French: 2 
(8.0%)</text><text id="ezcGraphTextBox_30" x="128.31682459679" 
text-length="66.78px" y="110.85" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">German: 
2</text><text id="ezcGraphTextBox_30" x
 ="150.57682459679" text-length="44.52px" y="126.25" style="font-size: 14px; 
font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">(8.0%)</text><text id="ezcGraphTextBox_34" x="131.56271120391" 
text-length="59.36px" y="171.85" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Dutch: 
3</text><text id="ezcGraphTextBox_34" x="138.98271120391" text-length="51.94px" 
y="187.25" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; 
fill-opacity: 1.00; stroke: none;">(12.0%)</text><text id="ezcGraphTextBox_38" 
x="364.67826876426" text-length="126.14px" y="69.9" style="font-size: 14px; 
font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Others: 8 (32.0%)</text><text id="ezcGraphTextBox_42" 
x="343.22498999199" text-length="155.82px" y="249.9" style="font-size: 14px; 
font-family: sans-serif; fill
 : #2e3436; fill-opacity: 1.00; stroke: none;">Norwegian: 10 
(40.0%)</text></g></svg>

Deleted: 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHoldAndCustomSum.svg
===================================================================
--- 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHoldAndCustomSum.svg
       2006-11-30 08:48:56 UTC (rev 4137)
+++ 
trunk/Graph/tests/data/compare/ezcGraphPieChartTest_testRenderPieChartWithPercentageTreshHoldAndCustomSum.svg
       2006-11-30 08:56:48 UTC (rev 4138)
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="500" height="300" version="1.0" 
id="ezcGraph"><defs/><g id="ezcGraphChart" color-rendering="optimizeQuality" 
shape-rendering="geometricPrecision" text-rendering="optimizeLegibility"><path 
d=" M 0.0000,300.0000 L 0.0000,0.0000 L 500.0000,0.0000 L 500.0000,300.0000 L 
0.0000,300.0000 z " style="fill: #eeeeec; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_1"/><path d=" M 0.0000,300.0000 L 0.0000,0.0000 L 
100.0000,0.0000 L 100.0000,300.0000 L 0.0000,300.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: #4e9a06; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_3"/><path d=" M 2.0000,34.0000 L 2.0000,20.0000 L 
16.0000,20.0000 L 16.0000,34.0000 L 2.0000,34.0000 z " style="fill: #cc000
 0; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_5"/><path d=" M 
2.0000,52.0000 L 2.0000,38.0000 L 16.0000,38.0000 L 16.0000,52.0000 L 
2.0000,52.0000 z " style="fill: #edd400; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_7"/><path d=" M 2.0000,70.0000 L 2.0000,56.0000 L 
16.0000,56.0000 L 16.0000,70.0000 L 2.0000,70.0000 z " style="fill: #75505b; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_9"/><path d=" M 
2.0000,88.0000 L 2.0000,74.0000 L 16.0000,74.0000 L 16.0000,88.0000 L 
2.0000,88.0000 z " style="fill: #3465a4; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphPolygon_11"/><path d="M 300.00,150.00 L 390.00,150.00 A 90.00,90.00 
0 0,1 255.00,227.94 z" style="fill: #4e9a06; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircleSector_13"/><path d="M 300.00,150.00 L 390.00,150.00 A 
90.00,90.00 0 0,1 255.00,227.94 z" style="fill: none; stroke: #274d03; 
stroke-wid
 th: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphCircleSector_14"/><path d="M 300.00,150.00 L 255.00,227.94 A 
90.00,90.00 0 0,1 217.78,186.61 z" style="fill: #cc0000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircleSector_15"/><path d="M 300.00,150.00 L 
255.00,227.94 A 90.00,90.00 0 0,1 217.78,186.61 z" style="fill: none; stroke: 
#660000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
stroke-linejoin: round;" id="ezcGraphCircleSector_16"/><path d="M 300.00,150.00 
L 217.78,186.61 A 90.00,90.00 0 0,1 210.00,150.00 z" style="fill: #edd400; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_17"/><path d="M 
300.00,150.00 L 217.78,186.61 A 90.00,90.00 0 0,1 210.00,150.00 z" style="fill: 
none; stroke: #776a00; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: 
round; stroke-linejoin: round;" id="ezcGraphCircleSector_18"/
 ><path d="M 300.00,150.00 L 210.00,150.00 A 90.00,90.00 0 0,1 217.78,113.39 z" 
 >style="fill: #75505b; fill-opacity: 1.00; stroke: none;" 
 >id="ezcGraphCircleSector_19"/><path d="M 300.00,150.00 L 210.00,150.00 A 
 >90.00,90.00 0 0,1 217.78,113.39 z" style="fill: none; stroke: #3b282e; 
 >stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
 >stroke-linejoin: round;" id="ezcGraphCircleSector_20"/><path d="M 
 >300.00,150.00 L 217.78,113.39 A 90.00,90.00 0 0,1 345.00,72.06 z" 
 >style="fill: #3465a4; fill-opacity: 1.00; stroke: none;" 
 >id="ezcGraphCircleSector_21"/><path d="M 300.00,150.00 L 217.78,113.39 A 
 >90.00,90.00 0 0,1 345.00,72.06 z" style="fill: none; stroke: #1a3352; 
 >stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; 
 >stroke-linejoin: round;" id="ezcGraphCircleSector_22"/><path d=" M 
 >279.3989,86.5962 L 266.0000,54.0000" style="fill: none; stroke: #000000; 
 >stroke-width: 1; strok
 e-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphLine_23"/><ellipse cx="279.39886704167" cy="86.59623224699" rx="3" 
ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_24"/><ellipse cx="266" cy="54" rx="3" ry="3" style="fill: 
#000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_25"/><path d=" M 
234.7902,136.1392 L 196.2299,129.0000" style="fill: none; stroke: #000000; 
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: 
round;" id="ezcGraphLine_27"/><ellipse cx="234.79015995108" 
cy="136.13922061215" rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircle_28"/><ellipse cx="196.22986140953" cy="129" 
rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_29"/><path d=" M 234.7902,163.8608 L 196.0204,170.0000" 
style="fill: none;
  stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: 
round; stroke-linejoin: round;" id="ezcGraphLine_31"/><ellipse 
cx="234.79015995108" cy="163.86077938785" rx="3" ry="3" style="fill: #000000; 
fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_32"/><ellipse 
cx="196.02041028867" cy="170" rx="3" ry="3" style="fill: #000000; fill-opacity: 
1.00; stroke: none;" id="ezcGraphCircle_33"/><path d=" M 250.4570,194.6087 L 
218.8734,216.0000" style="fill: none; stroke: #000000; stroke-width: 1; 
stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" 
id="ezcGraphLine_35"/><ellipse cx="250.45701163484" cy="194.60870709059" rx="3" 
ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_36"/><ellipse cx="218.87344011603" cy="216" rx="3" ry="3" 
style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_37"/><path d=" M 333
 .3333,207.7350 L 357.0294,236.0000" style="fill: none; stroke: #000000; 
stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: 
round;" id="ezcGraphLine_39"/><ellipse cx="333.33333333333" 
cy="207.73502691896" rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; 
stroke: none;" id="ezcGraphCircle_40"/><ellipse cx="357.02940328869" cy="236" 
rx="3" ry="3" style="fill: #000000; fill-opacity: 1.00; stroke: none;" 
id="ezcGraphCircle_41"/><text id="ezcGraphTextBox_4" x="17" 
text-length="66.78px" y="13.9" style="font-size: 14px; font-family: sans-serif; 
fill: #2e3436; fill-opacity: 1.00; stroke: none;">Norwegian</text><text 
id="ezcGraphTextBox_6" x="17" text-length="37.1px" y="31.9" style="font-size: 
14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Dutch</text><text id="ezcGraphTextBox_8" x="17" text-length="44.52px" 
y="49.9" style="font
 -size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; 
stroke: none;">German</text><text id="ezcGraphTextBox_10" x="17" 
text-length="44.52px" y="67.9" style="font-size: 14px; font-family: sans-serif; 
fill: #2e3436; fill-opacity: 1.00; stroke: none;">French</text><text 
id="ezcGraphTextBox_12" x="17" text-length="44.52px" y="85.9" style="font-size: 
14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Others</text><text id="ezcGraphTextBox_26" x="133.86" 
text-length="126.14px" y="58.9" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Others: 8 
(26.7%)</text><text id="ezcGraphTextBox_30" x="123.44986140953" 
text-length="66.78px" y="126.85" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">French: 
2</text><text id="ezcGraphTextBox_30" x="145.709861
 40953" text-length="44.52px" y="142.25" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">(6.7%)</text><text id="ezcGraphTextBox_34" x="123.24041028867" 
text-length="66.78px" y="167.85" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">German: 
2</text><text id="ezcGraphTextBox_34" x="145.50041028867" text-length="44.52px" 
y="183.25" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; 
fill-opacity: 1.00; stroke: none;">(6.7%)</text><text id="ezcGraphTextBox_38" 
x="153.51344011603" text-length="59.36px" y="213.85" style="font-size: 14px; 
font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Dutch: 3</text><text id="ezcGraphTextBox_38" x="160.93344011603" 
text-length="51.94px" y="229.25" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opac
 ity: 1.00; stroke: none;">(10.0%)</text><text id="ezcGraphTextBox_42" 
x="363.02940328869" text-length="96.46px" y="233.85" style="font-size: 14px; 
font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">Norwegian: 10</text><text id="ezcGraphTextBox_42" x="363.02940328869" 
text-length="51.94px" y="249.25" style="font-size: 14px; font-family: 
sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: 
none;">(33.3%)</text></g></svg>

Modified: trunk/Graph/tests/pie_test.php
===================================================================
--- trunk/Graph/tests/pie_test.php      2006-11-30 08:48:56 UTC (rev 4137)
+++ trunk/Graph/tests/pie_test.php      2006-11-30 08:56:48 UTC (rev 4138)
@@ -138,39 +138,39 @@
         );
     }
 
-    public function testPieChartOptionsPropertyPercentTreshHold()
+    public function testPieChartOptionsPropertyPercentThreshold()
     {
         $options = new ezcGraphPieChartOptions();
 
         $this->assertSame(
             0.,
-            $options->percentTreshHold,
-            'Wrong default value for property percentTreshHold in class 
ezcGraphPieChartOptions'
+            $options->percentThreshold,
+            'Wrong default value for property percentThreshold in class 
ezcGraphPieChartOptions'
         );
 
-        $options->percentTreshHold = .5;
+        $options->percentThreshold = .5;
         $this->assertSame(
             .5,
-            $options->percentTreshHold,
-            'Setting property value did not work for property percentTreshHold 
in class ezcGraphPieChartOptions'
+            $options->percentThreshold,
+            'Setting property value did not work for property percentThreshold 
in class ezcGraphPieChartOptions'
         );
     }
 
-    public function testPieChartOptionsPropertyAbsoluteTreshHold()
+    public function testPieChartOptionsPropertyAbsoluteThreshold()
     {
         $options = new ezcGraphPieChartOptions();
 
         $this->assertSame(
             0.,
-            $options->absoluteTreshHold,
-            'Wrong default value for property absoluteTreshHold in class 
ezcGraphPieChartOptions'
+            $options->absoluteThreshold,
+            'Wrong default value for property absoluteThreshold in class 
ezcGraphPieChartOptions'
         );
 
-        $options->absoluteTreshHold = 5;
+        $options->absoluteThreshold = 5;
         $this->assertSame(
             5.,
-            $options->absoluteTreshHold,
-            'Setting property value did not work for property 
absoluteTreshHold in class ezcGraphPieChartOptions'
+            $options->absoluteThreshold,
+            'Setting property value did not work for property 
absoluteThreshold in class ezcGraphPieChartOptions'
         );
     }
 
@@ -493,12 +493,12 @@
         $this->fail( 'Expected ezcBaseValueException.' );
     }
 
-    public function testRenderPieChartWithAbsoluteTreshHold()
+    public function testRenderPieChartWithAbsoluteThreshold()
     {
         $filename = $this->tempDir . __FUNCTION__ . '.svg';
 
         $chart = new ezcGraphPieChart();
-        $chart->options->absoluteTreshHold = 1;
+        $chart->options->absoluteThreshold = 1;
         $chart->data['Skien'] = new ezcGraphArrayDataSet( array( 'Norwegian' 
=> 10, 'Dutch' => 3, 'German' => 2, 'French' => 2, 'Hindi' => 1, 'Taiwanese' => 
1, 'Brazilian' => 1, 'Venezuelan' => 1, 'Japanese' => 1, 'Czech' => 1, 
'Hungarian' => 1, 'Romanian' => 1 ) );
 
         $chart->render( 500, 300, $filename );
@@ -510,7 +510,7 @@
 
         try
         {
-            $chart->options->absoluteTreshHold = false;
+            $chart->options->absoluteThreshold = false;
         }
         catch( ezcBaseValueException $e )
         {
@@ -520,12 +520,12 @@
         $this->fail( 'Expected ezcBaseValueException.' );
     }
 
-    public function testRenderPieChartWithPercentageTreshHold()
+    public function testRenderPieChartWithPercentageThreshold()
     {
         $filename = $this->tempDir . __FUNCTION__ . '.svg';
 
         $chart = new ezcGraphPieChart();
-        $chart->options->percentTreshHold = .05;
+        $chart->options->percentThreshold = .05;
         $chart->options->summarizeCaption = 'Others';
         $chart->data['Skien'] = new ezcGraphArrayDataSet( array( 'Norwegian' 
=> 10, 'Dutch' => 3, 'German' => 2, 'French' => 2, 'Hindi' => 1, 'Taiwanese' => 
1, 'Brazilian' => 1, 'Venezuelan' => 1, 'Japanese' => 1, 'Czech' => 1, 
'Hungarian' => 1, 'Romanian' => 1 ) );
 
@@ -538,7 +538,7 @@
 
         try
         {
-            $chart->options->percentTreshHold = false;
+            $chart->options->percentThreshold = false;
         }
         catch( ezcBaseValueException $e )
         {
@@ -548,13 +548,13 @@
         $this->fail( 'Expected ezcBaseValueException.' );
     }
 
-    public function testRenderPieChartWithPercentageTreshHoldAndCustomSum()
+    public function testRenderPieChartWithPercentageThresholdAndCustomSum()
     {
         $filename = $this->tempDir . __FUNCTION__ . '.svg';
 
         $chart = new ezcGraphPieChart();
         $chart->options->sum = 30;
-        $chart->options->percentTreshHold = .05;
+        $chart->options->percentThreshold = .05;
         $chart->options->summarizeCaption = 'Others';
         $chart->data['Skien'] = new ezcGraphArrayDataSet( array( 'Norwegian' 
=> 10, 'Dutch' => 3, 'German' => 2, 'French' => 2, 'Hindi' => 1, 'Taiwanese' => 
1, 'Brazilian' => 1, 'Venezuelan' => 1, 'Japanese' => 1, 'Czech' => 1, 
'Hungarian' => 1, 'Romanian' => 1 ) );