@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | public $frame_weight; // Frame around graph |
35 | 35 | public $boxed = false; |
36 | 36 | public $box_color = 'black'; |
37 | - public $box_weight = 1; // Box around plot area |
|
37 | + public $box_weight = 1; // Box around plot area |
|
38 | 38 | public $doshadow = false; |
39 | 39 | public $shadow_width = 4; |
40 | 40 | public $shadow_color = '[email protected]'; // Shadow for graph |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | public $bands = null; |
58 | 58 | public $y2bands = null; |
59 | 59 | public $text_scale_off = 0; |
60 | - public $text_scale_abscenteroff = -1; // Text scale in fractions and for centering bars |
|
60 | + public $text_scale_abscenteroff = -1; // Text scale in fractions and for centering bars |
|
61 | 61 | public $background_image = ''; |
62 | - public $background_image_type = -1; |
|
63 | - public $background_image_format = "png"; |
|
62 | + public $background_image_type = -1; |
|
63 | + public $background_image_format = "png"; |
|
64 | 64 | public $background_image_bright = 0; |
65 | 65 | public $background_image_contr = 0; |
66 | 66 | public $background_image_sat = 0; |
67 | 67 | public $background_image_xpos = 0; |
68 | 68 | public $background_image_ypos = 0; |
69 | 69 | public $image_bright = 0; |
70 | - public $image_contr = 0; |
|
71 | - public $image_sat = 0; |
|
70 | + public $image_contr = 0; |
|
71 | + public $image_sat = 0; |
|
72 | 72 | public $inline; |
73 | 73 | public $showcsim = 0; |
74 | - public $csimcolor = "red"; //debug stuff, draw the csim boundaris on the image if <>0 |
|
74 | + public $csimcolor = "red"; //debug stuff, draw the csim boundaris on the image if <>0 |
|
75 | 75 | public $grid_depth = DEPTH_BACK; // Draw grid under all plots as default |
76 | 76 | public $iAxisStyle = AXSTYLE_SIMPLE; |
77 | 77 | public $iCSIMdisplay = false; |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | public $y2orderback = true; |
85 | 85 | public $tabtitle; |
86 | 86 | public $bkg_gradtype = -1; |
87 | - public $bkg_gradstyle = BGRAD_MARGIN; |
|
87 | + public $bkg_gradstyle = BGRAD_MARGIN; |
|
88 | 88 | public $bkg_gradfrom = 'navy'; |
89 | - public $bkg_gradto = 'silver'; |
|
89 | + public $bkg_gradto = 'silver'; |
|
90 | 90 | public $plot_gradtype = -1; |
91 | 91 | public $plot_gradstyle = BGRAD_MARGIN; |
92 | 92 | public $plot_gradfrom = 'silver'; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | public $titlebackground = false; |
96 | 96 | public $titlebackground_color = 'lightblue'; |
97 | - public $titlebackground_style = 1; |
|
97 | + public $titlebackground_style = 1; |
|
98 | 98 | public $titlebackground_framecolor; |
99 | 99 | public $titlebackground_framestyle; |
100 | 100 | public $titlebackground_frameweight; |
@@ -114,13 +114,13 @@ discard block |
||
114 | 114 | public $background_cflag_mix = 100; |
115 | 115 | public $iImgTrans = false; |
116 | 116 | public $iImgTransHorizon = 100; |
117 | - public $iImgTransSkewDist = 150; |
|
117 | + public $iImgTransSkewDist = 150; |
|
118 | 118 | public $iImgTransDirection = 1; |
119 | - public $iImgTransMinSize = true; |
|
119 | + public $iImgTransMinSize = true; |
|
120 | 120 | public $iImgTransFillColor = 'white'; |
121 | - public $iImgTransHighQ = false; |
|
121 | + public $iImgTransHighQ = false; |
|
122 | 122 | public $iImgTransBorder = false; |
123 | - public $iImgTransHorizonPos = 0.5; |
|
123 | + public $iImgTransHorizonPos = 0.5; |
|
124 | 124 | public $legend; |
125 | 125 | public $graph_theme; |
126 | 126 | protected $iYAxisDeltaPos = 50; |
@@ -237,6 +237,9 @@ discard block |
||
237 | 237 | $this->margin_color = [250, 250, 250]; |
238 | 238 | } |
239 | 239 | |
240 | + /** |
|
241 | + * @param string $aFilename |
|
242 | + */ |
|
240 | 243 | public function SetupCache($aFilename, $aTimeout = 60) |
241 | 244 | { |
242 | 245 | $this->cache_name = $aFilename; |
@@ -284,6 +287,10 @@ discard block |
||
284 | 287 | } |
285 | 288 | |
286 | 289 | // Should the grid be in front or back of the plot? |
290 | + |
|
291 | + /** |
|
292 | + * @param integer $aDepth |
|
293 | + */ |
|
287 | 294 | public function SetGridDepth($aDepth) |
288 | 295 | { |
289 | 296 | $this->grid_depth = $aDepth; |
@@ -295,6 +302,10 @@ discard block |
||
295 | 302 | } |
296 | 303 | |
297 | 304 | // Specify graph angle 0-360 degrees. |
305 | + |
|
306 | + /** |
|
307 | + * @param integer $aAngle |
|
308 | + */ |
|
298 | 309 | public function SetAngle($aAngle) |
299 | 310 | { |
300 | 311 | $this->img->SetAngle($aAngle); |
@@ -775,6 +786,10 @@ discard block |
||
775 | 786 | // Specify density of ticks when autoscaling 'normal', 'dense', 'sparse', 'verysparse' |
776 | 787 | // The dividing factor have been determined heuristically according to my aesthetic |
777 | 788 | // sense (or lack off) y.m.m.v ! |
789 | + |
|
790 | + /** |
|
791 | + * @param integer $aYDensity |
|
792 | + */ |
|
778 | 793 | public function SetTickDensity($aYDensity = TICKD_NORMAL, $aXDensity = TICKD_NORMAL) |
779 | 794 | { |
780 | 795 | $this->xtick_factor = 30; |
@@ -875,6 +890,10 @@ discard block |
||
875 | 890 | } |
876 | 891 | |
877 | 892 | // Get a complete <MAP>..</MAP> tag for the final image map |
893 | + |
|
894 | + /** |
|
895 | + * @param string $aMapName |
|
896 | + */ |
|
878 | 897 | public function GetHTMLImageMap($aMapName) |
879 | 898 | { |
880 | 899 | $im = "<map name=\"$aMapName\" id=\"$aMapName\" >\n"; |
@@ -1050,6 +1069,9 @@ discard block |
||
1050 | 1069 | } |
1051 | 1070 | } |
1052 | 1071 | |
1072 | + /** |
|
1073 | + * @param string $aCSIMName |
|
1074 | + */ |
|
1053 | 1075 | public function GetCSIMImgHTML($aCSIMName, $aScriptName = 'auto', $aBorder = 0) |
1054 | 1076 | { |
1055 | 1077 | if ($aScriptName == 'auto') { |
@@ -1551,6 +1573,10 @@ discard block |
||
1551 | 1573 | } |
1552 | 1574 | } |
1553 | 1575 | |
1576 | + /** |
|
1577 | + * @param integer $aDepth |
|
1578 | + * @param boolean $aCSIM |
|
1579 | + */ |
|
1554 | 1580 | public function StrokeBands($aDepth, $aCSIM) |
1555 | 1581 | { |
1556 | 1582 | // Stroke bands |
@@ -30,7 +30,7 @@ |
||
30 | 30 | protected $autoscale_min = false; // Forced minimum value, auto determine max |
31 | 31 | protected $autoscale_max = false; // Forced maximum value, auto determine min |
32 | 32 | private $gracetop = 0; |
33 | - private $gracebottom = 0; |
|
33 | + private $gracebottom = 0; |
|
34 | 34 | |
35 | 35 | private $_world_size; // Plot area size in world coordinates |
36 | 36 |
@@ -259,6 +259,10 @@ discard block |
||
259 | 259 | |
260 | 260 | // Calculate autoscale. Used if user hasn't given a scale and ticks |
261 | 261 | // $maxsteps is the maximum number of major tickmarks allowed. |
262 | + |
|
263 | + /** |
|
264 | + * @param \Amenadiel\JpGraph\Image\RotImage $img |
|
265 | + */ |
|
262 | 266 | public function AutoScale($img, $min, $max, $maxsteps, $majend = true) |
263 | 267 | { |
264 | 268 | if (!is_numeric($min) || !is_numeric($max)) { |
@@ -422,6 +426,12 @@ discard block |
||
422 | 426 | // [$numsteps,$adjmin,$adjmax,$minstep,$majstep] |
423 | 427 | // If $majend==true then the first and last marks on the axis will be major |
424 | 428 | // labeled tick marks otherwise it will be adjusted to the closest min tick mark |
429 | + |
|
430 | + /** |
|
431 | + * @param double $min |
|
432 | + * @param integer $a |
|
433 | + * @param integer $b |
|
434 | + */ |
|
425 | 435 | public function CalcTicks($maxsteps, $min, $max, $a, $b, $majend = true) |
426 | 436 | { |
427 | 437 | $diff = $max - $min; |
@@ -465,6 +475,11 @@ discard block |
||
465 | 475 | return array($numsteps, $adjmin, $adjmax, $minstep, $majstep); |
466 | 476 | } |
467 | 477 | |
478 | + /** |
|
479 | + * @param double $min |
|
480 | + * @param integer $a |
|
481 | + * @param integer $b |
|
482 | + */ |
|
468 | 483 | public function CalcTicksFreeze($maxsteps, $min, $max, $a, $b) |
469 | 484 | { |
470 | 485 | // Same as CalcTicks but don't adjust min/max values |
@@ -489,6 +504,12 @@ discard block |
||
489 | 504 | return array($numsteps, $minstep, $majstep); |
490 | 505 | } |
491 | 506 | |
507 | + /** |
|
508 | + * @param double $maxsteps |
|
509 | + * @param double $min |
|
510 | + * @param double $max |
|
511 | + * @param integer $a |
|
512 | + */ |
|
492 | 513 | public function IntCalcTicks($maxsteps, $min, $max, $a, $majend = true) |
493 | 514 | { |
494 | 515 | $diff = $max - $min; |
@@ -534,6 +555,12 @@ discard block |
||
534 | 555 | return array($numsteps, $adjmin, $adjmax, $majstep); |
535 | 556 | } |
536 | 557 | |
558 | + /** |
|
559 | + * @param double $maxsteps |
|
560 | + * @param double $min |
|
561 | + * @param double $max |
|
562 | + * @param integer $a |
|
563 | + */ |
|
537 | 564 | public function IntCalcTicksFreeze($maxsteps, $min, $max, $a) |
538 | 565 | { |
539 | 566 | // Same as IntCalcTick but don't change min/max values |
@@ -563,6 +590,10 @@ discard block |
||
563 | 590 | } |
564 | 591 | |
565 | 592 | // Determine the minimum of three values witha weight for last value |
593 | + |
|
594 | + /** |
|
595 | + * @param double $weight |
|
596 | + */ |
|
566 | 597 | public function MatchMin3($a, $b, $c, $weight) |
567 | 598 | { |
568 | 599 | if ($a < $b) { |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | public $direction = 1; // Should ticks be in(=1) the plot area or outside (=-1) |
16 | 16 | public $supress_last = false; |
17 | 17 | public $supress_tickmarks = false; |
18 | - public $supress_minor_tickmarks = false; |
|
18 | + public $supress_minor_tickmarks = false; |
|
19 | 19 | public $maj_ticks_pos = array(); |
20 | 20 | public $maj_ticklabels_pos = array(); |
21 | - public $ticks_pos = array(); |
|
22 | - public $maj_ticks_label = array(); |
|
21 | + public $ticks_pos = array(); |
|
22 | + public $maj_ticks_label = array(); |
|
23 | 23 | public $precision; |
24 | 24 | |
25 | 25 | protected $minor_abs_size = 3; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | protected $scale; |
28 | 28 | protected $is_set = false; |
29 | 29 | protected $supress_zerolabel = false; |
30 | - protected $supress_first = false; |
|
30 | + protected $supress_first = false; |
|
31 | 31 | protected $mincolor = ''; |
32 | 32 | protected $majcolor = ''; |
33 | 33 | protected $weight = 1; |
@@ -16,11 +16,11 @@ |
||
16 | 16 | protected $majortype = 'solid'; |
17 | 17 | protected $minortype = 'solid'; |
18 | 18 | protected $show = false; |
19 | - protected $showMinor = false; |
|
19 | + protected $showMinor = false; |
|
20 | 20 | protected $majorweight = 1; |
21 | 21 | protected $minorweight = 1; |
22 | - protected $fill = false; |
|
23 | - protected $fillcolor = array('#EFEFEF', '#BBCCFF'); |
|
22 | + protected $fill = false; |
|
23 | + protected $fillcolor = array('#EFEFEF', '#BBCCFF'); |
|
24 | 24 | |
25 | 25 | public function __construct($aAxis) |
26 | 26 | { |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | { |
27 | 27 | public $txtcol = []; |
28 | 28 | public $font_family = FF_DEFAULT; |
29 | - public $font_style = FS_NORMAL; |
|
30 | - public $font_size = 8; // old. 12 |
|
29 | + public $font_style = FS_NORMAL; |
|
30 | + public $font_size = 8; // old. 12 |
|
31 | 31 | private $color = [120, 120, 120]; // Default frame color |
32 | 32 | private $fill_color = [245, 245, 245]; // Default fill color |
33 | 33 | private $shadow = false; // Shadow around legend "box" |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | private $mark_abs_vsize = _DEFAULT_LPM_SIZE; |
37 | 37 | private $xmargin = 10; |
38 | 38 | private $ymargin = 0; |
39 | - private $shadow_width = 2; |
|
39 | + private $shadow_width = 2; |
|
40 | 40 | private $xlmargin = 4; |
41 | 41 | private $ylinespacing = 5; |
42 | 42 | |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | private $valign = "top"; |
52 | 52 | private $font_color = 'black'; |
53 | 53 | private $hide = false; |
54 | - private $layout_n = 1; |
|
54 | + private $layout_n = 1; |
|
55 | 55 | private $weight = 1; |
56 | - private $frameweight = 1; |
|
56 | + private $frameweight = 1; |
|
57 | 57 | private $csimareas = ''; |
58 | 58 | private $reverse = false; |
59 | 59 | private $bkg_gradtype = -1; |
@@ -217,6 +217,9 @@ |
||
217 | 217 | return (boolean) (count($this->txtcol)); |
218 | 218 | } |
219 | 219 | |
220 | + /** |
|
221 | + * @param \Amenadiel\JpGraph\Image\RotImage $aImg |
|
222 | + */ |
|
220 | 223 | public function Stroke($aImg) |
221 | 224 | { |
222 | 225 | // Constant |
@@ -9,11 +9,11 @@ |
||
9 | 9 | { |
10 | 10 | public $iShow = true; |
11 | 11 | public $csimtarget = ''; |
12 | - public $csimwintarget = ''; |
|
13 | - public $csimalt = ''; |
|
12 | + public $csimwintarget = ''; |
|
13 | + public $csimalt = ''; |
|
14 | 14 | private $iFFamily = FF_FONT1; |
15 | - private $iFStyle = FS_NORMAL; |
|
16 | - private $iFSize = 10; |
|
15 | + private $iFStyle = FS_NORMAL; |
|
16 | + private $iFSize = 10; |
|
17 | 17 | private $iFontArray = array(); |
18 | 18 | private $iColor = "black"; |
19 | 19 | private $iText = ""; |
@@ -22,26 +22,26 @@ |
||
22 | 22 | public $y = 0; |
23 | 23 | public $halign = "left"; |
24 | 24 | public $valign = "top"; |
25 | - public $color = array(0, 0, 0); |
|
25 | + public $color = array(0, 0, 0); |
|
26 | 26 | public $hide = false; |
27 | - public $dir = 0; |
|
27 | + public $dir = 0; |
|
28 | 28 | public $iScalePosY = null; |
29 | 29 | public $iScalePosX = null; |
30 | 30 | public $iWordwrap = 0; |
31 | 31 | public $font_family = FF_DEFAULT; |
32 | - public $font_style = FS_NORMAL; // old. FF_FONT1 |
|
32 | + public $font_style = FS_NORMAL; // old. FF_FONT1 |
|
33 | 33 | protected $boxed = false; // Should the text be boxed |
34 | 34 | protected $paragraph_align = "left"; |
35 | 35 | protected $icornerradius = 0; |
36 | - protected $ishadowwidth = 3; |
|
36 | + protected $ishadowwidth = 3; |
|
37 | 37 | protected $fcolor = 'white'; |
38 | 38 | protected $bcolor = 'black'; |
39 | 39 | protected $shadow = false; |
40 | 40 | protected $iCSIMarea = ''; |
41 | - protected $iCSIMalt = ''; |
|
42 | - protected $iCSIMtarget = ''; |
|
43 | - protected $iCSIMWinTarget = ''; |
|
44 | - private $iBoxType = 1; // Which variant of filled box around text we want |
|
41 | + protected $iCSIMalt = ''; |
|
42 | + protected $iCSIMtarget = ''; |
|
43 | + protected $iCSIMWinTarget = ''; |
|
44 | + private $iBoxType = 1; // Which variant of filled box around text we want |
|
45 | 45 | |
46 | 46 | // for __get, __set |
47 | 47 | private $_margin; |
@@ -97,18 +97,30 @@ discard block |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | // Alias |
100 | + |
|
101 | + /** |
|
102 | + * @param string $aHAlign |
|
103 | + */ |
|
100 | 104 | public function SetAlign($aHAlign, $aVAlign = "top", $aParagraphAlign = "") |
101 | 105 | { |
102 | 106 | $this->Align($aHAlign, $aVAlign, $aParagraphAlign); |
103 | 107 | } |
104 | 108 | |
105 | 109 | // Specifies the alignment for a multi line text |
110 | + |
|
111 | + /** |
|
112 | + * @param string $aAlign |
|
113 | + */ |
|
106 | 114 | public function ParagraphAlign($aAlign) |
107 | 115 | { |
108 | 116 | $this->paragraph_align = $aAlign; |
109 | 117 | } |
110 | 118 | |
111 | 119 | // Specifies the alignment for a multi line text |
120 | + |
|
121 | + /** |
|
122 | + * @param string $aAlign |
|
123 | + */ |
|
112 | 124 | public function SetParagraphAlign($aAlign) |
113 | 125 | { |
114 | 126 | $this->paragraph_align = $aAlign; |
@@ -176,6 +188,10 @@ discard block |
||
176 | 188 | } |
177 | 189 | |
178 | 190 | // Center the text between $left and $right coordinates |
191 | + |
|
192 | + /** |
|
193 | + * @param integer $aLeft |
|
194 | + */ |
|
179 | 195 | public function Center($aLeft, $aRight, $aYAbsPos = false) |
180 | 196 | { |
181 | 197 | $this->x = $aLeft + ($aRight - $aLeft) / 2; |
@@ -186,6 +202,10 @@ discard block |
||
186 | 202 | } |
187 | 203 | |
188 | 204 | // Set text color |
205 | + |
|
206 | + /** |
|
207 | + * @param string $aColor |
|
208 | + */ |
|
189 | 209 | public function SetColor($aColor) |
190 | 210 | { |
191 | 211 | $this->color = $aColor; |
@@ -244,6 +264,10 @@ discard block |
||
244 | 264 | |
245 | 265 | // Set the margin which will be interpretated differently depending |
246 | 266 | // on the context. |
267 | + |
|
268 | + /** |
|
269 | + * @param integer $aMarg |
|
270 | + */ |
|
247 | 271 | public function SetMargin($aMarg) |
248 | 272 | { |
249 | 273 | $this->margin = $aMarg; |
@@ -14,7 +14,7 @@ |
||
14 | 14 | private $ih; |
15 | 15 | private $ir = 4; |
16 | 16 | private $iTxt; |
17 | - private $iColor = 'black'; |
|
17 | + private $iColor = 'black'; |
|
18 | 18 | private $iFillColor = ''; |
19 | 19 | private $iFontColor = 'black'; |
20 | 20 | private $iParaAlign = 'center'; |
@@ -30,19 +30,19 @@ discard block |
||
30 | 30 | public $iColSpan = 1; |
31 | 31 | public $iRowSpan = 1; |
32 | 32 | public $iMarginLeft = 5; |
33 | - public $iMarginRight = 5; |
|
34 | - public $iMarginTop = 5; |
|
33 | + public $iMarginRight = 5; |
|
34 | + public $iMarginTop = 5; |
|
35 | 35 | public $iMarginBottom = 5; |
36 | 36 | public $iVal = null; |
37 | 37 | private $iBGColor = ''; |
38 | 38 | private $iFontColor = 'black'; |
39 | 39 | private $iFF = FF_FONT1; |
40 | 40 | private $iFS = FS_NORMAL; |
41 | - private $iFSize = 10; |
|
41 | + private $iFSize = 10; |
|
42 | 42 | private $iRow = 0; |
43 | 43 | private $iCol = 0; |
44 | 44 | private $iVertAlign = 'bottom'; |
45 | - private $iHorAlign = 'left'; |
|
45 | + private $iHorAlign = 'left'; |
|
46 | 46 | private $iMerged = false; |
47 | 47 | private $iPRow = null; |
48 | 48 | private $iPCol = null; |
@@ -52,11 +52,11 @@ discard block |
||
52 | 52 | private $iGridStyle = array(TGRID_SINGLE, TGRID_SINGLE, TGRID_SINGLE, TGRID_SINGLE); // left,top,bottom,right; |
53 | 53 | private $iNumberFormat = null; |
54 | 54 | private $iIcon = null; |
55 | - private $iIconConstrain = array(); |
|
55 | + private $iIconConstrain = array(); |
|
56 | 56 | private $iCSIMtarget = ''; |
57 | - private $iCSIMwintarget = ''; |
|
58 | - private $iCSIMalt = ''; |
|
59 | - private $iCSIMArea = ''; |
|
57 | + private $iCSIMwintarget = ''; |
|
58 | + private $iCSIMalt = ''; |
|
59 | + private $iCSIMArea = ''; |
|
60 | 60 | |
61 | 61 | public function __construct($aVal = '', $aRow = 0, $aCol = 0) |
62 | 62 | { |