Changeset 69 for trunk/Packages/Common/Image.php

Timestamp:

Feb 28, 2016, 10:54:30 AM (9 years ago)

Author:

chronos

Message:

• Modified: Use object oriented approach for page drawing using Application class.
• Added: SQL updated will be automatic using UpdateTrace.php file.
• Added: Use generic setup page at URL /setup for SQL structure update.
• Modified: Update Common package to newer version.

File:

• trunk/Packages/Common/Image.php (modified) (6 diffs)

trunk/Packages/Common/Image.php

@@ -12 +12 @@
   var $FileName;
   var $Color;
-  
-  function __construct() 
+
+  function __construct()
   {
     $this->Color = COLOR_BLACK;
@@ -27 +27 @@
   var $Y;
 
-  function __construct() 
+  function __construct()
   {
     $this->Color = COLOR_BLACK;
@@ -40 +40 @@
   var $Color;
 
-  function __construct() 
+  function __construct()
   {
     $this->Color = COLOR_BLACK;
@@ -47 +47 @@
 }
 
-class Image 
+class Image
 {
-  var $Image;  
+  var $Image;
   var $Type;
   var $Font;
   var $Pen;
-  
+
   function __construct()
   {
@@ -59 +59 @@
     $this->Type = IMAGETYPE_PNG;
     $this->Pen = new Pen();
-    $this->Font = new Font();   
-    $this->Brush = new Brush();   
+    $this->Font = new Font();
+    $this->Brush = new Brush();
   }
-  
+
   function SaveToFile($FileName)
   {
-    if($this->Type == IMAGETYPE_JPEG) 
+    if($this->Type == IMAGETYPE_JPEG)
     {
       imagejpeg($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF) 
+    if($this->Type == IMAGETYPE_GIF)
     {
       imagegif($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_PNG) 
+    if($this->Type == IMAGETYPE_PNG)
     {
       imagepng($this->Image, $FileName);
     }
   }
-  
+
   function LoadFromFile($FileName)
   {
     $ImageInfo = getimagesize($FileName);
     $this->Type = $ImageInfo[2];
-    if($this->Type == IMAGETYPE_JPEG) 
+    if($this->Type == IMAGETYPE_JPEG)
     {
       $this->Image = imagecreatefromjpeg($FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF) 
+    if($this->Type == IMAGETYPE_GIF)
     {
       $this->Image = imagecreatefromgif($FileName);
     } else
-    if( $this->Type == IMAGETYPE_PNG) 
+    if( $this->Type == IMAGETYPE_PNG)
     {
       $this->Image = imagecreatefrompng($FileName);
-    }  
+    }
   }
-  
+
   function Output()
   {
@@ -103 +103 @@
 
   function SetSize($Width, $Height)
-  {     
+  {
     $NewImage = imagecreatetruecolor($Width, $Height);
-    imagecopy($NewImage, $this->Image, 0, 0, 0, 0, $this->GetWidth(), $this->GetHeight());      
+    imagecopy($NewImage, $this->Image, 0, 0, 0, 0, $this->GetWidth(), $this->GetHeight());
     imagedestroy($this->Image);
     $this->Image = $NewImage;
   }
 
-  function GetWidth() 
-  { 
+  function GetWidth()
+  {
     return(imagesx($this->Image));
   }
-  
-  function GetHeight() 
+
+  function GetHeight()
   {
     return(imagesy($this->Image));
   }
-  
+
   function TextOut($X, $Y, $Text)
   {
     imagettftext($this->Image, $this->Font->Size, 0, $X, $Y, $this->ConvertColor($this->Font->Color), $this->Font->FileName, $Text);
   }
-  
+
   function ConvertColor($Color)
   {
     return(imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff));
   }
-  
+
   function FillRect($X1, $Y1, $X2, $Y2)
   {
     imagefilledrectangle($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Brush->Color));
   }
-  
+
   function Line($X1, $Y1, $X2, $Y2)
   {