@@ -24,7 +24,7 @@ |
||
| 24 | 24 | private $showlabelhint = true; |
| 25 | 25 | private $angle = 50; |
| 26 | 26 | private $edgecolor = ""; |
| 27 | - private $edgeweight = 1; |
|
| 27 | + private $edgeweight = 1; |
|
| 28 | 28 | private $iThickness = false; |
| 29 | 29 | |
| 30 | 30 | //--------------- |
@@ -87,6 +87,15 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | + /** |
|
| 91 | + * @param integer $i |
|
| 92 | + * @param double $xc |
|
| 93 | + * @param double $yc |
|
| 94 | + * @param double $height |
|
| 95 | + * @param double $width |
|
| 96 | + * @param double $sa |
|
| 97 | + * @param double $ea |
|
| 98 | + */ |
|
| 90 | 99 | public function Add3DSliceToCSIM($i, $xc, $yc, $height, $width, $thick, $sa, $ea) |
| 91 | 100 | { |
| 92 | 101 | //Slice number, ellipse centre (x,y), height, width, start angle, end angle |
@@ -201,6 +210,10 @@ discard block |
||
| 201 | 210 | } |
| 202 | 211 | |
| 203 | 212 | // Draw one 3D pie slice at position ($xc,$yc) with height $z |
| 213 | + |
|
| 214 | + /** |
|
| 215 | + * @param double $h |
|
| 216 | + */ |
|
| 204 | 217 | public function Pie3DSlice($img, $xc, $yc, $w, $h, $sa, $ea, $z, $fillcolor, $shadow = 0.65) |
| 205 | 218 | { |
| 206 | 219 | |
@@ -413,6 +426,13 @@ discard block |
||
| 413 | 426 | } |
| 414 | 427 | |
| 415 | 428 | // Draw a 3D Pie |
| 429 | + |
|
| 430 | + /** |
|
| 431 | + * @param integer $aaoption |
|
| 432 | + * @param double $yc |
|
| 433 | + * @param integer $angle |
|
| 434 | + * @param double $z |
|
| 435 | + */ |
|
| 416 | 436 | public function Pie3D($aaoption, $img, $data, $colors, $xc, $yc, $d, $angle, $z, |
| 417 | 437 | $shadow = 0.65, $startangle = 0, $edgecolor = "", $edgeweight = 1) |
| 418 | 438 | { |
@@ -746,6 +766,13 @@ discard block |
||
| 746 | 766 | $img->PopColor(); |
| 747 | 767 | } |
| 748 | 768 | |
| 769 | + /** |
|
| 770 | + * @param double $sa |
|
| 771 | + * @param double $ea |
|
| 772 | + * @param double $h |
|
| 773 | + * @param string $edgecolor |
|
| 774 | + * @param boolean $fulledge |
|
| 775 | + */ |
|
| 749 | 776 | public function StrokeFullSliceFrame($img, $xc, $yc, $sa, $ea, $w, $h, $z, $edgecolor, $exploderadius, $fulledge) |
| 750 | 777 | { |
| 751 | 778 | $step = 0.02; |
@@ -905,6 +932,12 @@ discard block |
||
| 905 | 932 | // PRIVATE METHODS |
| 906 | 933 | |
| 907 | 934 | // Position the labels of each slice |
| 935 | + |
|
| 936 | + /** |
|
| 937 | + * @param double $a |
|
| 938 | + * @param double $xp |
|
| 939 | + * @param double $yp |
|
| 940 | + */ |
|
| 908 | 941 | public function StrokeLabels($label, $img, $a, $xp, $yp, $z) |
| 909 | 942 | { |
| 910 | 943 | $this->value->halign = "left"; |
@@ -9,10 +9,10 @@ |
||
| 9 | 9 | { |
| 10 | 10 | public $title; |
| 11 | 11 | public $caption; |
| 12 | - public $csimarea = ''; |
|
| 13 | - public $csimtarget = ''; |
|
| 14 | - public $csimwintarget = ''; |
|
| 15 | - public $csimalt = ''; |
|
| 12 | + public $csimarea = ''; |
|
| 13 | + public $csimtarget = ''; |
|
| 14 | + public $csimwintarget = ''; |
|
| 15 | + public $csimalt = ''; |
|
| 16 | 16 | public $constraints = array(); |
| 17 | 17 | public $iCaptionMargin = 5; |
| 18 | 18 | public $iConstrainPos = array(); |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | class AccLinePlot extends Plot |
| 9 | 9 | { |
| 10 | 10 | protected $plots = null; |
| 11 | - protected $nbrplots = 0; |
|
| 11 | + protected $nbrplots = 0; |
|
| 12 | 12 | private $iStartEndZero = true; |
| 13 | 13 | //--------------- |
| 14 | 14 | // CONSTRUCTOR |
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | private $iLine; |
| 9 | 9 | private $title_margin = 3; |
| 10 | 10 | private $iDayOffset = 0.5; |
| 11 | - private $iStartRow = -1; |
|
| 12 | - private $iEndRow = -1; |
|
| 11 | + private $iStartRow = -1; |
|
| 12 | + private $iEndRow = -1; |
|
| 13 | 13 | |
| 14 | 14 | //--------------- |
| 15 | 15 | // CONSTRUCTOR |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | private $nbrCols = 0; |
| 30 | 30 | private $nbrRows = 0; |
| 31 | 31 | private $horizEdges = array(); |
| 32 | - private $vertEdges = array(); |
|
| 32 | + private $vertEdges = array(); |
|
| 33 | 33 | private $isobarValues = array(); |
| 34 | 34 | private $stack = null; |
| 35 | 35 | private $isobarCoord = array(); |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | /** |
| 137 | 137 | * Determine if the specified isobar crosses the horizontal edge specified by its row and column |
| 138 | 138 | * |
| 139 | - * @param $aRow Row index of edge to be checked |
|
| 140 | - * @param $aCol Col index of edge to be checked |
|
| 139 | + * @param integer $aRow Row index of edge to be checked |
|
| 140 | + * @param integer $aCol Col index of edge to be checked |
|
| 141 | 141 | * @param $aIsobar Isobar value |
| 142 | - * @return true if the isobar is crossing this edge |
|
| 142 | + * @return boolean if the isobar is crossing this edge |
|
| 143 | 143 | */ |
| 144 | 144 | public function isobarHCrossing($aRow, $aCol, $aIsobar) |
| 145 | 145 | { |
@@ -161,10 +161,10 @@ discard block |
||
| 161 | 161 | /** |
| 162 | 162 | * Determine if the specified isobar crosses the vertical edge specified by its row and column |
| 163 | 163 | * |
| 164 | - * @param $aRow Row index of edge to be checked |
|
| 165 | - * @param $aCol Col index of edge to be checked |
|
| 164 | + * @param integer $aRow Row index of edge to be checked |
|
| 165 | + * @param integer $aCol Col index of edge to be checked |
|
| 166 | 166 | * @param $aIsobar Isobar value |
| 167 | - * @return true if the isobar is crossing this edge |
|
| 167 | + * @return boolean if the isobar is crossing this edge |
|
| 168 | 168 | */ |
| 169 | 169 | public function isobarVCrossing($aRow, $aCol, $aIsobar) |
| 170 | 170 | { |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | * Determine all edges, horizontal and vertical that the specified isobar crosses. The crossings |
| 188 | 188 | * are recorded in the two edge matrices. |
| 189 | 189 | * |
| 190 | - * @param $aIsobar The value of the isobar to be checked |
|
| 190 | + * @param integer $aIsobar The value of the isobar to be checked |
|
| 191 | 191 | */ |
| 192 | 192 | public function determineIsobarEdgeCrossings($aIsobar) |
| 193 | 193 | { |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | * isobar- The crossing is simpy detrmined with a linear interpolation between the two vertices |
| 215 | 215 | * on each side of the edge and the value of the isobar |
| 216 | 216 | * |
| 217 | - * @param $aRow Row of edge |
|
| 218 | - * @param $aCol Column of edge |
|
| 219 | - * @param $aEdgeDir Determine if this is a horizontal or vertical edge |
|
| 217 | + * @param integer $aRow Row of edge |
|
| 218 | + * @param integer $aCol Column of edge |
|
| 219 | + * @param integer $aEdgeDir Determine if this is a horizontal or vertical edge |
|
| 220 | 220 | * @param $ib The isobar value |
| 221 | 221 | * @return unknown_type |
| 222 | 222 | */ |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | private $iFormCallback = ''; |
| 22 | 22 | private $angle = 0; |
| 23 | 23 | private $color = 'navy'; |
| 24 | - private $negcolor = ''; |
|
| 24 | + private $negcolor = ''; |
|
| 25 | 25 | private $iHideZero = false; |
| 26 | 26 | public $txt = null; |
| 27 | 27 | |
@@ -52,24 +52,24 @@ |
||
| 52 | 52 | public $iCenterSize = 60; |
| 53 | 53 | private $iType = WINDROSE_TYPE16; |
| 54 | 54 | public $iFontFamily = FF_VERDANA; |
| 55 | - public $iFontStyle = FS_NORMAL; |
|
| 56 | - public $iFontSize = 10; |
|
| 55 | + public $iFontStyle = FS_NORMAL; |
|
| 56 | + public $iFontSize = 10; |
|
| 57 | 57 | public $iFontColor = 'darkgray'; |
| 58 | 58 | private $iRadialGridStyle = 'longdashed'; |
| 59 | 59 | private $iAllDirectionLabels = ['E', 'ENE', 'NE', 'NNE', 'N', 'NNW', 'NW', 'WNW', 'W', 'WSW', 'SW', 'SSW', 'S', 'SSE', 'SE', 'ESE']; |
| 60 | 60 | private $iStandardDirections = []; |
| 61 | 61 | private $iCircGridWeight = 3; |
| 62 | - private $iRadialGridWeight = 1; |
|
| 62 | + private $iRadialGridWeight = 1; |
|
| 63 | 63 | private $iLabelMargin = 12; |
| 64 | 64 | private $iLegweights = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]; |
| 65 | 65 | private $iLegColors = ['orange', 'black', 'blue', 'red', 'green', 'purple', 'navy', 'yellow', 'brown']; |
| 66 | 66 | private $iLabelFormatString = ''; |
| 67 | - private $iLabels = []; |
|
| 67 | + private $iLabels = []; |
|
| 68 | 68 | private $iLabelPositioning = LBLPOSITION_EDGE; |
| 69 | 69 | private $iColor = 'white'; |
| 70 | 70 | private $iShowBox = false; |
| 71 | 71 | private $iBoxColor = 'black'; |
| 72 | - private $iBoxWeight = 1; |
|
| 72 | + private $iBoxWeight = 1; |
|
| 73 | 73 | private $iBoxStyle = 'solid'; |
| 74 | 74 | private $iOrdinalEncoding = KEYENCODING_ANTICLOCKWISE; |
| 75 | 75 | public $legend = null; |
@@ -261,6 +261,10 @@ discard block |
||
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | + /** |
|
| 265 | + * @param double $aXC |
|
| 266 | + * @param string $aColor |
|
| 267 | + */ |
|
| 264 | 268 | public function _ThickCircle($aImg, $aXC, $aYC, $aRad, $aWeight = 2, $aColor) |
| 265 | 269 | { |
| 266 | 270 | $aImg->SetColor($aColor); |
@@ -578,6 +582,14 @@ discard block |
||
| 578 | 582 | $this->iLabelPositioning = $aPos; |
| 579 | 583 | } |
| 580 | 584 | |
| 585 | + /** |
|
| 586 | + * @param Text\Text $value |
|
| 587 | + * @param double $scaling |
|
| 588 | + * @param double $xc |
|
| 589 | + * @param double $yc |
|
| 590 | + * @param double $r |
|
| 591 | + * @param double $ri |
|
| 592 | + */ |
|
| 581 | 593 | public function _StrokeFreeRose($dblImg, $value, $scaling, $xc, $yc, $r, $ri) |
| 582 | 594 | { |
| 583 | 595 | |
@@ -753,6 +765,10 @@ discard block |
||
| 753 | 765 | |
| 754 | 766 | // Translate potential string specified compass labels to their |
| 755 | 767 | // corresponding index. |
| 768 | + |
|
| 769 | + /** |
|
| 770 | + * @param integer $num |
|
| 771 | + */ |
|
| 756 | 772 | public function FixupIndexes($aDataArray, $num) |
| 757 | 773 | { |
| 758 | 774 | $ret = []; |
@@ -782,6 +798,14 @@ discard block |
||
| 782 | 798 | return $ret; |
| 783 | 799 | } |
| 784 | 800 | |
| 801 | + /** |
|
| 802 | + * @param Text\Text $value |
|
| 803 | + * @param double $scaling |
|
| 804 | + * @param double $xc |
|
| 805 | + * @param double $yc |
|
| 806 | + * @param double $r |
|
| 807 | + * @param double $ri |
|
| 808 | + */ |
|
| 785 | 809 | public function _StrokeRegularRose($dblImg, $value, $scaling, $xc, $yc, $r, $ri) |
| 786 | 810 | { |
| 787 | 811 | // _StrokeRegularRose($dblImg,$xc,$yc,$r,$ri) |
@@ -13,17 +13,17 @@ |
||
| 13 | 13 | private $iEnd; |
| 14 | 14 | private $iHeightFactor = 0.5; |
| 15 | 15 | private $iFillColor = "white"; |
| 16 | - private $iFrameColor = "black"; |
|
| 16 | + private $iFrameColor = "black"; |
|
| 17 | 17 | private $iShadow = false; |
| 18 | 18 | private $iShadowColor = "darkgray"; |
| 19 | 19 | private $iShadowWidth = 1; |
| 20 | 20 | private $iShadowFrame = "black"; |
| 21 | 21 | private $iPattern = GANTT_RDIAG; |
| 22 | 22 | private $iPatternColor = "blue"; |
| 23 | - private $iPatternDensity = 95; |
|
| 23 | + private $iPatternDensity = 95; |
|
| 24 | 24 | private $iBreakStyle = false; |
| 25 | - private $iBreakLineStyle = 'dotted'; |
|
| 26 | - private $iBreakLineWeight = 1; |
|
| 25 | + private $iBreakLineStyle = 'dotted'; |
|
| 26 | + private $iBreakLineWeight = 1; |
|
| 27 | 27 | //--------------- |
| 28 | 28 | // CONSTRUCTOR |
| 29 | 29 | public function __construct($aPos, $aLabel, $aStart, $aEnd, $aCaption = "", $aHeightFactor = 0.6) |
@@ -23,10 +23,10 @@ |
||
| 23 | 23 | protected $weight = 1; |
| 24 | 24 | protected $color = 'black'; |
| 25 | 25 | private $legend = ''; |
| 26 | - private $hidelegend = false; |
|
| 27 | - private $legendcsimtarget = ''; |
|
| 28 | - private $legendcsimalt = ''; |
|
| 29 | - private $legendcsimwintarget = ''; |
|
| 26 | + private $hidelegend = false; |
|
| 27 | + private $legendcsimtarget = ''; |
|
| 28 | + private $legendcsimalt = ''; |
|
| 29 | + private $legendcsimwintarget = ''; |
|
| 30 | 30 | private $iLineStyle = 'solid'; |
| 31 | 31 | public $numpoints = 0; // Needed since the framework expects this property |
| 32 | 32 | |