@@ -10,14 +10,14 @@ |
||
10 | 10 | { |
11 | 11 | public $grid; |
12 | 12 | public $iShowLabels = true; |
13 | - public $iShowGrid = true; |
|
13 | + public $iShowGrid = true; |
|
14 | 14 | public $iTitleVertMargin = 3; |
15 | - public $iFFamily = FF_FONT0; |
|
16 | - public $iFStyle = FS_NORMAL; |
|
17 | - public $iFSize = 8; |
|
15 | + public $iFFamily = FF_FONT0; |
|
16 | + public $iFStyle = FS_NORMAL; |
|
17 | + public $iFSize = 8; |
|
18 | 18 | public $iStyle = 0; |
19 | 19 | public $iFrameColor = "black"; |
20 | - public $iFrameWeight = 1; |
|
20 | + public $iFrameWeight = 1; |
|
21 | 21 | public $iBackgroundColor = "white"; |
22 | 22 | public $iWeekendBackgroundColor = "lightgray"; |
23 | 23 | public $iSundayTextColor = "red"; // these are only used with day scale |
@@ -145,19 +145,19 @@ |
||
145 | 145 | { |
146 | 146 | public $iShow = true; |
147 | 147 | public $iLeftColMargin = 4; |
148 | - public $iRightColMargin = 1; |
|
149 | - public $iTopColMargin = 1; |
|
150 | - public $iBottomColMargin = 3; |
|
148 | + public $iRightColMargin = 1; |
|
149 | + public $iTopColMargin = 1; |
|
150 | + public $iBottomColMargin = 3; |
|
151 | 151 | public $vgrid = null; |
152 | 152 | private $iColor = 'black'; |
153 | 153 | private $iBackgroundColor = 'lightgray'; |
154 | 154 | private $iFFamily = FF_FONT1; |
155 | - private $iFStyle = FS_NORMAL; |
|
156 | - private $iFSize = 10; |
|
157 | - private $iFontColor = 'black'; |
|
155 | + private $iFStyle = FS_NORMAL; |
|
156 | + private $iFSize = 10; |
|
157 | + private $iFontColor = 'black'; |
|
158 | 158 | private $iTitles = array(); |
159 | 159 | private $iWidth = array(); |
160 | - private $iHeight = -1; |
|
160 | + private $iHeight = -1; |
|
161 | 161 | private $iTopHeaderMargin = 4; |
162 | 162 | private $iStyle = 1; |
163 | 163 | private $iHeaderAlign = 'center'; |
@@ -231,6 +231,9 @@ |
||
231 | 231 | } |
232 | 232 | } |
233 | 233 | |
234 | + /** |
|
235 | + * @param \Amenadiel\JpGraph\Image\RotImage $aImg |
|
236 | + */ |
|
234 | 237 | public function GetWidth($aImg) |
235 | 238 | { |
236 | 239 | $txt = new TextProperty(); |
@@ -17,10 +17,10 @@ |
||
17 | 17 | private $iLabelVMarginFactor = 0.4; // 40% margin on top and bottom of label |
18 | 18 | private $iLayout = GANTT_FROMTOP; // Could also be GANTT_EVEN |
19 | 19 | private $iSimpleFont = FF_FONT1; |
20 | - private $iSimpleFontSize = 11; |
|
20 | + private $iSimpleFontSize = 11; |
|
21 | 21 | private $iSimpleStyle = GANTT_RDIAG; |
22 | 22 | private $iSimpleColor = 'yellow'; |
23 | - private $iSimpleBkgColor = 'red'; |
|
23 | + private $iSimpleBkgColor = 'red'; |
|
24 | 24 | private $iSimpleProgressBkgColor = 'gray'; |
25 | 25 | private $iSimpleProgressColor = 'darkgreen'; |
26 | 26 | private $iSimpleProgressStyle = GANTT_SOLID; |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public $scale = null; |
18 | 18 | public $img = null; |
19 | 19 | public $hide = false; |
20 | - public $hide_labels = false; |
|
20 | + public $hide_labels = false; |
|
21 | 21 | public $title = null; |
22 | 22 | public $font_family = FF_DEFAULT; |
23 | 23 | public $font_style = FS_NORMAL; |
@@ -29,20 +29,20 @@ discard block |
||
29 | 29 | |
30 | 30 | protected $weight = 1; |
31 | 31 | protected $color = array(0, 0, 0); |
32 | - protected $label_color = array(0, 0, 0); |
|
32 | + protected $label_color = array(0, 0, 0); |
|
33 | 33 | protected $ticks_label_colors = null; |
34 | 34 | protected $show_first_label = true; |
35 | - protected $show_last_label = true; |
|
35 | + protected $show_last_label = true; |
|
36 | 36 | protected $label_step = 1; // Used by a text axis to specify what multiple of major steps |
37 | 37 | // should be labeled. |
38 | - protected $labelPos = 0; // Which side of the axis should the labels be? |
|
38 | + protected $labelPos = 0; // Which side of the axis should the labels be? |
|
39 | 39 | protected $title_adjust; |
40 | 40 | protected $title_margin; |
41 | 41 | protected $title_side = SIDE_LEFT; |
42 | 42 | protected $tick_label_margin = 5; |
43 | 43 | protected $label_halign = ''; |
44 | 44 | protected $label_valign = ''; |
45 | - protected $label_para_align = 'left'; |
|
45 | + protected $label_para_align = 'left'; |
|
46 | 46 | protected $hide_line = false; |
47 | 47 | protected $iDeltaAbsPos = 0; |
48 | 48 |
@@ -84,6 +84,9 @@ discard block |
||
84 | 84 | $this->scale->ticks->SetFormatCallback($aFuncName); |
85 | 85 | } |
86 | 86 | |
87 | + /** |
|
88 | + * @param string $aHAlign |
|
89 | + */ |
|
87 | 90 | public function SetLabelAlign($aHAlign, $aVAlign = 'top', $aParagraphAlign = 'left') |
88 | 91 | { |
89 | 92 | $this->label_halign = $aHAlign; |
@@ -188,6 +191,10 @@ discard block |
||
188 | 191 | } |
189 | 192 | |
190 | 193 | // Which side of the axis should the axis title be? |
194 | + |
|
195 | + /** |
|
196 | + * @param integer $aSideOfAxis |
|
197 | + */ |
|
191 | 198 | public function SetTitleSide($aSideOfAxis) |
192 | 199 | { |
193 | 200 | $this->title_side = $aSideOfAxis; |
@@ -233,6 +240,9 @@ discard block |
||
233 | 240 | $this->label_step = $aStep; |
234 | 241 | } |
235 | 242 | |
243 | + /** |
|
244 | + * @param integer $aSidePos |
|
245 | + */ |
|
236 | 246 | public function SetLabelSide($aSidePos) |
237 | 247 | { |
238 | 248 | $this->labelPos = $aSidePos; |
@@ -9,11 +9,11 @@ discard block |
||
9 | 9 | class PolarAxis extends Axis |
10 | 10 | { |
11 | 11 | private $angle_step = 15; |
12 | - private $angle_color = 'lightgray'; |
|
13 | - private $angle_label_color = 'black'; |
|
12 | + private $angle_color = 'lightgray'; |
|
13 | + private $angle_label_color = 'black'; |
|
14 | 14 | private $angle_fontfam = FF_FONT1; |
15 | - private $angle_fontstyle = FS_NORMAL; |
|
16 | - private $angle_fontsize = 10; |
|
15 | + private $angle_fontstyle = FS_NORMAL; |
|
16 | + private $angle_fontsize = 10; |
|
17 | 17 | private $angle_fontcolor = 'navy'; |
18 | 18 | private $gridminor_color = 'lightgray'; |
19 | 19 | private $gridmajor_color = 'lightgray'; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | private $show_angle_label = true; |
25 | 25 | private $angle_tick_len = 3; |
26 | 26 | private $angle_tick_len2 = 3; |
27 | - private $angle_tick_color = 'black'; |
|
27 | + private $angle_tick_color = 'black'; |
|
28 | 28 | private $show_angle_tick = true; |
29 | 29 | private $radius_tick_color = 'black'; |
30 | 30 |
@@ -28,6 +28,9 @@ |
||
28 | 28 | private $show_angle_tick = true; |
29 | 29 | private $radius_tick_color = 'black'; |
30 | 30 | |
31 | + /** |
|
32 | + * @param \Amenadiel\JpGraph\Image\RotImage $img |
|
33 | + */ |
|
31 | 34 | public function __construct($img, $aScale) |
32 | 35 | { |
33 | 36 | parent::__construct($img, $aScale); |
@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | protected $tm = 4; |
36 | 36 | protected $bm = 4; |
37 | 37 | protected $iDoFrame = false; |
38 | - protected $iFrameColor = 'black'; |
|
39 | - protected $iFrameWeight = 1; |
|
38 | + protected $iFrameColor = 'black'; |
|
39 | + protected $iFrameWeight = 1; |
|
40 | 40 | protected $iLineWeight = 1; |
41 | 41 | protected $expired = false; |
42 | 42 | protected $cache = null; |
43 | - protected $cache_name = ''; |
|
43 | + protected $cache_name = ''; |
|
44 | 44 | protected $inline = true; |
45 | 45 | protected $image_format = 'png'; |
46 | 46 | protected $image_quality = 75; |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | protected $background_image = ''; |
50 | 50 | protected $background_image_center = true; |
51 | 51 | protected $backround_image_format = ''; |
52 | - protected $background_image_mix = 100; |
|
52 | + protected $background_image_mix = 100; |
|
53 | 53 | protected $background_image_y = null; |
54 | 54 | protected $background_image_x = null; |
55 | - private $doshadow = false; |
|
55 | + private $doshadow = false; |
|
56 | 56 | private $shadow_width = 4; |
57 | 57 | private $shadow_color = '[email protected]'; |
58 | 58 | public $footer; |
@@ -200,6 +200,10 @@ discard block |
||
200 | 200 | $this->_gdImgHandle($aGraph->Stroke(_IMG_HANDLER), $x, $y, $fx = 0, $fy = 0, $w, $h); |
201 | 201 | } |
202 | 202 | |
203 | + /** |
|
204 | + * @param integer $x |
|
205 | + * @param integer $y |
|
206 | + */ |
|
203 | 207 | public function _gdImgHandle($agdCanvas, $x, $y, $fx = 0, $fy = 0, $w = 0, $h = 0, $mix = 100) |
204 | 208 | { |
205 | 209 | if ($w == 0) { |
@@ -245,6 +249,9 @@ discard block |
||
245 | 249 | $this->footer->iRightMargin += $aShadowWidth; |
246 | 250 | } |
247 | 251 | |
252 | + /** |
|
253 | + * @param Image\Image $image |
|
254 | + */ |
|
248 | 255 | public function StrokeTitle($image, $w, $h) |
249 | 256 | { |
250 | 257 | // Stroke title |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | private $type = 'solid'; |
24 | 24 | private $grid_color = '#DDDDDD'; |
25 | 25 | private $show = false; |
26 | - private $weight = 1; |
|
26 | + private $weight = 1; |
|
27 | 27 | |
28 | 28 | public function __construct() |
29 | 29 | { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | public $csimalts = null; // ALT:s for corresponding target |
101 | 101 | private $data = array(); |
102 | 102 | private $fill = false; |
103 | - private $fill_color = array(200, 170, 180); |
|
103 | + private $fill_color = array(200, 170, 180); |
|
104 | 104 | private $color = array(0, 0, 0); |
105 | 105 | private $weight = 1; |
106 | 106 | private $linestyle = 'solid'; |
@@ -52,6 +52,9 @@ discard block |
||
52 | 52 | $this->show = $aShowMajor; |
53 | 53 | } |
54 | 54 | |
55 | + /** |
|
56 | + * @param \Amenadiel\JpGraph\Image\RotImage $img |
|
57 | + */ |
|
55 | 58 | public function Stroke($img, $grid) |
56 | 59 | { |
57 | 60 | if (!$this->show) { |
@@ -138,6 +141,9 @@ discard block |
||
138 | 141 | $this->weight = $w; |
139 | 142 | } |
140 | 143 | |
144 | + /** |
|
145 | + * @param boolean $aColor |
|
146 | + */ |
|
141 | 147 | public function SetFillColor($aColor) |
142 | 148 | { |
143 | 149 | $this->fill_color = $aColor; |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | class WindrosePlotScale |
10 | 10 | { |
11 | 11 | private $iMax; |
12 | - private $iDelta = 5; |
|
12 | + private $iDelta = 5; |
|
13 | 13 | private $iNumCirc = 3; |
14 | 14 | public $iMaxNum = 0; |
15 | 15 | private $iLblFmt = '%.0f%%'; |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | public $iZFontStyle = FS_NORMAL; |
21 | 21 | public $iZFontSize = 10; |
22 | 22 | public $iFontColor = 'black'; |
23 | - public $iZFontColor = 'black'; |
|
23 | + public $iZFontColor = 'black'; |
|
24 | 24 | private $iFontFrameColor = false; |
25 | 25 | private $iFontBkgColor = false; |
26 | 26 | private $iLblZeroTxt = null; |
@@ -278,8 +278,8 @@ |
||
278 | 278 | } |
279 | 279 | } else { |
280 | 280 | //FIX: if negative precision is returned "0f" , instead of formatted values |
281 | - $format = $precision > 0?'%01.' . $precision . 'f':'%01.0f'; |
|
282 | - $l = sprintf($format, round($aVal, $precision)); |
|
281 | + $format = $precision > 0 ? '%01.' . $precision . 'f' : '%01.0f'; |
|
282 | + $l = sprintf($format, round($aVal, $precision)); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | if (($this->supress_zerolabel && $l == 0) || ($this->supress_first && $aIdx == 0) || ($this->supress_last && $aIdx == $aNbrTicks - 1)) { |