@@ -16,7 +16,7 @@ |
||
16 | 16 | public $csimalts = null; // ALT:s for corresponding target |
17 | 17 | private $data = array(); |
18 | 18 | private $fill = false; |
19 | - private $fill_color = array(200, 170, 180); |
|
19 | + private $fill_color = array(200, 170, 180); |
|
20 | 20 | private $color = array(0, 0, 0); |
21 | 21 | private $weight = 1; |
22 | 22 | private $linestyle = 'solid'; |
@@ -54,6 +54,9 @@ |
||
54 | 54 | $this->weight = $w; |
55 | 55 | } |
56 | 56 | |
57 | + /** |
|
58 | + * @param boolean $aColor |
|
59 | + */ |
|
57 | 60 | public function SetFillColor($aColor) |
58 | 61 | { |
59 | 62 | $this->fill_color = $aColor; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | { |
23 | 23 | public $iLength = 40; |
24 | 24 | public $iMargin = 20; |
25 | - public $iBottomMargin = 5; |
|
25 | + public $iBottomMargin = 5; |
|
26 | 26 | public $iCircleWeight = 2; |
27 | 27 | public $iCircleRadius = 18; |
28 | 28 | public $iCircleColor = 'black'; |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | public $iCircleFontSize = 8; |
38 | 38 | public $iLblFontColor = 'black'; |
39 | 39 | public $iTxtFontColor = 'black'; |
40 | - public $iCircleFontColor = 'black'; |
|
40 | + public $iCircleFontColor = 'black'; |
|
41 | 41 | public $iShow = true; |
42 | 42 | public $iFormatString = '%.1f'; |
43 | 43 | public $iTxtMargin = 6; |
44 | - public $iTxt = ''; |
|
44 | + public $iTxt = ''; |
|
45 | 45 | public $iZCircleTxt = 'Calm'; |
46 | 46 | |
47 | 47 | public function SetFont($aFontFamily, $aFontStyle = FS_NORMAL, $aFontSize = 10) |
@@ -16,7 +16,7 @@ |
||
16 | 16 | public $hidelegend = false; |
17 | 17 | public $line_weight = 1; |
18 | 18 | public $csimtargets = array(); |
19 | - public $csimwintargets = array(); // Array of targets for CSIM |
|
19 | + public $csimwintargets = array(); // Array of targets for CSIM |
|
20 | 20 | public $csimareas = ''; // Resultant CSIM area tags |
21 | 21 | public $csimalts = null; // ALT:s for corresponding target |
22 | 22 | public $legendcsimtarget = ''; |
@@ -188,6 +188,9 @@ |
||
188 | 188 | $this->legendcsimalt = $aCSIMAlt; |
189 | 189 | } |
190 | 190 | |
191 | + /** |
|
192 | + * @param integer $aWeight |
|
193 | + */ |
|
191 | 194 | public function SetWeight($aWeight) |
192 | 195 | { |
193 | 196 | $this->weight = $aWeight; |
@@ -32,15 +32,15 @@ |
||
32 | 32 | class BarPlot extends Plot |
33 | 33 | { |
34 | 34 | public $fill = false; |
35 | - public $fill_color = "lightblue"; // Default is to fill with light blue |
|
35 | + public $fill_color = "lightblue"; // Default is to fill with light blue |
|
36 | 36 | public $iPattern = -1; |
37 | - public $iPatternDensity = 80; |
|
38 | - public $iPatternColor = 'black'; |
|
37 | + public $iPatternDensity = 80; |
|
38 | + public $iPatternColor = 'black'; |
|
39 | 39 | public $valuepos = 'top'; |
40 | 40 | public $grad = false; |
41 | - public $grad_style = 1; |
|
41 | + public $grad_style = 1; |
|
42 | 42 | public $grad_fromcolor = [50, 50, 200]; |
43 | - public $grad_tocolor = [255, 255, 255]; |
|
43 | + public $grad_tocolor = [255, 255, 255]; |
|
44 | 44 | public $ymin = 0; |
45 | 45 | protected $width = 0.4; // in percent of major ticks |
46 | 46 | protected $abswidth = -1; // Width in absolute pixels |
@@ -35,19 +35,19 @@ discard block |
||
35 | 35 | protected $use_plot_theme_colors = false; |
36 | 36 | protected $radius = 0.3; |
37 | 37 | protected $explode_radius = array(); |
38 | - protected $explode_all = false; |
|
39 | - protected $explode_r = 20; |
|
38 | + protected $explode_all = false; |
|
39 | + protected $explode_r = 20; |
|
40 | 40 | protected $labels = null; |
41 | - protected $legends = null; |
|
41 | + protected $legends = null; |
|
42 | 42 | protected $csimtargets = null; |
43 | - protected $csimwintargets = null; // Array of targets for CSIM |
|
43 | + protected $csimwintargets = null; // Array of targets for CSIM |
|
44 | 44 | protected $csimareas = ''; // Generated CSIM text |
45 | 45 | protected $csimalts = null; // ALT tags for corresponding target |
46 | 46 | protected $data = null; |
47 | 47 | public $title; |
48 | 48 | protected $startangle = 0; |
49 | 49 | protected $weight = 1; |
50 | - protected $color = "black"; |
|
50 | + protected $color = "black"; |
|
51 | 51 | protected $legend_margin = 6; |
52 | 52 | protected $show_labels = true; |
53 | 53 | protected $themearr = array( |
@@ -58,10 +58,10 @@ discard block |
||
58 | 58 | protected $setslicecolors = array(); |
59 | 59 | protected $labeltype = 0; // Default to percentage |
60 | 60 | protected $pie_border = true; |
61 | - protected $pie_interior_border = true; |
|
61 | + protected $pie_interior_border = true; |
|
62 | 62 | public $value; |
63 | 63 | protected $ishadowcolor = ''; |
64 | - protected $ishadowdrop = 4; |
|
64 | + protected $ishadowdrop = 4; |
|
65 | 65 | protected $ilabelposadj = 1; |
66 | 66 | protected $legendcsimtargets = array(); |
67 | 67 | protected $legendcsimwintargets = array(); |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | protected $adjusted_data = array(); |
70 | 70 | public $guideline = null; |
71 | 71 | protected $guidelinemargin = 10; |
72 | - protected $iShowGuideLineForSingle = false; |
|
72 | + protected $iShowGuideLineForSingle = false; |
|
73 | 73 | protected $iGuideLineCurve = false; |
74 | - protected $iGuideVFactor = 1.4; |
|
75 | - protected $iGuideLineRFactor = 0.8; |
|
74 | + protected $iGuideVFactor = 1.4; |
|
75 | + protected $iGuideLineRFactor = 0.8; |
|
76 | 76 | protected $la = array(); // Holds the exact angle for each label |
77 | 77 | |
78 | 78 | //--------------- |
@@ -144,6 +144,11 @@ discard block |
||
144 | 144 | return $this->csimareas; |
145 | 145 | } |
146 | 146 | |
147 | + /** |
|
148 | + * @param integer $i |
|
149 | + * @param double $xc |
|
150 | + * @param double $yc |
|
151 | + */ |
|
147 | 152 | public function AddSliceToCSIM($i, $xc, $yc, $radius, $sa, $ea) |
148 | 153 | { |
149 | 154 | //Slice number, ellipse centre (x,y), height, width, start angle, end angle |
@@ -1007,6 +1012,9 @@ discard block |
||
1007 | 1012 | } |
1008 | 1013 | } |
1009 | 1014 | |
1015 | + /** |
|
1016 | + * @param double $yc |
|
1017 | + */ |
|
1010 | 1018 | public function StrokeAllLabels($img, $xc, $yc, $radius) |
1011 | 1019 | { |
1012 | 1020 | // First normalize all angles for labels |
@@ -19,10 +19,10 @@ |
||
19 | 19 | { |
20 | 20 | public $iX = 0; |
21 | 21 | public $iY = 0; |
22 | - public $iScale = 1.0; |
|
23 | - public $iMix = 100; |
|
22 | + public $iScale = 1.0; |
|
23 | + public $iMix = 100; |
|
24 | 24 | private $iHorAnchor = 'left'; |
25 | - private $iVertAnchor = 'top'; |
|
25 | + private $iVertAnchor = 'top'; |
|
26 | 26 | private $iFile = ''; |
27 | 27 | private $iAnchors = array('left', 'right', 'top', 'bottom', 'center'); |
28 | 28 | private $iCountryFlag = ''; |
@@ -167,6 +167,10 @@ |
||
167 | 167 | return $this->_Stroke($dummy, null, null, true); |
168 | 168 | } |
169 | 169 | |
170 | + /** |
|
171 | + * @param double $x |
|
172 | + * @param double $y |
|
173 | + */ |
|
170 | 174 | public function _Stroke($aImg, $x = null, $y = null, $aReturnWidthHeight = false) |
171 | 175 | { |
172 | 176 | if ($this->iFile != '' && $this->iCountryFlag != '') { |
@@ -45,7 +45,7 @@ |
||
45 | 45 | public $scale = null; |
46 | 46 | private $numpoints = 0; |
47 | 47 | private $iColor = 'navy'; |
48 | - private $iFillColor = ''; |
|
48 | + private $iFillColor = ''; |
|
49 | 49 | private $iLineWeight = 1; |
50 | 50 | private $coord = null; |
51 | 51 |
@@ -20,24 +20,24 @@ |
||
20 | 20 | class PlotMark |
21 | 21 | { |
22 | 22 | public $title; |
23 | - public $show = true; |
|
23 | + public $show = true; |
|
24 | 24 | public $type; |
25 | - public $weight = 1; |
|
25 | + public $weight = 1; |
|
26 | 26 | public $iFormatCallback = ""; |
27 | - public $iFormatCallback2 = ""; |
|
27 | + public $iFormatCallback2 = ""; |
|
28 | 28 | public $fill_color = "blue"; |
29 | 29 | public $color = "black"; |
30 | 30 | public $width = 4; |
31 | 31 | private $yvalue; |
32 | - private $xvalue = ''; |
|
32 | + private $xvalue = ''; |
|
33 | 33 | private $csimtarget; |
34 | - private $csimwintarget = ''; |
|
34 | + private $csimwintarget = ''; |
|
35 | 35 | private $csimalt; |
36 | 36 | private $csimareas; |
37 | 37 | private $markimg = ''; |
38 | - private $iScale = 1.0; |
|
38 | + private $iScale = 1.0; |
|
39 | 39 | private $oldfilename = ''; |
40 | - private $iFileName = ''; |
|
40 | + private $iFileName = ''; |
|
41 | 41 | private $imgdata_balls = null; |
42 | 42 | private $imgdata_diamonds = null; |
43 | 43 | private $imgdata_squares = null; |
@@ -57,6 +57,10 @@ discard block |
||
57 | 57 | |
58 | 58 | //--------------- |
59 | 59 | // PUBLIC METHODS |
60 | + |
|
61 | + /** |
|
62 | + * @param integer $aType |
|
63 | + */ |
|
60 | 64 | public function SetType($aType, $aFileName = '', $aScale = 1.0) |
61 | 65 | { |
62 | 66 | $this->type = $aType; |
@@ -82,11 +86,17 @@ discard block |
||
82 | 86 | return $this->type; |
83 | 87 | } |
84 | 88 | |
89 | + /** |
|
90 | + * @param string $aColor |
|
91 | + */ |
|
85 | 92 | public function SetColor($aColor) |
86 | 93 | { |
87 | 94 | $this->color = $aColor; |
88 | 95 | } |
89 | 96 | |
97 | + /** |
|
98 | + * @param string $aFillColor |
|
99 | + */ |
|
90 | 100 | public function SetFillColor($aFillColor) |
91 | 101 | { |
92 | 102 | $this->fill_color = $aFillColor; |
@@ -103,6 +113,9 @@ discard block |
||
103 | 113 | $this->width = $aWidth; |
104 | 114 | } |
105 | 115 | |
116 | + /** |
|
117 | + * @param integer $aWidth |
|
118 | + */ |
|
106 | 119 | public function SetWidth($aWidth) |
107 | 120 | { |
108 | 121 | $this->width = $aWidth; |
@@ -157,6 +170,9 @@ discard block |
||
157 | 170 | return $this->csimareas; |
158 | 171 | } |
159 | 172 | |
173 | + /** |
|
174 | + * @param double[] $aPts |
|
175 | + */ |
|
160 | 176 | public function AddCSIMPoly($aPts) |
161 | 177 | { |
162 | 178 | $coords = round($aPts[0]) . ", " . round($aPts[1]); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | private $isobar = 10; |
20 | 20 | private $showLegend = false; |
21 | 21 | private $highcontrast = false; |
22 | - private $highcontrastbw = false; |
|
22 | + private $highcontrastbw = false; |
|
23 | 23 | private $manualIsobarColors = array(); |
24 | 24 | |
25 | 25 | /** |