lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Pb avec graph bar artichow

Browse Source
This commit is contained in:
Laurent Destailleur 2007-12-21 03:34:32 +00:00
parent 5d7e0c4840
commit 993799af8b
11 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/stats/index.php
View File

@ -66,7 +66,7 @@ if (! $mesg)
$px->SetMaxValue($px->GetCeilMaxValue()); $px->SetMaxValue($px->GetCeilMaxValue());
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);

6
htdocs/comm/propal/stats/month.php
View File

@ -75,7 +75,7 @@ if (! $mesg)
$px->SetMaxValue($px->GetCeilMaxValue()); $px->SetMaxValue($px->GetCeilMaxValue());
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);
@ -111,7 +111,7 @@ if (! $mesg)
$px->SetMaxValue($px->GetCeilMaxValue()); $px->SetMaxValue($px->GetCeilMaxValue());
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename_amount, $data, $year); $px->draw($filename_amount, $data, $year);
@ -146,7 +146,7 @@ if (! $mesg)
$px->SetMaxValue($px->GetCeilMaxValue()); $px->SetMaxValue($px->GetCeilMaxValue());
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename_avg); $px->draw($filename_avg);

2
htdocs/commande/stats/index.php
View File

@ -86,7 +86,7 @@ if (! $mesg)
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetYLabel($langs->trans("NbOfOrder")); $px->SetYLabel($langs->trans("NbOfOrder"));
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);

2
htdocs/commande/stats/month.php
View File

@ -83,7 +83,7 @@ if (! $mesg)
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetYLabel($langs->trans("NbOfOrders")); $px->SetYLabel($langs->trans("NbOfOrders"));
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);

2
htdocs/compta/bank/graph.php
View File

@ -498,7 +498,7 @@ if ($_GET["account"] || $_GET["ref"])
$px->SetWidth($width); $px->SetWidth($width);
$px->SetHeight($height); $px->SetHeight($height);
$px->SetType('bars'); $px->SetType('bars');
$px->SetShading(8); $px->SetShading(3);
$px->setBgColor('onglet'); $px->setBgColor('onglet');
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);

2
htdocs/compta/facture/stats/index.php
View File

@ -63,7 +63,7 @@ if (! $mesg)
$px->SetLegend(array($year - 1, $year)); $px->SetLegend(array($year - 1, $year));
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);

4
htdocs/compta/facture/stats/month.php
View File

@ -68,7 +68,7 @@ if (! $mesg)
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->SetWidth($GRAPHWIDTH); $px->SetWidth($GRAPHWIDTH);
$px->SetHeight($GRAPHHEIGHT); $px->SetHeight($GRAPHHEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);
@ -96,7 +96,7 @@ if (! $mesg)
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->SetWidth($GRAPHWIDTH); $px->SetWidth($GRAPHWIDTH);
$px->SetHeight($GRAPHHEIGHT); $px->SetHeight($GRAPHHEIGHT);
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename_amount); $px->draw($filename_amount);

118
htdocs/dolgraph.class.php
View File

@ -21,7 +21,7 @@
/** /**
\file htdocs/dolgraph.class.php \file htdocs/dolgraph.class.php
\brief Fichier de la classe mère de gestion des graph phplot \brief Fichier de la classe m<EFBFBD>re de gestion des graph phplot
\version $Revision$ \version $Revision$
\remarks Usage: \remarks Usage:
$graph_data = array(array('labelA',yA),array('labelB',yB)); $graph_data = array(array('labelA',yA),array('labelB',yB));
@ -40,7 +40,7 @@
/** /**
\class Graph \class Graph
\brief Classe mère permettant la gestion des graph \brief Classe m<EFBFBD>re permettant la gestion des graph
*/ */
class DolGraph class DolGraph
@ -80,7 +80,7 @@ class DolGraph
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
// Test si module GD présent // Test si module GD pr<EFBFBD>sent
$modules_list = get_loaded_extensions(); $modules_list = get_loaded_extensions();
$isgdinstalled=0; $isgdinstalled=0;
foreach ($modules_list as $module) foreach ($modules_list as $module)
@ -89,12 +89,12 @@ class DolGraph
} }
if (! $isgdinstalled) if (! $isgdinstalled)
{ {
$this->error="Erreur: Le module GD pour php ne semble pas disponible. Il est requis pour générer les graphiques."; $this->error="Erreur: Le module GD pour php ne semble pas disponible. Il est requis pour g<EFBFBD>n<EFBFBD>rer les graphiques.";
return -1; return -1;
} }
// Défini propriétés de l'objet graphe // D<EFBFBD>fini propri<72>t<EFBFBD>s de l'objet graphe
$this->library=$conf->global->MAIN_GRAPH_LIBRARY; $this->library=$conf->global->MAIN_GRAPH_LIBRARY;
$this->bordercolor = array(235,235,224); $this->bordercolor = array(235,235,224);
@ -120,7 +120,7 @@ class DolGraph
} }
/** /**
* \brief Génère le fichier graphique sur le disque * \brief G<EFBFBD>n<EFBFBD>re le fichier graphique sur le disque
* \param file Nom du fichier image * \param file Nom du fichier image
*/ */
function draw($file) function draw($file)
@ -157,9 +157,13 @@ class DolGraph
if ($this->type == 'lines') $class='LinePlot'; if ($this->type == 'lines') $class='LinePlot';
include_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/".$class.".class.php"; include_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/".$class.".class.php";
$group = new PlotGroup; // Definition de couleurs
$group->setPadding(30, 10, NULL, NULL); $bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
$colortrans=new Color(0,0,0,100);
$colorsemitrans=new Color(255,255,255,50);
$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
// Graph
$graph = new Graph($this->width, $this->height); $graph = new Graph($this->width, $this->height);
$graph->border->hide(); $graph->border->hide();
$graph->setAntiAliasing(true); $graph->setAntiAliasing(true);
@ -168,19 +172,18 @@ class DolGraph
$graph->title->set($this->title); $graph->title->set($this->title);
$graph->title->setFont(new Tuffy(10)); $graph->title->setFont(new Tuffy(10));
} }
/* // $graph->setBackgroundColor($bgcolor);
if (isset($this->SetShading)) $graph->setBackgroundGradient($colorgradient);
{
// Ombre ne fonctionne pas. Un Mars a celui qui trouve pourquoi. $group = new PlotGroup;
$shadow=new Shadow(3); //$group->setSpace(5, 5, 0, 0);
$shadow->setSize($this->SetShading); $group->setPadding(30, 10);
$graph->Shadow=$shadow; $group->legend->setSpace(0);
} $group->legend->setPadding(2,2,2,2);
*/ $group->legend->setPosition(NULL,0.1);
$group->legend->setBackgroundColor($colorsemitrans);
$group->grid->setBackgroundColor($colortrans);
$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
$graph->setBackgroundColor($bgcolor);
//print "dd".sizeof($this->data);
// On boucle sur chaque lot de donnees // On boucle sur chaque lot de donnees
$legends=array(); $legends=array();
@ -198,35 +201,40 @@ class DolGraph
$j++; $j++;
} }
/*
print "Lot de donnees $i<br>";
print_r($values);
print '<br>';
*/
if ($this->type == 'bars') if ($this->type == 'bars')
{ {
// Artichow ne gère pas les valeurs inconnues //print "Lot de donnees $i<br>";
// Donc si inconnu, on la fixe à null //print_r($values);
//print '<br>';
// Artichow ne gere pas les valeurs inconnues
// Donc si inconnu, on la fixe a null
$newvalues=array(); $newvalues=array();
foreach($values as $val) foreach($values as $val)
{ {
$newvalues[]=(is_numeric($val) ? $val : null); $newvalues[]=(is_numeric($val) ? $val : null);
} }
$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
//$plot = new BarPlot($newvalues,1,1,0); //$plot = new BarPlot($newvalues,1,1,0);
$plot = new BarPlot($newvalues); $plot = new BarPlot($newvalues, $i+1, $nblot);
$plot->barShadow->setSize(2); $plot->barBorder->setColor($colorborder);
$plot->barShadow->setPosition('Shadow::RIGHT_TOP'); $plot->setBarColor($color);
$plot->barShadow->setColor(new Color(160, 160, 160, 10));
$plot->setBarPadding(0.1, 0.1);
$plot->setBarSpace(5);
$plot->barShadow->setSize($this->SetShading);
$plot->barShadow->setPosition(Shadow::RIGHT_TOP);
$plot->barShadow->setColor(new Color(160, 160, 160, 50));
$plot->barShadow->smooth(TRUE); $plot->barShadow->smooth(TRUE);
//$plot->setSize(1, 0.96); //$plot->setSize(1, 0.96);
//$plot->setCenter(0.5, 0.52); //$plot->setCenter(0.5, 0.52);
$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],25);
$plot->setBarColor($color);
// Le mode automatique est plus efficace // Le mode automatique est plus efficace
$plot->SetYMax($this->MaxValue); $plot->SetYMax($this->MaxValue);
$plot->SetYMin($this->MinValue); $plot->SetYMin($this->MinValue);
@ -234,8 +242,8 @@ class DolGraph
if ($this->type == 'lines') if ($this->type == 'lines')
{ {
// Artichow ne gère pas les valeurs inconnues // Artichow ne gere pas les valeurs inconnues
// Donc si inconnu, on la fixe à null // Donc si inconnu, on la fixe a null
$newvalues=array(); $newvalues=array();
foreach($values as $val) foreach($values as $val)
{ {
@ -246,7 +254,7 @@ class DolGraph
//$plot->setSize(1, 0.96); //$plot->setSize(1, 0.96);
//$plot->setCenter(0.5, 0.52); //$plot->setCenter(0.5, 0.52);
$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],25); $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],30);
$plot->setColor($color); $plot->setColor($color);
// Le mode automatique est plus efficace // Le mode automatique est plus efficace
@ -254,39 +262,33 @@ class DolGraph
$plot->SetYMin($this->MinValue); $plot->SetYMin($this->MinValue);
} }
$plot->reduce(80); // Evite temps d'affichage trop long et nombre de ticks absisce saturés $plot->reduce(80); // Evite temps d'affichage trop long et nombre de ticks absisce satures
if ($nblot >= 2) if ($nblot >= 2)
{ {
$group->legend->add($plot, $this->Legend[$i], 'Legend::MARK'); $group->legend->add($plot, $this->Legend[$i], Legend::BACKGROUND);
$group->add($plot);
} }
else else
{ {
$plot->xAxis->setLabelText($legends); $plot->xAxis->setLabelText($legends);
$plot->xAxis->label->setFont(new Tuffy(7)); $plot->xAxis->label->setFont(new Tuffy(7));
}
$graph->add($plot); $group->add($plot);
}
$i++; $i++;
} }
if ($nblot >= 2) $group->axis->bottom->setLabelText($legends);
{ $group->axis->bottom->label->setFont(new Tuffy(7));
$group->axis->bottom->setLabelText($legends);
$group->axis->bottom->label->setFont(new Tuffy(7));
$graph->add($group); $graph->add($group);
}
// Generate file // Generate file
$graph->draw($file); $graph->draw($file);
} }
/** /**
* \brief Génère le fichier graphique sur le disque * \brief Genere le fichier graphique sur le disque
* via la librairie PHPlot 5 ou 4 * via la librairie PHPlot 5 ou 4
* \param file Nom du fichier image * \param file Nom du fichier image
*/ */
@ -294,7 +296,7 @@ class DolGraph
{ {
dolibarr_syslog("DolGraph.class::draw_phplot this->type=".$this->type); dolibarr_syslog("DolGraph.class::draw_phplot this->type=".$this->type);
// Vérifie que chemin vers PHPLOT_PATH est connu et on definie $graphpathdir // Verifie que chemin vers PHPLOT_PATH est connu et on definie $graphpathdir
$graphpathdir=DOL_DOCUMENT_ROOT."/includes/phplot"; $graphpathdir=DOL_DOCUMENT_ROOT."/includes/phplot";
if (defined('PHPLOT_PATH')) $graphpathdir=PHPLOT_PATH; if (defined('PHPLOT_PATH')) $graphpathdir=PHPLOT_PATH;
if ($conf->global->PHPLOT_PATH) $graphpathdir=$conf->global->PHPLOT_PATH; if ($conf->global->PHPLOT_PATH) $graphpathdir=$conf->global->PHPLOT_PATH;
@ -388,7 +390,7 @@ class DolGraph
// Define title // Define title
if (isset($this->title)) $graph->SetTitle($this->title); if (isset($this->title)) $graph->SetTitle($this->title);
// Défini position du graphe (et legende) au sein de l'image // D<EFBFBD>fini position du graphe (et legende) au sein de l'image
if (isset($this->Legend) && sizeof($this->Legend)) if (isset($this->Legend) && sizeof($this->Legend))
{ {
$graph->SetLegendPixels($this->width - $right_space+8,40,''); $graph->SetLegendPixels($this->width - $right_space+8,40,'');
@ -716,7 +718,7 @@ class DolGraph
$plot->mark->setFill(new LightBlue); $plot->mark->setFill(new LightBlue);
$plot->mark->border->show(); $plot->mark->border->show();
// // $group->legend->add($plot, "Unités", 3); // // $group->legend->add($plot, "Unit<EFBFBD>s", 3);
$group->add($plot); $group->add($plot);
/* /*
* *
@ -812,7 +814,7 @@ class DolGraph
$plot->mark->setFill(new LightBlue); $plot->mark->setFill(new LightBlue);
$plot->mark->border->show(); $plot->mark->border->show();
$group->legend->add($plot, "Unités", 3); $group->legend->add($plot, "Unit<EFBFBD>s", 3);
$group->add($plot); $group->add($plot);
/* /*
* *

2
htdocs/expedition/stats/month.php
View File

@ -59,7 +59,7 @@ if (! $mesg)
$px->SetWidth($WIDTH); $px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetYLabel($langs->trans("NbOfOrders")); $px->SetYLabel($langs->trans("NbOfOrders"));
$px->SetShading(5); $px->SetShading(3);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->draw($filename); $px->draw($filename);

2
htdocs/product/stats/fiche.php
View File

@ -205,7 +205,7 @@ if ($_GET["id"] || $_GET["ref"])
$px->SetHeight($HEIGHT); $px->SetHeight($HEIGHT);
$px->SetHorizTickIncrement(1); $px->SetHorizTickIncrement(1);
$px->SetPrecisionY(0); $px->SetPrecisionY(0);
$px->SetShading(5); $px->SetShading(3);
//print 'x '.$key.' '.$graphfiles[$key]['file']; //print 'x '.$key.' '.$graphfiles[$key]['file'];
$px->draw($dir."/".$graphfiles[$key]['file']); $px->draw($dir."/".$graphfiles[$key]['file']);

2
scripts/banque/graph-solde.php
View File

@ -492,7 +492,7 @@ foreach ($accounts as $account)
$px->SetWidth($width); $px->SetWidth($width);
$px->SetHeight($height); $px->SetHeight($height);
$px->SetType('bars'); $px->SetType('bars');
$px->SetShading(8); $px->SetShading(3);
$px->draw($file); $px->draw($file);
} }