Index: branches/RC/core/units/general/libchart/fonts/DejaVuSansCondensed-Bold.ttf
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/general/libchart/fonts/DejaVuSansCondensed.ttf
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/general/libchart/classes/view/chart/HorizontalBarChart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/chart/HorizontalBarChart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/chart/HorizontalBarChart.php (revision 10155)
@@ -0,0 +1,213 @@
+.
+ *
+ */
+
+ /**
+ * Horizontal bar chart
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartHorizontalBarChart extends LibchartBarChart {
+ /**
+ * Ratio of empty space beside the bars.
+ */
+ private $emptyToFullRatio;
+
+ /**
+ * Creates a new horizontal bar chart.
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ public function LibchartHorizontalBarChart($width = 600, $height = 250) {
+ parent::BarChart($width, $height);
+
+ $this->emptyToFullRatio = 1 / 5;
+ $this->plot->setGraphPadding(new Padding(5, 30, 30, 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();
+
+ // Horizontal axis
+ for ($value = $minValue; $value <= $maxValue; $value += $stepValue) {
+ $x = $graphArea->x1 + ($value - $minValue) * ($graphArea->x2 - $graphArea->x1) / ($this->axis->displayDelta);
+
+ 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));
+
+ $text->printText($img, $x, $graphArea->y2 + 5, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN);
+ }
+
+ // Get first serie of a list
+ $pointList = $this->getFirstSerieOfList();
+
+ // Vertical Axis
+ $pointCount = count($pointList);
+ reset($pointList);
+ $rowHeight = ($graphArea->y2 - $graphArea->y1) / $pointCount;
+ reset($pointList);
+ for ($i = 0; $i <= $pointCount; $i++) {
+ $y = $graphArea->y2 - $i * $rowHeight;
+
+ 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));
+
+ if ($i < $pointCount) {
+ $point = current($pointList);
+ next($pointList);
+
+ $label = $point->getX();
+
+ $text->printText($img, $graphArea->x1 - 5, $y - $rowHeight / 2, $this->plot->getTextColor(), $label, $text->fontCondensed, $text->HORIZONTAL_RIGHT_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+ }
+ }
+ }
+
+ /**
+ * Print the bars.
+ */
+ protected function printBar() {
+ // 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();
+
+ // Get the graph area
+ $graphArea = $this->plot->getGraphArea();
+
+ $minValue = $this->axis->getLowerBoundary();
+ $maxValue = $this->axis->getUpperBoundary();
+ $stepValue = $this->axis->getTics();
+
+ $barColorSet = $palette->barColorSet;
+ $barColorSet->reset();
+
+ $serieCount = count($serieList);
+ for ($j = 0; $j < $serieCount; $j++) {
+ $serie = $serieList[$j];
+ $pointList = $serie->getPointList();
+ $pointCount = count($pointList);
+ reset($pointList);
+
+ // Get the next color
+ $color = $barColorSet->currentColor();
+ $shadowColor = $barColorSet->currentShadowColor();
+ $barColorSet->next();
+
+ $rowHeight = ($graphArea->y2 - $graphArea->y1) / $pointCount;
+ for ($i = 0; $i < $pointCount; $i++) {
+ $y = $graphArea->y2 - $i * $rowHeight;
+
+ $point = current($pointList);
+ next($pointList);
+
+ $value = $point->getY();
+
+ $xmax = $graphArea->x1 + ($value - $minValue) * ($graphArea->x2 - $graphArea->x1) / ($this->axis->displayDelta);
+
+ // Bar dimensions
+ $yWithMargin = $y - $rowHeight * $this->emptyToFullRatio;
+ $rowWidthWithMargin = $rowHeight * (1 - $this->emptyToFullRatio * 2);
+ $barWidth = $rowWidthWithMargin / $serieCount;
+ $barOffset = $barWidth * $j;
+ $y1 = $yWithMargin - $barWidth - $barOffset;
+ $y2 = $yWithMargin - $barOffset - 1;
+
+ // Text
+ $text->printText($img, $xmax + 5, $y2 - $barWidth / 2, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->VERTICAL_CENTER_ALIGN);
+
+ imagefilledrectangle($img, $graphArea->x1 + 1, $y1, $xmax, $y2, $shadowColor->getColor($img));
+ imagefilledrectangle($img, $graphArea->x1 + 2, $y1 + 1, $xmax - 4, $y2, $color->getColor($img));
+ }
+ }
+ }
+
+ /**
+ * Renders the caption.
+ */
+ protected function printCaption() {
+ // Get the list of labels
+ $labelList = $this->dataSet->getTitleList();
+
+ // Create the caption
+ $caption = new LibchartCaption();
+ $caption->setPlot($this->plot);
+ $caption->setLabelList($labelList);
+
+ $palette = $this->plot->getPalette();
+ $barColorSet = $palette->barColorSet;
+ $caption->setColorSet($barColorSet);
+
+ // 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();
+
+ $this->bound->computeBound($this->dataSet);
+ $this->computeAxis();
+ $this->computeLayout();
+ $this->createImage();
+ $this->plot->printLogo();
+ $this->plot->printTitle();
+ if (!$this->isEmptyDataSet(1)) {
+ $this->printAxis();
+ $this->printBar();
+ if ($this->hasSeveralSerie) {
+ $this->printCaption();
+ }
+ }
+
+ $this->plot->render($fileName);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/color/Color.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/color/Color.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/color/Color.php (revision 10155)
@@ -0,0 +1,99 @@
+.
+ *
+ */
+
+ /**
+ * Color.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartColor {
+ private $red;
+ private $green;
+ private $blue;
+ private $alpha;
+ private $gdColor;
+
+ /**
+ * Creates a new color
+ *
+ * @param integer red [0..255]
+ * @param integer green [0..255]
+ * @param integer blue [0..255]
+ * @param integer alpha [0..255]
+ */
+ public function LibchartColor($red, $green, $blue, $alpha = 0) {
+ $this->red = (int) $red;
+ $this->green = (int) $green;
+ $this->blue = (int) $blue;
+ $this->alpha = (int) round($alpha * 127.0 / 255);
+
+ $this->gdColor = null;
+ }
+
+ /**
+ * Get GD color.
+ *
+ * @param $img GD image resource
+ */
+ public function getColor($img) {
+ // Checks if color has already been allocated
+ if (!$this->gdColor) {
+ if ($this->alpha == 0 || !function_exists('imagecolorallocatealpha')) {
+ $this->gdColor = imagecolorallocate($img, $this->red, $this->green, $this->blue);
+ } else {
+ $this->gdColor = imagecolorallocatealpha($img, $this->red, $this->green, $this->blue, $this->alpha);
+ }
+ }
+
+ // Returns GD color
+ return $this->gdColor;
+ }
+
+ /**
+ * Clip a color component in the interval [0..255]
+ *
+ * @param integer Component
+ * @return Clipped component
+ */
+ public function clip($component) {
+ if ($component < 0) {
+ $component = 0;
+ } else if ($component > 255) {
+ $component = 255;
+ }
+
+ return $component;
+ }
+
+ /**
+ * Return a new color, which is a shadow of this one.
+ *
+ * @param double Multiplication factor
+ * @return Shadow color
+ */
+ public function getShadowColor($shadowFactor) {
+ $red = $this->clip($this->red * $shadowFactor);
+ $green = $this->clip($this->green * $shadowFactor);
+ $blue = $this->clip($this->blue * $shadowFactor);
+ $shadowColor = new LibchartColor($red, $green, $blue);
+
+ return $shadowColor;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/model/XYDataSet.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/model/XYDataSet.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/model/XYDataSet.php (revision 10155)
@@ -0,0 +1,56 @@
+.
+ *
+ */
+
+ /**
+ * Set of data in the form of (x, y) items.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 10 may 2007
+ */
+ class LibchartXYDataSet extends LibchartDataSet {
+ private $pointList;
+
+ /**
+ * Constructor of XYDataSet.
+ *
+ */
+ public function LibchartXYDataSet() {
+ $this->pointList = array();
+ }
+
+ /**
+ * Add a new point to the dataset.
+ *
+ * @param Point Point to add to the dataset
+ */
+
+ public function addPoint($point) {
+ array_push($this->pointList, $point);
+ }
+
+ /**
+ * Getter of pointList.
+ *
+ * @return List of points.
+ */
+ public function getPointList() {
+ return $this->pointList;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/ChangeLog
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/ChangeLog (revision 0)
+++ branches/RC/core/units/general/libchart/ChangeLog (revision 10155)
@@ -0,0 +1,41 @@
+Libchart ChangeLog
+==================
+(C) 2005-2007 Jean-Marc Tr�meaux
+
+
+VERSION 1.2: (2007-08-13)
+==========
+ LICENSE:
+ * Change of license to GPL v3
+
+ FEATURES:
+ * Multiple line charts
+ * Multiple vertical and horizontal bar charts
+ * Customizable layout (plot)
+
+ REFACTORING:
+ * Support for PHP4 is deprecated, as PHP 4 has reached its end of life.
+ * Use of PHP5 OO constructs
+ * Use of setLowerBound(null) if you want to revert to the old behaviour.
+
+ BUGFIXES:
+ * Removed undefined IMG_ARC_FILL constant
+ * Added missing default parameter in HorizontalChart::render()
+ * Fixed decimal values in Bar Charts
+ * Typo in default logo
+ * Crashed when no point was defined
+ * Crashed when all values were set to 0
+
+Version 1.0: (2005-09-30)
+==========
+ INITIAL RELEASE
+
Index: branches/RC/core/units/general/libchart/classes/view/color/ColorSet.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/color/ColorSet.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/color/ColorSet.php (revision 10155)
@@ -0,0 +1,83 @@
+.
+ *
+ */
+
+ /**
+ * A set of colors, used for drawing series of data.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 26 july 2007
+ */
+ class LibchartColorSet {
+ public $colorList;
+ public $shadowColorList;
+
+ /**
+ * ColorSet constructor.
+ *
+ * @param $shadowFactor Shadow factor
+ * @param $colorArray Colors as an array
+ */
+ public function LibchartColorSet($colorList, $shadowFactor) {
+ $this->colorList = $colorList;
+ $this->shadowColorList = array();
+
+ // Generate the shadow color set
+ foreach ($colorList as $color) {
+ $shadowColor = $color->getShadowColor($shadowFactor);
+
+ array_push($this->shadowColorList, $shadowColor);
+ }
+ }
+
+ /**
+ * Reset the iterator over the collections of colors.
+ */
+ public function reset() {
+ reset($this->colorList);
+ reset($this->shadowColorList);
+ }
+
+ /**
+ * Iterate over the colors and shadow colors. When we go after the last one, loop over (TODO).
+ *
+ */
+ public function next() {
+ next($this->colorList);
+ next($this->shadowColorList);
+ }
+
+ /**
+ * Returns the current color.
+ *
+ * @return Current color
+ */
+ public function currentColor() {
+ return current($this->colorList);
+ }
+
+ /**
+ * Returns the current shadow color.
+ *
+ * @return Current shadow color
+ */
+ public function currentShadowColor() {
+ return current($this->shadowColorList);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/caption/Caption.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/caption/Caption.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/caption/Caption.php (revision 10155)
@@ -0,0 +1,112 @@
+.
+ *
+ */
+
+ /**
+ * Caption.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 30 july 2007
+ */
+ class LibchartCaption {
+ protected $labelBoxWidth;
+ protected $labelBoxHeight;
+
+ // Plot
+ protected $plot;
+
+ // Label list
+ protected $labelList;
+
+ // Color set
+ protected $colorSet;
+
+ /**
+ * Constructor of Caption
+ */
+ public function LibchartCaption() {
+ $this->labelBoxWidth = 15;
+ $this->labelBoxHeight = 15;
+ }
+
+ /**
+ * Render the caption.
+ */
+ public function render() {
+ // Get graphical obects
+ $img = $this->plot->getImg();
+ $palette = $this->plot->getPalette();
+ $text = $this->plot->getText();
+ $primitive = $this->plot->getPrimitive();
+
+ // Get the caption area
+ $captionArea = $this->plot->getCaptionArea();
+
+ // Get the pie color set
+ $colorSet = $this->colorSet;
+ $colorSet->reset();
+
+ $i = 0;
+ foreach ($this->labelList as $label) {
+ // Get the next color
+ $color = $colorSet->currentColor();
+ $colorSet->next();
+
+ $boxX1 = $captionArea->x1;
+ $boxX2 = $boxX1 + $this->labelBoxWidth;
+ $boxY1 = $captionArea->y1 + 5 + $i * ($this->labelBoxHeight + 5);
+ $boxY2 = $boxY1 + $this->labelBoxHeight;
+
+ $primitive->outlinedBox($boxX1, $boxY1, $boxX2, $boxY2, $palette->axisColor[0], $palette->axisColor[1]);
+ imagefilledrectangle($img, $boxX1 + 2, $boxY1 + 2, $boxX2 - 2, $boxY2 - 2, $color->getColor($img));
+
+ $text->printText($img, $boxX2 + 5, $boxY1 + $this->labelBoxHeight / 2, $this->plot->getTextColor(), $label, $text->fontCondensed, $text->VERTICAL_CENTER_ALIGN);
+
+ $i++;
+ }
+ }
+
+ /**
+ * Sets the plot.
+ *
+ * @param Plot The plot
+ */
+ public function setPlot($plot) {
+ $this->plot = $plot;
+ }
+
+ /**
+ * Sets the label list.
+ *
+ * @param Array label list
+ */
+ public function setLabelList($labelList) {
+ $this->labelList = $labelList;
+ }
+
+
+ /**
+ * Sets the color set.
+ *
+ * @param Array Color set
+ */
+ public function setColorSet($colorSet) {
+ $this->colorSet = $colorSet;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/primitive/Primitive.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/primitive/Primitive.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/primitive/Primitive.php (revision 10155)
@@ -0,0 +1,70 @@
+.
+ *
+ */
+
+ /**
+ * Graphic primitives, extends GD with chart related primitives.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartPrimitive {
+ private $img;
+
+ /**
+ * Creates a new primitive object
+ *
+ * @param resource GD image resource
+ */
+ public function LibchartPrimitive($img) {
+ $this->img = $img;
+ }
+
+ /**
+ * Draws a straight line.
+ *
+ * @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 line($x1, $y1, $x2, $y2, $color, $width = 1) {
+ imagefilledpolygon($this->img, array($x1, $y1 - $width / 2, $x1, $y1 + $width / 2, $x2, $y2 + $width / 2, $x2, $y2 - $width / 2), 4, $color->getColor($this->img));
+ // imageline($this->img, $x1, $y1, $x2, $y2, $color->getColor($this->img));
+ }
+
+ /**
+ * Draw a filled gray box with thick borders and darker corners.
+ *
+ * @param integer top left coordinate (x)
+ * @param integer top left coordinate (y)
+ * @param integer bottom right coordinate (x)
+ * @param integer bottom right coordinate (y)
+ * @param Color edge color
+ * @param Color corner color
+ */
+ public function outlinedBox($x1, $y1, $x2, $y2, $color0, $color1) {
+ imagefilledrectangle($this->img, $x1, $y1, $x2, $y2, $color0->getColor($this->img));
+ imagerectangle($this->img, $x1, $y1, $x1 + 1, $y1 + 1, $color1->getColor($this->img));
+ imagerectangle($this->img, $x2 - 1, $y1, $x2, $y1 + 1, $color1->getColor($this->img));
+ imagerectangle($this->img, $x1, $y2 - 1, $x1 + 1, $y2, $color1->getColor($this->img));
+ imagerectangle($this->img, $x2 - 1, $y2 - 1, $x2, $y2, $color1->getColor($this->img));
+ }
+
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/helpers/chart_helper.php
===================================================================
diff -u
--- branches/RC/core/units/general/helpers/chart_helper.php (revision 0)
+++ branches/RC/core/units/general/helpers/chart_helper.php (revision 10155)
@@ -0,0 +1,35 @@
+
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/model/XYSeriesDataSet.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/model/XYSeriesDataSet.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/model/XYSeriesDataSet.php (revision 10155)
@@ -0,0 +1,76 @@
+.
+ *
+ */
+
+ /**
+ * This dataset comprises several series of points and is used to plot multiple lines charts.
+ * Each serie is a XYDataSet.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 20 july 2007
+ */
+ class LibchartXYSeriesDataSet extends LibchartDataSet {
+ /**
+ * List of titles
+ */
+ private $titleList;
+
+ /**
+ * List of XYDataSet.
+ */
+ private $serieList;
+
+ /**
+ * Constructor of XYSeriesDataSet.
+ *
+ */
+ public function LibchartXYSeriesDataSet() {
+ $this->titleList = array();
+ $this->serieList = array();
+ }
+
+ /**
+ * Add a new serie to the dataset.
+ *
+ * @param string Title (label) of the serie.
+ * @param XYDataSet Serie of points to add
+ */
+ public function addSerie($title, $serie) {
+ array_push($this->titleList, $title);
+ array_push($this->serieList, $serie);
+ }
+
+ /**
+ * Getter of titleList.
+ *
+ * @return List of titles.
+ */
+ public function getTitleList() {
+ return $this->titleList;
+ }
+
+ /**
+ * Getter of serieList.
+ *
+ * @return List of series.
+ */
+ public function getSerieList() {
+ return $this->serieList;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/libchart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/libchart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/libchart.php (revision 10155)
@@ -0,0 +1,42 @@
+.
+ *
+ */
+
+ require_once 'model/Point.php';
+ require_once 'model/DataSet.php';
+ require_once 'model/XYDataSet.php';
+ require_once 'model/XYSeriesDataSet.php';
+
+ require_once 'view/primitive/Padding.php';
+ require_once 'view/primitive/Rectangle.php';
+ require_once 'view/primitive/Primitive.php';
+ require_once 'view/text/Text.php';
+ require_once 'view/color/Color.php';
+ require_once 'view/color/ColorSet.php';
+ require_once 'view/color/Palette.php';
+ require_once 'view/axis/Bound.php';
+ require_once 'view/axis/Axis.php';
+ require_once 'view/plot/Plot.php';
+ require_once 'view/caption/Caption.php';
+ require_once 'view/chart/Chart.php';
+ require_once 'view/chart/BarChart.php';
+ require_once 'view/chart/VerticalBarChart.php';
+ require_once 'view/chart/HorizontalBarChart.php';
+ require_once 'view/chart/LineChart.php';
+ require_once 'view/chart/PieChart.php';
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/chart/VerticalBarChart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/chart/VerticalBarChart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/chart/VerticalBarChart.php (revision 10155)
@@ -0,0 +1,213 @@
+.
+ *
+ */
+
+ /**
+ * Chart composed of vertical bars.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartVerticalBarChart extends LibchartBarChart {
+ /**
+ * Ratio of empty space beside the bars.
+ */
+ private $emptyToFullRatio;
+
+ /**
+ * Creates a new vertical bar chart
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ public function LibchartVerticalBarChart($width = 600, $height = 250) {
+ parent::LibchartBarChart($width, $height);
+
+ $this->emptyToFullRatio = 1 / 5;
+ $this->plot->setGraphPadding(new LibchartPadding(5, 30, 50, 50));
+ }
+
+ /**
+ * Computes the layout.
+ */
+ protected function computeLayout() {
+ if ($this->hasSeveralSerie) {
+ $this->plot->setHasCaption(true);
+ }
+ $this->plot->computeLayout();
+ }
+
+ /**
+ * Print the horizontal and veritcal 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;
+ 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));
+
+ if ($i < $pointCount) {
+ $point = current($pointList);
+ next($pointList);
+
+ $label = $point->getX();
+
+ $text->printDiagonal($img, $x + $columnWidth * 1 / 3, $graphArea->y2 + 10, $this->plot->getTextColor(), $label);
+ }
+ }
+ }
+
+ /**
+ * Print the bars.
+ */
+ protected function printBar() {
+ // 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();
+
+ // Get the graph area
+ $graphArea = $this->plot->getGraphArea();
+
+ $barColorSet = $palette->barColorSet;
+ $barColorSet->reset();
+
+ $minValue = $this->axis->getLowerBoundary();
+ $maxValue = $this->axis->getUpperBoundary();
+ $stepValue = $this->axis->getTics();
+
+ $serieCount = count($serieList);
+ for ($j = 0; $j < $serieCount; $j++) {
+ $serie = $serieList[$j];
+ $pointList = $serie->getPointList();
+ $pointCount = count($pointList);
+ reset($pointList);
+
+ // Get the next color
+ $color = $barColorSet->currentColor();
+ $shadowColor = $barColorSet->currentShadowColor();
+ $barColorSet->next();
+
+ $columnWidth = ($graphArea->x2 - $graphArea->x1) / $pointCount;
+ for ($i = 0; $i < $pointCount; $i++) {
+ $x = $graphArea->x1 + $i * $columnWidth;
+
+ $point = current($pointList);
+ next($pointList);
+
+ $value = $point->getY();
+
+ $ymin = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+ // Bar dimensions
+ $xWithMargin = $x + $columnWidth * $this->emptyToFullRatio;
+ $columnWidthWithMargin = $columnWidth * (1 - $this->emptyToFullRatio * 2);
+ $barWidth = $columnWidthWithMargin / $serieCount;
+ $barOffset = $barWidth * $j;
+ $x1 = $xWithMargin + $barOffset;
+ $x2 = $xWithMargin + $barWidth + $barOffset - 1;
+
+ // Text
+ $text->printText($img, $x1 + $barWidth / 2 , $ymin - 5, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN | $text->VERTICAL_BOTTOM_ALIGN);
+
+ // Vertical bar
+ imagefilledrectangle($img, $x1, $ymin, $x2, $graphArea->y2 - 1, $shadowColor->getColor($img));
+ imagefilledrectangle($img, $x1 + 1, $ymin + 1, $x2 - 4, $graphArea->y2 - 1, $color->getColor($img));
+ }
+ }
+ }
+
+ /**
+ * Renders the caption.
+ */
+ protected function printCaption() {
+ // Get the list of labels
+ $labelList = $this->dataSet->getTitleList();
+
+ // Create the caption
+ $caption = new LibchartCaption();
+ $caption->setPlot($this->plot);
+ $caption->setLabelList($labelList);
+
+ $palette = $this->plot->getPalette();
+ $barColorSet = $palette->barColorSet;
+ $caption->setColorSet($barColorSet);
+
+ // 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();
+
+ $this->bound->computeBound($this->dataSet);
+ $this->computeAxis();
+ $this->computeLayout();
+ $this->createImage();
+ $this->plot->printLogo();
+ $this->plot->printTitle();
+ if (!$this->isEmptyDataSet(1)) {
+ $this->printAxis();
+ $this->printBar();
+ if ($this->hasSeveralSerie) {
+ $this->printCaption();
+ }
+ }
+
+ $this->plot->render($fileName);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/primitive/Rectangle.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/primitive/Rectangle.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/primitive/Rectangle.php (revision 10155)
@@ -0,0 +1,76 @@
+.
+ *
+ */
+
+ /**
+ * A rectangle identified by the top-left and the bottom-right corners.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * @Created on 27 july 2007
+ */
+ class LibchartRectangle {
+ /**
+ * Top left X
+ */
+ public $x1;
+
+ /**
+ * Top left Y
+ */
+ public $y1;
+
+ /**
+ * Bottom right X
+ */
+ public $x2;
+
+ /**
+ * Bottom right Y
+ */
+ public $y2;
+
+ /**
+ * Creates a new rectangle
+ *
+ * @param resource GD image resource
+ */
+ public function LibchartRectangle($x1, $y1, $x2, $y2) {
+ $this->x1 = $x1;
+ $this->y1 = $y1;
+ $this->x2 = $x2;
+ $this->y2 = $y2;
+ }
+
+ /**
+ * Apply a padding and returns the resulting rectangle.
+ *
+ * @return Resulting rectangle
+ */
+ public function getPaddedRectangle($padding) {
+ $rectangle = new LibchartRectangle(
+ $this->x1 + $padding->left,
+ $this->y1 + $padding->top,
+ $this->x2 - $padding->right,
+ $this->y2 - $padding->bottom
+ );
+
+ //echo "(" . $this->x1 . "," . $this->y1 . ") (" . $this->x2 . "," . $this->y2 . ")
";
+ return $rectangle;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/helpers/helpers_config.php
===================================================================
diff -u -r9644 -r10155
--- branches/RC/core/units/general/helpers/helpers_config.php (.../helpers_config.php) (revision 9644)
+++ branches/RC/core/units/general/helpers/helpers_config.php (.../helpers_config.php) (revision 10155)
@@ -25,5 +25,6 @@
Array('pseudo' => 'FileHelper', 'class' => 'FileHelper','file' => 'file_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')),
Array('pseudo'=>'CategoryHelper','class'=>'CategoryHelper','file'=>'category_helper.php','build_event'=>'','require_classes'=>'kHelper'),
Array('pseudo'=>'CSVHelper','class'=>'kCSVHelper','file'=>'csv_helper.php','build_event'=>'','require_classes'=>'kHelper'),
+ Array('pseudo'=>'ChartHelper','class'=>'kChartHelper','file'=>'chart_helper.php','build_event'=>'','require_classes'=>'kHelper'),
),
);
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/axis/Axis.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/axis/Axis.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/axis/Axis.php (revision 10155)
@@ -0,0 +1,130 @@
+.
+ *
+ */
+
+ /**
+ * Automatic axis boundaries and ticks calibration
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartAxis {
+ private $min;
+ private $max;
+ private $guide;
+ private $delta;
+ private $magnitude;
+ private $displayMin;
+ private $displayMax;
+ private $tics;
+
+ /**
+ * Creates a new axis formatter.
+ *
+ * @param integer minimum value on the axis
+ * @param integer maximum value on the axis
+ */
+ public function LibchartAxis($min, $max) {
+ $this->min = $min;
+ $this->max = $max;
+
+ $this->guide = 10;
+ }
+
+ /**
+ * Computes value between two ticks.
+ */
+ public function quantizeTics() {
+ // Approximate number of decades, in [1..10[
+ $norm = $this->delta / $this->magnitude;
+
+ // Approximate number of tics per decade
+ $posns = $this->guide / $norm;
+
+ if ($posns > 20) {
+ $tics = 0.05; // e.g. 0, .05, .10, ...
+ } else if ($posns > 10) {
+ $tics = 0.2; // e.g. 0, .1, .2, ...
+ } else if ($posns > 5) {
+ $tics = 0.4; // e.g. 0, 0.2, 0.4, ...
+ } else if ($posns > 3) {
+ $tics = 0.5; // e.g. 0, 0.5, 1, ...
+ } else if ($posns > 2) {
+ $tics = 1; // e.g. 0, 1, 2, ...
+ } else if ($posns > 0.25) {
+ $tics = 2; // e.g. 0, 2, 4, 6
+ } else {
+ $tics = ceil($norm);
+ }
+
+ $this->tics = $tics * $this->magnitude;
+ }
+
+ /**
+ * Computes automatic boundaries on the axis
+ */
+ public function computeBoundaries() {
+ // Range
+ $this->delta = abs($this->max - $this->min);
+
+ // Check for null distribution
+ if ($this->delta == 0)
+ $this->delta = 1;
+
+ // Order of magnitude of range
+ $this->magnitude = pow(10, floor(log10($this->delta)));
+
+ $this->quantizeTics();
+
+ $this->displayMin = floor($this->min / $this->tics) * $this->tics;
+ $this->displayMax = ceil($this->max / $this->tics) * $this->tics;
+ $this->displayDelta = $this->displayMax - $this->displayMin;
+
+ // Check for null distribution
+ if ($this->displayDelta == 0) {
+ $this->displayDelta = 1;
+ }
+ }
+
+ /**
+ * Get the lower boundary on the axis3
+ *
+ * @return integer lower boundary on the axis
+ */
+ public function getLowerBoundary() {
+ return $this->displayMin;
+ }
+
+ /**
+ * Get the upper boundary on the axis3
+ *
+ * @return integer upper boundary on the axis
+ */
+ public function getUpperBoundary() {
+ return $this->displayMax;
+ }
+
+ /**
+ * Get the value between two ticks3
+ *
+ * @return integer value between two ticks
+ */
+ public function getTics() {
+ return $this->tics;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/plot/Plot.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/plot/Plot.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/plot/Plot.php (revision 10155)
@@ -0,0 +1,415 @@
+.
+ *
+ */
+
+ /**
+ * 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) (caption padding) | |
+ * | | graph area----------------| caption area---------| | |
+ * | | | | | | | |
+ * | | | | | | | |
+ * | | | | | | | |
+ * | | | | | | | |
+ * | | | | | | | |
+ * | | |-------------------------| |--------------------| | |
+ * | | | |
+ * | |-----------------------------------------------------| |
+ * | |
+ * |----------------------------------------------------------|
+ *
+ * All area dimensions are known in advance , and the optional logo is drawn in absolute coordinates.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 27 july 2007
+ */
+ class LibchartPlot {
+ // 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 LibchartPlot($width, $height) {
+ $this->width = $width;
+ $this->height = $height;
+
+ $this->text = new LibchartText();
+ $this->palette = new LibchartPalette();
+
+ // Default layout
+ $this->outputArea = new LibchartRectangle(0, 0, $width - 1, $height - 1);
+ $this->outerPadding = new LibchartPadding(5);
+ $this->titleHeight = 26;
+ $this->titlePadding = new LibchartPadding(5);
+ $this->hasCaption = false;
+ $this->graphCaptionRatio = 0.50;
+ $this->graphPadding = new LibchartPadding(50);
+ $this->captionPadding = new LibchartPadding(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 LibchartRectangle(
+ $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) {
+ $graphUnpaddedRight = $this->imageArea->x1 + ($this->imageArea->x2 - $this->imageArea->x1) * $this->graphCaptionRatio
+ + $this->graphPadding->left + $this->graphPadding->right;
+ $graphArea = new LibchartRectangle(
+ $this->imageArea->x1,
+ $titleUnpaddedBottom,
+ $graphUnpaddedRight - 1,
+ $this->imageArea->y2
+ );
+ } else {
+ $graphArea = new LibchartRectangle(
+ $this->imageArea->x1,
+ $titleUnpaddedBottom,
+ $this->imageArea->x2,
+ $this->imageArea->y2
+ );
+ }
+ $this->graphArea = $graphArea->getPaddedRectangle($this->graphPadding);
+ }
+
+ /**
+ * Compute the caption area.
+ */
+ private function computeCaptionArea() {
+ $graphUnpaddedRight = $this->imageArea->x1 + ($this->imageArea->x2 - $this->imageArea->x1) * $this->graphCaptionRatio
+ + $this->graphPadding->left + $this->graphPadding->right;
+ $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+ $captionArea = new LibchartRectangle(
+ $graphUnpaddedRight,
+ $titleUnpaddedBottom,
+ $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 LibchartPrimitive($this->img);
+
+ $this->backGroundColor = new LibchartColor(255, 255, 255);
+ $this->textColor = new LibchartColor(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;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/text/Text.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/text/Text.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/text/Text.php (revision 10155)
@@ -0,0 +1,129 @@
+.
+ *
+ */
+
+ /**
+ * Text drawing helper
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartText {
+ public $HORIZONTAL_LEFT_ALIGN = 1;
+ public $HORIZONTAL_CENTER_ALIGN = 2;
+ public $HORIZONTAL_RIGHT_ALIGN = 4;
+ public $VERTICAL_TOP_ALIGN = 8;
+ public $VERTICAL_CENTER_ALIGN = 16;
+ public $VERTICAL_BOTTOM_ALIGN = 32;
+
+ /**
+ * Creates a new text drawing helper.
+ */
+ public function LibchartText() {
+ $baseDir = dirname(__FILE__) . "/../../../";
+
+ // Free low-res fonts based on Bitstream Vera
+ $this->fontCondensed = $baseDir . "fonts/DejaVuSansCondensed.ttf";
+ $this->fontCondensedBold = $baseDir . "fonts/DejaVuSansCondensed-Bold.ttf";
+ }
+
+ /**
+ * Print text.
+ *
+ * @param Image GD image
+ * @param integer text coordinate (x)
+ * @param integer text coordinate (y)
+ * @param Color text color
+ * @param string text value
+ * @param string font file name
+ * @param bitfield text alignment
+ */
+ public function printText($img, $px, $py, $color, $text, $fontFileName, $align = 0) {
+ if (!($align & $this->HORIZONTAL_CENTER_ALIGN) && !($align & $this->HORIZONTAL_RIGHT_ALIGN)) {
+ $align |= $this->HORIZONTAL_LEFT_ALIGN;
+ }
+
+ if (!($align & $this->VERTICAL_CENTER_ALIGN) && !($align & $this->VERTICAL_BOTTOM_ALIGN)) {
+ $align |= $this->VERTICAL_TOP_ALIGN;
+ }
+
+ $fontSize = 8;
+ $lineSpacing = 1;
+
+ list ($llx, $lly, $lrx, $lry, $urx, $ury, $ulx, $uly) = imageftbbox($fontSize, 0, $fontFileName, $text, array("linespacing" => $lineSpacing));
+
+ $textWidth = $lrx - $llx;
+ $textHeight = $lry - $ury;
+
+ $angle = 0;
+
+ if ($align & $this->HORIZONTAL_CENTER_ALIGN) {
+ $px -= $textWidth / 2;
+ }
+
+ if ($align & $this->HORIZONTAL_RIGHT_ALIGN) {
+ $px -= $textWidth;
+ }
+
+ if ($align & $this->VERTICAL_CENTER_ALIGN) {
+ $py += $textHeight / 2;
+ }
+
+ if ($align & $this->VERTICAL_TOP_ALIGN) {
+ $py += $textHeight;
+ }
+
+ imagettftext($img, $fontSize, $angle, $px, $py, $color->getColor($img), $fontFileName, $text);
+ }
+
+ /**
+ * Print text centered horizontally on the image.
+ *
+ * @param Image GD image
+ * @param integer text coordinate (y)
+ * @param Color text color
+ * @param string text value
+ * @param string font file name
+ */
+ public function printCentered($img, $py, $color, $text, $fontFileName) {
+ $this->printText($img, imagesx($img) / 2, $py, $color, $text, $fontFileName, $this->HORIZONTAL_CENTER_ALIGN | $this->VERTICAL_CENTER_ALIGN);
+ }
+
+ /**
+ * Print text in diagonal.
+ *
+ * @param Image GD image
+ * @param integer text coordinate (x)
+ * @param integer text coordinate (y)
+ * @param Color text color
+ * @param string text value
+ */
+ public function printDiagonal($img, $px, $py, $color, $text) {
+ $fontSize = 8;
+ $fontFileName = $this->fontCondensed;
+
+ $lineSpacing = 1;
+
+ list ($lx, $ly, $rx, $ry) = imageftbbox($fontSize, 0, $fontFileName, $text, array("linespacing" => $lineSpacing));
+ $textWidth = $rx - $lx;
+
+ $angle = -45;
+
+ imagettftext($img, $fontSize, $angle, $px, $py, $color->getColor($img), $fontFileName, $text);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/color/Palette.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/color/Palette.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/color/Palette.php (revision 10155)
@@ -0,0 +1,110 @@
+.
+ *
+ */
+
+ /**
+ * Color palette shared by all chart types.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 25 july 2007
+ */
+ class LibchartPalette {
+ public $red;
+ public $axisColor;
+ public $aquaColor;
+
+ public $barColorSet;
+ public $lineColorSet;
+ public $pieColorSet;
+
+ /**
+ * Palette constructor.
+ */
+ public function LibchartPalette() {
+ $this->red = new LibchartColor(255, 0, 0);
+
+ // Colors for the horizontal and vertical axis
+ $this->axisColor = array(
+ new LibchartColor(201, 201, 201),
+ new LibchartColor(158, 158, 158)
+ );
+
+ // Colors for the background
+ $this->aquaColor = array(
+ new LibchartColor(242, 242, 242),
+ new LibchartColor(231, 231, 231),
+ new LibchartColor(239, 239, 239),
+ new LibchartColor(253, 253, 253)
+ );
+
+ // Colors for the bars
+ $this->barColorSet = new LibchartColorSet(array(
+ new LibchartColor(42, 71, 181),
+ new LibchartColor(243, 198, 118),
+ new LibchartColor(128, 63, 35),
+ new LibchartColor(128, 63, 35),
+ new LibchartColor(195, 45, 28),
+ new LibchartColor(224, 198, 165),
+ new LibchartColor(239, 238, 218),
+ new LibchartColor(40, 72, 59),
+ new LibchartColor(71, 112, 132),
+ new LibchartColor(167, 192, 199),
+ new LibchartColor(218, 233, 202)
+ ), 0.75);
+
+ // Colors for the lines
+ $this->lineColorSet = new LibchartColorSet(array(
+ new LibchartColor(172, 172, 210),
+ new LibchartColor(2, 78, 0),
+ new LibchartColor(148, 170, 36),
+ new LibchartColor(233, 191, 49),
+ new LibchartColor(240, 127, 41),
+ new LibchartColor(243, 63, 34),
+ new LibchartColor(190, 71, 47),
+ new LibchartColor(135, 81, 60),
+ new LibchartColor(128, 78, 162),
+ new LibchartColor(121, 75, 255),
+ new LibchartColor(142, 165, 250),
+ new LibchartColor(162, 254, 239),
+ new LibchartColor(137, 240, 166),
+ new LibchartColor(104, 221, 71),
+ new LibchartColor(98, 174, 35),
+ new LibchartColor(93, 129, 1)
+ ), 0.75);
+
+ // Colors for the pie
+ $this->pieColorSet = new LibchartColorSet(array(
+ new LibchartColor(2, 78, 0),
+ new LibchartColor(148, 170, 36),
+ new LibchartColor(233, 191, 49),
+ new LibchartColor(240, 127, 41),
+ new LibchartColor(243, 63, 34),
+ new LibchartColor(190, 71, 47),
+ new LibchartColor(135, 81, 60),
+ new LibchartColor(128, 78, 162),
+ new LibchartColor(121, 75, 255),
+ new LibchartColor(142, 165, 250),
+ new LibchartColor(162, 254, 239),
+ new LibchartColor(137, 240, 166),
+ new LibchartColor(104, 221, 71),
+ new LibchartColor(98, 174, 35),
+ new LibchartColor(93, 129, 1)
+ ), 0.7);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/model/Point.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/model/Point.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/model/Point.php (revision 10155)
@@ -0,0 +1,59 @@
+.
+ *
+ */
+
+ /**
+ * Point of coordinates (X,Y).
+ * The value of X isn't really of interest, but X is used as a label to display on the horizontal axis.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartPoint {
+ private $x;
+ private $y;
+
+ /**
+ * Creates a new sampling point of coordinates (x, y)
+ *
+ * @param integer x coordinate (label)
+ * @param integer y coordinate (value)
+ */
+ public function LibchartPoint($x, $y) {
+ $this->x = $x;
+ $this->y = $y;
+ }
+
+ /**
+ * Gets the x coordinate (label).
+ *
+ * @return integer x coordinate (label)
+ */
+ public function getX() {
+ return $this->x;
+ }
+
+ /**
+ * Gets the y coordinate (value).
+ *
+ * @return integer y coordinate (value)
+ */
+ public function getY() {
+ return $this->y;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/COPYING
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/COPYING (revision 0)
+++ branches/RC/core/units/general/libchart/COPYING (revision 10155)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
Index: branches/RC/core/units/general/libchart/classes/view/chart/PieChart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/chart/PieChart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/chart/PieChart.php (revision 10155)
@@ -0,0 +1,253 @@
+.
+ *
+ */
+
+ /**
+ * Pie chart.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartPieChart extends LibchartChart {
+ protected $pieCenterX;
+ protected $pieCenterY;
+
+ /**
+ * Constructor of a pie chart.
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ public function LibchartPieChart($width = 600, $height = 250) {
+ parent::LibchartChart($width, $height);
+ $this->plot->setGraphPadding(new LibchartPadding(15, 10, 30, 30));
+ }
+
+ /**
+ * Computes the layout.
+ */
+ protected function computeLayout() {
+ $this->plot->setHasCaption(true);
+ $this->plot->computeLayout();
+
+ // Get the graph area
+ $graphArea = $this->plot->getGraphArea();
+
+ // Compute the coordinates of the pie
+ $this->pieCenterX = $graphArea->x1 + ($graphArea->x2 - $graphArea->x1) / 2;
+ $this->pieCenterY = $graphArea->y1 + ($graphArea->y2 - $graphArea->y1) / 2;
+
+ $this->pieWidth = round(($graphArea->x2 - $graphArea->x1) * 4 / 5);
+ $this->pieHeight = round(($graphArea->y2 - $graphArea->y1) * 3.7 / 5);
+ $this->pieDepth = round($this->pieWidth * 0.05);
+ }
+
+ /**
+ * Compare two sampling point values, order from biggest to lowest value.
+ *
+ * @param double first value
+ * @param double second value
+ * @return integer result of the comparison
+ */
+ protected function sortPie($v1, $v2) {
+ return $v1[0] == $v2[0] ? 0 :
+ $v1[0] > $v2[0] ? -1 :
+ 1;
+ }
+
+ /**
+ * Compute pie values in percentage and sort them.
+ */
+ protected function computePercent() {
+ $this->total = 0;
+ $this->percent = array();
+
+ $pointList = $this->dataSet->getPointList();
+ foreach ($pointList as $point) {
+ $this->total += $point->getY();
+ }
+
+ foreach ($pointList as $point) {
+ $percent = $this->total == 0 ? 0 : 100 * $point->getY() / $this->total;
+
+ array_push($this->percent, array($percent, $point));
+ }
+
+ usort($this->percent, array("PieChart", "sortPie"));
+ }
+
+ /**
+ * Creates the pie chart image.
+ */
+ protected function createImage() {
+ parent::createImage();
+
+ // Get graphical obects
+ $img = $this->plot->getImg();
+ $palette = $this->plot->getPalette();
+ $primitive = $this->plot->getPrimitive();
+
+ // Get the graph area
+ $graphArea = $this->plot->getGraphArea();
+
+ // Legend box
+ $primitive->outlinedBox($graphArea->x1, $graphArea->y1, $graphArea->x2, $graphArea->y2, $palette->axisColor[0], $palette->axisColor[1]);
+
+ // Aqua-like background
+ for ($i = $graphArea->y1 + 2; $i < $graphArea->y2 - 1; $i++) {
+ $color = $palette->aquaColor[($i + 3) % 4];
+ $primitive->line($graphArea->x1 + 2, $i, $graphArea->x2 - 2, $i, $color);
+ }
+ }
+
+ /**
+ * Renders the caption.
+ */
+ protected function printCaption() {
+ // Create a list of labels
+ $labelList = array();
+ foreach($this->percent as $percent) {
+ list($percent, $point) = $percent;
+ $label = $point->getX();
+
+ array_push($labelList, $label);
+ }
+
+ // Create the caption
+ $caption = new LibchartCaption();
+ $caption->setPlot($this->plot);
+ $caption->setLabelList($labelList);
+
+ $palette = $this->plot->getPalette();
+ $pieColorSet = $palette->pieColorSet;
+ $caption->setColorSet($pieColorSet);
+
+ // Render the caption
+ $caption->render();
+ }
+
+ /**
+ * Draw a 2D disc.
+ *
+ * @param integer center coordinate (y)
+ * @param array colors for each portion
+ * @param bitfield drawing mode
+ */
+ protected function drawDisc($cy, $colorArray, $mode) {
+ // Get graphical obects
+ $img = $this->plot->getImg();
+
+ $i = 0;
+ $angle1 = 0;
+ $percentTotal = 0;
+
+ foreach ($this->percent as $a) {
+ list ($percent, $point) = $a;
+
+ $color = $colorArray[$i % count($colorArray)];
+
+ $percentTotal += $percent;
+ $angle2 = $percentTotal * 360 / 100;
+
+ imagefilledarc($img, $this->pieCenterX, $cy, $this->pieWidth, $this->pieHeight, $angle1, $angle2, $color->getColor($img), $mode);
+
+ $angle1 = $angle2;
+
+ $i++;
+ }
+ }
+
+ /**
+ * Print the percentage text.
+ */
+ protected function drawPercent() {
+ // Get graphical obects
+ $img = $this->plot->getImg();
+ $palette = $this->plot->getPalette();
+ $text = $this->plot->getText();
+ $primitive = $this->plot->getPrimitive();
+
+ $angle1 = 0;
+ $percentTotal = 0;
+
+ foreach ($this->percent as $a) {
+ list ($percent, $point) = $a;
+
+ // If value is null, don't print percentage
+ if ($percent <= 0) {
+ continue;
+ }
+
+ $percentTotal += $percent;
+ $angle2 = $percentTotal * 2 * M_PI / 100;
+
+ $angle = $angle1 + ($angle2 - $angle1) / 2;
+ $label = number_format($percent) . "%";
+
+ $x = cos($angle) * ($this->pieWidth + 35) / 2 + $this->pieCenterX;
+ $y = sin($angle) * ($this->pieHeight + 35) / 2 + $this->pieCenterY;
+
+ $text->printText($img, $x, $y, $this->plot->getTextColor(), $label, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+
+ $angle1 = $angle2;
+ }
+ }
+
+ /**
+ * Print the pie chart.
+ */
+ protected function printPie() {
+ // Get graphical obects
+ $img = $this->plot->getImg();
+ $palette = $this->plot->getPalette();
+ $text = $this->plot->getText();
+ $primitive = $this->plot->getPrimitive();
+
+ // Get the pie color set
+ $pieColorSet = $palette->pieColorSet;
+ $pieColorSet->reset();
+
+ // Silhouette
+ for ($cy = $this->pieCenterY + $this->pieDepth / 2; $cy >= $this->pieCenterY - $this->pieDepth / 2; $cy--) {
+ $this->drawDisc($cy, $palette->pieColorSet->shadowColorList, IMG_ARC_EDGED);
+ }
+
+ // Top
+ $this->drawDisc($this->pieCenterY - $this->pieDepth / 2, $palette->pieColorSet->colorList, IMG_ARC_PIE);
+
+ // Top Outline
+ $this->drawPercent();
+ }
+
+ /**
+ * Render the chart image.
+ *
+ * @param string name of the file to render the image to (optional)
+ */
+ public function render($fileName = null) {
+ $this->computePercent();
+ $this->computeLayout();
+ $this->createImage();
+ $this->plot->printLogo();
+ $this->plot->printTitle();
+ $this->printPie();
+ $this->printCaption();
+
+ $this->plot->render($fileName);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/images/PoweredBy.png
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/general/libchart/classes/view/chart/LineChart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/chart/LineChart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/chart/LineChart.php (revision 10155)
@@ -0,0 +1,200 @@
+.
+ *
+ */
+
+ /**
+ * Line chart.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ class LibchartLineChart extends LibchartBarChart {
+ /**
+ * Creates a new 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 LibchartLineChart($width = 600, $height = 250) {
+ parent::LibchartBarChart($width, $height);
+
+ $this->plot->setGraphPadding(new LibchartPadding(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() {
+ $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;
+ for ($i = 0; $i < $pointCount; $i++) {
+ $x2 = $graphArea->x1 + $i * $columnWidth;
+
+ $point = current($pointList);
+ next($pointList);
+
+ $value = $point->getY();
+
+ $y2 = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+ // Draw line
+ if ($x1) {
+ $primitive->line($x1, $y1, $x2, $y2, $lineColor, 4);
+ $primitive->line($x1, $y1 - 1, $x2, $y2 - 1, $lineColorShadow, 2);
+ }
+
+ $x1 = $x2;
+ $y1 = $y2;
+ }
+ }
+ }
+
+ /**
+ * Renders the caption.
+ */
+ protected function printCaption() {
+ // Get the list of labels
+ $labelList = $this->dataSet->getTitleList();
+
+ // Create the caption
+ $caption = new LibchartCaption();
+ $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();
+
+ $this->bound->computeBound($this->dataSet);
+ $this->computeAxis();
+ $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);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/model/DataSet.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/model/DataSet.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/model/DataSet.php (revision 10155)
@@ -0,0 +1,28 @@
+.
+ *
+ */
+
+ /**
+ * Superclass of all data sets.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 10 may 2007
+ */
+ abstract class LibchartDataSet {
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/axis/Bound.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/axis/Bound.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/axis/Bound.php (revision 10155)
@@ -0,0 +1,146 @@
+.
+ *
+ */
+
+ /**
+ * Object representing the bounds of a dataset (its minimal and maximal values) on its vertical axis.
+ * The bounds are automatically calculated from a XYDataSet or XYSeriesDataSet.
+ * Default (calculated) bounds can be overriden using the setLowerBound() and setUpperBound() methods.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * Created on 25 july 2007
+ */
+ class LibchartBound {
+ /**
+ * Manually set lower bound, overrides the value calculated by computeBound().
+ */
+ private $lowerBound = null;
+
+ /**
+ * Manually set upper bound, overrides the value calculated by computeBound().
+ */
+ private $upperBound = null;
+
+ /**
+ * Computed min bound.
+ */
+ private $yMinValue = null;
+
+ /**
+ * Computed max bound.
+ */
+ private $yMaxValue = null;
+
+ /**
+ * Compute the boundaries on the axis.
+ *
+ * @param dataSet The data set
+ */
+ public function computeBound($dataSet) {
+ // Check if the data set is empty
+ $dataSetEmpty = true;
+ $serieList = null;
+ if ($dataSet instanceof LibchartXYDataSet) {
+ $pointList = $dataSet->getPointList();
+ $dataSetEmpty = count($pointList) == 0;
+
+ if (!$dataSetEmpty) {
+ // Process it as a serie
+ $serieList = array();
+ array_push($serieList, $dataSet);
+ }
+ } else if ($dataSet instanceof LibchartXYSeriesDataSet) {
+ $serieList = $dataSet->getSerieList();
+ if (count($serieList) > 0) {
+ $serie = current($serieList);
+ $dataSetEmpty = count($serie) == 0;
+ }
+ } else {
+ die("Error: unknown dataset type");
+ }
+
+ // If the dataset is empty, default some bounds
+ $yMin = 0;
+ $yMax = 1;
+ if (!$dataSetEmpty) {
+ // Compute lower and upper bound on the value axis
+ unset($yMin);
+ unset($yMax);
+
+ foreach ($serieList as $serie) {
+ foreach ($serie->getPointList() as $point) {
+ $y = $point->getY();
+
+ if (!isset($yMin)) {
+ $yMin = $y;
+ $yMax = $y;
+ } else {
+ if ($y < $yMin) {
+ $yMin = $y;
+ }
+
+ if ($y > $yMax) {
+ $yMax = $y;
+ }
+ }
+ }
+ }
+ }
+
+ $this->yMinValue = isset($this->lowerBound) ? $this->lowerBound : $yMin;
+ $this->yMaxValue = isset($this->upperBound) ? $this->upperBound : $yMax;
+ }
+
+ /**
+ * Getter of yMinValue.
+ *
+ * @return min bound
+ */
+ public function getYMinValue() {
+ return $this->yMinValue;
+ }
+
+ /**
+ * Getter of yMaxValue.
+ *
+ * @return max bound
+ */
+ public function getYMaxValue() {
+ return $this->yMaxValue;
+ }
+
+ /**
+ * Set manually the lower boundary value (overrides the automatic formatting).
+ * Typical usage is to set the bars starting from zero.
+ *
+ * @param double lower boundary value
+ */
+ public function setLowerBound($lowerBound) {
+ $this->lowerBound = $lowerBound;
+ }
+
+ /**
+ * Set manually the upper boundary value (overrides the automatic formatting).
+ *
+ * @param double upper boundary value
+ */
+ public function setUpperBound($upperBound) {
+ $this->upperBound = $upperBound;
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/README
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/README (revision 0)
+++ branches/RC/core/units/general/libchart/README (revision 10155)
@@ -0,0 +1,46 @@
+
+ Libchart - Simple PHP chart drawing library
+=============================================
+
+Libchart is a free chart creation PHP library, that is easy to use.
+
+--------------------------------------------------------------------------------
+
+
+ Features
+==========
+
+ * Bar charts (horizontal or vertical).
+ * Pie charts.
+ * Compatibility with PHP 5.
+
+--------------------------------------------------------------------------------
+
+
+ Dependencies
+==============
+
+ * PHP 5, compiled with:
+ * GD 2+
+ * FreeType 2+
+
+--------------------------------------------------------------------------------
+
+
+ Installation
+==============
+
+In order to use Libchart, unpack the archive in you project directory and
+include libchart.php. Please have a look at the demo files for more information.
+You need to chmod 777 the "generated" directory in order to generate the demos.
+There is also a tutorial available at the project homepage.
+
+
+--------------------------------------------------------------------------------
+
+
+ Contact info
+==============
+
+WWW: http://naku.dohcrew.com/libchart/
+MAIL: jm.tremeaux at gmail dot com
Index: branches/RC/core/units/general/libchart/classes/view/primitive/Padding.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/primitive/Padding.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/primitive/Padding.php (revision 10155)
@@ -0,0 +1,68 @@
+.
+ *
+ */
+
+ /**
+ * A padding.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ * @Created on 27 july 2007
+ */
+ class LibchartPadding {
+ /**
+ * Top padding
+ */
+ public $top;
+
+ /**
+ * Right padding
+ */
+ public $right;
+
+ /**
+ * Bottom padding
+ */
+ public $bottom;
+
+ /**
+ * Left padding
+ */
+ public $left;
+
+ /**
+ * Creates a new padding.
+ *
+ * @param integer Top padding
+ * @param integer Right padding
+ * @param integer Bottom padding
+ * @param integer Left padding
+ */
+ public function LibchartPadding($top, $right = null, $bottom = null, $left = null) {
+ $this->top = $top;
+ if ($right == null) {
+ $this->right = $top;
+ $this->bottom = $top;
+ $this->left = $top;
+ } else {
+ $this->right = $right;
+ $this->bottom = $bottom;
+ $this->left = $left;
+ }
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/chart/Chart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/chart/Chart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/chart/Chart.php (revision 10155)
@@ -0,0 +1,102 @@
+.
+ *
+ */
+
+ /*! \mainpage Libchart
+ *
+ * This is the reference API, automatically compiled by Doxygen.
+ * You can find here information that is not covered by the tutorial.
+ *
+ */
+
+ /**
+ * Base chart class.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ abstract class LibchartChart {
+ /**
+ * The data set.
+ */
+ protected $dataSet;
+
+ /**
+ * Plot (holds graphical attributes).
+ */
+ protected $plot;
+
+ /**
+ * Abstract constructor of Chart.
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ protected function LibchartChart($width, $height) {
+ // Creates the plot
+ $this->plot = new LibchartPlot($width, $height);
+ $this->plot->setTitle("Untitled chart");
+ $this->plot->setLogoFileName(dirname(__FILE__) . "/../../../images/PoweredBy.png");
+ }
+
+ /**
+ * Checks the data model before rendering the graph.
+ */
+ protected function checkDataModel() {
+ // Check if a dataset was defined
+ if (!$this->dataSet) {
+ die("Error: No dataset defined.");
+ }
+
+ // Maybe no points are defined, but that's ok. This will yield and empty graph with default boundaries.
+ }
+
+ /**
+ * Create the image.
+ */
+ protected function createImage() {
+ $this->plot->createImage();
+ }
+
+ /**
+ * Sets the data set.
+ *
+ * @param DataSet The data set
+ */
+ public function setDataSet($dataSet) {
+ $this->dataSet = $dataSet;
+ }
+
+ /**
+ * Return the plot.
+ *
+ * @return plot
+ */
+ public function getPlot() {
+ return $this->plot;
+ }
+
+ /**
+ * Sets the title.
+ *
+ * @param string New title
+ */
+ public function setTitle($title) {
+ $this->plot->setTitle($title);
+ }
+ }
+?>
\ No newline at end of file
Index: branches/RC/core/units/general/libchart/classes/view/chart/BarChart.php
===================================================================
diff -u
--- branches/RC/core/units/general/libchart/classes/view/chart/BarChart.php (revision 0)
+++ branches/RC/core/units/general/libchart/classes/view/chart/BarChart.php (revision 10155)
@@ -0,0 +1,174 @@
+.
+ *
+ */
+
+ /**
+ * Base abstract class for rendering both horizontal and vertical bar charts.
+ *
+ * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+ */
+ abstract class LibchartBarChart extends LibchartChart {
+ protected $bound;
+ protected $axis;
+ protected $hasSeveralSerie;
+
+ /**
+ * Creates a new bar chart.
+ *
+ * @param integer width of the image
+ * @param integer height of the image
+ */
+ protected function LibchartBarChart($width, $height) {
+ parent::LibchartChart($width, $height);
+
+ // Initialize the bounds
+ $this->bound = new LibchartBound();
+ $this->bound->setLowerBound(0);
+ }
+
+ /**
+ * Compute the axis.
+ */
+ protected function computeAxis() {
+ $this->axis = new LibchartAxis($this->bound->getYMinValue(), $this->bound->getYMaxValue());
+ $this->axis->computeBoundaries();
+ }
+
+ /**
+ * Create the image.
+ */
+ protected function createImage() {
+ parent::createImage();
+
+ // 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();
+
+ // Aqua-like background
+ for ($i = $graphArea->y1; $i < $graphArea->y2; $i++) {
+ $color = $palette->aquaColor[($i + 3) % 4];
+ $primitive->line($graphArea->x1, $i, $graphArea->x2, $i, $color);
+ }
+
+ // Axis
+ imagerectangle($img, $graphArea->x1 - 1, $graphArea->y1, $graphArea->x1, $graphArea->y2, $palette->axisColor[0]->getColor($img));
+ imagerectangle($img, $graphArea->x1 - 1, $graphArea->y2, $graphArea->x2, $graphArea->y2 + 1, $palette->axisColor[0]->getColor($img));
+ }
+
+ /**
+ * Returns true if the data set has some data.
+ * @param minNumberOfPoint Minimum number of points (1 for bars, 2 for lines).
+ *
+ * @return true if data set empty
+ */
+ protected function isEmptyDataSet($minNumberOfPoint) {
+ if ($this->dataSet instanceof LibchartXYDataSet) {
+ $pointList = $this->dataSet->getPointList();
+ $pointCount = count($pointList);
+ return $pointCount < $minNumberOfPoint;
+ } else if ($this->dataSet instanceof LibchartXYSeriesDataSet) {
+ $serieList = $this->dataSet->getSerieList();
+ reset($serieList);
+ if (count($serieList) > 0) {
+ $serie = current($serieList);
+ $pointList = $serie->getPointList();
+ $pointCount = count($pointList);
+ return $pointCount < $minNumberOfPoint;
+ }
+ } else {
+ die("Error: unknown dataset type");
+ }
+ }
+
+ /**
+ * Checks the data model before rendering the graph.
+ */
+ protected function checkDataModel() {
+ // Check if a dataset was defined
+ if (!$this->dataSet) {
+ die("Error: No dataset defined.");
+ }
+
+ // Bar charts accept both XYDataSet and XYSeriesDataSet
+ if ($this->dataSet instanceof LibchartXYDataSet) {
+ // The dataset contains only one serie
+ $this->hasSeveralSerie = false;
+ } else if ($this->dataSet instanceof LibchartXYSeriesDataSet) {
+ // Check if each series has the same number of points
+ unset($lastPointCount);
+ $serieList = $this->dataSet->getSerieList();
+ for ($i = 0; $i < count($serieList); $i++) {
+ $serie = $serieList[$i];
+ $pointCount = count($serie->getPointList());
+ if (isset($lastPointCount) && $pointCount != $lastPointCount) {
+ die("Error: serie <" . $i . "> doesn't have the same number of points as last serie (last one: <" . $lastPointCount. ">, this one: <" . $pointCount. ">).");
+ }
+ $lastPointCount = $pointCount;
+ }
+
+ // The dataset contains several series
+ $this->hasSeveralSerie = true;
+ } else {
+ die("Error: Bar chart accept only XYDataSet and XYSeriesDataSet");
+ }
+ }
+
+ /**
+ * Return the data as a series list (for consistency).
+ *
+ * @return List of series
+ */
+ protected function getDataAsSerieList() {
+ // Get the data as a series list
+ $serieList = null;
+ if ($this->dataSet instanceof LibchartXYSeriesDataSet) {
+ $serieList = $this->dataSet->getSerieList();
+ } else if ($this->dataSet instanceof LibchartXYDataSet) {
+ $serieList = array();
+ array_push($serieList, $this->dataSet);
+ }
+
+ return $serieList;
+ }
+
+ /**
+ * Return the first serie of the list, or the dataSet itself if there is no serie.
+ *
+ * @return XYDataSet
+ */
+ protected function getFirstSerieOfList() {
+ $pointList = null;
+ if ($this->dataSet instanceof LibchartXYSeriesDataSet) {
+ // For a series dataset, print the legend from the first serie
+ $serieList = $this->dataSet->getSerieList();
+ reset($serieList);
+ $serie = current($serieList);
+ $pointList = $serie->getPointList();
+ } else if ($this->dataSet instanceof LibchartXYDataSet) {
+ $pointList = $this->dataSet->getPointList();
+ }
+
+ return $pointList;
+ }
+ }
+?>
\ No newline at end of file