From 928a4ad9053b606edc6f21f4f281095f54ec54e1 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Sat, 28 Oct 2017 22:09:40 +0900 Subject: [PATCH] Upgrade to JpGraph v4.1.0 This is a direct copy of original source code as downloaded from http://jpgraph.net/download/ without any modification whatsoever. --- README.md | 5 +- lib/JpGraph.php | 12 +- lib/jpgraph/VERSION | 2 +- lib/jpgraph/docs/chunkhtml/index.html | 2 +- lib/jpgraph/docs/classref/BoxPlot.html | 8 +- lib/jpgraph/docs/classref/DateScale.html | 108 +++++++-------- lib/jpgraph/docs/classref/ErrorLinePlot.html | 4 +- lib/jpgraph/docs/classref/Footer.html | 10 +- lib/jpgraph/docs/classref/LineErrorPlot.html | 4 +- lib/jpgraph/docs/classref/LineProperty.html | 6 +- lib/jpgraph/docs/classref/LogTicks.html | 18 +-- lib/jpgraph/docs/classref/projinfo.html | 2 +- lib/jpgraph/src/Examples/accbarex1.php | 3 +- lib/jpgraph/src/Examples/alphabarex1.php | 4 +- .../src/Examples/background_type_ex0.php | 1 + .../src/Examples/background_type_ex1.php | 1 + .../src/Examples/background_type_ex2.php | 1 + .../src/Examples/background_type_ex3.php | 1 + .../src/Examples/background_type_ex4.php | 1 + lib/jpgraph/src/Examples/backgroundex01.php | 7 +- lib/jpgraph/src/Examples/backgroundex02.php | 7 +- lib/jpgraph/src/Examples/backgroundex03.php | 7 +- lib/jpgraph/src/Examples/balloonex1.php | 5 +- lib/jpgraph/src/Examples/balloonex2.php | 11 +- lib/jpgraph/src/Examples/bar2scalesex1.php | 5 +- lib/jpgraph/src/Examples/bargradex1.php | 1 + lib/jpgraph/src/Examples/bargradex2.php | 9 +- lib/jpgraph/src/Examples/bargradex3.php | 9 +- lib/jpgraph/src/Examples/bargradex4.php | 9 +- lib/jpgraph/src/Examples/bargradex5.php | 9 +- lib/jpgraph/src/Examples/bargradex6.php | 9 +- lib/jpgraph/src/Examples/barimgex1.php | 3 +- lib/jpgraph/src/Examples/barintex1.php | 9 +- lib/jpgraph/src/Examples/barintex2.php | 11 +- lib/jpgraph/src/Examples/barlinefreqex1.php | 5 +- lib/jpgraph/src/Examples/barpatternex1.php | 5 +- .../src/Examples/barscalecallbackex1.php | 1 + lib/jpgraph/src/Examples/bartutex1.php | 3 +- lib/jpgraph/src/Examples/bartutex12.php | 7 +- lib/jpgraph/src/Examples/bartutex2.php | 3 +- lib/jpgraph/src/Examples/bartutex3.php | 5 +- lib/jpgraph/src/Examples/bartutex4.php | 5 +- lib/jpgraph/src/Examples/bartutex5.php | 5 +- lib/jpgraph/src/Examples/bartutex6.php | 5 +- lib/jpgraph/src/Examples/bezierex1.php | 2 +- lib/jpgraph/src/Examples/bkgimgflagex1.php | 4 +- lib/jpgraph/src/Examples/bkgimgflagex2.php | 6 +- lib/jpgraph/src/Examples/bkgimgflagex3.php | 6 +- lib/jpgraph/src/Examples/bkgimgflagex4.php | 6 +- lib/jpgraph/src/Examples/bkgimgflagex5.php | 6 +- lib/jpgraph/src/Examples/boxstockex1.php | 1 + lib/jpgraph/src/Examples/boxstockex2.php | 1 + lib/jpgraph/src/Examples/ccbpgraph.class.php | 89 +++++++------ lib/jpgraph/src/Examples/centerlinebarex1.php | 5 +- lib/jpgraph/src/Examples/clipping_ex1.php | 3 +- lib/jpgraph/src/Examples/clipping_ex2.php | 3 +- .../src/Examples/comb90dategraphex01.php | 2 + .../src/Examples/comb90dategraphex02.php | 2 + .../src/Examples/comb90dategraphex03.php | 3 + lib/jpgraph/src/Examples/dateutilex01.php | 1 + lib/jpgraph/src/Examples/dateutilex02.php | 1 + lib/jpgraph/src/Examples/dupyaxisex1.php | 7 +- lib/jpgraph/src/Examples/example1.1.php | 7 +- lib/jpgraph/src/Examples/example13.php | 3 +- lib/jpgraph/src/Examples/example14.php | 3 +- lib/jpgraph/src/Examples/example15.php | 3 +- lib/jpgraph/src/Examples/example16.1.php | 5 +- lib/jpgraph/src/Examples/example16.2.php | 5 +- lib/jpgraph/src/Examples/example16.3.php | 5 +- lib/jpgraph/src/Examples/example16.4.php | 5 +- lib/jpgraph/src/Examples/example16.5.php | 5 +- lib/jpgraph/src/Examples/example16.6.php | 3 +- lib/jpgraph/src/Examples/example16.php | 3 +- lib/jpgraph/src/Examples/example17.php | 1 + lib/jpgraph/src/Examples/example18.php | 3 +- lib/jpgraph/src/Examples/example19.1.php | 1 + lib/jpgraph/src/Examples/example19.php | 1 + lib/jpgraph/src/Examples/example20.1.php | 3 +- lib/jpgraph/src/Examples/example20.2.php | 3 +- lib/jpgraph/src/Examples/example20.3.php | 3 +- lib/jpgraph/src/Examples/example20.4.php | 3 +- lib/jpgraph/src/Examples/example20.5.php | 3 +- lib/jpgraph/src/Examples/example20.php | 3 +- lib/jpgraph/src/Examples/example21.php | 3 +- lib/jpgraph/src/Examples/example22.php | 3 +- lib/jpgraph/src/Examples/example23.php | 3 +- lib/jpgraph/src/Examples/example24.php | 3 +- lib/jpgraph/src/Examples/example25.1.php | 1 + lib/jpgraph/src/Examples/example25.2.php | 1 + lib/jpgraph/src/Examples/example25.php | 1 + lib/jpgraph/src/Examples/example26.1.php | 3 +- lib/jpgraph/src/Examples/example26.php | 3 +- lib/jpgraph/src/Examples/example27.1.php | 3 +- lib/jpgraph/src/Examples/example27.2.php | 3 +- lib/jpgraph/src/Examples/example27.3.php | 3 +- lib/jpgraph/src/Examples/example27.php | 3 +- lib/jpgraph/src/Examples/example28.1.php | 3 +- lib/jpgraph/src/Examples/example28.2.php | 3 +- lib/jpgraph/src/Examples/example28.3.php | 3 +- lib/jpgraph/src/Examples/example28.php | 3 +- lib/jpgraph/src/Examples/example3.0.1.php | 1 + lib/jpgraph/src/Examples/example3.0.2.php | 1 + lib/jpgraph/src/Examples/example3.0.3.php | 1 + lib/jpgraph/src/Examples/example3.1.1.php | 1 + lib/jpgraph/src/Examples/example3.1.php | 1 + lib/jpgraph/src/Examples/example3.2.1.php | 3 +- lib/jpgraph/src/Examples/example3.2.2.php | 3 +- lib/jpgraph/src/Examples/example3.2.php | 3 +- lib/jpgraph/src/Examples/example3.3.php | 1 + lib/jpgraph/src/Examples/example3.4.1.php | 1 + lib/jpgraph/src/Examples/example3.4.php | 1 + lib/jpgraph/src/Examples/example3.php | 1 + lib/jpgraph/src/Examples/example4.php | 1 + lib/jpgraph/src/Examples/example5.1.php | 3 +- lib/jpgraph/src/Examples/example5.php | 3 +- lib/jpgraph/src/Examples/example6.1.php | 5 +- lib/jpgraph/src/Examples/example6.2.php | 5 +- lib/jpgraph/src/Examples/example6.php | 1 + lib/jpgraph/src/Examples/example7.php | 3 +- lib/jpgraph/src/Examples/example8.1.php | 3 +- lib/jpgraph/src/Examples/example8.php | 3 +- lib/jpgraph/src/Examples/example9.1.php | 1 + lib/jpgraph/src/Examples/example9.2.php | 1 + lib/jpgraph/src/Examples/example9.php | 1 + lib/jpgraph/src/Examples/fieldscatterex1.php | 9 +- lib/jpgraph/src/Examples/filledgridex1.php | 3 +- lib/jpgraph/src/Examples/filledlineex01.1.php | 3 +- .../src/Examples/filledstepstyleex1.php | 1 + lib/jpgraph/src/Examples/footerex1.php | 7 +- lib/jpgraph/src/Examples/funcex1.php | 7 +- lib/jpgraph/src/Examples/funcex2.php | 7 +- lib/jpgraph/src/Examples/funcex3.php | 9 +- lib/jpgraph/src/Examples/funcex4.php | 7 +- lib/jpgraph/src/Examples/fusion_example.php | 57 -------- lib/jpgraph/src/Examples/ganttex19.php | 2 +- lib/jpgraph/src/Examples/grace_ex0.php | 11 +- lib/jpgraph/src/Examples/grace_ex1.php | 11 +- lib/jpgraph/src/Examples/grace_ex2.php | 11 +- lib/jpgraph/src/Examples/grace_ex3.php | 11 +- lib/jpgraph/src/Examples/gradbkgex1.php | 3 +- lib/jpgraph/src/Examples/gradlinefillex1.php | 5 +- lib/jpgraph/src/Examples/gradlinefillex2.php | 5 +- lib/jpgraph/src/Examples/gradlinefillex3.php | 5 +- lib/jpgraph/src/Examples/gradlinefillex4.php | 5 +- lib/jpgraph/src/Examples/groupbarex1.php | 4 +- lib/jpgraph/src/Examples/horizbarex1.php | 1 + lib/jpgraph/src/Examples/horizbarex2.php | 5 +- lib/jpgraph/src/Examples/horizbarex3.php | 7 +- lib/jpgraph/src/Examples/horizbarex4.php | 1 + lib/jpgraph/src/Examples/horizbarex6.php | 5 +- lib/jpgraph/src/Examples/imgmarkerex1.php | 3 +- lib/jpgraph/src/Examples/impulsex2.php | 3 +- lib/jpgraph/src/Examples/impulsex4.php | 1 + lib/jpgraph/src/Examples/inyaxisex1.php | 5 +- lib/jpgraph/src/Examples/inyaxisex2.php | 5 +- lib/jpgraph/src/Examples/inyaxisex3.php | 5 +- lib/jpgraph/src/Examples/linebarcentex1.php | 5 +- lib/jpgraph/src/Examples/linebarex1.php | 9 +- lib/jpgraph/src/Examples/linebarex2.php | 5 +- lib/jpgraph/src/Examples/linebarex3.php | 17 +-- lib/jpgraph/src/Examples/linegraceex.php | 5 +- lib/jpgraph/src/Examples/lineiconex1.php | 5 +- lib/jpgraph/src/Examples/lineiconex2.php | 5 +- lib/jpgraph/src/Examples/logbarex1.php | 5 +- .../src/Examples/manual_textscale_ex1.php | 3 +- .../src/Examples/manual_textscale_ex2.php | 3 +- .../src/Examples/manual_textscale_ex3.php | 3 +- lib/jpgraph/src/Examples/manualtickex1.php | 7 +- lib/jpgraph/src/Examples/manualtickex1a.php | 7 +- lib/jpgraph/src/Examples/manualtickex2.php | 5 +- lib/jpgraph/src/Examples/manualtickex3.php | 5 +- lib/jpgraph/src/Examples/manualtickex4.php | 5 +- lib/jpgraph/src/Examples/markflagex1.php | 3 +- lib/jpgraph/src/Examples/mulyaxisex1.php | 3 +- lib/jpgraph/src/Examples/negbarvalueex01.php | 5 +- lib/jpgraph/src/Examples/nullvalueex01.php | 5 +- .../src/Examples/partiallyfilledlineex1.php | 1 + lib/jpgraph/src/Examples/pieex1.php | 5 +- lib/jpgraph/src/Examples/pieex2.php | 5 +- lib/jpgraph/src/Examples/pieex3.php | 4 +- lib/jpgraph/src/Examples/pieex4.php | 3 +- lib/jpgraph/src/Examples/pieex5.php | 3 +- lib/jpgraph/src/Examples/pieex6.php | 3 +- lib/jpgraph/src/Examples/pieex7.php | 3 +- lib/jpgraph/src/Examples/pieex8.php | 1 + lib/jpgraph/src/Examples/pieex9.php | 1 + lib/jpgraph/src/Examples/plotlineex1.php | 1 + lib/jpgraph/src/Examples/rotateex1.php | 3 +- lib/jpgraph/src/Examples/rotex0.php | 3 +- lib/jpgraph/src/Examples/rotex1.php | 3 +- lib/jpgraph/src/Examples/rotex2.php | 3 +- lib/jpgraph/src/Examples/rotex3.php | 3 +- lib/jpgraph/src/Examples/rotex4.php | 3 +- lib/jpgraph/src/Examples/rotex5.php | 3 +- lib/jpgraph/src/Examples/scatterex1.php | 3 +- lib/jpgraph/src/Examples/scatterex2.php | 3 +- lib/jpgraph/src/Examples/scatterlinkex1.php | 5 +- lib/jpgraph/src/Examples/scatterlinkex2.php | 5 +- lib/jpgraph/src/Examples/scatterlinkex3.php | 3 +- lib/jpgraph/src/Examples/scatterlinkex4.php | 3 +- lib/jpgraph/src/Examples/scatterrotex1.php | 3 +- lib/jpgraph/src/Examples/splineex1.php | 4 +- lib/jpgraph/src/Examples/staticbandbarex1.php | 7 +- lib/jpgraph/src/Examples/staticbandbarex2.php | 7 +- lib/jpgraph/src/Examples/staticbandbarex3.php | 7 +- lib/jpgraph/src/Examples/staticbandbarex4.php | 7 +- lib/jpgraph/src/Examples/staticbandbarex5.php | 7 +- lib/jpgraph/src/Examples/staticbandbarex6.php | 8 +- lib/jpgraph/src/Examples/staticbandbarex7.php | 7 +- lib/jpgraph/src/Examples/staticlinebarex1.php | 7 +- lib/jpgraph/src/Examples/stockex1.php | 1 + lib/jpgraph/src/Examples/tabtitleex1.php | 3 +- lib/jpgraph/src/Examples/topxaxisex1.php | 3 +- lib/jpgraph/src/README | 126 +++++++++--------- lib/jpgraph/src/jpgraph.php | 2 +- lib/jpgraph/src/jpgraph_gradient.php | 4 +- lib/jpgraph/src/jpgraph_table.php | 14 +- 217 files changed, 637 insertions(+), 647 deletions(-) delete mode 100755 lib/jpgraph/src/Examples/fusion_example.php diff --git a/README.md b/README.md index 49df5b4..e13ba58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ JpGraph from http://jpgraph.net/ ====== -This is a port for Composer users to use JpGraph as a Vendor library -use JpGraph\JpGraph::load(); and JpGraph\JpGraph::module('moduleName'); to load required modules +This is a port for Composer users to use JpGraph as a Vendor library. + +Use `JpGraph\JpGraph::load();` and `JpGraph\JpGraph::module('moduleName');` to load required modules. diff --git a/lib/JpGraph.php b/lib/JpGraph.php index 2893aa3..6551571 100644 --- a/lib/JpGraph.php +++ b/lib/JpGraph.php @@ -1,20 +1,20 @@ JpGraph Manual
JpGraph Manual

JpGraph Manual

Version : 4.0.0

+JpGraph Manual
JpGraph Manual

JpGraph Manual

Version : 4.1

Asial Corporation

Copyright © 2000-2016 Asial Corporation

2016-06-21

Table of Contents

Preface and history of the JpGraph library
I. Installing and verifying the configuring
1. About the library
1.1. What is JpGraph?
1.2. Software license
1.3. Versions of the library covered
1.4. Purpose and usage
1.5. Prerequisites for running the library
1.6. Who can use the library
1.7. What you can do with the library
1.8. What you shouldn't or cannot do with this library
1.9. Feature-matrix for the library
1.10. Where to find additional information
2. The Short Version: Installing the library (for PHP/Apache experts)
2.1. Installing
2.2. Running the examples
2.3. Basic trouble shooting
3. The Long Version: Installing the Library
3.1. Downloading the library
3.2. Necessary system requirements for the library
3.3. Installing the library
3.4. Installing and configuring Font support
3.5. Adapting and customizing the installation
3.6. Verifying the library installation
3.7. Troubleshooting the installation
II. Basic graph creation
4. Your first graph script
4.1. Some words of caution
4.2. Graphing the number of sun spots during the 19th Century
5. Fundamentals of dynamic graph generation
5.1. Making sense of HTTP streams and MIME types
5.2. What is an image?
5.3. Static vs dynamic images
5.4. Dynamic images on the command line
5.5. How to generate images with JpGraph library
5.6. Efficient graph generation using the built-in cache subsystem
6. Error handling
6.1. The problem with error messages and images
6.2. Available error messages
6.3. Using PHP Exceptions
6.4. Adding a new locale
7. Color handling
7.1. Specifying colors by name
7.2. Specifying colors by RGB triples
7.3. Using HTML color specifications
7.4. Fine tuning the color
7.5. Additional color handling
8. Text and font handling
8.1. Different types of fonts
8.2. Font families and font styles
8.3. Understanding text alignment and anchor point
8.4. Rotating text
8.5. Formatting text paragraphs
8.6. Adding custom TTF fonts
8.7. Inserting Unicode entities
8.8. Character encoding
9. Using the JpGraph cache system
9.1. Enabling the library cache system
9.2. Permission settings for the cache files
9.3. Using the cache in your script
9.4. Using the cache with Client Side Image Maps (CSIM)
10. Using CSIM (Client side image maps)
10.1. The principles
10.2. The basic structure of an image map script
10.3. Specifying targets for image map plots
10.4. Using StrokeCSIM()
10.5. Getting hold of the image map
10.6. Mixing several CSIM images in an HTML page with text
11. NuSphere PHP accelerator
11.1. Introduction and purpose
11.2. Installing PhpExpress
III. Common features
12. Commonalities for all graphs
12.1. Common objects for cartesian graphs (x-, y-graphs)
12.2. Common object for Pie Graphs
13. Getting hold of the data to be displayed
13.1. Static data
13.2. Reading data from a file
13.3. Sending data to a graph script with URI arguments (GET and POST)
13.4. Reading data from a database
13.5. Reading binary data from a file
13.6. Different types of NULL data handling
13.7. Troubleshooting input data
14. Common features for all Cartesian (x,y) graph types
14.1. The definition of linear graphs
14.2. Specifying and formatting the overall displayed graph
14.3. Adjusting the look and feel of the plot area
14.4. Adjusting the position and layout of the legend
14.5. Other formatting options of the axis
14.6. Using multiple y-axis
14.7. Understanding and using different scales on the axis
14.8. Adjusting the appearance of the scale labels
14.9. Using a logarithmic scale
14.10. Using a date/time scale
14.11. Adding shearing image transformation to the graph
14.12. Rotating graphs
14.13. Using anti-aliasing in the graph generation
14.14. Adding icons (and small images) to the graph
14.15. Adding images and country flags to the background of the graph
14.16. Using background gradients
14.17. Adding arbitrary texts to the graph
IV. Creating linear and non-linear graphs
15. Different types of linear (cartesian) graph types
15.1. Basic Line and area graphs
15.2. Bar graphs
15.3. Error plot graphs
15.4. Stock graphs
15.5. Scatter graphs
15.6. Contour graphs
15.7. Combining several different plot types in the same graph
15.8. Creating several graphs in the same image
16. Non-Linear graph types
16.1. Pie graphs
16.2. Radar graphs
16.3. Polar graphs
16.4. Gantt charts
17. Additional graph types
17.1. LED bill boards
17.2. Captcha generation
17.3. Canvas graphs
18. Miscellaneous formatting and tools
18.1. Linear regression analysis
V. Additional graph types available in the professional version
19. Graphical tables
19.1. Introduction
19.2. Constructing tables
19.3. CSIM Table support
19.4. Table API Overview
19.5. Examples
19.6. Case study: Adding a table to a bar graph
20. Odometer
20.1. Introduction
20.2. Creating and formatting basic odometer graphs
20.3. Working with the odometer scale
20.4. Adding and positioning multiple odometers to a graph
20.5. Adding icon and text objects to the graph
21. Windrose
21.1. Introduction
21.2. Creating and formatting basic Windrose graphs
21.3. Formatting the plot
21.4. Some more advanced formatting
21.5. Adding icon and text objects to the graph
21.6. Using layout classes to position Windrose plots
21.7. Example section
22. Matrix graphs
22.1. Introduction
22.2. Creating and formatting a basic matrix graph
22.3. Mesh interpolating of input data
22.4. Formatting the matrix plot
22.5. Adding icon and text objects to the graph
22.6. Adding marker lines to the matrix plot
22.7. Using layout classes to position matrix plots
22.8. Built in color maps
22.9. Using CSIM with matrix plots
22.10. Matrix graph examples
23. Filled contour graphs
23.1. Filled Contour graphs
VI. Barcodes
24. Linear Barcodes (One Dimensional Barcodes)
24.1. Introduction
24.2. How does linear barcodes work?
24.3. Barcode symbologies
24.4. Features
24.5. Creating barcodes - quick start
24.6. Error handling
24.7. Generating barcodes on the command line
24.8. Format options for barcodes
24.9. Short description of supported symbologies
25. PDF417 (2D-Barcode)
25.1. Principle of PDF417 Barcodes
25.2. Creating barcodes
25.3. Creating barcodes
25.4. Specifying the PDF417 parameters
25.5. Adjusting the output
25.6. A template to create barcodes
25.7. Method reference
25.8. Example scripts
26. Datamatrix (2D-Barcode)
26.1. Principle of Datamatrix Barcodes
26.2. Creating barcodes
26.3. Example script
27. QR (2D-Barcode)
27.1. Principle of QR Barcodes
27.2. Creating barcodes
27.3. Example scripts
VII. Theme Class
28. Applying the prepared theme
29. Attention
29.1. The order of SetTheme() and changing settings
29.2. Changing the display settings of line/bar graphs
30. Examples of applying a theme
31. Creating original themes
VIII. Case studies
32. Synchronized Y-axis
32.1. Creating two scales
33. USPS Confirmation Barcodes
33.1. Creating the confirmation codes
34. Showing SPAM statistics
34.1. Introduction and purpose
34.2. Step 1: Parsing the log file
34.3. Step 2: Creating the graph
34.4. Step 3: Uploading the image file to a server
34.5. Step 0: The full driver script
35. Creating Critical chain buffer penetration charts
35.1. Introduction and purpose
35.2. Creating a utility class to construct CC BP charts
35.3. The Init() method
35.4. Suggested improvements
35.5. The implementation of class CCBPGraph
35.6. References
IX. Appendices
A. How this manual was produced
B. JpGraph Professional License
B.1. Single License
B.2. Bulk (Re-seller license)
C. FAQ
D. Named color list
E. Available plot marks
E.1. Built in basic plot marks
E.2. Built in image plot marks
F. List of all country flags
G. List of files included in the library
H. Error messages
H.1. Core error messages
H.2. QR 2D Barcode error messages
H.3. Datamatrix 2D barcode error messages
I. Compiling PHP
I.1. Compiling PHP4
I.2. Compiling PHP5
J. Setting up PHP5 in parallel with PHP4 in SuSE 10.1
J.1. Configuration files and directories for Apache2 in SuSE 10.1
J.2. Making sure you have the correct Apache2 setup
J.3. Approaches to running multiple PHP versions
J.4. Outline of the remainder of the chapter
J.5. Part I - Installing PHP4
J.6. Part II - Creating a virtual host
J.7. Part III - Installing PHP5
J.8. Part IV - Verifying the setup
K. Why it is not possible to add a SVG backend to JpGraph
K.1. Background
K.2. Summary of findings
K.3. Detailing the issue
L. The JpGraph configuration file

List of Figures

1. Link to highlighted graph source
1.1. JpGraph and PHP
1.2. This is the very first example (example0.php)
2.1. phpinfo() GD sections
3.1. Pro-login dialogue on JpGraph Website
3.2. phphinfo() GD-Information
3.3. Verifying the GD installations (checkgd.php)
3.4. Verifying GD2 (checkgd2.php)
3.5. Verifying TTF with a known font (checkttf.php)
4.1. The first ten rows of data of sunspot activities from year 1700
4.2. Reading numeric tabulated sunspot data from a file
4.3. Line plot showing the number of sun spots since 1700 (sunspotsex1.php)
4.4. Displaying sun spots with a semi filled line graph (sunspotsex2.php)
4.5. Adding tick labels to the graph (sunspotsex3.php)
4.6. Manually specifying the X scale to use just the supplied X values (sunspotsex4.php)
4.7. Using a callback to get correct values on the x axis (sunspotsex5.php)
4.8. Changing the plot type to a bar plot instead (sunspotsex6.php)
4.9. Sunspots zoomed to only show the last 20 years (sunspotsex7.php)
6.1. Typical image error message
6.2. The "Header already sent error message"
6.3. The "Header already sent" error message using German locale
6.4. Using the production "pseudo" locale
7.1. Using alpha channel modifiers
7.2. Making use of transparency to combine two plots (barlinealphaex1.php)
7.3. Adjusting brightness of named color specifier
7.4. Adjusting brightness of a HTML color specifier
8.1. List of all latin TTF fonts. (listfontsex1.php)
8.2. Illustration of anchor point alignment (textalignex1.php)
8.3. Example of how to use rotated labels (bargradex1.php)
8.4. Example of using rotated data point values (example20.3.php)
8.5. The different types of paragraph alignments (textpalignex1.php)
8.6. Rendered symbol characters corresponding to diff --git a/lib/jpgraph/docs/classref/BoxPlot.html b/lib/jpgraph/docs/classref/BoxPlot.html index 19eb534..3b96f19 100755 --- a/lib/jpgraph/docs/classref/BoxPlot.html +++ b/lib/jpgraph/docs/classref/BoxPlot.html @@ -17,8 +17,8 @@  SetColor() 
 SetWidth() 
 __construct() 
- 

Class usage and Overview
Create a box plot. This is the same as a stock plot but with the added feature of a median line. For each X-value 5 Y values must be specified: -(open,close,min,max,median) + 

Class usage and Overview
Create a box plot. This is the same as a stock plot but with the added feature of a median line. For each X-value 5 Y values must be specified: +(open,close,min,max,median)

 

See also related classes:
StockPlot

 

Class Methods

 

@@ -69,8 +69,8 @@ If specified, X-positions -
Description:
Create a new Box plot. Each data point in a box plotconsists of 5 values; (open,close,min,max,median) - +
Description:
Create a new Box plot. Each data point in a box plotconsists of 5 values; (open,close,min,max,median) +  
 
See also:

Example:

diff --git a/lib/jpgraph/docs/classref/DateScale.html b/lib/jpgraph/docs/classref/DateScale.html index eca9045..3be7bf1 100755 --- a/lib/jpgraph/docs/classref/DateScale.html +++ b/lib/jpgraph/docs/classref/DateScale.html @@ -60,29 +60,29 @@ End alignment -
Description:
Specify start and end date alignment for the scale -Possible values are -
    -
  1. Alignment on a day basis -
      -
    • DAYADJ_1, Align on the start of a day -
    • DAYADJ_7, Align on the start of a week -
    • DAYADJ_WEEK, Synonym to DAYADJ_7 -
    - -
  2. Alignment on a monthly basis -
      -
    • MONTHADJ_1, Align on a month start -
    • MONTHADJ_6, Align on the start of halfyear -
    - -
  3. Alignment on a yearly basis -
      -
    • YEARADJ_1, Align on a year -
    • YEARADJ_2, Align on a bi-yearly basis -
    • YEARADJ_5, Align on a 5 year basis -
    -
+
Description:
Specify start and end date alignment for the scale +Possible values are +
    +
  1. Alignment on a day basis +
      +
    • DAYADJ_1, Align on the start of a day +
    • DAYADJ_7, Align on the start of a week +
    • DAYADJ_WEEK, Synonym to DAYADJ_7 +
    + +
  2. Alignment on a monthly basis +
      +
    • MONTHADJ_1, Align on a month start +
    • MONTHADJ_6, Align on the start of halfyear +
    + +
  3. Alignment on a yearly basis +
      +
    • YEARADJ_1, Align on a year +
    • YEARADJ_2, Align on a bi-yearly basis +
    • YEARADJ_5, Align on a 5 year basis +
    +
 
 
See also:

Example:

@@ -126,37 +126,37 @@ End time alignment -
Description:
Specify the start and end alignment with the time granularity. For date granularity see SetDateAlign(). Note that only one of SetDateAlign() and SetTimeAlign() can be used. - -For start and end alignment the following values are valid - -
    -
  1. Alignment on seconds -
      -
    • MINADJ_1, Align on a single second (This is the lowest resolution) -
    • MINADJ_5, Align on the nearest 5 seconds -
    • MINADJ_10, Align on the nearest 10 seconds -
    • MINADJ_15, Align on the nearest 15 seconds -
    • MINADJ_30, Align on the nearest 30 seconds -
    -
  2. Alignment on minutes -
      -
    • MINADJ_1, Align to the nearest minute -
    • MINADJ_5, Align on the nearest 5 minutes -
    • MINADJ_10, Align on the nearest 10 minutes -
    • MINADJ_15, Align on the nearest 15 minutes -
    • MINADJ_30, Align on the nearest 30 minutes -
    -
  3. Alignment on hours -
      -
    • HOURADJ_1, Align to the nearest hour -
    • HOURADJ_2, Align to the nearest two hour -
    • HOURADJ_3, Align to the nearest three hour -
    • HOURADJ_4, Align to the nearest four hour -
    • HOURADJ_6, Align to the nearest six hour -
    • HOURADJ_12, Align to the nearest tolw hour -
    -
+
Description:
Specify the start and end alignment with the time granularity. For date granularity see SetDateAlign(). Note that only one of SetDateAlign() and SetTimeAlign() can be used. + +For start and end alignment the following values are valid + +
    +
  1. Alignment on seconds +
      +
    • MINADJ_1, Align on a single second (This is the lowest resolution) +
    • MINADJ_5, Align on the nearest 5 seconds +
    • MINADJ_10, Align on the nearest 10 seconds +
    • MINADJ_15, Align on the nearest 15 seconds +
    • MINADJ_30, Align on the nearest 30 seconds +
    +
  2. Alignment on minutes +
      +
    • MINADJ_1, Align to the nearest minute +
    • MINADJ_5, Align on the nearest 5 minutes +
    • MINADJ_10, Align on the nearest 10 minutes +
    • MINADJ_15, Align on the nearest 15 minutes +
    • MINADJ_30, Align on the nearest 30 minutes +
    +
  3. Alignment on hours +
      +
    • HOURADJ_1, Align to the nearest hour +
    • HOURADJ_2, Align to the nearest two hour +
    • HOURADJ_3, Align to the nearest three hour +
    • HOURADJ_4, Align to the nearest four hour +
    • HOURADJ_6, Align to the nearest six hour +
    • HOURADJ_12, Align to the nearest tolw hour +
    +
 
 
See also:

Example:

diff --git a/lib/jpgraph/docs/classref/ErrorLinePlot.html b/lib/jpgraph/docs/classref/ErrorLinePlot.html index 73b7469..7aa74a9 100755 --- a/lib/jpgraph/docs/classref/ErrorLinePlot.html +++ b/lib/jpgraph/docs/classref/ErrorLinePlot.html @@ -13,8 +13,8 @@
(Defined in: jpgraph_error.php : 87)
 
 ErrorLinePlot  ErrorPlot 
 __construct() 
 __construct() 
-
 

Class usage and Overview
The error line plot is much the same as the error plot with the addition of a line between the average value of each error plot pair. The properties of the line may be accessed through the ?line? property of the ErrLinePlot, so for example to draw a red line you issue the statement - + 

Class usage and Overview
The error line plot is much the same as the error plot with the addition of a line between the average value of each error plot pair. The properties of the line may be accessed through the ?line? property of the ErrLinePlot, so for example to draw a red line you issue the statement + $errlineplot->line->SetColor(?red?);

 

See also related classes:
LinePlot and ErrorPlot

 

Class Methods

 

diff --git a/lib/jpgraph/docs/classref/Footer.html b/lib/jpgraph/docs/classref/Footer.html index fec63b9..c8b004a 100755 --- a/lib/jpgraph/docs/classref/Footer.html +++ b/lib/jpgraph/docs/classref/Footer.html @@ -13,11 +13,11 @@
Class Footer
(Defined in: jpgraph.php : 442)
 
 Footer 
 SetMargin() 
 SetTimer() 
-
 

Class usage and Overview
Represents the footer in all graphs. The footer consists of three fields accessed by properties "left", "center" and "right" representing. This lets you have footer text to the left, center and to the right. -

-For example -

-$graph->footer->left->Set("(C) 2002"); + 

Class usage and Overview
Represents the footer in all graphs. The footer consists of three fields accessed by properties "left", "center" and "right" representing. This lets you have footer text to the left, center and to the right. +

+For example +

+$graph->footer->left->Set("(C) 2002");

 

Class Methods

 

diff --git a/lib/jpgraph/docs/classref/LineErrorPlot.html b/lib/jpgraph/docs/classref/LineErrorPlot.html index 744a21a..4aeb071 100755 --- a/lib/jpgraph/docs/classref/LineErrorPlot.html +++ b/lib/jpgraph/docs/classref/LineErrorPlot.html @@ -13,8 +13,8 @@
(Defined in: jpgraph_error.php : 120)
 
 LineErrorPlot  ErrorPlot 
 __construct() 
 __construct() 
-
 

Class usage and Overview
A line error plot is in principle a line plot but with the added feature that each point also have a two error values. Low and high error. - + 

Class usage and Overview
A line error plot is in principle a line plot but with the added feature that each point also have a two error values. Low and high error. + This means that data array must be an even number of three values.

 

See also related classes:
LinePlot

 

Class Methods

 

diff --git a/lib/jpgraph/docs/classref/LineProperty.html b/lib/jpgraph/docs/classref/LineProperty.html index 8a3c7e9..67e504d 100755 --- a/lib/jpgraph/docs/classref/LineProperty.html +++ b/lib/jpgraph/docs/classref/LineProperty.html @@ -51,9 +51,9 @@  Line style -
Description:
Linestyle for lines. Valid linestyles are:
-'solid', 'dotted', 'dashed' -

+

Description:
Linestyle for lines. Valid linestyles are:
+'solid', 'dotted', 'dashed' +

The default line style is 'solid' 
 

See also:

Example:

diff --git a/lib/jpgraph/docs/classref/LogTicks.html b/lib/jpgraph/docs/classref/LogTicks.html index 6378cef..0ec4198 100755 --- a/lib/jpgraph/docs/classref/LogTicks.html +++ b/lib/jpgraph/docs/classref/LogTicks.html @@ -38,15 +38,15 @@  Magnitude (10^x) or plain -
Description:
Specify how labels for log scales should be formatted as magnitude (scientific) or plain. -

-$aType can be either -

    -
  • LOGLABELS_PLAIN, will show labels as for example 10000 -
  • LOGLABELS_MAGNITUDE, will show labels as 10^4 -
- -By default log scale uses magnitude type of labels. +
Description:
Specify how labels for log scales should be formatted as magnitude (scientific) or plain. +

+$aType can be either +

    +
  • LOGLABELS_PLAIN, will show labels as for example 10000 +
  • LOGLABELS_MAGNITUDE, will show labels as 10^4 +
+ +By default log scale uses magnitude type of labels.  

Example:

diff --git a/lib/jpgraph/docs/classref/projinfo.html b/lib/jpgraph/docs/classref/projinfo.html index 882bd7b..995b3a3 100755 --- a/lib/jpgraph/docs/classref/projinfo.html +++ b/lib/jpgraph/docs/classref/projinfo.html @@ -1,5 +1,5 @@
JpGraph

Documentation status: 73%

Total number of Classes: 135, Methods: 1362

This version does not include private methods & classes

Generated at 20 Jul 2009 at 16:57
-

+

© 2000 - 2009 Aditus Consulting. All rights reserved.
\ No newline at end of file diff --git a/lib/jpgraph/src/Examples/accbarex1.php b/lib/jpgraph/src/Examples/accbarex1.php index 0179629..bf36ca2 100755 --- a/lib/jpgraph/src/Examples/accbarex1.php +++ b/lib/jpgraph/src/Examples/accbarex1.php @@ -7,7 +7,8 @@ $data2y=array(18,2,1,7,5,4); // Create the graph. These two calls are always required -$graph = new Graph(500,400); +$graph = new Graph(500,400); +$graph->cleartheme(); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/alphabarex1.php b/lib/jpgraph/src/Examples/alphabarex1.php index 81c821c..1fcc713 100755 --- a/lib/jpgraph/src/Examples/alphabarex1.php +++ b/lib/jpgraph/src/Examples/alphabarex1.php @@ -9,7 +9,8 @@ $datay3=array(20,60,70,140); // Create the basic graph -$graph = new Graph(450,250,'auto'); +$graph = new Graph(450,250,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(40,80,30,40); @@ -72,4 +73,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/background_type_ex0.php b/lib/jpgraph/src/Examples/background_type_ex0.php index 1c4e745..d814842 100755 --- a/lib/jpgraph/src/Examples/background_type_ex0.php +++ b/lib/jpgraph/src/Examples/background_type_ex0.php @@ -7,6 +7,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,250); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,40,50,50); diff --git a/lib/jpgraph/src/Examples/background_type_ex1.php b/lib/jpgraph/src/Examples/background_type_ex1.php index cdd3cce..3491ab5 100755 --- a/lib/jpgraph/src/Examples/background_type_ex1.php +++ b/lib/jpgraph/src/Examples/background_type_ex1.php @@ -7,6 +7,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,250); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,40,50,50); diff --git a/lib/jpgraph/src/Examples/background_type_ex2.php b/lib/jpgraph/src/Examples/background_type_ex2.php index 932f7a5..9ccdf08 100755 --- a/lib/jpgraph/src/Examples/background_type_ex2.php +++ b/lib/jpgraph/src/Examples/background_type_ex2.php @@ -7,6 +7,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,250); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,40,50,50); diff --git a/lib/jpgraph/src/Examples/background_type_ex3.php b/lib/jpgraph/src/Examples/background_type_ex3.php index 8b265c8..f0e5f59 100755 --- a/lib/jpgraph/src/Examples/background_type_ex3.php +++ b/lib/jpgraph/src/Examples/background_type_ex3.php @@ -7,6 +7,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,250); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,40,50,50); diff --git a/lib/jpgraph/src/Examples/background_type_ex4.php b/lib/jpgraph/src/Examples/background_type_ex4.php index 3ff1ceb..cfca2f9 100755 --- a/lib/jpgraph/src/Examples/background_type_ex4.php +++ b/lib/jpgraph/src/Examples/background_type_ex4.php @@ -7,6 +7,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,250); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,40,50,50); diff --git a/lib/jpgraph/src/Examples/backgroundex01.php b/lib/jpgraph/src/Examples/backgroundex01.php index fac8e93..1e0525f 100755 --- a/lib/jpgraph/src/Examples/backgroundex01.php +++ b/lib/jpgraph/src/Examples/backgroundex01.php @@ -8,7 +8,8 @@ // A nice graph with anti-aliasing $graph = new Graph(400,200); -$graph->img->SetMargin(40,180,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,180,40,40); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLPLOT); $graph->img->SetAntiAliasing("white"); @@ -20,7 +21,7 @@ $graph->title->SetFont(FF_FONT1,FS_BOLD); // Slightly adjust the legend from it's default position in the -// top right corner. +// top right corner. $graph->legend->Pos(0.05,0.5,"right","center"); // Create the first line @@ -47,5 +48,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/backgroundex02.php b/lib/jpgraph/src/Examples/backgroundex02.php index 542be5d..f7cef69 100755 --- a/lib/jpgraph/src/Examples/backgroundex02.php +++ b/lib/jpgraph/src/Examples/backgroundex02.php @@ -8,7 +8,8 @@ // A nice graph with anti-aliasing $graph = new Graph(400,200); -$graph->img->SetMargin(40,180,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,180,40,40); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); $graph->img->SetAntiAliasing(); @@ -20,7 +21,7 @@ $graph->title->SetFont(FF_FONT1,FS_BOLD); // Slightly adjust the legend from it's default position in the -// top right corner. +// top right corner. $graph->legend->Pos(0.05,0.5,"right","center"); // Create the first line @@ -47,5 +48,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/backgroundex03.php b/lib/jpgraph/src/Examples/backgroundex03.php index a1c1337..1d490d3 100755 --- a/lib/jpgraph/src/Examples/backgroundex03.php +++ b/lib/jpgraph/src/Examples/backgroundex03.php @@ -8,7 +8,8 @@ // A nice graph with anti-aliasing $graph = new Graph(400,200); -$graph->img->SetMargin(40,180,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,180,40,40); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_COPY); $graph->img->SetAntiAliasing("white"); @@ -20,7 +21,7 @@ $graph->title->SetFont(FF_FONT1,FS_BOLD); // Slightly adjust the legend from it's default position in the -// top right corner. +// top right corner. $graph->legend->Pos(0.05,0.5,"right","center"); // Create the first line @@ -47,5 +48,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/balloonex1.php b/lib/jpgraph/src/Examples/balloonex1.php index c963d76..26e82ea 100755 --- a/lib/jpgraph/src/Examples/balloonex1.php +++ b/lib/jpgraph/src/Examples/balloonex1.php @@ -21,8 +21,9 @@ function FCallback($aVal) { // Setup a basic graph $graph = new Graph(400,300,'auto'); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->img->SetMargin(40,100,40,40); +$graph->img->SetMargin(40,100,40,40); $graph->SetShadow(); $graph->title->Set("Example of ballon scatter plot"); // Use a lot of grace to get large scales @@ -52,5 +53,3 @@ function FCallback($aVal) { $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/balloonex2.php b/lib/jpgraph/src/Examples/balloonex2.php index 257a664..111db13 100755 --- a/lib/jpgraph/src/Examples/balloonex2.php +++ b/lib/jpgraph/src/Examples/balloonex2.php @@ -2,7 +2,7 @@ require_once ('jpgraph/jpgraph.php'); require_once ('jpgraph/jpgraph_scatter.php'); -// Each ballon is specificed by four values. +// Each ballon is specificed by four values. // (X,Y,Size,Color) $data = array( array(1,12,10,'orange'), @@ -17,14 +17,14 @@ // library from the above raw data. $n = count($data); for( $i=0; $i < $n; ++$i ) { - + $datax[$i] = $data[$i][0]; $datay[$i] = $data[$i][1]; // Create a faster lookup array so we don't have to search // for the correct values in the callback function $format[strval($datax[$i])][strval($datay[$i])] = array($data[$i][2],$data[$i][3]); - + } @@ -40,8 +40,9 @@ function FCallback($aYVal,$aXVal) { // Setup a basic graph $graph = new Graph(450,300,'auto'); +$graph->clearTheme(); $graph->SetScale("intlin"); -$graph->SetMargin(40,40,40,40); +$graph->SetMargin(40,40,40,40); $graph->SetMarginColor('wheat'); $graph->title->Set("Example of ballon scatter plot with X,Y callback"); @@ -77,5 +78,3 @@ function FCallback($aYVal,$aXVal) { $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bar2scalesex1.php b/lib/jpgraph/src/Examples/bar2scalesex1.php index 9248e7c..e1f4219 100755 --- a/lib/jpgraph/src/Examples/bar2scalesex1.php +++ b/lib/jpgraph/src/Examples/bar2scalesex1.php @@ -6,11 +6,12 @@ $datay2=array(430,645,223,690); $datazero=array(0,0,0,0); -// Create the graph. +// Create the graph. $graph = new Graph(450,200); +$graph->clearTheme(); $graph->title->Set('Example with 2 scale bars'); -// Setup Y and Y2 scales with some "grace" +// Setup Y and Y2 scales with some "grace" $graph->SetScale("textlin"); $graph->SetY2Scale("lin"); $graph->yaxis->scale->SetGrace(30); diff --git a/lib/jpgraph/src/Examples/bargradex1.php b/lib/jpgraph/src/Examples/bargradex1.php index e325223..f8543f5 100755 --- a/lib/jpgraph/src/Examples/bargradex1.php +++ b/lib/jpgraph/src/Examples/bargradex1.php @@ -9,6 +9,7 @@ // Setup the graph. $graph = new Graph(400,240); +$graph->clearTheme(); $graph->img->SetMargin(60,20,35,75); $graph->SetScale("textlin"); $graph->SetMarginColor("lightblue:1.1"); diff --git a/lib/jpgraph/src/Examples/bargradex2.php b/lib/jpgraph/src/Examples/bargradex2.php index 02da925..4f6203e 100755 --- a/lib/jpgraph/src/Examples/bargradex2.php +++ b/lib/jpgraph/src/Examples/bargradex2.php @@ -1,5 +1,5 @@ clearTheme(); $graph->img->SetMargin(60,20,30,50); $graph->SetScale("textlin"); $graph->SetMarginColor("silver"); @@ -36,7 +37,7 @@ $bplot = new BarPlot($datay); $bplot->SetWidth(0.6); -// Setup color for gradient fill style +// Setup color for gradient fill style $bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER); // Set color for the frame of each bar diff --git a/lib/jpgraph/src/Examples/bargradex3.php b/lib/jpgraph/src/Examples/bargradex3.php index 8a3f99d..f496c79 100755 --- a/lib/jpgraph/src/Examples/bargradex3.php +++ b/lib/jpgraph/src/Examples/bargradex3.php @@ -1,5 +1,5 @@ clearTheme(); $graph->img->SetMargin(60,20,30,50); $graph->SetScale("textlin"); $graph->SetMarginColor("silver"); @@ -38,7 +39,7 @@ $bplot = new BarPlot($datay); $bplot->SetWidth(0.6); -// Setup color for gradient fill style +// Setup color for gradient fill style $bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER); // Set color for the frame of each bar diff --git a/lib/jpgraph/src/Examples/bargradex4.php b/lib/jpgraph/src/Examples/bargradex4.php index 7de203a..7ea199a 100755 --- a/lib/jpgraph/src/Examples/bargradex4.php +++ b/lib/jpgraph/src/Examples/bargradex4.php @@ -1,5 +1,5 @@ clearTheme(); $graph->img->SetMargin(60,30,30,40); $graph->SetScale("textlin"); $graph->SetMarginColor("teal"); @@ -36,7 +37,7 @@ $bplot = new BarPlot($datay); $bplot->SetWidth(0.6); -// Setup color for gradient fill style +// Setup color for gradient fill style $tcol=array(100,100,255); $fcol=array(255,100,100); $bplot->SetFillGradient($fcol,$tcol,GRAD_HOR); diff --git a/lib/jpgraph/src/Examples/bargradex5.php b/lib/jpgraph/src/Examples/bargradex5.php index e012292..a61d96b 100755 --- a/lib/jpgraph/src/Examples/bargradex5.php +++ b/lib/jpgraph/src/Examples/bargradex5.php @@ -1,5 +1,5 @@ clearTheme(); $graph->img->SetMargin(60,30,30,40); $graph->SetScale("textlin"); $graph->SetMarginColor("teal"); @@ -22,7 +23,7 @@ // This is how you make the bar graph start from something other than 0 $bplot->SetYMin(0.302); -// Setup color for gradient fill style +// Setup color for gradient fill style $tcol=array(100,100,255); $fcol=array(255,100,100); $bplot->SetFillGradient($fcol,$tcol,GRAD_HOR); diff --git a/lib/jpgraph/src/Examples/bargradex6.php b/lib/jpgraph/src/Examples/bargradex6.php index 43bf966..f0d09b3 100755 --- a/lib/jpgraph/src/Examples/bargradex6.php +++ b/lib/jpgraph/src/Examples/bargradex6.php @@ -1,5 +1,5 @@ clearTheme(); $graph->img->SetMargin(60,150,30,50); $graph->SetScale("textlin"); $graph->SetMarginColor("silver"); @@ -39,7 +40,7 @@ $bplot->SetWidth(0.6); $bplot->SetLegend("Result 1999","blue"); -// Setup color for gradient fill style +// Setup color for gradient fill style $bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER); // Set color for the frame of each bar diff --git a/lib/jpgraph/src/Examples/barimgex1.php b/lib/jpgraph/src/Examples/barimgex1.php index 76aee8f..f4053cb 100755 --- a/lib/jpgraph/src/Examples/barimgex1.php +++ b/lib/jpgraph/src/Examples/barimgex1.php @@ -5,7 +5,8 @@ $datay=array(5,3,11,6,3); -$graph = new Graph(400,300,'auto'); +$graph = new Graph(400,300,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->title->Set('Images on top of bars'); diff --git a/lib/jpgraph/src/Examples/barintex1.php b/lib/jpgraph/src/Examples/barintex1.php index 9ba063d..0dcc6cc 100755 --- a/lib/jpgraph/src/Examples/barintex1.php +++ b/lib/jpgraph/src/Examples/barintex1.php @@ -6,15 +6,16 @@ // Some data $datay=array(1,1,0.5); -// Create the graph and setup the basic parameters -$graph = new Graph(460,200,'auto'); +// Create the graph and setup the basic parameters +$graph = new Graph(460,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,30,30,40); $graph->SetScale("textint"); $graph->SetShadow(); $graph->SetFrame(false); // No border around the graph // Add some grace to the top so that the scale doesn't -// end exactly at the max value. +// end exactly at the max value. $graph->yaxis->scale->SetGrace(100); // Setup X-axis labels @@ -27,7 +28,7 @@ $graph->title->SetFont(FF_FONT2,FS_BOLD); $graph->xaxis->title->Set("Year 2002"); $graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); - + // Create a bar pot $bplot = new BarPlot($datay); $bplot->SetFillColor("orange"); diff --git a/lib/jpgraph/src/Examples/barintex2.php b/lib/jpgraph/src/Examples/barintex2.php index 59f3b73..e764ebe 100755 --- a/lib/jpgraph/src/Examples/barintex2.php +++ b/lib/jpgraph/src/Examples/barintex2.php @@ -5,16 +5,17 @@ // Some data $datay=array(3,7,19,11,4,20); -// Create the graph and setup the basic parameters -$graph = new Graph(350,200,'auto'); +// Create the graph and setup the basic parameters +$graph = new Graph(350,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,30,40,40); $graph->SetScale("textint"); -$graph->SetFrame(true,'blue',1); +$graph->SetFrame(true,'blue',1); $graph->SetColor('lightblue'); $graph->SetMarginColor('lightblue'); // Add some grace to the top so that the scale doesn't -// end exactly at the max value. +// end exactly at the max value. //$graph->yaxis->scale->SetGrace(20); // Setup X-axis labels @@ -35,7 +36,7 @@ $graph->title->SetFont(FF_FONT2,FS_BOLD); $graph->xaxis->title->Set("Year 2002"); $graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); - + // Create a bar pot $bplot = new BarPlot($datay); $bplot->SetFillColor('darkblue'); diff --git a/lib/jpgraph/src/Examples/barlinefreqex1.php b/lib/jpgraph/src/Examples/barlinefreqex1.php index c5966bb..6c5155c 100755 --- a/lib/jpgraph/src/Examples/barlinefreqex1.php +++ b/lib/jpgraph/src/Examples/barlinefreqex1.php @@ -1,6 +1,6 @@ clearTheme(); // Setup some basic graph parameters $graph->SetScale("textlin"); diff --git a/lib/jpgraph/src/Examples/barpatternex1.php b/lib/jpgraph/src/Examples/barpatternex1.php index f0be38e..13af270 100755 --- a/lib/jpgraph/src/Examples/barpatternex1.php +++ b/lib/jpgraph/src/Examples/barpatternex1.php @@ -6,8 +6,9 @@ $datay=array(2,3,5,8.5,11.5,6,3); -// Create the graph. -$graph = new Graph(350,300); +// Create the graph. +$graph = new Graph(350,300); +$graph->clearTheme(); $graph->SetScale("textlin"); diff --git a/lib/jpgraph/src/Examples/barscalecallbackex1.php b/lib/jpgraph/src/Examples/barscalecallbackex1.php index 7e73f20..555341b 100755 --- a/lib/jpgraph/src/Examples/barscalecallbackex1.php +++ b/lib/jpgraph/src/Examples/barscalecallbackex1.php @@ -16,6 +16,7 @@ function separator1000_usd($aVal) { // Create the graph and setup the basic parameters $graph = new Graph(500,300,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(80,30,30,40); $graph->SetScale('textint'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/bartutex1.php b/lib/jpgraph/src/Examples/bartutex1.php index 0c0f9c5..791a1c3 100755 --- a/lib/jpgraph/src/Examples/bartutex1.php +++ b/lib/jpgraph/src/Examples/bartutex1.php @@ -7,6 +7,7 @@ // New graph with a drop shadow $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -31,5 +32,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bartutex12.php b/lib/jpgraph/src/Examples/bartutex12.php index 6f97c5c..c8db0cf 100755 --- a/lib/jpgraph/src/Examples/bartutex12.php +++ b/lib/jpgraph/src/Examples/bartutex12.php @@ -11,7 +11,7 @@ $month=array( "Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"); -// Create some datapoints +// Create some datapoints $steps=100; for($i=0; $i<$steps; ++$i) { $databarx[]=sprintf("198%d %s",floor($i/12),$month[$i%12]); @@ -26,6 +26,7 @@ // New graph with a background image and drop shadow $graph = new Graph(450,300); +$graph->clearTheme(); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); $graph->SetShadow(); @@ -48,7 +49,7 @@ $graph->title->SetFont(FF_FONT1,FS_BOLD); // Make the margin around the plot a little bit bigger then default -$graph->img->SetMargin(40,140,40,80); +$graph->img->SetMargin(40,140,40,80); // Slightly adjust the legend from it's default position in the // top right corner to middle right side @@ -86,5 +87,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bartutex2.php b/lib/jpgraph/src/Examples/bartutex2.php index a911c33..28bae4c 100755 --- a/lib/jpgraph/src/Examples/bartutex2.php +++ b/lib/jpgraph/src/Examples/bartutex2.php @@ -8,6 +8,7 @@ // New graph with a drop shadow $graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -36,5 +37,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bartutex3.php b/lib/jpgraph/src/Examples/bartutex3.php index addb91c..ce0378d 100755 --- a/lib/jpgraph/src/Examples/bartutex3.php +++ b/lib/jpgraph/src/Examples/bartutex3.php @@ -10,9 +10,10 @@ $databary[]=rand(1,50); $databarx[]=$months[$i%12]; } - + // New graph with a drop shadow $graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -40,5 +41,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bartutex4.php b/lib/jpgraph/src/Examples/bartutex4.php index dffe16a..9a36b73 100755 --- a/lib/jpgraph/src/Examples/bartutex4.php +++ b/lib/jpgraph/src/Examples/bartutex4.php @@ -10,9 +10,10 @@ $databary[]=rand(1,50); $databarx[]=$months[$i%12]; } - + // New graph with a drop shadow $graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -43,5 +44,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bartutex5.php b/lib/jpgraph/src/Examples/bartutex5.php index e41a47b..75f3b6c 100755 --- a/lib/jpgraph/src/Examples/bartutex5.php +++ b/lib/jpgraph/src/Examples/bartutex5.php @@ -10,9 +10,10 @@ $databary[]=rand(1,50); $databarx[]=$months[$i%12]; } - + // New graph with a drop shadow $graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -41,5 +42,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bartutex6.php b/lib/jpgraph/src/Examples/bartutex6.php index 13b0557..ffad0a2 100755 --- a/lib/jpgraph/src/Examples/bartutex6.php +++ b/lib/jpgraph/src/Examples/bartutex6.php @@ -9,9 +9,10 @@ $databary[]=rand(1,50); $databarx[]=$months[$i%12]; } - + // New graph with a drop shadow $graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -43,5 +44,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/bezierex1.php b/lib/jpgraph/src/Examples/bezierex1.php index 50fad51..e7f1f5e 100755 --- a/lib/jpgraph/src/Examples/bezierex1.php +++ b/lib/jpgraph/src/Examples/bezierex1.php @@ -18,6 +18,7 @@ // Create the graph $g = new Graph(300,200); +$g->clearTheme(); $g->SetMargin(30,20,40,30); $g->title->Set("Bezier interpolation"); $g->title->SetFont(FF_ARIAL,FS_NORMAL,12); @@ -51,4 +52,3 @@ $g->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/bkgimgflagex1.php b/lib/jpgraph/src/Examples/bkgimgflagex1.php index 1e47938..ed2d8d8 100755 --- a/lib/jpgraph/src/Examples/bkgimgflagex1.php +++ b/lib/jpgraph/src/Examples/bkgimgflagex1.php @@ -10,7 +10,8 @@ $datay3=array(20,60,70); // Create the basic graph -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('textlin'); $graph->SetMargin(40,20,20,40); $graph->SetMarginColor('white:0.9'); @@ -76,4 +77,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/bkgimgflagex2.php b/lib/jpgraph/src/Examples/bkgimgflagex2.php index c6a27b3..91876fa 100755 --- a/lib/jpgraph/src/Examples/bkgimgflagex2.php +++ b/lib/jpgraph/src/Examples/bkgimgflagex2.php @@ -10,14 +10,15 @@ $datay3=array(20,60,70); // Create the basic graph -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,20,20,40); $graph->SetMarginColor('white:0.9'); $graph->SetColor('white'); $graph->SetShadow(); -// Apply a perspective transformation at the end +// Apply a perspective transformation at the end $graph->Set3DPerspective(SKEW3D_UP,100,180); // Adjust the position of the legend box @@ -80,4 +81,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/bkgimgflagex3.php b/lib/jpgraph/src/Examples/bkgimgflagex3.php index be9afb7..2f2c50c 100755 --- a/lib/jpgraph/src/Examples/bkgimgflagex3.php +++ b/lib/jpgraph/src/Examples/bkgimgflagex3.php @@ -10,14 +10,15 @@ $datay3=array(20,60,70); // Create the basic graph -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,20,20,40); $graph->SetMarginColor('white:0.9'); $graph->SetColor('white'); $graph->SetShadow(); -// Apply a perspective transformation at the end +// Apply a perspective transformation at the end $graph->Set3DPerspective(SKEW3D_DOWN,100,180); // Adjust the position of the legend box @@ -80,4 +81,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/bkgimgflagex4.php b/lib/jpgraph/src/Examples/bkgimgflagex4.php index d7db486..5930a7c 100755 --- a/lib/jpgraph/src/Examples/bkgimgflagex4.php +++ b/lib/jpgraph/src/Examples/bkgimgflagex4.php @@ -10,14 +10,15 @@ $datay3=array(20,60,70); // Create the basic graph -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,20,20,40); $graph->SetMarginColor('white:0.9'); $graph->SetColor('white'); $graph->SetShadow(); -// Apply a perspective transformation at the end +// Apply a perspective transformation at the end $graph->Set3DPerspective(SKEW3D_LEFT,350,320,true); // Adjust the position of the legend box @@ -80,4 +81,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/bkgimgflagex5.php b/lib/jpgraph/src/Examples/bkgimgflagex5.php index f45a85a..351ee96 100755 --- a/lib/jpgraph/src/Examples/bkgimgflagex5.php +++ b/lib/jpgraph/src/Examples/bkgimgflagex5.php @@ -10,14 +10,15 @@ $datay3=array(20,60,70); // Create the basic graph -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,20,20,40); $graph->SetMarginColor('white:0.9'); $graph->SetColor('white'); $graph->SetShadow(); -// Apply a perspective transformation at the end +// Apply a perspective transformation at the end $graph->Set3DPerspective(SKEW3D_RIGHT,350,320,true); // Adjust the position of the legend box @@ -80,4 +81,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/boxstockex1.php b/lib/jpgraph/src/Examples/boxstockex1.php index 4e09833..ff2a043 100755 --- a/lib/jpgraph/src/Examples/boxstockex1.php +++ b/lib/jpgraph/src/Examples/boxstockex1.php @@ -13,6 +13,7 @@ // Setup a simple graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('textlin'); $graph->SetMarginColor('lightblue'); $graph->title->Set('Box Stock chart example'); diff --git a/lib/jpgraph/src/Examples/boxstockex2.php b/lib/jpgraph/src/Examples/boxstockex2.php index d3531f4..2f7338a 100755 --- a/lib/jpgraph/src/Examples/boxstockex2.php +++ b/lib/jpgraph/src/Examples/boxstockex2.php @@ -13,6 +13,7 @@ // Setup a simple graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMarginColor('lightblue'); $graph->title->Set('Box Stock chart example'); diff --git a/lib/jpgraph/src/Examples/ccbpgraph.class.php b/lib/jpgraph/src/Examples/ccbpgraph.class.php index 91954e1..3afac9b 100755 --- a/lib/jpgraph/src/Examples/ccbpgraph.class.php +++ b/lib/jpgraph/src/Examples/ccbpgraph.class.php @@ -1,4 +1,4 @@ -iColorInd = $aSpec; + $this->iColorInd = $aSpec; if( $aColors !== null ) { if( is_array($aColors) && count($aColors) == 4 ) { $this->iColorSpec = $aColors; @@ -93,11 +93,11 @@ public function SetColorIndication(array $aSpec,array $aColors=null) { else { JpGraphError::Raise('Color specification for background indication must have four colors.'); } - } + } } /** * Construct the graph - * + * */ private function Init() { @@ -109,54 +109,55 @@ private function Init() { // Margins $lm=50; $rm=40; $tm=60; $bm=40; - + if( $width <= 300 || $height <= 250 ) { $labelsize = 8; $lm=25; $rm=25; $tm=45; $bm=25; - } + } elseif( $width <= 450 || $height <= 300 ) { $labelsize = 8; $lm=30; $rm=30; $tm=50; $bm=30; } elseif( $width <= 600 || $height <= 400 ) { - $labelsize = 9; + $labelsize = 9; } else { $labelsize = 11; - } - + } + if( $this->iSubTitle == '' ) { $tm -= $labelsize+4; - } + } $graph = new Graph($width,$height); + $graph->clearTheme(); $graph->SetScale('intint',$lowy,$highy,$lowx,$highx); $graph->SetMargin($lm,$rm,$tm,$bm); $graph->SetMarginColor($this->iMarginColor[$this->iColorMap]); $graph->SetClipping(); - + $graph->title->Set($this->iTitle); $graph->subtitle->Set($this->iSubTitle); - + $graph->title->SetFont(FF_ARIAL,FS_BOLD,$labelsize+4); $graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,$labelsize+1); - + $graph->SetBox(true,'black@0.3'); $graph->xaxis->SetFont(FF_ARIAL,FS_BOLD,$labelsize); $graph->yaxis->SetFont(FF_ARIAL,FS_BOLD,$labelsize); - + $graph->xaxis->scale->ticks->Set(CCBPGraph::TickStep,CCBPGraph::TickStep); $graph->yaxis->scale->ticks->Set(CCBPGraph::TickStep,CCBPGraph::TickStep); - + $graph->xaxis->HideZeroLabel(); $graph->yaxis->HideZeroLabel(); - + $graph->xaxis->SetLabelFormatString('%d%%'); $graph->yaxis->SetLabelFormatString('%d%%'); - + // For the x-axis we adjust the color so labels on the left of the Y-axis are in black $n1 = floor(abs($this->iXMin/25))+1; $n2 = floor($this->iXMax/25); @@ -173,33 +174,33 @@ private function Init() { } else { $graph->xaxis->SetColor('darkgray','darkgray:0.8'); - $graph->yaxis->SetColor('darkgray','darkgray:0.8'); + $graph->yaxis->SetColor('darkgray','darkgray:0.8'); } $graph->SetGridDepth(DEPTH_FRONT); $graph->ygrid->SetColor('gray@0.6'); $graph->ygrid->SetLineStyle('dotted'); - + $graph->ygrid->Show(); - + $graph->xaxis->SetWeight(1); $graph->yaxis->SetWeight(1); - + $ytitle = new Text(CCBPGraph::YTitle,floor($lm*.75),($height-$tm-$bm)/2+$tm); #$ytitle->SetFont(FF_VERA,FS_BOLD,$labelsize+1); $ytitle->SetAlign('right','center'); $ytitle->SetAngle(90); $graph->Add($ytitle); - + $xtitle = new Text(CCBPGraph::XTitle,($width-$lm-$rm)/2+$lm,$height - 10); #$xtitle->SetFont(FF_VERA,FS_BOLD,$labelsize); $xtitle->SetAlign('center','bottom'); $graph->Add($xtitle); - - $df = 'D j:S M, Y'; + + $df = 'D j:S M, Y'; if( $width < 400 ) { $df = 'D j:S M'; } - + $time = new Text(date($df),$width-10,$height-10); $time->SetAlign('right','bottom'); #$time->SetFont(FF_VERA,FS_NORMAL,$labelsize-1); @@ -207,7 +208,7 @@ private function Init() { $graph->Add($time); // Use an accumulated fille line graph to create the colored bands - + $n = 3; for( $i=0; $i < $n; ++$i ) { $b = $this->iColorInd[$i][0]; @@ -215,27 +216,27 @@ private function Init() { $colarea[$i] = array( array($lowx,$lowx*$k+$b), array($highx,$highx*$k+$b) ); } $colarea[3] = array( array($lowx,$highy), array($highx,$highy) ); - - + + $cb = array(); for( $i=0; $i < 4; ++$i ) { $cb[$i] = new LinePlot(array($colarea[$i][0][1],$colarea[$i][1][1]), array($colarea[$i][0][0],$colarea[$i][1][0])); $cb[$i]->SetFillColor($this->iColorSpec[$this->iColorMap][$i]); - $cb[$i]->SetFillFromYMin(); + $cb[$i]->SetFillFromYMin(); } - $graph->Add(array_slice(array_reverse($cb),0,4)); + $graph->Add(array_slice(array_reverse($cb),0,4)); $this->graph = $graph; } /** * Add a line or scatter plot to the graph - * + * * @param mixed $aPlots */ public function Add($aPlots) { if( is_array($aPlots) ) { - $this->iPlots = array_merge($this->iPlots,$aPlots); + $this->iPlots = array_merge($this->iPlots,$aPlots); } else { $this->iPlots[] = $aPlots; @@ -243,7 +244,7 @@ public function Add($aPlots) { } /** * Stroke the graph back to the client or to a file - * + * * @param mixed $aFile */ public function Stroke($aFile='') { diff --git a/lib/jpgraph/src/Examples/centerlinebarex1.php b/lib/jpgraph/src/Examples/centerlinebarex1.php index d686bc6..ccfba33 100755 --- a/lib/jpgraph/src/Examples/centerlinebarex1.php +++ b/lib/jpgraph/src/Examples/centerlinebarex1.php @@ -8,7 +8,8 @@ $ydata = array(12,15,22,19,5); $graph = new Graph(400,200); -$graph->img->SetMargin(40,80,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,80,40,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -31,5 +32,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/clipping_ex1.php b/lib/jpgraph/src/Examples/clipping_ex1.php index 8629fce..4033111 100755 --- a/lib/jpgraph/src/Examples/clipping_ex1.php +++ b/lib/jpgraph/src/Examples/clipping_ex1.php @@ -5,7 +5,8 @@ $ydata = array(11,3,8,12,5,1,9,13,5,7); // Create the graph. These two calls are always required -$graph = new Graph(300,250); +$graph = new Graph(300,250); +$graph->clearTheme(); $graph->SetScale('intlin',0,10); $graph->SetMargin(30,20,70,40); $graph->SetMarginColor(array(177,191,174)); diff --git a/lib/jpgraph/src/Examples/clipping_ex2.php b/lib/jpgraph/src/Examples/clipping_ex2.php index aba939f..168a863 100755 --- a/lib/jpgraph/src/Examples/clipping_ex2.php +++ b/lib/jpgraph/src/Examples/clipping_ex2.php @@ -5,7 +5,8 @@ $ydata = array(11,3,8,12,5,1,9,13,5,7); // Create the graph. These two calls are always required -$graph = new Graph(300,250); +$graph = new Graph(300,250); +$graph->clearTheme(); $graph->SetScale('intlin',0,10); $graph->SetMargin(30,20,70,40); $graph->SetMarginColor(array(177,191,174)); diff --git a/lib/jpgraph/src/Examples/comb90dategraphex01.php b/lib/jpgraph/src/Examples/comb90dategraphex01.php index 3294822..3c9ed85 100755 --- a/lib/jpgraph/src/Examples/comb90dategraphex01.php +++ b/lib/jpgraph/src/Examples/comb90dategraphex01.php @@ -30,6 +30,7 @@ // Setup the Wind direction graph $graph = new Graph(300,800); +$graph->clearTheme(); $graph->SetMarginColor('lightgray:1.7'); $graph->SetScale('datlin',0,360); $graph->Set90AndMargin(50,30,60,30); @@ -57,6 +58,7 @@ // Setup the wind speed graph $graph2 = new Graph(300,800); +$graph2->clearTheme(); $graph2->SetScale('datlin'); $graph2->Set90AndMargin(50,30,60,30); $graph2->SetMarginColor('lightgray:1.7'); diff --git a/lib/jpgraph/src/Examples/comb90dategraphex02.php b/lib/jpgraph/src/Examples/comb90dategraphex02.php index b667181..fa9ca71 100755 --- a/lib/jpgraph/src/Examples/comb90dategraphex02.php +++ b/lib/jpgraph/src/Examples/comb90dategraphex02.php @@ -34,6 +34,7 @@ // Setup the Wind direction graph $graph = new Graph(WIND_WIDTH,WIND_HEIGHT); +$graph->clearTheme(); $graph->SetMarginColor(BKG_COLOR); $graph->SetScale('datlin',0,360); $graph->Set90AndMargin(50,10,60,30); @@ -63,6 +64,7 @@ // Setup the wind speed graph $graph2 = new Graph(WIND_WIDTH-30,WIND_HEIGHT); +$graph2->clearTheme(); $graph2->SetScale('datlin'); $graph2->Set90AndMargin(5,20,60,30); $graph2->SetMarginColor(BKG_COLOR); diff --git a/lib/jpgraph/src/Examples/comb90dategraphex03.php b/lib/jpgraph/src/Examples/comb90dategraphex03.php index 2911f8b..eda202c 100755 --- a/lib/jpgraph/src/Examples/comb90dategraphex03.php +++ b/lib/jpgraph/src/Examples/comb90dategraphex03.php @@ -42,6 +42,7 @@ // Setup the Wind direction graph //------------------------------------------------------------------ $graph = new Graph(WIND_WIDTH,WIND_HEIGHT); +$graph->clearTheme(); $graph->SetMarginColor(BKG_COLOR); $graph->SetScale('datlin',0,360); $graph->Set90AndMargin(50,10,70,30); @@ -73,6 +74,7 @@ // Setup the wind speed graph //------------------------------------------------------------------ $graph2 = new Graph(WIND_WIDTH-30,WIND_HEIGHT); +$graph2->clearTheme(); $graph2->SetScale('datlin'); $graph2->Set90AndMargin(5,20,70,30); $graph2->SetMarginColor(BKG_COLOR); @@ -103,6 +105,7 @@ // Setup the wind temp graph //------------------------------------------------------------------ $graph3 = new Graph(WIND_WIDTH-30,WIND_HEIGHT); +$graph3->clearTheme(); $graph3->SetScale('datlin'); $graph3->Set90AndMargin(5,20,70,30); $graph3->SetMarginColor(BKG_COLOR); diff --git a/lib/jpgraph/src/Examples/dateutilex01.php b/lib/jpgraph/src/Examples/dateutilex01.php index 75f0d33..a534d7a 100755 --- a/lib/jpgraph/src/Examples/dateutilex01.php +++ b/lib/jpgraph/src/Examples/dateutilex01.php @@ -11,6 +11,7 @@ // Setup a basic graph $width=500; $height=300; $graph = new Graph($width, $height); +$graph->clearTheme(); // We set the x-scale min/max values to avoid empty space // on the side of the plot diff --git a/lib/jpgraph/src/Examples/dateutilex02.php b/lib/jpgraph/src/Examples/dateutilex02.php index f95db47..8d37b7a 100755 --- a/lib/jpgraph/src/Examples/dateutilex02.php +++ b/lib/jpgraph/src/Examples/dateutilex02.php @@ -12,6 +12,7 @@ // Setup a basic graph $width=500; $height=300; $graph = new Graph($width, $height); +$graph->clearTheme(); $graph->SetScale('datlin'); $graph->SetMargin(60,20,40,60); diff --git a/lib/jpgraph/src/Examples/dupyaxisex1.php b/lib/jpgraph/src/Examples/dupyaxisex1.php index b4b63fe..3293db1 100755 --- a/lib/jpgraph/src/Examples/dupyaxisex1.php +++ b/lib/jpgraph/src/Examples/dupyaxisex1.php @@ -7,10 +7,11 @@ list($xdata,$ydata) = $f->E(-M_PI,M_PI,25); $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->SetMargin(50,50,20,30); +$graph->SetMargin(50,50,20,30); $graph->SetFrame(false); -$graph->SetBox(true,'black',2); +$graph->SetBox(true,'black',2); $graph->SetMarginColor('white'); $graph->SetColor('lightyellow'); @@ -27,5 +28,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example1.1.php b/lib/jpgraph/src/Examples/example1.1.php index e171e3b..f3a1f43 100755 --- a/lib/jpgraph/src/Examples/example1.1.php +++ b/lib/jpgraph/src/Examples/example1.1.php @@ -1,11 +1,12 @@ clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(30,90,40,50); $graph->xaxis->SetFont(FF_FONT1,FS_BOLD); diff --git a/lib/jpgraph/src/Examples/example13.php b/lib/jpgraph/src/Examples/example13.php index ae0eb95..c4a1155 100755 --- a/lib/jpgraph/src/Examples/example13.php +++ b/lib/jpgraph/src/Examples/example13.php @@ -6,7 +6,8 @@ // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(40,30,20,40); diff --git a/lib/jpgraph/src/Examples/example14.php b/lib/jpgraph/src/Examples/example14.php index cc591cb..5cde1f0 100755 --- a/lib/jpgraph/src/Examples/example14.php +++ b/lib/jpgraph/src/Examples/example14.php @@ -6,7 +6,8 @@ // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(40,30,20,40); diff --git a/lib/jpgraph/src/Examples/example15.php b/lib/jpgraph/src/Examples/example15.php index 79ebb9e..0e6f291 100755 --- a/lib/jpgraph/src/Examples/example15.php +++ b/lib/jpgraph/src/Examples/example15.php @@ -6,7 +6,8 @@ $errdatay = array(11,9,2,4,19,26,13,19,7,12); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(40,30,20,40); diff --git a/lib/jpgraph/src/Examples/example16.1.php b/lib/jpgraph/src/Examples/example16.1.php index edbb010..f9a6b38 100755 --- a/lib/jpgraph/src/Examples/example16.1.php +++ b/lib/jpgraph/src/Examples/example16.1.php @@ -6,8 +6,9 @@ $l2datay = array(23,12,5,19,17,10,15); $datax=array('Jan','Feb','Mar','Apr','May'); -// Create the graph. -$graph = new Graph(400,200); +// Create the graph. +$graph = new Graph(400,200); +$graph->clearTheme(); $graph->SetScale('textlin'); $graph->img->SetMargin(40,130,20,40); diff --git a/lib/jpgraph/src/Examples/example16.2.php b/lib/jpgraph/src/Examples/example16.2.php index 649a7a9..13af2ea 100755 --- a/lib/jpgraph/src/Examples/example16.2.php +++ b/lib/jpgraph/src/Examples/example16.2.php @@ -7,8 +7,9 @@ $l2datay = array(23,12,5,19,17,10,15); $datax=array("Jan","Feb","Mar","Apr","May"); -// Create the graph. -$graph = new Graph(400,200); +// Create the graph. +$graph = new Graph(400,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(40,130,20,40); diff --git a/lib/jpgraph/src/Examples/example16.3.php b/lib/jpgraph/src/Examples/example16.3.php index f184fa2..98df199 100755 --- a/lib/jpgraph/src/Examples/example16.3.php +++ b/lib/jpgraph/src/Examples/example16.3.php @@ -7,8 +7,9 @@ $l2datay = array(23,12,5,19,17,10,15); $datax=array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug'); -// Create the graph. -$graph = new Graph(400,200); +// Create the graph. +$graph = new Graph(400,200); +$graph->clearTheme(); $graph->SetScale('textlin'); $graph->img->SetMargin(40,130,20,40); diff --git a/lib/jpgraph/src/Examples/example16.4.php b/lib/jpgraph/src/Examples/example16.4.php index a23c2a5..cfe1caf 100755 --- a/lib/jpgraph/src/Examples/example16.4.php +++ b/lib/jpgraph/src/Examples/example16.4.php @@ -8,8 +8,9 @@ JpgraphError::SetImageFlag(false); JpGraphError::SetLogFile('syslog'); -// Create the graph. -$graph = new Graph(400,200); +// Create the graph. +$graph = new Graph(400,200); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->img->SetMargin(40,130,20,40); diff --git a/lib/jpgraph/src/Examples/example16.5.php b/lib/jpgraph/src/Examples/example16.5.php index bfad3ce..ba8248d 100755 --- a/lib/jpgraph/src/Examples/example16.5.php +++ b/lib/jpgraph/src/Examples/example16.5.php @@ -8,8 +8,9 @@ $l2datay = array(23,12,5,19,17,10,15); $datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul"); -// Create the graph. -$graph = new Graph(350,200); +// Create the graph. +$graph = new Graph(350,200); +$graph->clearTheme(); $graph->img->SetMargin(40,70,20,40); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example16.6.php b/lib/jpgraph/src/Examples/example16.6.php index 8dac312..3590348 100755 --- a/lib/jpgraph/src/Examples/example16.6.php +++ b/lib/jpgraph/src/Examples/example16.6.php @@ -20,6 +20,7 @@ // Create the graph $graph = new Graph(300,250); +$graph->clearTheme(); $graph->SetScale('linlin'); // Setup title @@ -55,5 +56,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example16.php b/lib/jpgraph/src/Examples/example16.php index 04c2427..d7b98e0 100755 --- a/lib/jpgraph/src/Examples/example16.php +++ b/lib/jpgraph/src/Examples/example16.php @@ -6,7 +6,8 @@ $errdatay = array(11,9,2,4,19,26,13,19,7,12); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->img->SetMargin(40,30,20,40); diff --git a/lib/jpgraph/src/Examples/example17.php b/lib/jpgraph/src/Examples/example17.php index a394ddf..29fb3ee 100755 --- a/lib/jpgraph/src/Examples/example17.php +++ b/lib/jpgraph/src/Examples/example17.php @@ -8,6 +8,7 @@ // Create the graph. These two calls are always required $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); $graph->img->SetMargin(40,30,20,40); diff --git a/lib/jpgraph/src/Examples/example18.php b/lib/jpgraph/src/Examples/example18.php index 458219c..def62f1 100755 --- a/lib/jpgraph/src/Examples/example18.php +++ b/lib/jpgraph/src/Examples/example18.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example19.1.php b/lib/jpgraph/src/Examples/example19.1.php index feddf70..d5146cf 100755 --- a/lib/jpgraph/src/Examples/example19.1.php +++ b/lib/jpgraph/src/Examples/example19.1.php @@ -6,6 +6,7 @@ // Create the graph. These two calls are always required $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('intlin'); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example19.php b/lib/jpgraph/src/Examples/example19.php index 13af5c0..2d898ce 100755 --- a/lib/jpgraph/src/Examples/example19.php +++ b/lib/jpgraph/src/Examples/example19.php @@ -6,6 +6,7 @@ // Create the graph. These two calls are always required $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('textlin'); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example20.1.php b/lib/jpgraph/src/Examples/example20.1.php index 0b25144..8dbab86 100755 --- a/lib/jpgraph/src/Examples/example20.1.php +++ b/lib/jpgraph/src/Examples/example20.1.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example20.2.php b/lib/jpgraph/src/Examples/example20.2.php index b623219..337677d 100755 --- a/lib/jpgraph/src/Examples/example20.2.php +++ b/lib/jpgraph/src/Examples/example20.2.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->yaxis->scale->SetGrace(20); diff --git a/lib/jpgraph/src/Examples/example20.3.php b/lib/jpgraph/src/Examples/example20.3.php index ac2df48..33ef60c 100755 --- a/lib/jpgraph/src/Examples/example20.3.php +++ b/lib/jpgraph/src/Examples/example20.3.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->yaxis->scale->SetGrace(20); diff --git a/lib/jpgraph/src/Examples/example20.4.php b/lib/jpgraph/src/Examples/example20.4.php index 6786efb..a53b5b5 100755 --- a/lib/jpgraph/src/Examples/example20.4.php +++ b/lib/jpgraph/src/Examples/example20.4.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->yaxis->scale->SetGrace(20); diff --git a/lib/jpgraph/src/Examples/example20.5.php b/lib/jpgraph/src/Examples/example20.5.php index a191e5a..adb7f40 100755 --- a/lib/jpgraph/src/Examples/example20.5.php +++ b/lib/jpgraph/src/Examples/example20.5.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example20.php b/lib/jpgraph/src/Examples/example20.php index 434860f..35f3d83 100755 --- a/lib/jpgraph/src/Examples/example20.php +++ b/lib/jpgraph/src/Examples/example20.php @@ -5,7 +5,8 @@ $datay=array(12,8,19,3,10,5); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example21.php b/lib/jpgraph/src/Examples/example21.php index 81debb2..6856b2c 100755 --- a/lib/jpgraph/src/Examples/example21.php +++ b/lib/jpgraph/src/Examples/example21.php @@ -6,7 +6,8 @@ $data2y=array(8,2,11,7,14,4); // Create the graph. These two calls are always required -$graph = new Graph(310,200); +$graph = new Graph(310,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example22.php b/lib/jpgraph/src/Examples/example22.php index f5223d0..c461673 100755 --- a/lib/jpgraph/src/Examples/example22.php +++ b/lib/jpgraph/src/Examples/example22.php @@ -6,7 +6,8 @@ $data2y=array(8,2,11,7,14,4); // Create the graph. These two calls are always required -$graph = new Graph(310,200); +$graph = new Graph(310,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example23.php b/lib/jpgraph/src/Examples/example23.php index fcec9de..dca054f 100755 --- a/lib/jpgraph/src/Examples/example23.php +++ b/lib/jpgraph/src/Examples/example23.php @@ -8,7 +8,8 @@ $data2y=array(8,2,11,7,14,4); // Create the graph. These two calls are always required -$graph = new Graph(310,200); +$graph = new Graph(310,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example24.php b/lib/jpgraph/src/Examples/example24.php index 48d48da..ecd5c51 100755 --- a/lib/jpgraph/src/Examples/example24.php +++ b/lib/jpgraph/src/Examples/example24.php @@ -8,7 +8,8 @@ $data4y=array(1,5,11,2,14,4); // Create the graph. These two calls are always required -$graph = new Graph(310,200); +$graph = new Graph(310,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example25.1.php b/lib/jpgraph/src/Examples/example25.1.php index a3afb03..3c5ea59 100755 --- a/lib/jpgraph/src/Examples/example25.1.php +++ b/lib/jpgraph/src/Examples/example25.1.php @@ -6,6 +6,7 @@ // Create the graph. These two calls are always required $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('textlin'); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example25.2.php b/lib/jpgraph/src/Examples/example25.2.php index 53f8479..fbe6806 100755 --- a/lib/jpgraph/src/Examples/example25.2.php +++ b/lib/jpgraph/src/Examples/example25.2.php @@ -6,6 +6,7 @@ // Create the graph. These two calls are always required $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('textlin'); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example25.php b/lib/jpgraph/src/Examples/example25.php index 35802ae..a326c18 100755 --- a/lib/jpgraph/src/Examples/example25.php +++ b/lib/jpgraph/src/Examples/example25.php @@ -6,6 +6,7 @@ // Create the graph. These two calls are always required $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale('textlin'); // Add a drop shadow diff --git a/lib/jpgraph/src/Examples/example26.1.php b/lib/jpgraph/src/Examples/example26.1.php index 63a9d26..e224a98 100755 --- a/lib/jpgraph/src/Examples/example26.1.php +++ b/lib/jpgraph/src/Examples/example26.1.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("A simple Pie plot"); @@ -18,5 +19,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example26.php b/lib/jpgraph/src/Examples/example26.php index 9cb57eb..071f432 100755 --- a/lib/jpgraph/src/Examples/example26.php +++ b/lib/jpgraph/src/Examples/example26.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("A simple Pie plot"); @@ -14,5 +15,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example27.1.php b/lib/jpgraph/src/Examples/example27.1.php index 51d52e3..a5efd1c 100755 --- a/lib/jpgraph/src/Examples/example27.1.php +++ b/lib/jpgraph/src/Examples/example27.1.php @@ -6,6 +6,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("A simple Pie plot"); @@ -21,5 +22,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example27.2.php b/lib/jpgraph/src/Examples/example27.2.php index aad23a3..0fb9b54 100755 --- a/lib/jpgraph/src/Examples/example27.2.php +++ b/lib/jpgraph/src/Examples/example27.2.php @@ -6,6 +6,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("A simple Pie plot"); @@ -20,5 +21,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example27.3.php b/lib/jpgraph/src/Examples/example27.3.php index fb2a56e..2f8815a 100755 --- a/lib/jpgraph/src/Examples/example27.3.php +++ b/lib/jpgraph/src/Examples/example27.3.php @@ -6,6 +6,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(330,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("A simple 3D Pie plot"); @@ -20,5 +21,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example27.php b/lib/jpgraph/src/Examples/example27.php index 3feee43..b89447b 100755 --- a/lib/jpgraph/src/Examples/example27.php +++ b/lib/jpgraph/src/Examples/example27.php @@ -6,6 +6,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("A simple Pie plot"); @@ -20,5 +21,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example28.1.php b/lib/jpgraph/src/Examples/example28.1.php index 7dce5d8..f518de0 100755 --- a/lib/jpgraph/src/Examples/example28.1.php +++ b/lib/jpgraph/src/Examples/example28.1.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33,12,33); $graph = new PieGraph(150,150); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("'earth' Theme"); @@ -18,5 +19,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example28.2.php b/lib/jpgraph/src/Examples/example28.2.php index 905be8d..b2f5e7e 100755 --- a/lib/jpgraph/src/Examples/example28.2.php +++ b/lib/jpgraph/src/Examples/example28.2.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33,12,33); $graph = new PieGraph(150,150); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("'pastel' Theme"); @@ -18,5 +19,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example28.3.php b/lib/jpgraph/src/Examples/example28.3.php index bc4fdbd..0a3ca35 100755 --- a/lib/jpgraph/src/Examples/example28.3.php +++ b/lib/jpgraph/src/Examples/example28.3.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33,12,33); $graph = new PieGraph(150,150); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("'water' Theme"); @@ -18,5 +19,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example28.php b/lib/jpgraph/src/Examples/example28.php index 08d28bd..15fa682 100755 --- a/lib/jpgraph/src/Examples/example28.php +++ b/lib/jpgraph/src/Examples/example28.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33,12,33); $graph = new PieGraph(150,150); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("'sand' Theme"); @@ -18,5 +19,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/example3.0.1.php b/lib/jpgraph/src/Examples/example3.0.1.php index dd10c9e..681fd05 100755 --- a/lib/jpgraph/src/Examples/example3.0.1.php +++ b/lib/jpgraph/src/Examples/example3.0.1.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.0.2.php b/lib/jpgraph/src/Examples/example3.0.2.php index 3c8b1e6..6b63b42 100755 --- a/lib/jpgraph/src/Examples/example3.0.2.php +++ b/lib/jpgraph/src/Examples/example3.0.2.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.0.3.php b/lib/jpgraph/src/Examples/example3.0.3.php index cc39f63..05806f0 100755 --- a/lib/jpgraph/src/Examples/example3.0.3.php +++ b/lib/jpgraph/src/Examples/example3.0.3.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.1.1.php b/lib/jpgraph/src/Examples/example3.1.1.php index 32e2cef..846488f 100755 --- a/lib/jpgraph/src/Examples/example3.1.1.php +++ b/lib/jpgraph/src/Examples/example3.1.1.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.1.php b/lib/jpgraph/src/Examples/example3.1.php index 1c4e0ad..f768dc5 100755 --- a/lib/jpgraph/src/Examples/example3.1.php +++ b/lib/jpgraph/src/Examples/example3.1.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.2.1.php b/lib/jpgraph/src/Examples/example3.2.1.php index c739ce8..8180e29 100755 --- a/lib/jpgraph/src/Examples/example3.2.1.php +++ b/lib/jpgraph/src/Examples/example3.2.1.php @@ -5,7 +5,8 @@ $ydata = array(11,3,8,12,5,1,9,15,5,7); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->yaxis->scale->SetGrace(10,10); diff --git a/lib/jpgraph/src/Examples/example3.2.2.php b/lib/jpgraph/src/Examples/example3.2.2.php index 03d22c8..57d5c29 100755 --- a/lib/jpgraph/src/Examples/example3.2.2.php +++ b/lib/jpgraph/src/Examples/example3.2.2.php @@ -5,7 +5,8 @@ $ydata = array(11,3,8,12,5,1,9,15,5,7); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->yaxis->scale->SetGrace(10,10); diff --git a/lib/jpgraph/src/Examples/example3.2.php b/lib/jpgraph/src/Examples/example3.2.php index f7c05c5..b7a9b4f 100755 --- a/lib/jpgraph/src/Examples/example3.2.php +++ b/lib/jpgraph/src/Examples/example3.2.php @@ -5,7 +5,8 @@ $ydata = array(11,3,8,12,5,1,9,15,5,7); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); // Create the linear plot diff --git a/lib/jpgraph/src/Examples/example3.3.php b/lib/jpgraph/src/Examples/example3.3.php index c20cd98..86462f8 100755 --- a/lib/jpgraph/src/Examples/example3.3.php +++ b/lib/jpgraph/src/Examples/example3.3.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.4.1.php b/lib/jpgraph/src/Examples/example3.4.1.php index 77c0b24..ecab862 100755 --- a/lib/jpgraph/src/Examples/example3.4.1.php +++ b/lib/jpgraph/src/Examples/example3.4.1.php @@ -45,6 +45,7 @@ function formatCallback($aVal) { // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.4.php b/lib/jpgraph/src/Examples/example3.4.php index 0d223c1..826593c 100755 --- a/lib/jpgraph/src/Examples/example3.4.php +++ b/lib/jpgraph/src/Examples/example3.4.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example3.php b/lib/jpgraph/src/Examples/example3.php index 4c79c1d..b43eddb 100755 --- a/lib/jpgraph/src/Examples/example3.php +++ b/lib/jpgraph/src/Examples/example3.php @@ -12,6 +12,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); // Setup margin and titles diff --git a/lib/jpgraph/src/Examples/example4.php b/lib/jpgraph/src/Examples/example4.php index 42549d8..b347dd3 100755 --- a/lib/jpgraph/src/Examples/example4.php +++ b/lib/jpgraph/src/Examples/example4.php @@ -13,6 +13,7 @@ // Create the graph and set a scale. // These two calls are always required $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('intlin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example5.1.php b/lib/jpgraph/src/Examples/example5.1.php index 3834558..543d383 100755 --- a/lib/jpgraph/src/Examples/example5.1.php +++ b/lib/jpgraph/src/Examples/example5.1.php @@ -6,7 +6,8 @@ $y2data = array(354,200,265,99,111,91,198,225,293,251); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->img->SetMargin(40,40,20,40); $graph->SetScale("textlin"); $graph->SetY2Scale("lin"); diff --git a/lib/jpgraph/src/Examples/example5.php b/lib/jpgraph/src/Examples/example5.php index d4b6838..5d1142c 100755 --- a/lib/jpgraph/src/Examples/example5.php +++ b/lib/jpgraph/src/Examples/example5.php @@ -6,7 +6,8 @@ $y2data = array(354,200,265,99,111,91,198,225,293,251); // Create the graph. These two calls are always required -$graph = new Graph(300,200); +$graph = new Graph(300,200); +$graph->clearTheme(); $graph->img->SetMargin(40,40,20,40); $graph->SetScale("textlin"); $graph->SetY2Scale("lin"); diff --git a/lib/jpgraph/src/Examples/example6.1.php b/lib/jpgraph/src/Examples/example6.1.php index 5000759..8263b91 100755 --- a/lib/jpgraph/src/Examples/example6.1.php +++ b/lib/jpgraph/src/Examples/example6.1.php @@ -6,7 +6,8 @@ $y2data = array(354,200,265,99,111,91,198,225,293,251); // Create the graph and specify the scale for both Y-axis -$graph = new Graph(300,240); +$graph = new Graph(300,240); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetY2Scale("lin"); $graph->SetShadow(); @@ -36,7 +37,7 @@ $graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); $graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); -// Set the colors for the plots +// Set the colors for the plots $lineplot->SetColor("blue"); $lineplot->SetWeight(2); $lineplot2->SetColor("orange"); diff --git a/lib/jpgraph/src/Examples/example6.2.php b/lib/jpgraph/src/Examples/example6.2.php index 7d0a755..a2e0b4f 100755 --- a/lib/jpgraph/src/Examples/example6.2.php +++ b/lib/jpgraph/src/Examples/example6.2.php @@ -6,7 +6,8 @@ $y2data = array(354,200,265,99,111,91,198,225,293,251); // Create the graph and specify the scale for both Y-axis -$graph = new Graph(300,240); +$graph = new Graph(300,240); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -28,7 +29,7 @@ $graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); $graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); -// Set the colors for the plots +// Set the colors for the plots $lineplot->SetColor("blue"); $lineplot->SetWeight(2); diff --git a/lib/jpgraph/src/Examples/example6.php b/lib/jpgraph/src/Examples/example6.php index 6cdc630..9288692 100755 --- a/lib/jpgraph/src/Examples/example6.php +++ b/lib/jpgraph/src/Examples/example6.php @@ -7,6 +7,7 @@ // Create the graph and specify the scale for both Y-axis $graph = new Graph(400,200); +$graph->clearTheme(); $graph->SetScale('textlin'); $graph->SetY2Scale('lin'); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example7.php b/lib/jpgraph/src/Examples/example7.php index e8f75c4..e7558f1 100755 --- a/lib/jpgraph/src/Examples/example7.php +++ b/lib/jpgraph/src/Examples/example7.php @@ -7,7 +7,8 @@ $y2data = array(354,70,265,29,111,91,198,225,593,251); // Create the graph. -$graph = new Graph(350,200); +$graph = new Graph(350,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetY2Scale("log"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/example8.1.php b/lib/jpgraph/src/Examples/example8.1.php index 8cab7e4..cc5ce53 100755 --- a/lib/jpgraph/src/Examples/example8.1.php +++ b/lib/jpgraph/src/Examples/example8.1.php @@ -7,7 +7,8 @@ $y2data = array(354,200,265,99,111,91,198,225,293,251); // Create the graph. These two calls are always required -$graph = new Graph(350,200); +$graph = new Graph(350,200); +$graph->clearTheme(); $graph->SetScale("textlog"); $graph->SetY2Scale("log"); diff --git a/lib/jpgraph/src/Examples/example8.php b/lib/jpgraph/src/Examples/example8.php index 773265b..9cf0fda 100755 --- a/lib/jpgraph/src/Examples/example8.php +++ b/lib/jpgraph/src/Examples/example8.php @@ -7,7 +7,8 @@ $y2data = array(354,200,265,99,111,91,198,225,293,251); // Create the graph. These two calls are always required -$graph = new Graph(350,200); +$graph = new Graph(350,200); +$graph->clearTheme(); $graph->SetScale("textlog"); $graph->SetShadow(); $graph->img->SetMargin(40,110,20,40); diff --git a/lib/jpgraph/src/Examples/example9.1.php b/lib/jpgraph/src/Examples/example9.1.php index addcb5f..75e7188 100755 --- a/lib/jpgraph/src/Examples/example9.1.php +++ b/lib/jpgraph/src/Examples/example9.1.php @@ -9,6 +9,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,200); +$graph->clearTheme(); $graph->SetScale("textlog"); $graph->img->SetMargin(40,110,20,40); diff --git a/lib/jpgraph/src/Examples/example9.2.php b/lib/jpgraph/src/Examples/example9.2.php index c765981..a3513fd 100755 --- a/lib/jpgraph/src/Examples/example9.2.php +++ b/lib/jpgraph/src/Examples/example9.2.php @@ -9,6 +9,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,200); +$graph->clearTheme(); $graph->SetScale("textlog"); $graph->img->SetMargin(40,110,20,50); diff --git a/lib/jpgraph/src/Examples/example9.php b/lib/jpgraph/src/Examples/example9.php index 03c5479..869ad34 100755 --- a/lib/jpgraph/src/Examples/example9.php +++ b/lib/jpgraph/src/Examples/example9.php @@ -9,6 +9,7 @@ // Create the graph. These two calls are always required $graph = new Graph(350,200); +$graph->clearTheme(); $graph->SetScale("textlog"); $graph->img->SetMargin(40,110,20,40); diff --git a/lib/jpgraph/src/Examples/fieldscatterex1.php b/lib/jpgraph/src/Examples/fieldscatterex1.php index 94b47fb..3a9d58e 100755 --- a/lib/jpgraph/src/Examples/fieldscatterex1.php +++ b/lib/jpgraph/src/Examples/fieldscatterex1.php @@ -16,7 +16,7 @@ function FldCallback($x,$y,$a) { // Since we have different scales we need the data points // to be of the same magnitude to give it a distance // interpretation. - $x *= 10; + $x *= 10; // Colors gets colder the further out we go from the center $r = ($x-$polex*10)*($x-$polex*10)+($y-$poley)*($y-$poley); @@ -43,7 +43,7 @@ function FldCallback($x,$y,$a) { } if( $y==$poley ) { if( $x > $polex ) $a=0; - else $a=180; + else $a=180; } if( $a == -1 ) { $d1 = $y-$poley; @@ -63,6 +63,7 @@ function FldCallback($x,$y,$a) { // Setup the graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("intlin",0,100,0,10); $graph->SetMarginColor('lightblue'); @@ -76,7 +77,7 @@ function FldCallback($x,$y,$a) { // Setup formatting callback $fp->SetCallback('FldCallback'); -// First size argument is length (in pixels of arrow) +// First size argument is length (in pixels of arrow) // Second size argument is roughly size of arrow. Arrow size is specified as // an integer in the range [0,9] $fp->arrow->SetSize(20,2); @@ -88,5 +89,3 @@ function FldCallback($x,$y,$a) { $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/filledgridex1.php b/lib/jpgraph/src/Examples/filledgridex1.php index 8e86379..c38d8aa 100755 --- a/lib/jpgraph/src/Examples/filledgridex1.php +++ b/lib/jpgraph/src/Examples/filledgridex1.php @@ -8,6 +8,7 @@ // Setup the graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); $graph->SetFrame(false); @@ -46,5 +47,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/filledlineex01.1.php b/lib/jpgraph/src/Examples/filledlineex01.1.php index 547d207..7d0cfc4 100755 --- a/lib/jpgraph/src/Examples/filledlineex01.1.php +++ b/lib/jpgraph/src/Examples/filledlineex01.1.php @@ -4,9 +4,10 @@ $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9); $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); -$graph->img->SetMargin(40,40,40,40); +$graph->img->SetMargin(40,40,40,40); $graph->SetShadow(); $graph->SetGridDepth(DEPTH_FRONT); diff --git a/lib/jpgraph/src/Examples/filledstepstyleex1.php b/lib/jpgraph/src/Examples/filledstepstyleex1.php index 75688b5..cdba4fe 100755 --- a/lib/jpgraph/src/Examples/filledstepstyleex1.php +++ b/lib/jpgraph/src/Examples/filledstepstyleex1.php @@ -5,6 +5,7 @@ // create the graph $graph= new Graph(400,250); +$graph->clearTheme(); $ydata = array(5,10,15,20,15,10); diff --git a/lib/jpgraph/src/Examples/footerex1.php b/lib/jpgraph/src/Examples/footerex1.php index a3d113d..5da1fcf 100755 --- a/lib/jpgraph/src/Examples/footerex1.php +++ b/lib/jpgraph/src/Examples/footerex1.php @@ -7,6 +7,7 @@ // Setup the graph $graph = new Graph(300,250); +$graph->clearTheme(); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); $graph->SetFrame(false); @@ -24,13 +25,13 @@ $graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); $graph->footer->left->Set('L. footer'); -$graph->footer->left->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->footer->left->SetFont(FF_ARIAL,FS_NORMAL,12); $graph->footer->left->SetColor('darkred'); $graph->footer->center->Set('C. footer'); $graph->footer->center->SetFont(FF_ARIAL,FS_BOLD,12); $graph->footer->center->SetColor('darkred'); $graph->footer->right->Set('R. footer'); -$graph->footer->right->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->footer->right->SetFont(FF_ARIAL,FS_NORMAL,12); $graph->footer->right->SetColor('darkred'); // Create the plot @@ -58,5 +59,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/funcex1.php b/lib/jpgraph/src/Examples/funcex1.php index de12e61..6f43103 100755 --- a/lib/jpgraph/src/Examples/funcex1.php +++ b/lib/jpgraph/src/Examples/funcex1.php @@ -11,10 +11,11 @@ // Setup the basic graph $graph = new Graph(450,350); +$graph->clearTheme(); $graph->SetScale("linlin"); $graph->SetShadow(); -$graph->img->SetMargin(50,50,60,40); -$graph->SetBox(true,'black',2); +$graph->img->SetMargin(50,50,60,40); +$graph->SetBox(true,'black',2); $graph->SetMarginColor('white'); $graph->SetColor('lightyellow'); @@ -54,5 +55,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/funcex2.php b/lib/jpgraph/src/Examples/funcex2.php index 5715f36..3e72bda 100755 --- a/lib/jpgraph/src/Examples/funcex2.php +++ b/lib/jpgraph/src/Examples/funcex2.php @@ -7,10 +7,11 @@ list($xdata,$ydata) = $f->E(-M_PI,M_PI,25); $graph = new Graph(380,450); +$graph->clearTheme(); $graph->SetScale("linlin"); $graph->SetShadow(); -$graph->img->SetMargin(50,50,60,40); -$graph->SetBox(true,'black',2); +$graph->img->SetMargin(50,50,60,40); +$graph->SetBox(true,'black',2); $graph->SetMarginColor('white'); $graph->SetColor('lightyellow'); $graph->SetAxisStyle(AXSTYLE_SIMPLE); @@ -30,5 +31,3 @@ $graph->Add($lp1); $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/funcex3.php b/lib/jpgraph/src/Examples/funcex3.php index a63456e..832c69f 100755 --- a/lib/jpgraph/src/Examples/funcex3.php +++ b/lib/jpgraph/src/Examples/funcex3.php @@ -7,10 +7,11 @@ list($xdata,$ydata) = $f->E(-M_PI,M_PI,25); $graph = new Graph(350,430); +$graph->clearTheme(); $graph->SetScale("linlin"); $graph->SetShadow(); -$graph->img->SetMargin(50,50,60,40); -$graph->SetBox(true,'black',2); +$graph->img->SetMargin(50,50,60,40); +$graph->SetBox(true,'black',2); $graph->SetMarginColor('white'); $graph->SetColor('lightyellow'); $graph->SetAxisStyle(AXSTYLE_BOXIN); @@ -19,7 +20,7 @@ //$graph->xaxis->SetLabelFormat('%.0f'); -$graph->img->SetMargin(50,50,60,40); +$graph->img->SetMargin(50,50,60,40); $graph->title->Set("Function plot"); $graph->title->SetFont(FF_FONT1,FS_BOLD); @@ -33,5 +34,3 @@ $graph->Add($lp1); $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/funcex4.php b/lib/jpgraph/src/Examples/funcex4.php index bcd8b4d..926574b 100755 --- a/lib/jpgraph/src/Examples/funcex4.php +++ b/lib/jpgraph/src/Examples/funcex4.php @@ -11,10 +11,11 @@ // Setup the basic graph $graph = new Graph(450,350); +$graph->clearTheme(); $graph->SetScale("linlin"); //$graph->SetShadow(); -$graph->img->SetMargin(5,10,60,9); -$graph->SetBox(true,'green',2); +$graph->img->SetMargin(5,10,60,9); +$graph->SetBox(true,'green',2); $graph->SetMarginColor('black'); $graph->SetColor('black'); @@ -59,5 +60,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/fusion_example.php b/lib/jpgraph/src/Examples/fusion_example.php deleted file mode 100755 index 4e4ae00..0000000 --- a/lib/jpgraph/src/Examples/fusion_example.php +++ /dev/null @@ -1,57 +0,0 @@ - array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), - 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), - 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), - 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), - 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), - 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), - 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), - 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), - 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), -); - - -// Create the graph. These two calls are always required -$graph = new Graph(400,300); - -$graph->SetScale("textlin"); -if ($theme) { - $graph->SetTheme(new $theme()); -} -$theme_class = new FusionTheme; -$graph->SetTheme($theme_class); - -$plot = array(); -// Create the bar plots -for ($i = 0; $i < 4; $i++) { - $plot[$i] = new BarPlot($data[$i]); - $plot[$i]->SetLegend('plot'.($i+1)); -} -//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); -//$acc1->value->Show(); -$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); - -for ($i = 4; $i < 8; $i++) { - $plot[$i] = new LinePlot($data[$i]); - $plot[$i]->SetLegend('plot'.$i); - $plot[$i]->value->Show(); -} - -$graph->Add($gbplot); -$graph->Add($plot[4]); - -$title = "FusionTheme Example"; -$title = mb_convert_encoding($title,'UTF-8'); -$graph->title->Set($title); -$graph->xaxis->title->Set("X-title"); -$graph->yaxis->title->Set("Y-title"); - -// Display the graph -$graph->Stroke(); -?> diff --git a/lib/jpgraph/src/Examples/ganttex19.php b/lib/jpgraph/src/Examples/ganttex19.php index 7528412..7bb77be 100755 --- a/lib/jpgraph/src/Examples/ganttex19.php +++ b/lib/jpgraph/src/Examples/ganttex19.php @@ -7,7 +7,7 @@ $graph->SetShadow(); // Use default locale -$graph->scale->SetDateLocale('sv_SE'); +$graph->scale->SetDateLocale(''); // Add title and subtitle $graph->title->Set('Example of captions'); diff --git a/lib/jpgraph/src/Examples/grace_ex0.php b/lib/jpgraph/src/Examples/grace_ex0.php index 5358ae5..cd10df9 100755 --- a/lib/jpgraph/src/Examples/grace_ex0.php +++ b/lib/jpgraph/src/Examples/grace_ex0.php @@ -5,11 +5,12 @@ // Some data $datay=array(7,19,11,4,20); -// Create the graph and setup the basic parameters -$graph = new Graph(300,200,'auto'); +// Create the graph and setup the basic parameters +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,30,40,50); $graph->SetScale("textint"); -$graph->SetFrame(true,'blue',1); +$graph->SetFrame(true,'blue',1); $graph->SetColor('lightblue'); $graph->SetMarginColor('lightblue'); @@ -33,10 +34,10 @@ $graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); // Add some grace to the top so that the scale doesn't -// end exactly at the max value. +// end exactly at the max value. $graph->yaxis->scale->SetGrace(0); - + // Create a bar pot $bplot = new BarPlot($datay); $bplot->SetFillColor('darkblue'); diff --git a/lib/jpgraph/src/Examples/grace_ex1.php b/lib/jpgraph/src/Examples/grace_ex1.php index 7544b44..26c4659 100755 --- a/lib/jpgraph/src/Examples/grace_ex1.php +++ b/lib/jpgraph/src/Examples/grace_ex1.php @@ -5,11 +5,12 @@ // Some data $datay=array(7,19,11,4,20); -// Create the graph and setup the basic parameters -$graph = new Graph(300,200,'auto'); +// Create the graph and setup the basic parameters +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,30,40,50); $graph->SetScale("textint"); -$graph->SetFrame(true,'blue',1); +$graph->SetFrame(true,'blue',1); $graph->SetColor('lightblue'); $graph->SetMarginColor('lightblue'); @@ -33,10 +34,10 @@ $graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); // Add some grace to the top so that the scale doesn't -// end exactly at the max value. +// end exactly at the max value. $graph->yaxis->scale->SetGrace(10); - + // Create a bar pot $bplot = new BarPlot($datay); $bplot->SetFillColor('darkblue'); diff --git a/lib/jpgraph/src/Examples/grace_ex2.php b/lib/jpgraph/src/Examples/grace_ex2.php index eff8b8d..a4e8460 100755 --- a/lib/jpgraph/src/Examples/grace_ex2.php +++ b/lib/jpgraph/src/Examples/grace_ex2.php @@ -5,11 +5,12 @@ // Some data $datay=array(7,19,11,4,20); -// Create the graph and setup the basic parameters -$graph = new Graph(300,200,'auto'); +// Create the graph and setup the basic parameters +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,30,40,50); $graph->SetScale("textint"); -$graph->SetFrame(true,'blue',1); +$graph->SetFrame(true,'blue',1); $graph->SetColor('lightblue'); $graph->SetMarginColor('lightblue'); @@ -33,10 +34,10 @@ $graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); // Add some grace to the top so that the scale doesn't -// end exactly at the max value. +// end exactly at the max value. $graph->yaxis->scale->SetGrace(50); - + // Create a bar pot $bplot = new BarPlot($datay); $bplot->SetFillColor('darkblue'); diff --git a/lib/jpgraph/src/Examples/grace_ex3.php b/lib/jpgraph/src/Examples/grace_ex3.php index 40f7daf..0d318c7 100755 --- a/lib/jpgraph/src/Examples/grace_ex3.php +++ b/lib/jpgraph/src/Examples/grace_ex3.php @@ -5,11 +5,12 @@ // Some data $datay=array(7,19,11,4,20); -// Create the graph and setup the basic parameters -$graph = new Graph(300,200,'auto'); +// Create the graph and setup the basic parameters +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,30,40,50); $graph->SetScale("textint"); -$graph->SetFrame(true,'blue',1); +$graph->SetFrame(true,'blue',1); $graph->SetColor('lightblue'); $graph->SetMarginColor('lightblue'); @@ -33,10 +34,10 @@ $graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); // Add some grace to the top so that the scale doesn't -// end exactly at the max value. +// end exactly at the max value. $graph->yaxis->scale->SetGrace(100); - + // Create a bar pot $bplot = new BarPlot($datay); $bplot->SetFillColor('darkblue'); diff --git a/lib/jpgraph/src/Examples/gradbkgex1.php b/lib/jpgraph/src/Examples/gradbkgex1.php index 0509e41..cfbaa1f 100755 --- a/lib/jpgraph/src/Examples/gradbkgex1.php +++ b/lib/jpgraph/src/Examples/gradbkgex1.php @@ -7,6 +7,7 @@ // Setup the graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetMarginColor('white'); $graph->SetScale("textlin",0,50); $graph->SetMargin(30,50,30,30); @@ -62,5 +63,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/gradlinefillex1.php b/lib/jpgraph/src/Examples/gradlinefillex1.php index 06520e2..8741eda 100755 --- a/lib/jpgraph/src/Examples/gradlinefillex1.php +++ b/lib/jpgraph/src/Examples/gradlinefillex1.php @@ -6,7 +6,8 @@ // Setup the graph $graph = new Graph(400,200); -$graph->SetMargin(40,40,20,30); +$graph->clearTheme(); +$graph->SetMargin(40,40,20,30); $graph->SetScale("intlin"); $graph->SetMarginColor('darkgreen@0.8'); @@ -25,5 +26,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/gradlinefillex2.php b/lib/jpgraph/src/Examples/gradlinefillex2.php index 9788744..b6f4080 100755 --- a/lib/jpgraph/src/Examples/gradlinefillex2.php +++ b/lib/jpgraph/src/Examples/gradlinefillex2.php @@ -6,7 +6,8 @@ // Setup the graph $graph = new Graph(400,200); -$graph->SetMargin(40,40,20,30); +$graph->clearTheme(); +$graph->SetMargin(40,40,20,30); $graph->SetScale("intlin"); $graph->SetBox(); $graph->SetMarginColor('darkgreen@0.8'); @@ -26,5 +27,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/gradlinefillex3.php b/lib/jpgraph/src/Examples/gradlinefillex3.php index 17b6e51..bfc09ba 100755 --- a/lib/jpgraph/src/Examples/gradlinefillex3.php +++ b/lib/jpgraph/src/Examples/gradlinefillex3.php @@ -6,7 +6,8 @@ // Setup the graph $graph = new Graph(400,200); -$graph->SetMargin(40,40,20,30); +$graph->clearTheme(); +$graph->SetMargin(40,40,20,30); $graph->SetScale("intlin"); $graph->SetBox(); $graph->SetMarginColor('darkgreen@0.8'); @@ -26,5 +27,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/gradlinefillex4.php b/lib/jpgraph/src/Examples/gradlinefillex4.php index f921560..7707beb 100755 --- a/lib/jpgraph/src/Examples/gradlinefillex4.php +++ b/lib/jpgraph/src/Examples/gradlinefillex4.php @@ -6,7 +6,8 @@ // Setup the graph $graph = new Graph(400,200); -$graph->SetMargin(40,40,20,30); +$graph->clearTheme(); +$graph->SetMargin(40,40,20,30); $graph->SetScale("intlin"); $graph->SetBox(); $graph->SetMarginColor('darkgreen@0.8'); @@ -27,5 +28,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/groupbarex1.php b/lib/jpgraph/src/Examples/groupbarex1.php index 40f28ee..0c4810e 100755 --- a/lib/jpgraph/src/Examples/groupbarex1.php +++ b/lib/jpgraph/src/Examples/groupbarex1.php @@ -7,7 +7,8 @@ $datay2=array(35,190,190,190,190,190); $datay3=array(20,70,70,140,230,260); -$graph = new Graph(450,200,'auto'); +$graph = new Graph(450,200,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); $graph->img->SetMargin(40,30,40,40); @@ -41,4 +42,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/horizbarex1.php b/lib/jpgraph/src/Examples/horizbarex1.php index bc5055f..586eb75 100755 --- a/lib/jpgraph/src/Examples/horizbarex1.php +++ b/lib/jpgraph/src/Examples/horizbarex1.php @@ -11,6 +11,7 @@ // Set the basic parameters of the graph $graph = new Graph($width,$height,'auto'); +$graph->clearTheme(); $graph->SetScale('textlin'); // Rotate graph 90 degrees and set margin diff --git a/lib/jpgraph/src/Examples/horizbarex2.php b/lib/jpgraph/src/Examples/horizbarex2.php index d50bb7d..fb992e9 100755 --- a/lib/jpgraph/src/Examples/horizbarex2.php +++ b/lib/jpgraph/src/Examples/horizbarex2.php @@ -5,11 +5,12 @@ $datay=array(2,3,5,8,12,6,3); $datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul"); -$width=400; +$width=400; $height=500; -// Set the basic parameters of the graph +// Set the basic parameters of the graph $graph = new Graph($width,$height,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); $top = 80; diff --git a/lib/jpgraph/src/Examples/horizbarex3.php b/lib/jpgraph/src/Examples/horizbarex3.php index c0d5a49..01156c4 100755 --- a/lib/jpgraph/src/Examples/horizbarex3.php +++ b/lib/jpgraph/src/Examples/horizbarex3.php @@ -6,11 +6,12 @@ $datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul"); // Size of graph -$width=400; +$width=400; $height=500; -// Set the basic parameters of the graph +// Set the basic parameters of the graph $graph = new Graph($width,$height,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); $top = 50; @@ -43,7 +44,7 @@ // all the way to the end of the plot area $graph->yaxis->scale->SetGrace(20); -// Setup the Y-axis to be displayed in the bottom of the +// Setup the Y-axis to be displayed in the bottom of the // graph. We also finetune the exact layout of the title, // ticks and labels to make them look nice. $graph->yaxis->SetPos('max'); diff --git a/lib/jpgraph/src/Examples/horizbarex4.php b/lib/jpgraph/src/Examples/horizbarex4.php index 5f51be4..729c67b 100755 --- a/lib/jpgraph/src/Examples/horizbarex4.php +++ b/lib/jpgraph/src/Examples/horizbarex4.php @@ -11,6 +11,7 @@ // Set the basic parameters of the graph $graph = new Graph($width,$height); +$graph->clearTheme(); $graph->SetScale('textlin'); $top = 60; diff --git a/lib/jpgraph/src/Examples/horizbarex6.php b/lib/jpgraph/src/Examples/horizbarex6.php index 8ab4cbc..344d837 100755 --- a/lib/jpgraph/src/Examples/horizbarex6.php +++ b/lib/jpgraph/src/Examples/horizbarex6.php @@ -7,11 +7,12 @@ "1600x1200(32)"); // Size of graph -$width=300; +$width=300; $height=400; -// Set the basic parameters of the graph +// Set the basic parameters of the graph $graph = new Graph($width,$height,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); // No frame around the image diff --git a/lib/jpgraph/src/Examples/imgmarkerex1.php b/lib/jpgraph/src/Examples/imgmarkerex1.php index 9f5e8ce..c8b88b6 100755 --- a/lib/jpgraph/src/Examples/imgmarkerex1.php +++ b/lib/jpgraph/src/Examples/imgmarkerex1.php @@ -7,6 +7,7 @@ // Setup the graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); $graph->SetFrame(false); @@ -48,5 +49,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/impulsex2.php b/lib/jpgraph/src/Examples/impulsex2.php index 8ea4597..550ea51 100755 --- a/lib/jpgraph/src/Examples/impulsex2.php +++ b/lib/jpgraph/src/Examples/impulsex2.php @@ -5,10 +5,11 @@ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43); $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(); -$graph->img->SetMargin(40,40,40,40); +$graph->img->SetMargin(40,40,40,40); $graph->title->Set("Impuls plot, variant 2"); $graph->title->SetFont(FF_FONT1,FS_BOLD); diff --git a/lib/jpgraph/src/Examples/impulsex4.php b/lib/jpgraph/src/Examples/impulsex4.php index ac497ad..e3c708e 100755 --- a/lib/jpgraph/src/Examples/impulsex4.php +++ b/lib/jpgraph/src/Examples/impulsex4.php @@ -22,6 +22,7 @@ // Setup the basic parameters for the graph $graph = new Graph(500,250); +$graph->clearTheme(); $graph->SetScale("intlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/inyaxisex1.php b/lib/jpgraph/src/Examples/inyaxisex1.php index d6e3d41..cf96cb2 100755 --- a/lib/jpgraph/src/Examples/inyaxisex1.php +++ b/lib/jpgraph/src/Examples/inyaxisex1.php @@ -18,8 +18,9 @@ function _cb_negate($aVal) { // Basic graph setup $graph = new Graph(400,300); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->img->SetMargin(50,50,60,40); +$graph->img->SetMargin(50,50,60,40); $graph->SetMarginColor('darkblue'); $graph->SetColor('darkblue'); $graph->SetAxisStyle(AXSTYLE_BOXOUT); @@ -47,5 +48,3 @@ function _cb_negate($aVal) { $graph->Add($lp1); $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/inyaxisex2.php b/lib/jpgraph/src/Examples/inyaxisex2.php index 5e19d4a..12daeaf 100755 --- a/lib/jpgraph/src/Examples/inyaxisex2.php +++ b/lib/jpgraph/src/Examples/inyaxisex2.php @@ -18,8 +18,9 @@ function _cb_negate($aVal) { // Basic graph setup $graph = new Graph(400,300); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->img->SetMargin(50,50,60,40); +$graph->img->SetMargin(50,50,60,40); $graph->SetMarginColor('darkblue'); $graph->SetColor('darkblue'); $graph->SetAxisStyle(AXSTYLE_BOXOUT); @@ -49,5 +50,3 @@ function _cb_negate($aVal) { $graph->Add($lp1); $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/inyaxisex3.php b/lib/jpgraph/src/Examples/inyaxisex3.php index e09567e..1678aee 100755 --- a/lib/jpgraph/src/Examples/inyaxisex3.php +++ b/lib/jpgraph/src/Examples/inyaxisex3.php @@ -25,9 +25,10 @@ function _cb_negate($aVal) { // Basic graph setup $graph = new Graph(400,300); +$graph->clearTheme(); $graph->SetScale("linlin"); $graph->SetY2Scale("lin"); -$graph->SetMargin(50,50,60,40); +$graph->SetMargin(50,50,60,40); $graph->SetMarginColor('darkblue'); $graph->SetColor('darkblue'); @@ -65,5 +66,3 @@ function _cb_negate($aVal) { $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/linebarcentex1.php b/lib/jpgraph/src/Examples/linebarcentex1.php index 1b5e188..0ccb096 100755 --- a/lib/jpgraph/src/Examples/linebarcentex1.php +++ b/lib/jpgraph/src/Examples/linebarcentex1.php @@ -8,8 +8,9 @@ $datax=$gDateLocale->GetShortMonth(); -// Create the graph. -$graph = new Graph(400,200); +// Create the graph. +$graph = new Graph(400,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,130,20,40); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/linebarex1.php b/lib/jpgraph/src/Examples/linebarex1.php index 2f4414d..f970a2a 100755 --- a/lib/jpgraph/src/Examples/linebarex1.php +++ b/lib/jpgraph/src/Examples/linebarex1.php @@ -11,7 +11,7 @@ for($i=0; $i<$steps; ++$i) { $datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35; $databarx[]=sprintf("198%d %s",floor($i/12),$month[$i%12]); - + // Simulate an accumulated value for every 5:th data point if( $i % 6 == 0 ) { $databary[]=abs(25*sin($i)+5); @@ -19,12 +19,13 @@ else { $databary[]=0; } - + } // New graph with a background image and drop shadow $graph = new Graph(450,300); +$graph->clearTheme(); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); $graph->SetShadow(); @@ -40,7 +41,7 @@ // Make the margin around the plot a little bit bigger // then default -$graph->img->SetMargin(40,140,40,80); +$graph->img->SetMargin(40,140,40,80); // Slightly adjust the legend from it's default position in the // top right corner to middle right side @@ -71,5 +72,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/linebarex2.php b/lib/jpgraph/src/Examples/linebarex2.php index efae8e2..4d58884 100755 --- a/lib/jpgraph/src/Examples/linebarex2.php +++ b/lib/jpgraph/src/Examples/linebarex2.php @@ -17,6 +17,7 @@ // New graph with a background image and drop shadow $graph = new Graph(450,300); +$graph->clearTheme(); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); $graph->SetShadow(); @@ -32,7 +33,7 @@ // Make the margin around the plot a little bit bigger // then default -$graph->img->SetMargin(40,120,40,40); +$graph->img->SetMargin(40,120,40,40); // Slightly adjust the legend from it's default position in the // top right corner to middle right side @@ -55,5 +56,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/linebarex3.php b/lib/jpgraph/src/Examples/linebarex3.php index faff220..15101e3 100755 --- a/lib/jpgraph/src/Examples/linebarex3.php +++ b/lib/jpgraph/src/Examples/linebarex3.php @@ -6,18 +6,19 @@ // Some data -$steps=100;for($i=0; $i<$steps; ++$i) { - $datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35; - $datax[]=$i; - if( $i % 10 == 0 ) { - $databarx[]=$i; - $databary[]=$datay[$i]/2; +$steps=100;for($i=0; $i<$steps; ++$i) { + $datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35; + $datax[]=$i; + if( $i % 10 == 0 ) { + $databarx[]=$i; + $databary[]=$datay[$i]/2; } } // New graph with a background image and drop shadow $graph = new Graph(450,300); -$graph->img->SetMargin(40,180,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,180,40,40); $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); //$graph->img->SetAntiAliasing(); @@ -31,7 +32,7 @@ $graph->title->SetFont(FF_FONT1,FS_BOLD); // Slightly adjust the legend from it's default position in the -// top right corner. +// top right corner. $graph->legend->Pos(0.05,0.5,"right","center"); // Create the first line diff --git a/lib/jpgraph/src/Examples/linegraceex.php b/lib/jpgraph/src/Examples/linegraceex.php index e64cdc4..f4bbf65 100755 --- a/lib/jpgraph/src/Examples/linegraceex.php +++ b/lib/jpgraph/src/Examples/linegraceex.php @@ -5,7 +5,8 @@ $datay = array(0.2980,0.3039,0.3020,0.3027,0.3015); $graph = new Graph(300,200); -$graph->img->SetMargin(40,40,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,40,40,40); $graph->img->SetAntiAliasing(); $graph->SetScale("textlin"); @@ -27,5 +28,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/lineiconex1.php b/lib/jpgraph/src/Examples/lineiconex1.php index 53f2b00..21843b6 100755 --- a/lib/jpgraph/src/Examples/lineiconex1.php +++ b/lib/jpgraph/src/Examples/lineiconex1.php @@ -11,7 +11,8 @@ // Setup the graph $graph = new Graph(400,250); -$graph->SetMargin(40,40,20,30); +$graph->clearTheme(); +$graph->SetMargin(40,40,20,30); $graph->SetScale("textlin"); $graph->title->Set('Adding an icon ("tux") in the background'); @@ -45,5 +46,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/lineiconex2.php b/lib/jpgraph/src/Examples/lineiconex2.php index d16ab8b..14b4cbf 100755 --- a/lib/jpgraph/src/Examples/lineiconex2.php +++ b/lib/jpgraph/src/Examples/lineiconex2.php @@ -8,7 +8,8 @@ // Setup the graph $graph = new Graph(400,250); -$graph->SetMargin(40,40,20,30); +$graph->clearTheme(); +$graph->SetMargin(40,40,20,30); $graph->SetScale("textlin"); $graph->title->Set('Adding a country flag as a an icon'); @@ -28,5 +29,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/logbarex1.php b/lib/jpgraph/src/Examples/logbarex1.php index a3a8a90..dcaffd8 100755 --- a/lib/jpgraph/src/Examples/logbarex1.php +++ b/lib/jpgraph/src/Examples/logbarex1.php @@ -7,8 +7,9 @@ $datay=array(4,13,30,28,12,45,30,12,55,3,0.5); $datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov"); -// Create the graph. -$graph = new Graph(400,220,'auto'); +// Create the graph. +$graph = new Graph(400,220,'auto'); +$graph->clearTheme(); //$graph->img->SetMargin(50,30,50,50); $graph->SetScale("textlog"); //$graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/manual_textscale_ex1.php b/lib/jpgraph/src/Examples/manual_textscale_ex1.php index a911c33..28bae4c 100755 --- a/lib/jpgraph/src/Examples/manual_textscale_ex1.php +++ b/lib/jpgraph/src/Examples/manual_textscale_ex1.php @@ -8,6 +8,7 @@ // New graph with a drop shadow $graph = new Graph(300,200,'auto'); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -36,5 +37,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manual_textscale_ex2.php b/lib/jpgraph/src/Examples/manual_textscale_ex2.php index 968d9dd..fa76b24 100755 --- a/lib/jpgraph/src/Examples/manual_textscale_ex2.php +++ b/lib/jpgraph/src/Examples/manual_textscale_ex2.php @@ -10,6 +10,7 @@ // New graph with a drop shadow $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -36,5 +37,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manual_textscale_ex3.php b/lib/jpgraph/src/Examples/manual_textscale_ex3.php index 18d718c..c96cbf5 100755 --- a/lib/jpgraph/src/Examples/manual_textscale_ex3.php +++ b/lib/jpgraph/src/Examples/manual_textscale_ex3.php @@ -10,6 +10,7 @@ // New graph with a drop shadow $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetShadow(); // Use a "text" X-scale @@ -36,5 +37,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manualtickex1.php b/lib/jpgraph/src/Examples/manualtickex1.php index 47d0b8d..6bc3f10 100755 --- a/lib/jpgraph/src/Examples/manualtickex1.php +++ b/lib/jpgraph/src/Examples/manualtickex1.php @@ -7,7 +7,7 @@ require_once ('jpgraph/jpgraph_line.php'); require_once ('jpgraph/jpgraph_utils.inc.php'); -// +// // Create some random data for the plot. We use the current time for the // first X-position // @@ -16,7 +16,7 @@ $ts = time(); $n=15; // Number of data points for($i=0; $i < $n; ++$i ) { - $datax[$i] = $ts+$i*700000; + $datax[$i] = $ts+$i*700000; $datay[$i] = rand(5,60); } @@ -34,6 +34,7 @@ // The code to setup a very basic graph // $graph = new Graph(400,200); +$graph->clearTheme(); // // We use an integer scale on the X-axis since the positions on the X axis @@ -69,5 +70,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manualtickex1a.php b/lib/jpgraph/src/Examples/manualtickex1a.php index 47d0b8d..6bc3f10 100755 --- a/lib/jpgraph/src/Examples/manualtickex1a.php +++ b/lib/jpgraph/src/Examples/manualtickex1a.php @@ -7,7 +7,7 @@ require_once ('jpgraph/jpgraph_line.php'); require_once ('jpgraph/jpgraph_utils.inc.php'); -// +// // Create some random data for the plot. We use the current time for the // first X-position // @@ -16,7 +16,7 @@ $ts = time(); $n=15; // Number of data points for($i=0; $i < $n; ++$i ) { - $datax[$i] = $ts+$i*700000; + $datax[$i] = $ts+$i*700000; $datay[$i] = rand(5,60); } @@ -34,6 +34,7 @@ // The code to setup a very basic graph // $graph = new Graph(400,200); +$graph->clearTheme(); // // We use an integer scale on the X-axis since the positions on the X axis @@ -69,5 +70,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manualtickex2.php b/lib/jpgraph/src/Examples/manualtickex2.php index abd7e10..2b21dc8 100755 --- a/lib/jpgraph/src/Examples/manualtickex2.php +++ b/lib/jpgraph/src/Examples/manualtickex2.php @@ -7,7 +7,7 @@ require_once ('jpgraph/jpgraph_line.php'); require_once ('jpgraph/jpgraph_utils.inc.php'); -// +// // Create some random data for the plot. We use the current time for the // first X-position // @@ -35,6 +35,7 @@ // The code to setup a very basic graph // $graph = new Graph(400,200); +$graph->clearTheme(); // // We use an integer scale on the X-axis since the positions on the X axis @@ -68,5 +69,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manualtickex3.php b/lib/jpgraph/src/Examples/manualtickex3.php index 0bd03ce..ff25013 100755 --- a/lib/jpgraph/src/Examples/manualtickex3.php +++ b/lib/jpgraph/src/Examples/manualtickex3.php @@ -7,7 +7,7 @@ require_once ('jpgraph/jpgraph_line.php'); require_once ('jpgraph/jpgraph_utils.inc.php'); -// +// // Create some random data for the plot. We use the current time for the // first X-position // @@ -35,6 +35,7 @@ // The code to setup a very basic graph // $graph = new Graph(400,200); +$graph->clearTheme(); // We use an integer scale on the X-axis since the positions on the X axis // are assumed to be UNI timestamps @@ -87,5 +88,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/manualtickex4.php b/lib/jpgraph/src/Examples/manualtickex4.php index f4a80e6..39f8d11 100755 --- a/lib/jpgraph/src/Examples/manualtickex4.php +++ b/lib/jpgraph/src/Examples/manualtickex4.php @@ -7,7 +7,7 @@ require_once ('jpgraph/jpgraph_line.php'); require_once ('jpgraph/jpgraph_utils.inc.php'); -// +// // Create some random data for the plot. We use the current time for the // first X-position // @@ -35,6 +35,7 @@ // The code to setup a very basic graph // $graph = new Graph(400,200); +$graph->clearTheme(); // We use an integer scale on the X-axis since the positions on the X axis // are assumed to be UNI timestamps @@ -88,5 +89,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/markflagex1.php b/lib/jpgraph/src/Examples/markflagex1.php index 576134e..138a018 100755 --- a/lib/jpgraph/src/Examples/markflagex1.php +++ b/lib/jpgraph/src/Examples/markflagex1.php @@ -9,6 +9,7 @@ // Setup the graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); $graph->SetFrame(false); @@ -70,5 +71,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/mulyaxisex1.php b/lib/jpgraph/src/Examples/mulyaxisex1.php index 57304eb..d2d812b 100755 --- a/lib/jpgraph/src/Examples/mulyaxisex1.php +++ b/lib/jpgraph/src/Examples/mulyaxisex1.php @@ -12,6 +12,7 @@ // Setup the graph $graph = new Graph(450,250); +$graph->clearTheme(); $graph->SetMargin(40,150,40,30); $graph->SetMarginColor('white'); @@ -44,5 +45,3 @@ // Output line $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/negbarvalueex01.php b/lib/jpgraph/src/Examples/negbarvalueex01.php index f825a59..e134123 100755 --- a/lib/jpgraph/src/Examples/negbarvalueex01.php +++ b/lib/jpgraph/src/Examples/negbarvalueex01.php @@ -4,8 +4,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,40,40); $graph->SetScale("textlin"); $graph->SetShadow(); diff --git a/lib/jpgraph/src/Examples/nullvalueex01.php b/lib/jpgraph/src/Examples/nullvalueex01.php index 3308811..df54e73 100755 --- a/lib/jpgraph/src/Examples/nullvalueex01.php +++ b/lib/jpgraph/src/Examples/nullvalueex01.php @@ -9,7 +9,8 @@ // Setup graph $graph = new Graph(400,250); -$graph->img->SetMargin(40,150,40,80); +$graph->clearTheme(); +$graph->img->SetMargin(40,150,40,80); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -52,5 +53,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/partiallyfilledlineex1.php b/lib/jpgraph/src/Examples/partiallyfilledlineex1.php index 7ad37ec..1e1cec1 100755 --- a/lib/jpgraph/src/Examples/partiallyfilledlineex1.php +++ b/lib/jpgraph/src/Examples/partiallyfilledlineex1.php @@ -8,6 +8,7 @@ // Create the graph $graph= new Graph(400,300); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetShadow(true); $graph->SetMarginColor("lightblue"); diff --git a/lib/jpgraph/src/Examples/pieex1.php b/lib/jpgraph/src/Examples/pieex1.php index 156d6e2..2e22160 100755 --- a/lib/jpgraph/src/Examples/pieex1.php +++ b/lib/jpgraph/src/Examples/pieex1.php @@ -7,11 +7,12 @@ // Create the Pie Graph. $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); // Set A title for the plot $graph->title->Set("Example 1 Pie plot"); -$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); $graph->title->SetColor("brown"); // Create pie plot @@ -28,5 +29,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/pieex2.php b/lib/jpgraph/src/Examples/pieex2.php index 195d975..e13df39 100755 --- a/lib/jpgraph/src/Examples/pieex2.php +++ b/lib/jpgraph/src/Examples/pieex2.php @@ -5,8 +5,9 @@ // Some data $data = array(40,21,17,14,23); -// Create the Pie Graph. +// Create the Pie Graph. $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); // Set A title for the plot @@ -20,5 +21,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/pieex3.php b/lib/jpgraph/src/Examples/pieex3.php index a7795c3..e9f1c77 100755 --- a/lib/jpgraph/src/Examples/pieex3.php +++ b/lib/jpgraph/src/Examples/pieex3.php @@ -7,6 +7,7 @@ // Create the Pie Graph. $graph = new PieGraph(350,300); +$graph->clearTheme(); $graph->SetShadow(); // Set A title for the plot @@ -48,6 +49,3 @@ $graph->Stroke(); ?> - - - diff --git a/lib/jpgraph/src/Examples/pieex4.php b/lib/jpgraph/src/Examples/pieex4.php index 5854426..5e3ac61 100755 --- a/lib/jpgraph/src/Examples/pieex4.php +++ b/lib/jpgraph/src/Examples/pieex4.php @@ -5,6 +5,7 @@ $data = array(40,60,21,33); $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); $graph->title->Set("Example 4 of pie plot"); @@ -21,5 +22,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/pieex5.php b/lib/jpgraph/src/Examples/pieex5.php index 808ab3e..7552c23 100755 --- a/lib/jpgraph/src/Examples/pieex5.php +++ b/lib/jpgraph/src/Examples/pieex5.php @@ -6,6 +6,7 @@ // Setup graph $graph = new PieGraph(300,200); +$graph->clearTheme(); $graph->SetShadow(); // Setup graph title @@ -27,5 +28,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/pieex6.php b/lib/jpgraph/src/Examples/pieex6.php index 46621e7..fba3458 100755 --- a/lib/jpgraph/src/Examples/pieex6.php +++ b/lib/jpgraph/src/Examples/pieex6.php @@ -7,6 +7,7 @@ // A new graph $graph = new PieGraph(350,200); +$graph->clearTheme(); $graph->SetShadow(); // Setup title @@ -44,5 +45,3 @@ $graph->Add($p1); $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/pieex7.php b/lib/jpgraph/src/Examples/pieex7.php index 77f4610..ce0c514 100755 --- a/lib/jpgraph/src/Examples/pieex7.php +++ b/lib/jpgraph/src/Examples/pieex7.php @@ -8,6 +8,7 @@ // A new graph $graph = new PieGraph(350,200); +$graph->clearTheme(); $graph->SetShadow(); // Setup title @@ -48,5 +49,3 @@ $graph->Add($p1); $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/pieex8.php b/lib/jpgraph/src/Examples/pieex8.php index 0ca1785..728004d 100755 --- a/lib/jpgraph/src/Examples/pieex8.php +++ b/lib/jpgraph/src/Examples/pieex8.php @@ -6,6 +6,7 @@ // A new pie graph $graph = new PieGraph(250,200); +$graph->clearTheme(); $graph->SetShadow(); // Title setup diff --git a/lib/jpgraph/src/Examples/pieex9.php b/lib/jpgraph/src/Examples/pieex9.php index 2354d06..9d16044 100755 --- a/lib/jpgraph/src/Examples/pieex9.php +++ b/lib/jpgraph/src/Examples/pieex9.php @@ -6,6 +6,7 @@ // A new pie graph $graph = new PieGraph(250,200); +$graph->clearTheme(); $graph->SetShadow(); // Title setup diff --git a/lib/jpgraph/src/Examples/plotlineex1.php b/lib/jpgraph/src/Examples/plotlineex1.php index 43a8016..0eb2fb8 100755 --- a/lib/jpgraph/src/Examples/plotlineex1.php +++ b/lib/jpgraph/src/Examples/plotlineex1.php @@ -8,6 +8,7 @@ // Create the graph. $graph = new Graph(460,400,'auto'); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMargin(40,20,50,70); diff --git a/lib/jpgraph/src/Examples/rotateex1.php b/lib/jpgraph/src/Examples/rotateex1.php index a90a600..ead398d 100755 --- a/lib/jpgraph/src/Examples/rotateex1.php +++ b/lib/jpgraph/src/Examples/rotateex1.php @@ -5,7 +5,8 @@ $ydata = array(11,3,8,12,5,1,9,13,5,7); $y2data = array(354,200,265,99,111,91,198,225,293,251); -$graph = new Graph(350,300); +$graph = new Graph(350,300); +$graph->clearTheme(); $graph->SetAngle(40); $graph->img->SetMargin(80,80,80,80); $graph->SetScale("textlin"); diff --git a/lib/jpgraph/src/Examples/rotex0.php b/lib/jpgraph/src/Examples/rotex0.php index 83d26bb..1c241a6 100755 --- a/lib/jpgraph/src/Examples/rotex0.php +++ b/lib/jpgraph/src/Examples/rotex0.php @@ -5,6 +5,7 @@ $ydata = array(12,17,22,19,5,15); $graph = new Graph(270,170); +$graph->clearTheme(); $graph->SetMargin(30,90,30,30); $graph->SetScale("textlin"); @@ -18,5 +19,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/rotex1.php b/lib/jpgraph/src/Examples/rotex1.php index f087b98..d2cec6a 100755 --- a/lib/jpgraph/src/Examples/rotex1.php +++ b/lib/jpgraph/src/Examples/rotex1.php @@ -5,6 +5,7 @@ $ydata = array(12,17,22,19,5,15); $graph = new Graph(270,170); +$graph->clearTheme(); $graph->SetMargin(30,90,30,30); $graph->SetScale("textlin"); @@ -20,5 +21,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/rotex2.php b/lib/jpgraph/src/Examples/rotex2.php index bfdea5a..55d4678 100755 --- a/lib/jpgraph/src/Examples/rotex2.php +++ b/lib/jpgraph/src/Examples/rotex2.php @@ -5,6 +5,7 @@ $ydata = array(12,17,22,19,5,15); $graph = new Graph(270,170); +$graph->clearTheme(); $graph->SetMargin(30,90,30,30); $graph->SetScale("textlin"); @@ -20,5 +21,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/rotex3.php b/lib/jpgraph/src/Examples/rotex3.php index 3a0a03d..2ed76fb 100755 --- a/lib/jpgraph/src/Examples/rotex3.php +++ b/lib/jpgraph/src/Examples/rotex3.php @@ -5,6 +5,7 @@ $ydata = array(12,17,22,19,5,15); $graph = new Graph(270,170); +$graph->clearTheme(); $graph->SetMargin(30,90,30,30); $graph->SetScale("textlin"); @@ -21,5 +22,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/rotex4.php b/lib/jpgraph/src/Examples/rotex4.php index 9c01a7b..14a5fe9 100755 --- a/lib/jpgraph/src/Examples/rotex4.php +++ b/lib/jpgraph/src/Examples/rotex4.php @@ -5,6 +5,7 @@ $ydata = array(12,17,22,19,5,15); $graph = new Graph(270,170); +$graph->clearTheme(); $graph->SetMargin(30,90,30,30); $graph->SetScale("textlin"); @@ -21,5 +22,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/rotex5.php b/lib/jpgraph/src/Examples/rotex5.php index bdf0d93..43e528a 100755 --- a/lib/jpgraph/src/Examples/rotex5.php +++ b/lib/jpgraph/src/Examples/rotex5.php @@ -5,6 +5,7 @@ $ydata = array(12,17,22,19,5,15); $graph = new Graph(270,170); +$graph->clearTheme(); $graph->SetMargin(30,90,30,30); $graph->SetScale("textlin"); @@ -21,5 +22,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/scatterex1.php b/lib/jpgraph/src/Examples/scatterex1.php index 83d830b..07fad2e 100755 --- a/lib/jpgraph/src/Examples/scatterex1.php +++ b/lib/jpgraph/src/Examples/scatterex1.php @@ -6,9 +6,10 @@ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43); $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->img->SetMargin(40,40,40,40); +$graph->img->SetMargin(40,40,40,40); $graph->SetShadow(); $graph->title->Set("A simple scatter plot"); diff --git a/lib/jpgraph/src/Examples/scatterex2.php b/lib/jpgraph/src/Examples/scatterex2.php index ff2b847..e2b73db 100755 --- a/lib/jpgraph/src/Examples/scatterex2.php +++ b/lib/jpgraph/src/Examples/scatterex2.php @@ -6,9 +6,10 @@ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43); $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->img->SetMargin(40,40,40,40); +$graph->img->SetMargin(40,40,40,40); $graph->SetShadow(); $graph->title->Set("A simple scatter plot"); diff --git a/lib/jpgraph/src/Examples/scatterlinkex1.php b/lib/jpgraph/src/Examples/scatterlinkex1.php index 2f2d1bd..c8eb3fa 100755 --- a/lib/jpgraph/src/Examples/scatterlinkex1.php +++ b/lib/jpgraph/src/Examples/scatterlinkex1.php @@ -5,7 +5,8 @@ $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7); $datay = array(20,22,12,13,17,20,16,19,30,31,40,43); $graph = new Graph(300,200); -$graph->img->SetMargin(40,40,40,40); +$graph->clearTheme(); +$graph->img->SetMargin(40,40,40,40); $graph->img->SetAntiAliasing(); $graph->SetScale("linlin"); $graph->SetShadow(); @@ -22,5 +23,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/scatterlinkex2.php b/lib/jpgraph/src/Examples/scatterlinkex2.php index f45f1ec..b5d6f04 100755 --- a/lib/jpgraph/src/Examples/scatterlinkex2.php +++ b/lib/jpgraph/src/Examples/scatterlinkex2.php @@ -13,9 +13,10 @@ $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->img->SetMargin(40,40,40,40); +$graph->img->SetMargin(40,40,40,40); $graph->SetShadow(); $graph->title->Set("Linked scatter plot"); @@ -39,5 +40,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/scatterlinkex3.php b/lib/jpgraph/src/Examples/scatterlinkex3.php index aef5150..e8309e1 100755 --- a/lib/jpgraph/src/Examples/scatterlinkex3.php +++ b/lib/jpgraph/src/Examples/scatterlinkex3.php @@ -12,6 +12,7 @@ } $graph = new Graph(350,230); +$graph->clearTheme(); $graph->SetScale('linlin'); $graph->SetShadow(); $graph->SetAxisStyle(AXSTYLE_BOXOUT); @@ -41,5 +42,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/scatterlinkex4.php b/lib/jpgraph/src/Examples/scatterlinkex4.php index 63659e0..34865c9 100755 --- a/lib/jpgraph/src/Examples/scatterlinkex4.php +++ b/lib/jpgraph/src/Examples/scatterlinkex4.php @@ -11,6 +11,7 @@ } $graph = new Graph(350,230); +$graph->clearTheme(); $graph->SetScale('linlin'); $graph->SetShadow(); $graph->SetAxisStyle(AXSTYLE_BOXIN); @@ -41,5 +42,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/scatterrotex1.php b/lib/jpgraph/src/Examples/scatterrotex1.php index 6d67e5b..ca0b12f 100755 --- a/lib/jpgraph/src/Examples/scatterrotex1.php +++ b/lib/jpgraph/src/Examples/scatterrotex1.php @@ -6,9 +6,10 @@ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43); $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("linlin"); -$graph->Set90AndMargin(40,40,40,40); +$graph->Set90AndMargin(40,40,40,40); $graph->SetShadow(); $graph->title->Set("A 90 degrees rotated scatter plot"); diff --git a/lib/jpgraph/src/Examples/splineex1.php b/lib/jpgraph/src/Examples/splineex1.php index 61f6032..c1de05f 100755 --- a/lib/jpgraph/src/Examples/splineex1.php +++ b/lib/jpgraph/src/Examples/splineex1.php @@ -18,6 +18,7 @@ // Create the graph $g = new Graph(300,200); +$g->clearTheme(); $g->SetMargin(30,20,40,30); $g->title->Set("Natural cubic splines"); $g->title->SetFont(FF_ARIAL,FS_NORMAL,12); @@ -38,7 +39,7 @@ // contro points. $splot = new ScatterPlot($ydata,$xdata); -// +// $splot->mark->SetFillColor('red@0.3'); $splot->mark->SetColor('red@0.5'); @@ -53,4 +54,3 @@ $g->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/staticbandbarex1.php b/lib/jpgraph/src/Examples/staticbandbarex1.php index 5d59b26..9397e14 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex1.php +++ b/lib/jpgraph/src/Examples/staticbandbarex1.php @@ -4,8 +4,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -17,7 +18,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area diff --git a/lib/jpgraph/src/Examples/staticbandbarex2.php b/lib/jpgraph/src/Examples/staticbandbarex2.php index 24d3bbc..2f90cab 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex2.php +++ b/lib/jpgraph/src/Examples/staticbandbarex2.php @@ -4,8 +4,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -17,7 +18,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area diff --git a/lib/jpgraph/src/Examples/staticbandbarex3.php b/lib/jpgraph/src/Examples/staticbandbarex3.php index fa38cca..76184f2 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex3.php +++ b/lib/jpgraph/src/Examples/staticbandbarex3.php @@ -4,8 +4,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -17,7 +18,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area diff --git a/lib/jpgraph/src/Examples/staticbandbarex4.php b/lib/jpgraph/src/Examples/staticbandbarex4.php index 57ca6db..e111ebc 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex4.php +++ b/lib/jpgraph/src/Examples/staticbandbarex4.php @@ -4,8 +4,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -17,7 +18,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area diff --git a/lib/jpgraph/src/Examples/staticbandbarex5.php b/lib/jpgraph/src/Examples/staticbandbarex5.php index 8d80855..26893a5 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex5.php +++ b/lib/jpgraph/src/Examples/staticbandbarex5.php @@ -4,8 +4,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -17,7 +18,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area diff --git a/lib/jpgraph/src/Examples/staticbandbarex6.php b/lib/jpgraph/src/Examples/staticbandbarex6.php index df352ea..7237c2b 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex6.php +++ b/lib/jpgraph/src/Examples/staticbandbarex6.php @@ -5,8 +5,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -18,7 +19,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area @@ -71,4 +72,3 @@ $graph->Stroke(); ?> - diff --git a/lib/jpgraph/src/Examples/staticbandbarex7.php b/lib/jpgraph/src/Examples/staticbandbarex7.php index 399a172..c6fbe03 100755 --- a/lib/jpgraph/src/Examples/staticbandbarex7.php +++ b/lib/jpgraph/src/Examples/staticbandbarex7.php @@ -5,8 +5,9 @@ $datay=array(12,5,19,22,17,6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -18,7 +19,7 @@ // Turn off Y-grid (it's on by default) $graph->ygrid->Show(false); -// Add 10% grace ("space") at top of Y-scale. +// Add 10% grace ("space") at top of Y-scale. $graph->yscale->SetGrace(10); $graph->yscale->SetAutoMin(-20); diff --git a/lib/jpgraph/src/Examples/staticlinebarex1.php b/lib/jpgraph/src/Examples/staticlinebarex1.php index 9c63442..016e0e5 100755 --- a/lib/jpgraph/src/Examples/staticlinebarex1.php +++ b/lib/jpgraph/src/Examples/staticlinebarex1.php @@ -5,8 +5,9 @@ $datay=array(12,0,-19,-7,17,-6); -// Create the graph. -$graph = new Graph(400,300); +// Create the graph. +$graph = new Graph(400,300); +$graph->clearTheme(); $graph->img->SetMargin(60,30,50,40); $graph->SetScale("textlin"); $graph->SetShadow(); @@ -18,7 +19,7 @@ // Show both X and Y grid $graph->xgrid->Show(true,false); -// Add 10% grace ("space") at top and botton of Y-scale. +// Add 10% grace ("space") at top and botton of Y-scale. $graph->yscale->SetGrace(10,10); // Turn the tick mark out from the plot area diff --git a/lib/jpgraph/src/Examples/stockex1.php b/lib/jpgraph/src/Examples/stockex1.php index d77145c..694faba 100755 --- a/lib/jpgraph/src/Examples/stockex1.php +++ b/lib/jpgraph/src/Examples/stockex1.php @@ -13,6 +13,7 @@ // Setup a simple graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetScale("textlin"); $graph->SetMarginColor('lightblue'); $graph->title->Set('Stockchart example'); diff --git a/lib/jpgraph/src/Examples/tabtitleex1.php b/lib/jpgraph/src/Examples/tabtitleex1.php index 55d87ea..b523ab4 100755 --- a/lib/jpgraph/src/Examples/tabtitleex1.php +++ b/lib/jpgraph/src/Examples/tabtitleex1.php @@ -8,6 +8,7 @@ // Setup the graph $graph = new Graph(300,200); +$graph->clearTheme(); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); $graph->SetFrame(false); @@ -47,5 +48,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/Examples/topxaxisex1.php b/lib/jpgraph/src/Examples/topxaxisex1.php index 6143875..023978b 100755 --- a/lib/jpgraph/src/Examples/topxaxisex1.php +++ b/lib/jpgraph/src/Examples/topxaxisex1.php @@ -6,6 +6,7 @@ $datay = array(25,29,29,39,55); $graph = new Graph(400,200,'auto'); +$graph->clearTheme(); $graph->img->SetMargin(40,40,40,20); $graph->SetScale("linlin"); @@ -45,5 +46,3 @@ $graph->Stroke(); ?> - - diff --git a/lib/jpgraph/src/README b/lib/jpgraph/src/README index 3e1446e..9ccab30 100755 --- a/lib/jpgraph/src/README +++ b/lib/jpgraph/src/README @@ -1,63 +1,63 @@ -README FOR JPGRAPH 4.0.2 -========================= - -This package contains the JpGraph PHP library version 4.0.2 - -The library is Copyright (C) 2000-2010 Asial Corporatoin and -released under dual license QPL 1.0 for open source and educational -use and JpGraph Professional License for commercial use. - -Please see full license details at -http://jpgraph.net/pro/ -http://jpgraph.net/download/ - - -Requirements: -------------- -Miminum: -* PHP 5.1.0 or higher -* GD 2.0.28 or higher -Note: Earlier versions might work but is unsupported. - -Recommended: -* >= PHP 5.2.0 -* PHP Builtin GD library - -Installation ------------- -1. Make sure that the PHP version is compatible with the stated - requirements and that the PHP installation has support for - the GD library. Please run phpinfo() to check if GD library - is supported in the installation. - If the GD library doesn't seem to be installed - please consult the PHP manual under section "Image" for - instructions on where to find this library. Please refer to - the manual section "Verifying your PHP installation" - -2. Unzip and copy the files to a directory of your choice where Your - httpd sever can access them. - For a global site installation you should copy the files to - somewhere in the PHP search path. - -3. Check that the default directory paths in jpg-config.inc.php - for cache directory and TTF directory suits your installation. - Note1: The default directories are different depending on if - the library is running on Windows or UNIX. - Note2: Apache/PHP must have write permission to your cache - directory if you enable the cache feature. By default the cache - is disabled. - - -Documentation -------------- -The installation includes HTML documentation and reference guide for the -library. The portal page for all documentation is -/docs/index.html - - -Bug reports and suggestions ---------------------------- -Should be reported using the contact form at - -http://jpgraph.net/contact/ - +README FOR JPGRAPH 4.1.0 +========================= + +This package contains the JpGraph PHP library version 4.1.0 + +The library is Copyright (C) 2000-2010 Asial Corporatoin and +released under dual license QPL 1.0 for open source and educational +use and JpGraph Professional License for commercial use. + +Please see full license details at +http://jpgraph.net/pro/ +http://jpgraph.net/download/ + + +Requirements: +------------- +Miminum: +* PHP 5.1.0 or higher +* GD 2.0.28 or higher +Note: Earlier versions might work but is unsupported. + +Recommended: +* >= PHP 5.2.0 +* PHP Builtin GD library + +Installation +------------ +1. Make sure that the PHP version is compatible with the stated + requirements and that the PHP installation has support for + the GD library. Please run phpinfo() to check if GD library + is supported in the installation. + If the GD library doesn't seem to be installed + please consult the PHP manual under section "Image" for + instructions on where to find this library. Please refer to + the manual section "Verifying your PHP installation" + +2. Unzip and copy the files to a directory of your choice where Your + httpd sever can access them. + For a global site installation you should copy the files to + somewhere in the PHP search path. + +3. Check that the default directory paths in jpg-config.inc.php + for cache directory and TTF directory suits your installation. + Note1: The default directories are different depending on if + the library is running on Windows or UNIX. + Note2: Apache/PHP must have write permission to your cache + directory if you enable the cache feature. By default the cache + is disabled. + + +Documentation +------------- +The installation includes HTML documentation and reference guide for the +library. The portal page for all documentation is +/docs/index.html + + +Bug reports and suggestions +--------------------------- +Should be reported using the contact form at + +http://jpgraph.net/contact/ + diff --git a/lib/jpgraph/src/jpgraph.php b/lib/jpgraph/src/jpgraph.php index 5db0bbc..3dd847b 100755 --- a/lib/jpgraph/src/jpgraph.php +++ b/lib/jpgraph/src/jpgraph.php @@ -19,7 +19,7 @@ require_once('gd_image.inc.php'); // Version info -define('JPG_VERSION','4.0.2'); +define('JPG_VERSION','4.1.0'); // Minimum required PHP version define('MIN_PHPVERSION','5.1.0'); diff --git a/lib/jpgraph/src/jpgraph_gradient.php b/lib/jpgraph/src/jpgraph_gradient.php index 225cf60..e3c24d3 100755 --- a/lib/jpgraph/src/jpgraph_gradient.php +++ b/lib/jpgraph/src/jpgraph_gradient.php @@ -410,8 +410,8 @@ function GetColArray($from_color,$to_color,$arr_size,&$colors,$numcols=100) { $bdelta=($to_color[2]-$from_color[2])/$numcols; $colorsperstep = $numcols/$arr_size; $prevcolnum = -1; - $from_alpha = $from_color[3]; - $to_alpha = $to_color[3]; + $from_alpha = floatval($from_color[3]); + $to_alpha = floatval($to_color[3]); $adelta = ( $to_alpha - $from_alpha ) / $numcols ; for ($i=0; $i < $arr_size; ++$i) { $colnum = floor($colorsperstep*$i); diff --git a/lib/jpgraph/src/jpgraph_table.php b/lib/jpgraph/src/jpgraph_table.php index 852d78b..7f55cc1 100755 --- a/lib/jpgraph/src/jpgraph_table.php +++ b/lib/jpgraph/src/jpgraph_table.php @@ -141,10 +141,16 @@ function SetGridStyle($aLeft,$aTop=null,$aBottom=null,$aRight=null) { } function SetGridWeight($aLeft=null,$aTop=null,$aBottom=null,$aRight=null) { - if( $aLeft !== null ) $this->iGridWeight[0] = $aLeft; - if( $aTop !== null ) $this->iGridWeight[1] = $aTop; - if( $aBottom !== null ) $this->iGridWeight[2] = $aBottom; - if( $aRight !== null ) $this->iGridWeight[3] = $aRight; + $weight_arr = array($aLeft, $aTop, $aBottom, $aRight); + for ($i = 0; $i < count($weight_arr); $i++) { + if ($weight_arr[$i] === "") { + $weight_arr[$i] = 0; + } + } + if( $aLeft !== null ) $this->iGridWeight[0] = $weight_arr[0]; + if( $aTop !== null ) $this->iGridWeight[1] = $weight_arr[1]; + if( $aBottom !== null ) $this->iGridWeight[2] = $weight_arr[2]; + if( $aRight !== null ) $this->iGridWeight[3] = $weight_arr[3]; } function SetMargin($aLeft,$aRight,$aTop,$aBottom) {