diff -NarU0 libchart-1.2/demo/MultipleStackedLineChartTest.php libchart-1.2-vert/demo/MultipleStackedLineChartTest.php
--- libchart-1.2/demo/MultipleStackedLineChartTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/MultipleStackedLineChartTest.php 2008-10-03 12:49:36.000000000 -0500
@@ -0,0 +1,90 @@
+.
+ *
+ */
+
+ /**
+ * Multiple line chart demonstration.
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ $chart = new StackedLineChart();
+
+ $serie1 = new XYDataSet();
+ $serie1->addPoint(new Point("06-01", 273));
+ $serie1->addPoint(new Point("06-02", 421));
+ $serie1->addPoint(new Point("06-03", 642));
+ $serie1->addPoint(new Point("06-04", 799));
+ $serie1->addPoint(new Point("06-05", 1009));
+ $serie1->addPoint(new Point("06-06", 1106));
+
+ $serie2 = new XYDataSet();
+ $serie2->addPoint(new Point("06-01", 280));
+ $serie2->addPoint(new Point("06-02", 300));
+ $serie2->addPoint(new Point("06-03", 212));
+ $serie2->addPoint(new Point("06-04", 542));
+ $serie2->addPoint(new Point("06-05", 600));
+ $serie2->addPoint(new Point("06-06", 850));
+
+ $serie3 = new XYDataSet();
+ $serie3->addPoint(new Point("06-01", 180));
+ $serie3->addPoint(new Point("06-02", 40));
+ $serie3->addPoint(new Point("06-03", 512));
+ $serie3->addPoint(new Point("06-04", 642));
+ $serie3->addPoint(new Point("06-05", 700));
+ $serie3->addPoint(new Point("06-06", 900));
+
+ $serie4 = new XYDataSet();
+ $serie4->addPoint(new Point("06-01", 280));
+ $serie4->addPoint(new Point("06-02", 500));
+ $serie4->addPoint(new Point("06-03", 612));
+ $serie4->addPoint(new Point("06-04", 742));
+ $serie4->addPoint(new Point("06-05", 800));
+ $serie4->addPoint(new Point("06-06", 1000));
+
+ $serie5 = new XYDataSet();
+ $serie5->addPoint(new Point("06-01", 380));
+ $serie5->addPoint(new Point("06-02", 600));
+ $serie5->addPoint(new Point("06-03", 712));
+ $serie5->addPoint(new Point("06-04", 842));
+ $serie5->addPoint(new Point("06-05", 900));
+ $serie5->addPoint(new Point("06-06", 1200));
+
+ $dataSet = new XYSeriesDataSet();
+ $dataSet->addSerie("Product 1", $serie1);
+ $dataSet->addSerie("Product 2", $serie2);
+ $dataSet->addSerie("Product 3", $serie3);
+ $dataSet->addSerie("Product 4", $serie4);
+ $dataSet->addSerie("Product 5", $serie5);
+ $chart->setDataSet($dataSet);
+
+ $chart->setTitle("Sales for 2006");
+ $chart->getPlot()->setGraphCaptionRatio(0.62);
+ $chart->render("generated/demo4.png");
+?>
+
+
+
+ Libchart line demonstration
+
+
+
+ 
+
+
diff -NarU0 libchart-1.2/demo/TallDirectPNGOutputTest.php libchart-1.2-vert/demo/TallDirectPNGOutputTest.php
--- libchart-1.2/demo/TallDirectPNGOutputTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/TallDirectPNGOutputTest.php 2008-10-03 13:01:47.000000000 -0500
@@ -0,0 +1,39 @@
+.
+ *
+ */
+
+ /**
+ * Direct PNG output demonstration (image not saved to disk)
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ header("Content-type: image/png");
+
+ $chart = new PieChart(300, 500);
+
+ $dataSet = new XYDataSet();
+ $dataSet->addPoint(new Point("Bleu d'Auvergne", 50));
+ $dataSet->addPoint(new Point("Tomme de Savoie", 75));
+ $dataSet->addPoint(new Point("Crottin de Chavignol", 30));
+ $chart->setDataSet($dataSet);
+
+ $chart->setTitle("Preferred Cheese");
+ $chart->render();
+?>
diff -NarU0 libchart-1.2/demo/TallMultipleHorizontalBarChartTest.php libchart-1.2-vert/demo/TallMultipleHorizontalBarChartTest.php
--- libchart-1.2/demo/TallMultipleHorizontalBarChartTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/TallMultipleHorizontalBarChartTest.php 2008-10-03 12:58:25.000000000 -0500
@@ -0,0 +1,58 @@
+.
+ *
+ */
+
+ /**
+ * Multiple horizontal bar chart demonstration.
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ $chart = new HorizontalBarChart(250, 450);
+
+ $serie1 = new XYDataSet();
+ $serie1->addPoint(new Point("18-24", 22));
+ $serie1->addPoint(new Point("25-34", 17));
+ $serie1->addPoint(new Point("35-44", 20));
+ $serie1->addPoint(new Point("45-54", 25));
+
+ $serie2 = new XYDataSet();
+ $serie2->addPoint(new Point("18-24", 13));
+ $serie2->addPoint(new Point("25-34", 18));
+ $serie2->addPoint(new Point("35-44", 23));
+ $serie2->addPoint(new Point("45-54", 22));
+
+ $dataSet = new XYSeriesDataSet();
+ $dataSet->addSerie("Male", $serie1);
+ $dataSet->addSerie("Female", $serie2);
+ $chart->setDataSet($dataSet);
+
+ $chart->setTitle("Firefox vs IE users: Age");
+ $chart->render("generated/talldemo8.png");
+?>
+
+
+
+ Libchart line demonstration
+
+
+
+ 
+
+
diff -NarU0 libchart-1.2/demo/TallMultipleLineChartTest.php libchart-1.2-vert/demo/TallMultipleLineChartTest.php
--- libchart-1.2/demo/TallMultipleLineChartTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/TallMultipleLineChartTest.php 2008-10-03 12:57:34.000000000 -0500
@@ -0,0 +1,90 @@
+.
+ *
+ */
+
+ /**
+ * Multiple line chart demonstration.
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ $chart = new LineChart(400,800);
+
+ $serie1 = new XYDataSet();
+ $serie1->addPoint(new Point("06-01", 273));
+ $serie1->addPoint(new Point("06-02", 421));
+ $serie1->addPoint(new Point("06-03", 642));
+ $serie1->addPoint(new Point("06-04", 799));
+ $serie1->addPoint(new Point("06-05", 1009));
+ $serie1->addPoint(new Point("06-06", 1106));
+
+ $serie2 = new XYDataSet();
+ $serie2->addPoint(new Point("06-01", 280));
+ $serie2->addPoint(new Point("06-02", 300));
+ $serie2->addPoint(new Point("06-03", 212));
+ $serie2->addPoint(new Point("06-04", 542));
+ $serie2->addPoint(new Point("06-05", 600));
+ $serie2->addPoint(new Point("06-06", 850));
+
+ $serie3 = new XYDataSet();
+ $serie3->addPoint(new Point("06-01", 180));
+ $serie3->addPoint(new Point("06-02", 400));
+ $serie3->addPoint(new Point("06-03", 512));
+ $serie3->addPoint(new Point("06-04", 642));
+ $serie3->addPoint(new Point("06-05", 700));
+ $serie3->addPoint(new Point("06-06", 900));
+
+ $serie4 = new XYDataSet();
+ $serie4->addPoint(new Point("06-01", 280));
+ $serie4->addPoint(new Point("06-02", 500));
+ $serie4->addPoint(new Point("06-03", 612));
+ $serie4->addPoint(new Point("06-04", 742));
+ $serie4->addPoint(new Point("06-05", 800));
+ $serie4->addPoint(new Point("06-06", 1000));
+
+ $serie5 = new XYDataSet();
+ $serie5->addPoint(new Point("06-01", 380));
+ $serie5->addPoint(new Point("06-02", 600));
+ $serie5->addPoint(new Point("06-03", 712));
+ $serie5->addPoint(new Point("06-04", 842));
+ $serie5->addPoint(new Point("06-05", 900));
+ $serie5->addPoint(new Point("06-06", 1200));
+
+ $dataSet = new XYSeriesDataSet();
+ $dataSet->addSerie("Product 1", $serie1);
+ $dataSet->addSerie("Product 2", $serie2);
+ $dataSet->addSerie("Product 3", $serie3);
+ $dataSet->addSerie("Product 4", $serie4);
+ $dataSet->addSerie("Product 5", $serie5);
+ $chart->setDataSet($dataSet);
+
+ $chart->setTitle("Sales for 2006");
+ $chart->getPlot()->setGraphCaptionRatio(0.62);
+ $chart->render("generated/talldemo6.png");
+?>
+
+
+
+ Libchart line demonstration
+
+
+
+ 
+
+
diff -NarU0 libchart-1.2/demo/TallMultipleStackedLineChartTest.php libchart-1.2-vert/demo/TallMultipleStackedLineChartTest.php
--- libchart-1.2/demo/TallMultipleStackedLineChartTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/TallMultipleStackedLineChartTest.php 2008-10-03 12:56:47.000000000 -0500
@@ -0,0 +1,90 @@
+.
+ *
+ */
+
+ /**
+ * Multiple line chart demonstration.
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ $chart = new StackedLineChart(400, 800);
+
+ $serie1 = new XYDataSet();
+ $serie1->addPoint(new Point("06-01", 273));
+ $serie1->addPoint(new Point("06-02", 421));
+ $serie1->addPoint(new Point("06-03", 642));
+ $serie1->addPoint(new Point("06-04", 799));
+ $serie1->addPoint(new Point("06-05", 1009));
+ $serie1->addPoint(new Point("06-06", 1106));
+
+ $serie2 = new XYDataSet();
+ $serie2->addPoint(new Point("06-01", 280));
+ $serie2->addPoint(new Point("06-02", 300));
+ $serie2->addPoint(new Point("06-03", 212));
+ $serie2->addPoint(new Point("06-04", 542));
+ $serie2->addPoint(new Point("06-05", 600));
+ $serie2->addPoint(new Point("06-06", 850));
+
+ $serie3 = new XYDataSet();
+ $serie3->addPoint(new Point("06-01", 180));
+ $serie3->addPoint(new Point("06-02", 40));
+ $serie3->addPoint(new Point("06-03", 512));
+ $serie3->addPoint(new Point("06-04", 642));
+ $serie3->addPoint(new Point("06-05", 700));
+ $serie3->addPoint(new Point("06-06", 900));
+
+ $serie4 = new XYDataSet();
+ $serie4->addPoint(new Point("06-01", 280));
+ $serie4->addPoint(new Point("06-02", 500));
+ $serie4->addPoint(new Point("06-03", 612));
+ $serie4->addPoint(new Point("06-04", 742));
+ $serie4->addPoint(new Point("06-05", 800));
+ $serie4->addPoint(new Point("06-06", 1000));
+
+ $serie5 = new XYDataSet();
+ $serie5->addPoint(new Point("06-01", 380));
+ $serie5->addPoint(new Point("06-02", 600));
+ $serie5->addPoint(new Point("06-03", 712));
+ $serie5->addPoint(new Point("06-04", 842));
+ $serie5->addPoint(new Point("06-05", 900));
+ $serie5->addPoint(new Point("06-06", 1200));
+
+ $dataSet = new XYSeriesDataSet();
+ $dataSet->addSerie("Product 1", $serie1);
+ $dataSet->addSerie("Product 2", $serie2);
+ $dataSet->addSerie("Product 3", $serie3);
+ $dataSet->addSerie("Product 4", $serie4);
+ $dataSet->addSerie("Product 5", $serie5);
+ $chart->setDataSet($dataSet);
+
+ $chart->setTitle("Sales for 2006");
+ $chart->getPlot()->setGraphCaptionRatio(0.62);
+ $chart->render("generated/talldemo4.png");
+?>
+
+
+
+ Libchart line demonstration
+
+
+
+ 
+
+
diff -NarU0 libchart-1.2/demo/TallMultipleVerticalBarChartTest.php libchart-1.2-vert/demo/TallMultipleVerticalBarChartTest.php
--- libchart-1.2/demo/TallMultipleVerticalBarChartTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/TallMultipleVerticalBarChartTest.php 2008-10-03 12:56:06.000000000 -0500
@@ -0,0 +1,61 @@
+.
+ *
+ */
+
+ /**
+ * Multiple horizontal bar chart demonstration.
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ $chart = new VerticalBarChart(400, 800);
+
+ $serie1 = new XYDataSet();
+ $serie1->addPoint(new Point("YT", 64));
+ $serie1->addPoint(new Point("NT", 63));
+ $serie1->addPoint(new Point("BC", 58));
+ $serie1->addPoint(new Point("AB", 58));
+ $serie1->addPoint(new Point("SK", 46));
+
+ $serie2 = new XYDataSet();
+ $serie2->addPoint(new Point("YT", 61));
+ $serie2->addPoint(new Point("NT", 60));
+ $serie2->addPoint(new Point("BC", 56));
+ $serie2->addPoint(new Point("AB", 57));
+ $serie2->addPoint(new Point("SK", 52));
+
+ $dataSet = new XYSeriesDataSet();
+ $dataSet->addSerie("1990", $serie1);
+ $dataSet->addSerie("1995", $serie2);
+ $chart->setDataSet($dataSet);
+ $chart->getPlot()->setGraphCaptionRatio(0.65);
+
+ $chart->setTitle("Average family income (k$)");
+ $chart->render("generated/talldemo7.png");
+?>
+
+
+
+ Libchart line demonstration
+
+
+
+ 
+
+
diff -NarU0 libchart-1.2/demo/TallPieChartTest.php libchart-1.2-vert/demo/TallPieChartTest.php
--- libchart-1.2/demo/TallPieChartTest.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/demo/TallPieChartTest.php 2008-10-03 12:55:06.000000000 -0500
@@ -0,0 +1,50 @@
+.
+ *
+ */
+
+ /**
+ * Pie chart demonstration
+ *
+ */
+
+ include "../libchart/classes/libchart.php";
+
+ $chart = new PieChart(300,600);
+
+ $dataSet = new XYDataSet();
+ $dataSet->addPoint(new Point("Mozilla Firefox (80)", 80));
+ $dataSet->addPoint(new Point("Konqueror (75)", 75));
+ $dataSet->addPoint(new Point("Opera (50)", 50));
+ $dataSet->addPoint(new Point("Safari (37)", 37));
+ $dataSet->addPoint(new Point("Dillo (37)", 37));
+ $dataSet->addPoint(new Point("Other (72)", 70));
+ $chart->setDataSet($dataSet);
+
+ $chart->setTitle("User agents for www.example.com");
+ $chart->render("generated/talldemo3.png");
+?>
+
+
+
+ Libchart pie chart demonstration
+
+
+
+ 
+
+
diff -NarU0 libchart-1.2/libchart/classes/libchart.php libchart-1.2-vert/libchart/classes/libchart.php
--- libchart-1.2/libchart/classes/libchart.php 2007-07-30 08:16:38.000000000 -0500
+++ libchart-1.2-vert/libchart/classes/libchart.php 2008-09-29 09:57:12.000000000 -0500
@@ -3 +3 @@
- * Copyright (C) 2005-2007 Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
+ * Copyright (C) 2005-2008 Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
@@ -34,0 +35 @@
+ require_once 'view/plot/TallPlot.php';
@@ -40,0 +42 @@
+ require_once 'view/chart/StackedLineChart.php';
@@ -42 +44 @@
-?>
\ No newline at end of file
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/chart/BarChart.php libchart-1.2-vert/libchart/classes/view/chart/BarChart.php
--- libchart-1.2/libchart/classes/view/chart/BarChart.php 2007-08-10 04:23:36.000000000 -0500
+++ libchart-1.2-vert/libchart/classes/view/chart/BarChart.php 2008-09-25 08:13:11.000000000 -0500
@@ -3 +3 @@
- * Copyright (C) 2005-2007 Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
+ * Copyright (C) 2005-2008 Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
@@ -50,0 +51,7 @@
+ /**
+ * Compute the axis for a "forced" y axis .
+ */
+ protected function computeForcedAxis($minY,$maxY) {
+ $this->axis = new Axis($minY,$maxY);
+ $this->axis->computeBoundaries();
+ }
@@ -172 +179,10 @@
- }
+ }
+
+ /**
+ * Retourns the bound.
+ *
+ * @return bound Bound
+ */
+ public function getBound() {
+ return $this->bound;
+ }
@@ -174 +190 @@
-?>
\ No newline at end of file
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/chart/Chart.php libchart-1.2-vert/libchart/classes/view/chart/Chart.php
--- libchart-1.2/libchart/classes/view/chart/Chart.php 2007-07-30 07:49:45.000000000 -0500
+++ libchart-1.2-vert/libchart/classes/view/chart/Chart.php 2008-09-29 09:56:07.000000000 -0500
@@ -51 +51,4 @@
- $this->plot = new Plot($width, $height);
+ if ( $width >= $height )
+ $this->plot = new Plot($width, $height);
+ else
+ $this->plot = new TallPlot($width, $height);
@@ -102 +105 @@
-?>
\ No newline at end of file
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/chart/StackedLineChart.php libchart-1.2-vert/libchart/classes/view/chart/StackedLineChart.php
--- libchart-1.2/libchart/classes/view/chart/StackedLineChart.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/libchart/classes/view/chart/StackedLineChart.php 2008-09-25 09:50:48.000000000 -0500
@@ -0,0 +1,258 @@
+.
+ *
+ */
+
+ /**
+ * Stacked Line chart.
+ *
+ * @author Tom Currie ( tjc.currie at gmail.com ) adapted from a prior work by Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
+ */
+ class StackedLineChart extends BarChart {
+ private $thispolygon;
+ /* Limitation on the implementation:
+ all series must have the same number of datapoints;
+ */
+
+ /**
+ * Creates a new stacked line chart.
+ * Line charts allow for XYDataSet and XYSeriesDataSet in order to plot several lines.
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ public function StackedLineChart($width = 600, $height = 250) {
+ parent::BarChart($width, $height);
+ $thispolygon=array();
+ $this->plot->setGraphPadding(new Padding(5, 30, 50, 50));
+ }
+
+ /**
+ * Computes the layout.
+ */
+ protected function computeLayout() {
+ if ($this->hasSeveralSerie) {
+ $this->plot->setHasCaption(true);
+ }
+ $this->plot->computeLayout();
+ }
+
+ /**
+ * Print the axis.
+ */
+ protected function printAxis() {
+ $minValue = $this->axis->getLowerBoundary();
+ $maxValue = $this->axis->getUpperBoundary();
+ $stepValue = $this->axis->getTics();
+
+ // Get graphical obects
+ $img = $this->plot->getImg();
+ $palette = $this->plot->getPalette();
+ $text = $this->plot->getText();
+
+ // Get the graph area
+ $graphArea = $this->plot->getGraphArea();
+
+ // Vertical axis
+ for ($value = $minValue; $value <= $maxValue; $value += $stepValue) {
+ $y = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+ imagerectangle($img, $graphArea->x1 - 3, $y, $graphArea->x1 - 2, $y + 1, $palette->axisColor[0]->getColor($img));
+ imagerectangle($img, $graphArea->x1 - 1, $y, $graphArea->x1, $y + 1, $palette->axisColor[1]->getColor($img));
+
+ $text->printText($img, $graphArea->x1 - 5, $y, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_RIGHT_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+ }
+
+ // Get first serie of a list
+ $pointList = $this->getFirstSerieOfList();
+
+ // Horizontal Axis
+ $pointCount = count($pointList);
+ reset($pointList);
+ $columnWidth = ($graphArea->x2 - $graphArea->x1) / ($pointCount - 1);
+
+ for ($i = 0; $i < $pointCount; $i++) {
+ $x = $graphArea->x1 + $i * $columnWidth;
+
+ imagerectangle($img, $x - 1, $graphArea->y2 + 2, $x, $graphArea->y2 + 3, $palette->axisColor[0]->getColor($img));
+ imagerectangle($img, $x - 1, $graphArea->y2, $x, $graphArea->y2 + 1, $palette->axisColor[1]->getColor($img));
+
+ $point = current($pointList);
+ next($pointList);
+
+ $label = $point->getX();
+
+ $text->printDiagonal($img, $x - 5, $graphArea->y2 + 10, $this->plot->getTextColor(), $label);
+ }
+ }
+
+ /**
+ * Print the lines.
+ */
+ protected function printLine() {
+ $nextpolygon=array();
+ $thisline=array();
+ $prevline=array();
+ $minValue = $this->axis->getLowerBoundary();
+ $maxValue = $this->axis->getUpperBoundary();
+
+ // Get the data as a list of series for consistency
+ $serieList = $this->getDataAsSerieList();
+
+ // Get graphical obects
+ $img = $this->plot->getImg();
+ $palette = $this->plot->getPalette();
+ $text = $this->plot->getText();
+ $primitive = $this->plot->getPrimitive();
+
+ // Get the graph area
+ $graphArea = $this->plot->getGraphArea();
+
+ $lineColorSet = $palette->lineColorSet;
+ $lineColorSet->reset();
+ for ($j = 0; $j < count($serieList); $j++) {
+ $serie = $serieList[$j];
+ $pointList = $serie->getPointList();
+ $pointCount = count($pointList);
+ reset($pointList);
+
+ $columnWidth = ($graphArea->x2 - $graphArea->x1) / ($pointCount - 1);
+
+ $lineColor = $lineColorSet->currentColor();
+ $lineColorShadow = $lineColorSet->currentShadowColor();
+ $lineColorSet->next();
+ $x1 = null;
+ $y1 = null;
+ if ( $j == 0 ) {
+ for ($i = 0; $i < $pointCount; $i++) {
+ $prevline[$i]=0;
+ }
+ $thispolygon[0]=$graphArea->x2;
+ $thispolygon[1]=$graphArea->y2;
+ $thispolygon[2]=$graphArea->x1;
+ $thispolygon[3]=$graphArea->y2;
+ }
+ for ($i = 0; $i < $pointCount; $i++) {
+ $x2 = $graphArea->x1 + $i * $columnWidth;
+
+ $point = current($pointList);
+ next($pointList);
+
+ $value = $point->getY()+$prevline[$i];
+ $thisline[$i]=$value;
+
+ $y2 = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+
+ // Draw line
+ if ($x1) {
+ $primitive->line($x1, $y1, $x2, $y2, $lineColor, 4);
+
+
+ }
+
+ $x1 = $x2;
+ $y1 = $y2;
+ array_push($thispolygon,$x1);
+ array_push($thispolygon,$y1+1);
+ array_push($nextpolygon,$x1);
+ array_push($nextpolygon,$y1-1);
+ }
+ $primitive->filledpolygon($thispolygon,$lineColorShadow);
+ /* print "polygon for series $j:\n";
+ ** for ($i=0; $i=0; $i=$i-2) {
+ array_push($thispolygon,$nextpolygon[$i-1]); /* x pt */
+ array_push($thispolygon,$nextpolygon[$i]); /* y pt */
+ }
+ $nextpolygon=array();
+ $prevline=$thisline;
+ }
+ }
+
+ /**
+ * Renders the caption.
+ */
+ protected function printCaption() {
+ // Get the list of labels
+ $labelList = $this->dataSet->getTitleList();
+
+ // Create the caption
+ $caption = new Caption();
+ $caption->setPlot($this->plot);
+ $caption->setLabelList($labelList);
+
+ $palette = $this->plot->getPalette();
+ $lineColorSet = $palette->lineColorSet;
+ $caption->setColorSet($lineColorSet);
+
+ // Render the caption
+ $caption->render();
+ }
+
+ /**
+ * Render the chart image.
+ *
+ * @param string name of the file to render the image to (optional)
+ */
+ public function render($fileName = null) {
+ // Check the data model
+ $this->checkDataModel();
+ if ($this->hasSeveralSerie) {
+ $topline=array();
+ /* calulate y-axis boundaries for y-axis height */
+ $serieList = $this->getDataAsSerieList();
+ for ($j = 0; $j < count($serieList); $j++) {
+ $pointList = $serieList[$j]->getPointList();
+ $pointCount = count($pointList);
+ reset($pointList);
+ for ($i=0; $i<$pointCount; $i++) {
+ $v=$pointList[$i]->getY();
+ if (isset($miny)) {
+ if ( $v < $miny ) $miny=$v;
+ }
+ else $miny=$v;
+ $topline[$i]+=$v;
+ }
+ }
+ }
+ $maxy=max($topline);
+
+
+
+
+ $this->bound->computeBound($this->dataSet);
+ $this->computeForcedAxis($miny,$maxy);
+ $this->computeLayout();
+ $this->createImage();
+ $this->plot->printLogo();
+ $this->plot->printTitle();
+ if (!$this->isEmptyDataSet(2)) {
+ $this->printAxis();
+ $this->printLine();
+ if ($this->hasSeveralSerie) {
+ $this->printCaption();
+ }
+ }
+
+ $this->plot->render($fileName);
+ }
+ }
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/chart/VerticalBarChart.php libchart-1.2-vert/libchart/classes/view/chart/VerticalBarChart.php
--- libchart-1.2/libchart/classes/view/chart/VerticalBarChart.php 2007-08-13 12:43:09.000000000 -0500
+++ libchart-1.2-vert/libchart/classes/view/chart/VerticalBarChart.php 2008-09-22 16:27:38.000000000 -0500
@@ -158 +158 @@
- $text->printText($img, $x1 + $barWidth / 2 , $ymin - 5, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN | $text->VERTICAL_BOTTOM_ALIGN);
+// $text->printText($img, $x1 + $barWidth / 2 , $ymin - 5, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN | $text->VERTICAL_BOTTOM_ALIGN);
@@ -213 +213 @@
-?>
\ No newline at end of file
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/color/Palette.php libchart-1.2-vert/libchart/classes/view/color/Palette.php
--- libchart-1.2/libchart/classes/view/color/Palette.php 2007-08-13 07:00:53.000000000 -0500
+++ libchart-1.2-vert/libchart/classes/view/color/Palette.php 2008-09-29 13:03:35.000000000 -0500
@@ -70 +70 @@
- // Colors for the lines
+ // Colors for the lines hue is the only variable, sat=79, volume=67
@@ -72,2 +72,2 @@
- new Color(172, 172, 210),
- new Color(2, 78, 0),
+ new Color(36, 167, 170),
+ new Color(36, 170, 47),
@@ -81 +81 @@
- new Color(121, 75, 255),
+ new Color(172, 172, 210),
@@ -85 +85 @@
- new Color(104, 221, 71),
+ new Color(2, 78, 0),
@@ -110 +110 @@
-?>
\ No newline at end of file
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/plot/TallPlot.php libchart-1.2-vert/libchart/classes/view/plot/TallPlot.php
--- libchart-1.2/libchart/classes/view/plot/TallPlot.php 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/libchart/classes/view/plot/TallPlot.php 2008-10-03 13:56:35.000000000 -0500
@@ -0,0 +1,424 @@
+.
+ *
+ */
+
+ /**
+ * The plot holds graphical attributes, and is responsible for computing the layout of the graph.
+ * The layout is quite simple right now, with 4 areas laid out like that:
+ * (of course this is subject to change in the future).
+ *
+ * output area---------------------------|
+ * | (outer padding) |
+ * | image area-----------------------| |
+ * | | (title padding) | |
+ * | | title area-------------------| | |
+ * | | |----------------------------| | |
+ * | | | |
+ * | | (graph padding) | |
+ * | | graph area-------------------| | |
+ * | | | | | |
+ * | | | | | |
+ * | | | | | |
+ * | | | | | |
+ * | | | | | |
+ * | | |----------------------------| | |
+ * | | | |
+ * | | caption area-----------------| | |
+ * | | | | | |
+ * | | | | | |
+ * | | | | | |
+ * | | | | | |
+ * | | | | | |
+ * | | |----------------------------| | |
+ * | | | |
+ * | |--------------------------------| |
+ * | |
+ * |-------------------------------------|
+ *
+ * // NOTICE that the caption padding is zero.
+ *
+ * All area dimensions are known in advance , and the optional logo is drawn in absolute coordinates.
+ *
+ * @author Tom Currie ( tjc.currie at gmail.com ) adapted from a prior work by Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
+ * Created on 27 july 2007
+ */
+ class TallPlot {
+ // Style properties
+ protected $title;
+ protected $logoFileName;
+
+ // Outer area, whose dimension is the same as the PNG returned
+ protected $outputArea;
+
+ // Outer padding surrounding the whole image, everything outside is blank
+ protected $outerPadding;
+
+ // Coordinates of the area inside the outer padding
+ protected $imageArea;
+
+ // Fixed title height in pixels
+ protected $titleHeight;
+
+ // Padding of the title area
+ protected $titlePadding;
+
+ // Coordinates of the title area
+ protected $titleArea;
+
+ // True if the plot has a caption
+ protected $hasCaption;
+
+ // Ratio of graph/caption in width
+ protected $graphCaptionRatio;
+
+ // Padding of the graph area
+ protected $graphPadding;
+
+ // Coordinates of the graph area
+ protected $graphArea;
+
+ // Padding of the caption area
+ protected $captionPadding;
+
+ // Coordinates of the caption area
+ protected $captionArea;
+
+ /**
+ * Text writer.
+ */
+ protected $text;
+
+ /**
+ * Color palette.
+ */
+ protected $palette;
+
+ /**
+ * GD image
+ */
+ protected $img;
+
+ /**
+ * Drawing primitives
+ */
+ protected $primitive;
+
+ protected $backGroundColor;
+ protected $textColor;
+
+ /**
+ * Constructor of Plot.
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ public function TallPlot($width, $height) {
+ $this->width = $width;
+ $this->height = $height;
+
+ $this->text = new Text();
+ $this->palette = new Palette();
+
+ // Default layout
+ $this->outputArea = new Rectangle(0, 0, $width - 1, $height - 1);
+ $this->outerPadding = new Padding(5);
+ $this->titleHeight = 26;
+ $this->titlePadding = new Padding(5);
+ $this->hasCaption = false;
+ $this->graphCaptionRatio = ($width-20)/($height+20); /* chart area should be square, caption is all else */
+ $this->graphPadding = new Padding(50);
+ $this->captionPadding = new Padding(15);
+ }
+
+ /**
+ * Compute the area inside the outer padding (outside is white).
+ */
+ private function computeImageArea() {
+ $this->imageArea = $this->outputArea->getPaddedRectangle($this->outerPadding);
+ }
+
+ /**
+ * Compute the title area.
+ */
+ private function computeTitleArea() {
+ $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+ $titleArea = new Rectangle(
+ $this->imageArea->x1,
+ $this->imageArea->y1,
+ $this->imageArea->x2,
+ $titleUnpaddedBottom - 1
+ );
+ $this->titleArea = $titleArea->getPaddedRectangle($this->titlePadding);
+ }
+
+ /**
+ * Compute the graph area.
+ */
+ private function computeGraphArea() {
+ $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+ $graphArea = null;
+ if ($this->hasCaption) {
+ $graphUnpaddedBottom = $titleUnpaddedBottom + ($this->imageArea->y2 - $titleUnpaddedBottom) * $this->graphCaptionRatio
+ + $this->graphPadding->bottom + $this->graphPadding->top;
+ $graphArea = new Rectangle(
+ $this->imageArea->x1,
+ $titleUnpaddedBottom,
+ $this->imageArea->x2,
+ $graphUnpaddedBottom
+ );
+ } else {
+ $graphArea = new Rectangle(
+ $this->imageArea->x1,
+ $titleUnpaddedBottom,
+ $this->imageArea->x2,
+ $this->imageArea->y2
+ );
+ }
+ $this->graphArea = $graphArea->getPaddedRectangle($this->graphPadding);
+ }
+
+ /**
+ * Compute the caption area.
+ */
+ private function computeCaptionArea() {
+ $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+ $graphUnpaddedBottom = $titleUnpaddedBottom + ($this->imageArea->y2 - $titleUnpaddedBottom) * $this->graphCaptionRatio + ($this->graphPadding->bottom/3);
+ $captionArea = new Rectangle(
+ $this->imageArea->x1,
+ $graphUnpaddedBottom,
+ $this->imageArea->x2,
+ $this->imageArea->y2
+ );
+ $this->captionArea = $captionArea->getPaddedRectangle($this->captionPadding);
+ }
+
+ /**
+ * Compute the layout of all areas of the graph.
+ */
+ public function computeLayout() {
+ $this->computeImageArea();
+ $this->computeTitleArea();
+ $this->computeGraphArea();
+ if ($this->hasCaption) {
+ $this->computeCaptionArea();
+ }
+ }
+
+ /**
+ * Creates and initialize the image.
+ */
+ public function createImage() {
+ $this->img = imagecreatetruecolor($this->width, $this->height);
+
+ $this->primitive = new Primitive($this->img);
+
+ $this->backGroundColor = new Color(255, 255, 255);
+ $this->textColor = new Color(0, 0, 0);
+
+ // White background
+ imagefilledrectangle($this->img, 0, 0, $this->width - 1, $this->height - 1, $this->backGroundColor->getColor($this->img));
+
+ //imagerectangle($this->img, $this->imageArea->x1, $this->imageArea->y1, $this->imageArea->x2, $this->imageArea->y2, $this->palette->red->getColor($this->img));
+ }
+
+ /**
+ * Print the title to the image.
+ */
+ public function printTitle() {
+ $yCenter = $this->titleArea->y1 + ($this->titleArea->y2 - $this->titleArea->y1) / 2;
+ $this->text->printCentered($this->img, $yCenter, $this->textColor, $this->title, $this->text->fontCondensedBold);
+ }
+
+ /**
+ * Print the logo image to the image.
+ */
+ public function printLogo() {
+ @$logoImage = imageCreateFromPNG($this->logoFileName);
+
+ if ($logoImage) {
+ imagecopymerge($this->img, $logoImage, 2 * $this->outerPadding->left, $this->outerPadding->top, 0, 0, imagesx($logoImage), imagesy($logoImage), 100);
+ }
+ }
+
+ /**
+ * Renders to a file or to standard output.
+ *
+ * @param fileName File name (optional)
+ */
+ public function render($fileName) {
+ if (isset($fileName)) {
+ imagepng($this->img, $fileName);
+ } else {
+ imagepng($this->img);
+ }
+ }
+
+ /**
+ * Sets the title.
+ *
+ * @param string New title
+ */
+ public function setTitle($title) {
+ $this->title = $title;
+ }
+
+ /**
+ * Sets the logo image file name.
+ *
+ * @param string New logo image file name
+ */
+ public function setLogoFileName($logoFileName) {
+ $this->logoFileName = $logoFileName;
+ }
+
+ /**
+ * Return the GD image.
+ *
+ * @return GD Image
+ */
+ public function getImg() {
+ return $this->img;
+ }
+
+ /**
+ * Return the palette.
+ *
+ * @return palette
+ */
+ public function getPalette() {
+ return $this->palette;
+ }
+
+ /**
+ * Return the text.
+ *
+ * @return text
+ */
+ public function getText() {
+ return $this->text;
+ }
+
+ /**
+ * Return the primitive.
+ *
+ * @return primitive
+ */
+ public function getPrimitive() {
+ return $this->primitive;
+ }
+
+ /**
+ * Return the outer padding.
+ *
+ * @param integer Outer padding value in pixels
+ */
+ public function getOuterPadding() {
+ return $outerPadding;
+ }
+
+ /**
+ * Set the outer padding.
+ *
+ * @param integer Outer padding value in pixels
+ */
+ public function setOuterPadding($outerPadding) {
+ $this->outerPadding = $outerPadding;
+ }
+
+ /**
+ * Return the title height.
+ *
+ * @param integer title height
+ */
+ public function setTitleHeight($titleHeight) {
+ $this->titleHeight = $titleHeight;
+ }
+
+ /**
+ * Return the title padding.
+ *
+ * @param integer title padding
+ */
+ public function setTitlePadding($titlePadding) {
+ $this->titlePadding = $titlePadding;
+ }
+
+ /**
+ * Return the graph padding.
+ *
+ * @param integer graph padding
+ */
+ public function setGraphPadding($graphPadding) {
+ $this->graphPadding = $graphPadding;
+ }
+
+ /**
+ * Set if the graph has a caption.
+ *
+ * @param boolean graph has a caption
+ */
+ public function setHasCaption($hasCaption) {
+ $this->hasCaption = $hasCaption;
+ }
+
+ /**
+ * Set the caption padding.
+ *
+ * @param integer caption padding
+ */
+ public function setCaptionPadding($captionPadding) {
+ $this->captionPadding = $captionPadding;
+ }
+
+ /**
+ * Set the graph/caption ratio.
+ *
+ * @param integer caption padding
+ */
+ public function setGraphCaptionRatio($graphCaptionRatio) {
+ $this->graphCaptionRatio = $graphCaptionRatio;
+ }
+
+ /**
+ * Return the graph area.
+ *
+ * @return graph area
+ */
+ public function getGraphArea() {
+ return $this->graphArea;
+ }
+
+ /**
+ * Return the caption area.
+ *
+ * @return caption area
+ */
+ public function getCaptionArea() {
+ return $this->captionArea;
+ }
+
+ /**
+ * Return the text color.
+ *
+ * @return text color
+ */
+ public function getTextColor() {
+ return $this->textColor;
+ }
+ }
+?>
diff -NarU0 libchart-1.2/libchart/classes/view/primitive/Primitive.php libchart-1.2-vert/libchart/classes/view/primitive/Primitive.php
--- libchart-1.2/libchart/classes/view/primitive/Primitive.php 2007-07-26 07:43:41.000000000 -0500
+++ libchart-1.2-vert/libchart/classes/view/primitive/Primitive.php 2008-09-25 08:56:07.000000000 -0500
@@ -3 +3 @@
- * Copyright (C) 2005-2007 Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
+ * Copyright (C) 2005-2008 Jean-Marc Trmeaux (jm.tremeaux at gmail.com)
@@ -51,0 +52,13 @@
+ * Draws a filled polygon.
+ *
+ * @param integer line start (X)
+ * @param integer line start (Y)
+ * @param integer line end (X)
+ * @param integer line end (Y)
+ * @param Color line color
+ */
+ public function filledpolygon($pointarray, $color, $width = 1) {
+ imagefilledpolygon($this->img, $pointarray, count($pointarray)/2, $color->getColor($this->img));
+ // imageline($this->img, $x1, $y1, $x2, $y2, $color->getColor($this->img));
+ }
+ /**
@@ -70 +83 @@
-?>
\ No newline at end of file
+?>
diff -NarU0 libchart-1.2/libchart/images/PoweredByLarge.png libchart-1.2-vert/libchart/images/PoweredByLarge.png
--- libchart-1.2/libchart/images/PoweredByLarge.png 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/libchart/images/PoweredByLarge.png 2006-03-31 09:36:13.000000000 -0600
@@ -0,0 +1,12 @@
+PNG
+
+
IHDR V ] bKGD pHYs tIME $
l tEXtComment Created with The GIMPd%n IDATXXoLSW? ,Ek &-qʔ5KVe !S1lqȘq.3": P>ftT=
+vr?w{9x(Y okbr9B Dkrv'%l X廇V8GCE.Y<x<ԴC{* Vv3M1ה|x+v.L$I }v}l Lv9zWJƍ,^+W @zzJU[h
+Do3ƃ.-^.bرe!, rXm0֭[*--R*jիǏ @)
+
!=::`0m6cbbBO~[*++Kh-V:|wq xlbEQU!C &/
+ x< @ ͛,NS(ɬAїɓ~Lxln- ^LY4h`U*Iy=]rSVVfXR߇{r%gs;,,]*nڴ 4Mbbbqq1 9rD"RMM
8qVG`փt"2ջX:!rh
+
+BꁁQ+%:z\{z wKj;~z(DN ~Su (z qriaY]]}Ν+V~udA8_e 8 VhG Bt:
+
+gZ v8 OftT=
-vr?w{9x(Y okbr9B Dkrv'%l X廇V8GCE.Y<x<ԴC{* Vv3M1ה|x+v.L$I }v}l Lv9zWJƍ,^+W @zzJU[h
-Do3ƃ.-^.bرe!, rXm0֭[*--R*jիǏ @)
-
!=::`0m6cbbBO~[*++Kh-V:|wq xlbEQU!C &/
- x< @ ͛,NS(ɬAїɓ~Lxln- ^LY4h`U*Iy=]rSVVfXR߇{r%gs;,,]*nڴ 4Mbbbqq1 9rD"RMM
8qVG`փt"2ջX:!rh
-
-BꁁQ+%:z\{z wKj;~z(DN ~Su (z qriaY]]}Ν+V~udA8_e 8 VhG Bt:
-
-gZ v8 OB rrrn[ %%%Bh4RŲƍU*A8ONNbVYY)bliӝA$'' @ T*CCI"CBA=w0aX;w t:H$ h4a# d
+AP%l6IYYY-jnnaA>_RRC|B
8.rʞU*EQE/M6E8 H$I2Yzu4 сfiC6Cŀ#²HJF &OddjLK. |>±c^aiY>}ziPT :tH",cB{c ֭5)
+N8n6 <鲳rfkiiijjjkkcʕ+eeejGחc?LCB.6Z%6[MI%I$~@ >e0w ݇$^ommmYYA۶m[8 0_ݠ)|sCQ>.s ~ Pfd2 \.ĄJ;L9J YaxYhgBc6t-Yx!aD!Ƅ'G8 4L>pt۷o
+ ].V HRd" @0BCK&;ss臫7-.R7(zF a A IENDB`
\ No newline at end of file
diff -NarU0 libchart-1.2/libchart/images/PoweredBySmall.png libchart-1.2-vert/libchart/images/PoweredBySmall.png
--- libchart-1.2/libchart/images/PoweredBySmall.png 1969-12-31 18:00:00.000000000 -0600
+++ libchart-1.2-vert/libchart/images/PoweredBySmall.png 2008-03-17 21:25:11.000000000 -0500
@@ -0,0 +1,12 @@
+PNG
+
+
IHDR < , pHYs tIME _u tEXtComment Created with The GIMPd%n zIDATH͖Lgz y%: "VFc`)G0',f%`t.a#ds.824X!R8J)B[h 5Ne,s=P8 kvcqdfm/\^%a *cz+,Q沊H8x#
+`|VU$fff R Ϝ9o߾
+}cYKN| Ӈa|I2 0??ϲlEE 8 HMM1 xB rrrn[ %%%Bh4RŲƍU*A8ONNbVYY)bliӝA$'' @ T*CCI"CBA=w0aX;w t:H$ h4a# d
+AP%l6IYYY-jnnaA>_RRC|B
8.rʞU*EQE/M6E8 H$I2Yzu4 сfiC6Cŀ#²HJF &OddjLK. |>±c^aiY>}ziPT :tH",cB{c ֭5)
+N8n6 <鲳rfkiiijjjkkcʕ+eeejGחc?LCB.6Z%6[MI%I$~@ >e0w ݇$^ommmYYA۶m[8 0_ݠ)|sCQ>.s ~ Pfd2 \.ĄJ;L9J YaxYhgBc6t-Yx!aD!Ƅ'G8 4L>pt۷o
+ ].V HRd" @0BCK&;ss臫7-.R7(zF a A IENDB`
\ No newline at end of file