[Web-erp-svn] SF.net SVN: web-erp:[6800] trunk

[<rc...@us...>]

Revision: 6800
          http://sourceforge.net/p/web-erp/reponame/6800
Author:   rchacon
Date:     2014-07-31 19:58:21 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Corrects the bottom line of the rectangle. Adds comments (info for developers).

Modified Paths:
--------------
    trunk/doc/Change.log
    trunk/includes/class.pdf.php

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-07-31 10:24:19 UTC (rev 6799)
+++ trunk/doc/Change.log	2014-07-31 19:58:21 UTC (rev 6800)
@@ -1,4 +1,5 @@
 webERP Change Log
+31/07/14 RChacon: Corrects the bottom line of the rectangle. Adds comments (info for developers).
 29/07/14 RChacon: In PDFPriceList.php: Adds comments (info for developers), ViewTopic and BookMark, and currency name in locale language; deletes unused lines; reformats for legibility; adjusts column sizes to field sizes; improves printing of stockmaster.longdescription; improves code to reduce execution time (calculation out of loops); links right column positions to right margin; corrects IF for CustomerSpecials (deletes translation). In ManualSalesTypes.html: Adds help info about Print a price list by inventory category.
 27/7/14 Exson: Fixed the PO header lost initiator bugs when locations changed. Report by Akits from www.minghao.hk/bbs/.
 25/7/14 Phil: Allow dummy - labour stock type items to be added to purchase orders.

Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php	2014-07-31 10:24:19 UTC (rev 6799)
+++ trunk/includes/class.pdf.php	2014-07-31 19:58:21 UTC (rev 6800)
@@ -1,5 +1,4 @@
 <?php
-
 /* $Id$ */
 
      /* -----------------------------------------------------------------------------------------------
@@ -218,26 +217,30 @@
 			$this->Output($DocumentFilename,'D');
 		}
 
-		function RoundRectangle($XPos, $YPos, $Width, $Height, $RadiusX, $RadiusY) {
-			$this->line($XPos, $YPos-$RadiusY, $XPos, $YPos-$Height+$RadiusY);// Left side
-			$this->line($XPos+$RadiusX, $YPos, $XPos+$Width-$RadiusX, $YPos);// Top side
-			$this->line($XPos+$RadiusX, $YPos-$Height-$RadiusX, $XPos+$Width-$RadiusX, $YPos-$Height-$RadiusX);// Bottom side
-			$this->line($XPos+$Width, $YPos-$RadiusY, $XPos+$Width, $YPos-$Height+$RadiusY);// Right side
-			$this->partEllipse($XPos+$RadiusX, $YPos-$RadiusY, 90, 180, $RadiusX, $RadiusY);// Top left corner
-			$this->partEllipse($XPos+$RadiusX, $YPos-$Height+$RadiusY, 180, 270, $RadiusX, $RadiusY);// Bottom left corner
-			$this->partEllipse($XPos+$Width-$RadiusX, $YPos-$RadiusY, 0, 90, $RadiusX, $RadiusY);// Top right corner
-			$this->partEllipse($XPos+$Width-$RadiusX, $YPos-$Height+$RadiusY, 270, 360, $RadiusX, $RadiusY);// Bottom right corner
+		function Rectangle($XPos, $YPos, $Width, $Height) {
+			// $XPos, $YPos = Left top position (left line, top line).
+			// $Width, $Height = Size (line-to-line).
+			$this->line($XPos, $YPos, $XPos+$Width, $YPos);// Top side.
+			$this->line($XPos, $YPos-$Height, $XPos+$Width, $YPos-$Height);// Bottom side.
+			$this->line($XPos, $YPos, $XPos, $YPos-$Height);// Left side.
+			$this->line($XPos+$Width, $YPos, $XPos+$Width, $YPos-$Height);// Right side
 		}
 
-		function Rectangle($XPos, $YPos, $Width, $Height) {
-			$this->line($XPos, $YPos, $XPos+$Width, $YPos);
-			$this->line($XPos+$Width, $YPos, $XPos+$Width, $YPos-$Height);
-			$this->line($XPos+$Width, $YPos-$Height, $XPos, $YPos-$Height);
-			$this->line($XPos, $YPos-$Height, $XPos, $YPos);
+		function RoundRectangle($XPos, $YPos, $Width, $Height, $RadiusX, $RadiusY) {
+			// $XPos, $YPos = Left top position (left line, top line).
+			// $Width, $Height = Size (line-to-line).
+			// $RadiusX, $RadiusY = corner radii (horizontal, vertical).
+			$this->line($XPos+$RadiusX, $YPos, $XPos+$Width-$RadiusX, $YPos);// Top side.
+			$this->line($XPos+$RadiusX, $YPos-$Height, $XPos+$Width-$RadiusX, $YPos-$Height);// Bottom side.
+			$this->line($XPos, $YPos-$RadiusY, $XPos, $YPos-$Height+$RadiusY);// Left side.
+			$this->line($XPos+$Width, $YPos-$RadiusY, $XPos+$Width, $YPos-$Height+$RadiusY);// Right side.
+			$this->partEllipse($XPos+$RadiusX, $YPos-$RadiusY, 90, 180, $RadiusX, $RadiusY);// Top left corner.
+			$this->partEllipse($XPos+$Width-$RadiusX, $YPos-$RadiusY, 0, 90, $RadiusX, $RadiusY);// Top right corner.
+			$this->partEllipse($XPos+$RadiusX, $YPos-$Height+$RadiusY, 180, 270, $RadiusX, $RadiusY);// Bottom left corner.
+			$this->partEllipse($XPos+$Width-$RadiusX, $YPos-$Height+$RadiusY, 270, 360, $RadiusX, $RadiusY);// Bottom right corner.
 		}
 
 		function addTextWrap($XPos, $YPos, $Width, $Height, $Text, $Align='J', $border=0, $fill=0) {
-
 			/* Returns the balance of the string that could not fit in the width
 			 * XPos = pdf horizontal coordinate
 			 * YPos = pdf vertical coordiante