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

Fix: Solve a bug with UTF8 texts in Artichow

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-26 21:29:34 +00:00
parent 389f744c4e
commit 2a021e8b40
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/core/dolgraph.class.php
View File

@ -18,29 +18,28 @@
*/ */
/** /**
\file htdocs/dolgraph.class.php * \file htdocs/dolgraph.class.php
\brief Fichier de la classe mere de gestion des graph * \brief Fichier de la classe mere de gestion des graph
\version $Id$ * \version $Id$
\remarks Usage: * \remarks Usage:
$graph_data = array(array('labelA',yA),array('labelB',yB)); * $graph_data = array(array('labelA',yA),array('labelB',yB));
array(array('labelA',yA1,...,yAn),array('labelB',yB1,...yBn)); * array(array('labelA',yA1,...,yAn),array('labelB',yB1,...yBn));
$px = new DolGraph(); * $px = new DolGraph();
$px->SetData($graph_data); * $px->SetData($graph_data);
$px->SetMaxValue($px->GetCeilMaxValue()); * $px->SetMaxValue($px->GetCeilMaxValue());
$px->SetMinValue($px->GetFloorMinValue()); * $px->SetMinValue($px->GetFloorMinValue());
$px->SetTitle("title"); * $px->SetTitle("title");
$px->SetLegend(array("Val1","Val2")); * $px->SetLegend(array("Val1","Val2"));
$px->SetWidth(width); * $px->SetWidth(width);
$px->SetHeight(height); * $px->SetHeight(height);
$px->draw("file.png"); * $px->draw("file.png");
*/ */
/** /**
\class Graph * \class Graph
\brief Classe mere permettant la gestion des graph * \brief Classe mere permettant la gestion des graph
*/ */
class DolGraph class DolGraph
{ {
//! Type du graphique //! Type du graphique
@ -96,7 +95,7 @@ class DolGraph
} }
if (! $isgdinstalled) if (! $isgdinstalled)
{ {
$this->error="Erreur: Le module GD pour php ne semble pas disponible. Il est requis pour generer les graphiques."; $this->error="Error: PHP GD module is not available. It is required to build graphics.";
return -1; return -1;
} }
@ -555,6 +554,8 @@ class DolGraph
//$plot->reduce(80); // Evite temps d'affichage trop long et nombre de ticks absisce satures //$plot->reduce(80); // Evite temps d'affichage trop long et nombre de ticks absisce satures
$group->legend->setTextFont(new Tuffy(10)); // This is to force Artichow to use awFileFontDriver to
// solve a bug in Artichow with UTF8
if (sizeof($this->Legend)) if (sizeof($this->Legend))
{ {
if ($this->type == 'bars') $group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND); if ($this->type == 'bars') $group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
@ -579,7 +580,7 @@ class DolGraph
/* /**
* Special function * Special function
* \TODO Replace by standard code * \TODO Replace by standard code
*/ */
@ -665,7 +666,7 @@ class DolGraph
$graph->draw($file); $graph->draw($file);
} }
/* /**
* Special function * Special function
* \TODO Replace by standard code * \TODO Replace by standard code
*/ */
@ -765,7 +766,7 @@ class DolGraph
} }
} }
/* /**
* Special function * Special function
* \TODO Replace by standard code * \TODO Replace by standard code
*/ */

2
htdocs/langs/fr_FR/banks.lang
View File

@ -25,7 +25,7 @@ InitialBankBalance=Solde initial
EndBankBalance=Solde final EndBankBalance=Solde final
CurrentBalance=Solde actuel CurrentBalance=Solde actuel
FutureBalance=Solde futur FutureBalance=Solde futur
ShowAllTimeBalance=Afficher solde depuis debut ShowAllTimeBalance=Afficher solde depuis début
Reconciliation=Rapprochement Reconciliation=Rapprochement
RIB=RIB RIB=RIB
IBAN=Identifiant IBAN IBAN=Identifiant IBAN