diff --git a/lam/HISTORY b/lam/HISTORY index 7a030542..7295e2f9 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,3 +1,8 @@ +December 2010 3.3.0 + - additional usability enhancements + - PDF export: higher resolution for logos + + 28.10.2010 3.2.0 - large usability enhancements - Shadow: allow to force password change when maximum password age is set diff --git a/lam/config/pdf/logos/printLogo.jpg b/lam/config/pdf/logos/printLogo.jpg index 35ef1e4d..d9709a57 100644 Binary files a/lam/config/pdf/logos/printLogo.jpg and b/lam/config/pdf/logos/printLogo.jpg differ diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml index 7930502e..343becec 100644 --- a/lam/docs/manual-sources/howto.xml +++ b/lam/docs/manual-sources/howto.xml @@ -644,6 +644,20 @@ Have fun!
Version specific upgrade instructions +
+ 3.2.0 -> 3.3.0 + + If you use custom images for the PDF export then these images + need to be 5 times bigger than before (e.g. 250x250px instead of + 50x50px). This allows to use images with higher resolution. +
+ +
+ 3.1.0 -> 3.2.0 + + No changes. +
+
3.0.0 -> 3.1.0 diff --git a/lam/lib/lamPDF.inc b/lam/lib/lamPDF.inc index f99b36d6..ecebbd0f 100644 --- a/lam/lib/lamPDF.inc +++ b/lam/lib/lamPDF.inc @@ -88,29 +88,16 @@ class lamPDF extends UFPDF { function header() { if($this->page_definitions['filename'] != 'none') { $imageFile = substr(__FILE__,0,strlen(__FILE__)- 14) . "config/pdf/logos/" . $this->page_definitions['filename']; - $width = $this->page_definitions['logo-width']; - $height = $this->page_definitions['logo-height']; - if($this->page_definitions['logo-max'] == true) { - if(($width / $height) <= 2.5) { - $factor = 20 / $height; - $width = $factor * $width; - $height = 20; - } - else { - $factor = 50 / $width; - $height = $factor * $height; - $width = 50; - } - } - $this->Image($imageFile,10,10,$width,$height,"JPG"); + $imgProperties = getimagesize($imageFile); + $this->Image($imageFile,10,15,($imgProperties[0] / $this->k) / 5, ($imgProperties[1] / $this->k) / 5,0,"JPG"); } - $this->SetY(18); + $this->SetY(23); $this->SetFont($this->fontName,"B",18); $this->Cell(170,5,$this->page_definitions['headline'],0,1,"R",0); $this->Ln(3); $this->SetLineWidth(0.4); + $this->Line(10,38,200,38); $this->Line(10,40,200,40); - $this->Line(10,42,200,42); $this->SetY(50); }