diff --git a/ChangeLog b/ChangeLog index 1ae9ad2..a306124 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ --------------------------------------------------------------------------- +Version 2.5.8 (devel), 2008-09-16 +- Added Bitstream Vera Fonts into the package which will be used by the + chart generator. So there won't be a problem of missing truetype fonts + anymore. +- Tweaked the visual appereance of all chart types. +--------------------------------------------------------------------------- Version 2.5.7 (devel), 2008-09-15 - Added Statistics page for chart generation. The following charts are possible right now: Pie, bars vertical and bars horicontal. diff --git a/src/BitstreamVeraFonts/COPYRIGHT.TXT b/src/BitstreamVeraFonts/COPYRIGHT.TXT new file mode 100644 index 0000000..e651be1 --- /dev/null +++ b/src/BitstreamVeraFonts/COPYRIGHT.TXT @@ -0,0 +1,124 @@ +Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as +long as "Bitstream" or "Vera" are not in the names), and full +redistribution (so long as they are not *sold* by themselves). They +can be be bundled, redistributed and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright +========= + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute +the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished +to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, +OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT +SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome Foundation +or Bitstream Inc., respectively. For further information, contact: +fonts at gnome dot org. + +Copyright FAQ +============= + + 1. I don't understand the resale restriction... What gives? + + Bitstream is giving away these fonts, but wishes to ensure its + competitors can't just drop the fonts as is into a font sale system + and sell them as is. It seems fair that if Bitstream can't make money + from the Bitstream Vera fonts, their competitors should not be able to + do so either. You can sell the fonts as part of any software package, + however. + + 2. I want to package these fonts separately for distribution and + sale as part of a larger software package or system. Can I do so? + + Yes. A RPM or Debian package is a "larger software package" to begin + with, and you aren't selling them independently by themselves. + See 1. above. + + 3. Are derivative works allowed? + Yes! + + 4. Can I change or add to the font(s)? + Yes, but you must change the name(s) of the font(s). + + 5. Under what terms are derivative works allowed? + + You must change the name(s) of the fonts. This is to ensure the + quality of the fonts, both to protect Bitstream and Gnome. We want to + ensure that if an application has opened a font specifically of these + names, it gets what it expects (though of course, using fontconfig, + substitutions could still could have occurred during font + opening). You must include the Bitstream copyright. Additional + copyrights can be added, as per copyright law. Happy Font Hacking! + + 6. If I have improvements for Bitstream Vera, is it possible they might get + adopted in future versions? + + Yes. The contract between the Gnome Foundation and Bitstream has + provisions for working with Bitstream to ensure quality additions to + the Bitstream Vera font family. Please contact us if you have such + additions. Note, that in general, we will want such additions for the + entire family, not just a single font, and that you'll have to keep + both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add + glyphs to the font, they must be stylistically in keeping with Vera's + design. Vera cannot become a "ransom note" font. Jim Lyles will be + providing a document describing the design elements used in Vera, as a + guide and aid for people interested in contributing to Vera. + + 7. I want to sell a software package that uses these fonts: Can I do so? + + Sure. Bundle the fonts with your software and sell your software + with the fonts. That is the intent of the copyright. + + 8. If applications have built the names "Bitstream Vera" into them, + can I override this somehow to use fonts of my choosing? + + This depends on exact details of the software. Most open source + systems and software (e.g., Gnome, KDE, etc.) are now converting to + use fontconfig (see www.fontconfig.org) to handle font configuration, + selection and substitution; it has provisions for overriding font + names and subsituting alternatives. An example is provided by the + supplied local.conf file, which chooses the family Bitstream Vera for + "sans", "serif" and "monospace". Other software (e.g., the XFree86 + core server) has other mechanisms for font substitution. + diff --git a/src/BitstreamVeraFonts/README.TXT b/src/BitstreamVeraFonts/README.TXT new file mode 100644 index 0000000..0f71795 --- /dev/null +++ b/src/BitstreamVeraFonts/README.TXT @@ -0,0 +1,11 @@ +Contained herin is the Bitstream Vera font family. + +The Copyright information is found in the COPYRIGHT.TXT file (along +with being incoporated into the fonts themselves). + +The releases notes are found in the file "RELEASENOTES.TXT". + +We hope you enjoy Vera! + + Bitstream, Inc. + The Gnome Project diff --git a/src/BitstreamVeraFonts/RELEASENOTES.TXT b/src/BitstreamVeraFonts/RELEASENOTES.TXT new file mode 100644 index 0000000..270bc0d --- /dev/null +++ b/src/BitstreamVeraFonts/RELEASENOTES.TXT @@ -0,0 +1,162 @@ +Bitstream Vera Fonts - April 16, 2003 +===================================== + +The version number of these fonts is 1.10 to distinguish them from the +beta test fonts. + +Note that the Vera copyright is incorporated in the fonts themselves. +The License field in the fonts contains the copyright license as it +appears below. The TrueType copyright field is not large enough to +contain the full license, so the license is incorporated (as you might +think if you thought about it) into the license field, which +unfortunately can be obscure to find. (In pfaedit, see: Element->Font +Info->TTFNames->License). + +Our apologies for it taking longer to complete the fonts than planned. +Beta testers requested a tighter line spacing (less leading) and Jim +Lyles redesigned Vera's accents to bring its line spacing to more +typical of other fonts. This took additional time and effort. Our +thanks to Jim for this effort above and beyond the call of duty. + +There are four monospace and sans faces (normal, oblique, bold, bold +oblique) and two serif faces (normal and bold). Fontconfig/Xft2 (see +www.fontconfig.org) can artificially oblique the serif faces for you: +this loses hinting and distorts the faces slightly, but is visibly +different than normal and bold, and reasonably pleasing. + +On systems with fontconfig 2.0 or 2.1 installed, making your sans, +serif and monospace fonts default to these fonts is very easy. Just +drop the file local.conf into your /etc/fonts directory. This will +make the Bitstream fonts your default fonts for all applications using +fontconfig (if sans, serif, or monospace names are used, as they often +are as default values in many desktops). The XML in local.conf may +need modification to enable subpixel decimation, if appropriate, +however, the commented out phrase does so for XFree86 4.3, in the case +that the server does not have sufficient information to identify the +use of a flat panel. Fontconfig 2.2 adds Vera to the list of font +families and will, by default use it as the default sans, serif and +monospace fonts. + +During the testing of the final Vera fonts, we learned that screen +fonts in general are only typically hinted to work correctly at +integer pixel sizes. Vera is coded internally for integer sizes only. +We need to investigate further to see if there are commonly used fonts +that are hinted to be rounded but are not rounded to integer sizes due +to oversights in their coding. + +Most fonts work best at 8 pixels and below if anti-aliased only, as +the amount of work required to hint well at smaller and smaller sizes +becomes astronomical. GASP tables are typically used to control +whether hinting is used or not, but Freetype/Xft does not currently +support GASP tables (which are present in Vera). + +To mitigate this problem, both for Vera and other fonts, there will be +(very shortly) a new fontconfig 2.2 release that will, by default not +apply hints if the size is below 8 pixels. if you should have a font +that in fact has been hinted more agressively, you can use fontconfig +to note this exception. We believe this should improve many hinted +fonts in addition to Vera, though implemeting GASP support is likely +the right long term solution. + +Font rendering in Gnome or KDE is the combination of algorithms in +Xft2 and Freetype, along with hinting in the fonts themselves. It is +vital to have sufficient information to disentangle problems that you +may observe. + +Note that having your font rendering system set up correctly is vital +to proper judgement of problems of the fonts: + + * Freetype may or may not be configured to in ways that may + implement execution of possibly patented (in some parts of the world) + TrueType hinting algorithms, particularly at small sizes. Best + results are obtained while using these algorithms. + + * The freetype autohinter (used when the possibly patented + algorithms are not used) continues to improve with each release. If + you are using the autohinter, please ensure you are using an up to + date version of freetype before reporting problems. + + * Please identify what version of freetype you are using in any + bug reports, and how your freetype is configured. + + * Make sure you are not using the freetype version included in + XFree86 4.3, as it has bugs that significantly degrade most fonts, + including Vera. if you build XFree86 4.3 from source yourself, you may + have installed this broken version without intending it (as I + did). Vera was verified with the recently released Freetype 2.1.4. On + many systems, 'ldd" can be used to see which freetype shared library + is actually being used. + + * Xft/X Render does not (yet) implement gamma correction. This + causes significant problems rendering white text on a black background + (causing partial pixels to be insufficiently shaded) if the gamma of + your monitor has not been compensated for, and minor problems with + black text on a while background. The program "xgamma" can be used to + set a gamma correction value in the X server's color pallette. Most + monitors have a gamma near 2. + + * Note that the Vera family uses minimal delta hinting. Your + results on other systems when not used anti-aliased may not be + entirely satisfying. We are primarily interested in reports of + problems on open source systems implementing Xft2/fontconfig/freetype + (which implements antialiasing and hinting adjustements, and + sophisticated subpixel decimation on flatpanels). Also, the + algorithms used by Xft2 adjust the hints to integer widths and the + results are crisper on open source systems than on Windows or + MacIntosh. + + * Your fontconfig may (probably does) predate the release of + fontconfig 2.2, and you may see artifacts not present when the font is + used at very small sizes with hinting enabled. "vc-list -V" can be + used to see what version you have installed. + +We believe and hope that these fonts will resolve the problems +reported during beta test. The largest change is the reduction of +leading (interline spacing), which had annoyed a number of people, and +reduced Vera's utility for some applcations. The Vera monospace font +should also now make '0' and 'O' and '1' and 'l' more clearly +distinguishable. + +The version of these fonts is version 1.10. Fontconfig should be +choosing the new version of the fonts if both the released fonts and +beta test fonts are installed (though please discard them: they have +names of form tt20[1-12]gn.ttf). Note that older versions of +fontconfig sometimes did not rebuild their cache correctly when new +fonts are installed: please upgrade to fontconfig 2.2. "fc-cache -f" +can be used to force rebuilding fontconfig's cache files. + +If you note problems, please send them to fonts at gnome dot org, with +exactly which face and size and unicode point you observe the problem +at. The xfd utility from XFree86 CVS may be useful for this (e.g. "xfd +-fa sans"). A possibly more useful program to examine fonts at a +variety of sizes is the "waterfall" program found in Keith Packard's +CVS. + + $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS login + Logging in to :pserver:anoncvs@keithp.com:2401/local/src/CVS + CVS password: + $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS co waterfall + $ cd waterfall + $ xmkmf -a + $ make + # make install + # make install.man + +Again, please make sure you are running an up-to-date freetype, and +that you are only examining integer sizes. + +Reporting Problems +================== + +Please send problem reports to fonts at gnome org, with the following +information: + + 1. Version of Freetype, Xft2 and fontconfig + 2. Whether TT hinting is being used, or the autohinter + 3. Application being used + 4. Character/Unicode code point that has problems (if applicable) + 5. Version of which operating system + 6. Please include a screenshot, when possible. + +Please check the fonts list archives before reporting problems to cut +down on duplication. diff --git a/src/BitstreamVeraFonts/VeraBI.ttf b/src/BitstreamVeraFonts/VeraBI.ttf new file mode 100644 index 0000000..b55eee3 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraBI.ttf differ diff --git a/src/BitstreamVeraFonts/VeraIt.ttf b/src/BitstreamVeraFonts/VeraIt.ttf new file mode 100644 index 0000000..cc23c9e Binary files /dev/null and b/src/BitstreamVeraFonts/VeraIt.ttf differ diff --git a/src/BitstreamVeraFonts/VeraMoBI.ttf b/src/BitstreamVeraFonts/VeraMoBI.ttf new file mode 100644 index 0000000..8624542 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraMoBI.ttf differ diff --git a/src/BitstreamVeraFonts/VeraMoBd.ttf b/src/BitstreamVeraFonts/VeraMoBd.ttf new file mode 100644 index 0000000..9be6547 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraMoBd.ttf differ diff --git a/src/BitstreamVeraFonts/VeraMoIt.ttf b/src/BitstreamVeraFonts/VeraMoIt.ttf new file mode 100644 index 0000000..2404924 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraMoIt.ttf differ diff --git a/src/BitstreamVeraFonts/VeraMono.ttf b/src/BitstreamVeraFonts/VeraMono.ttf new file mode 100644 index 0000000..139f0b4 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraMono.ttf differ diff --git a/src/BitstreamVeraFonts/VeraSe.ttf b/src/BitstreamVeraFonts/VeraSe.ttf new file mode 100644 index 0000000..4b4ecc6 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraSe.ttf differ diff --git a/src/BitstreamVeraFonts/VeraSeBd.ttf b/src/BitstreamVeraFonts/VeraSeBd.ttf new file mode 100644 index 0000000..672bf76 Binary files /dev/null and b/src/BitstreamVeraFonts/VeraSeBd.ttf differ diff --git a/src/BitstreamVeraFonts/local.conf b/src/BitstreamVeraFonts/local.conf new file mode 100644 index 0000000..0b8e3a2 --- /dev/null +++ b/src/BitstreamVeraFonts/local.conf @@ -0,0 +1,32 @@ + + + + + + + + serif + + Bitstream Vera Serif + + + + sans-serif + + Bitstream Vera Sans + + + + monospace + + Bitstream Vera Sans Mono + + + diff --git a/src/chartgenerator.php b/src/chartgenerator.php index 19b2aac..453ce2c 100644 --- a/src/chartgenerator.php +++ b/src/chartgenerator.php @@ -180,34 +180,31 @@ if ( !$content['error_occured'] ) // Setup the tab title $graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $content[ $fields[$content['chart_field']]['FieldCaptionID'] ]) ); - $graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,10); + $graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9); $graph->tabtitle->SetPos('left'); // Set Graph footer - $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] ); - $graph->footer->left->SetFont( FF_ARIAL, FS_NORMAL, 8); - $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); - $graph->footer->right->SetFont( FF_ARIAL, FS_NORMAL, 8); + $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); + $graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 7); +// $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); +// $graph->footer->right->SetFont( FF_VERA, FS_NORMAL, 8); // $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); -// $graph->footer->left->SetFont( FF_ARIAL, FS_NORMAL, 8); +// $graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 8); // $graph->footer->right->SetColor("darkred"); - // Setup font for axis - $graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,10); - $graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,10); - // Show 0 label on Y-axis (default is not to show) $graph->yscale->ticks->SupressZeroLabel(false); + // Set Fonts for graph! + $graph->xaxis->SetFont(FF_VERA,FS_NORMAL,8); + $graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8); + $graph->legend->SetFont(FF_VERA,FS_NORMAL,8); // Create $p1 = new PiePlot3D($YchartData); $p1->SetLegends($XchartData); $p1->SetEdge('#333333', 1); $p1->SetTheme('earth'); /* "earth" * "pastel" * "sand" * "water" */ -// $targ=array("pie3d_csimex1.php?v=1","pie3d_csimex1.php?v=2","pie3d_csimex1.php?v=3", -// "pie3d_csimex1.php?v=4","pie3d_csimex1.php?v=5","pie3d_csimex1.php?v=6"); -// $alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); $p1->SetCSIMTargets($chartImageMapLinks, $chartImageMapAlts, $chartImageMapTargets); // Set label format @@ -225,7 +222,7 @@ if ( !$content['error_occured'] ) // Set label properties $p1->SetLabelPos(1.0); $p1->SetSliceColors(array('#FFF584','#CBFF84','#FF6B9E','#FF9584','#EAFF84','#7BFF51','#51FFA6','#51FF52','#6BCFFF','#5170FF','#519CFF','#EAE3AD','#FFF184','#8584FF','#E698FF','#C384FF','#FF84EC','#FF98A3','#E5C285','#FFDA98' )); - $p1->value->SetFont(FF_ARIAL,FS_NORMAL); + $p1->value->SetFont(FF_VERA, FS_NORMAL, 8); $p1->value->SetColor("black"); // Adjust other Pie Properties @@ -250,29 +247,41 @@ if ( !$content['error_occured'] ) $graph->SetBox(); // Box around plotarea // Setup X-AXIS -// $graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,10); +// $graph->xaxis->SetFont(FF_VERA,FS_NORMAL,10); $graph->xaxis->SetTickLabels($XchartData); - $graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8); - $graph->xaxis->SetLabelAngle(0); + + if ( count($XchartData) > 5 ) + { + $graph->SetMargin(60,20,30,80); // Adjust margin area + $graph->xaxis->SetLabelAngle(45); + $graph->xaxis->SetLabelMargin(2); + } + else + $graph->xaxis->SetLabelAngle(0); + +// $graph->xaxis->scale->SetGrace(30); // So the value is readable // Setup Y-AXIS - $graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,8); $graph->yaxis->scale->SetGrace(10); // So the value is readable // $graph->yaxis->SetLabelFormat('%d %%'); // Show 0 label on Y-axis (default is not to show) $graph->yscale->ticks->SupressZeroLabel(false); + // Set Fonts for graph! + $graph->xaxis->SetFont(FF_VERA,FS_NORMAL,7); + $graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8); + // Setup the tab title $graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $content[ $fields[$content['chart_field']]['FieldCaptionID'] ]) ); - $graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,10); + $graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9); $graph->tabtitle->SetPos('left'); // Set Graph footer - $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] ); - $graph->footer->left->SetFont( FF_ARIAL, FS_NORMAL, 8); - $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); - $graph->footer->right->SetFont( FF_ARIAL, FS_NORMAL, 8); + $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); + $graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 7); +// $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); +// $graph->footer->right->SetFont( FF_VERA, FS_NORMAL, 8); // Setup the X and Y grid $graph->ygrid->SetFill(true,'#DDDDDD@0.5','#BBBBBB@0.5'); @@ -292,7 +301,7 @@ if ( !$content['error_occured'] ) // Display value in bars $bplot->value->Show(); - $bplot->value->SetFont(FF_ARIAL,FS_NORMAL,10); + $bplot->value->SetFont(FF_VERA,FS_NORMAL,8); // $bplot->value->SetAlign('left','center'); // $bplot->value->SetColor("black","darkred"); $bplot->value->SetFormat('%d'); @@ -328,9 +337,7 @@ if ( !$content['error_occured'] ) $graph->SetBox(); // Box around plotarea // Setup X-AXIS -// $graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,10); $graph->xaxis->SetTickLabels($XchartData); - $graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8); $graph->xaxis->SetLabelAngle(0); // $graph->xaxis->SetLabelAlign('center','top'); $graph->xaxis->SetPos('min'); @@ -338,7 +345,6 @@ if ( !$content['error_occured'] ) $graph->xaxis->SetLabelAlign('right','center'); // Setup Y-AXIS - $graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,8); $graph->yaxis->scale->SetGrace(20); // So the value is readable $graph->yaxis->SetLabelAlign('center','top'); $graph->yaxis->SetLabelFormat('%d'); @@ -347,21 +353,26 @@ if ( !$content['error_occured'] ) // $graph->yaxis->SetTitleSide(SIDE_RIGHT); // $graph->yaxis->SetTitleMargin(35); $graph->yaxis->SetPos('max'); + $graph->yaxis->SetTextLabelInterval(2); // Show 0 label on Y-axis (default is not to show) $graph->yscale->ticks->SupressZeroLabel(false); + // Set Fonts for graph! + $graph->xaxis->SetFont(FF_VERA,FS_NORMAL,7); + $graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8); + // Setup the tab title $graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $content[ $fields[$content['chart_field']]['FieldCaptionID'] ]) ); - $graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,10); + $graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9); $graph->tabtitle->SetPos('right'); $graph->tabtitle->SetTabAlign('right'); // Set Graph footer - $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] ); - $graph->footer->left->SetFont( FF_ARIAL, FS_NORMAL, 8); - $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); - $graph->footer->right->SetFont( FF_ARIAL, FS_NORMAL, 8); + $graph->footer->left->Set ("phpLogCon v" . $content['BUILDNUMBER'] . "\n" . GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); + $graph->footer->left->SetFont( FF_VERA, FS_NORMAL, 7); +// $graph->footer->right->Set ( GetAndReplaceLangStr($content['LN_STATS_GENERATEDAT'], date("Y-m-d")) ); +// $graph->footer->right->SetFont( FF_VERA, FS_NORMAL, 8); // Setup the X and Y grid $graph->ygrid->SetFill(true,'#DDDDDD@0.5','#BBBBBB@0.5'); @@ -381,7 +392,7 @@ if ( !$content['error_occured'] ) // Display value in bars $bplot->value->Show(); - $bplot->value->SetFont(FF_ARIAL,FS_NORMAL,10); + $bplot->value->SetFont(FF_VERA,FS_NORMAL, 8); // $bplot->value->SetAlign('left','center'); // $bplot->value->SetColor("black","darkred"); $bplot->value->SetFormat('%d'); @@ -389,7 +400,6 @@ if ( !$content['error_occured'] ) // Add links $bplot->SetCSIMTargets($chartImageMapLinks, $chartImageMapAlts, $chartImageMapTargets); - // TODO: Make Optional! // Create and Add filled line plot $lplot = new LinePlot($YchartData); diff --git a/src/classes/jpgraph/jpg-config.inc.php b/src/classes/jpgraph/jpg-config.inc.php index dbf2726..b148bf8 100644 --- a/src/classes/jpgraph/jpg-config.inc.php +++ b/src/classes/jpgraph/jpg-config.inc.php @@ -38,6 +38,8 @@ //------------------------------------------------------------------------ // DEFINE("CACHE_DIR","/tmp/jpgraph_cache/"); // DEFINE("TTF_DIR","/usr/X11R6/lib/X11/fonts/truetype/"); +DEFINE("TTF_DIR", $gl_root_path . "BitstreamVeraFonts/"); + // DEFINE("MBTTF_DIR","/usr/share/fonts/ja/TrueType/"); //------------------------------------------------------------------------- diff --git a/src/include/functions_common.php b/src/include/functions_common.php index 8646f39..7fac042 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -66,7 +66,7 @@ $LANG_EN = "en"; // Used for fallback $LANG = "en"; // Default language // Default Template vars -$content['BUILDNUMBER'] = "2.5.7"; +$content['BUILDNUMBER'] = "2.5.8"; $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER']; // Default page title $content['BASEPATH'] = $gl_root_path; $content['SHOW_DONATEBUTTON'] = true; // Default = true!