Changeset 5548

Timestamp:

11/17/09 14:43:03 (3 years ago)

Author:

MichaelDaum

Message:

Item8332: added zoom parameter for better thumbnailing

Location:

trunk/ImagePlugin

Files:

• data/System/ImagePlugin.txt (modified) (5 diffs)
• lib/Foswiki/Plugins/ImagePlugin.pm (modified) (1 diff)
• lib/Foswiki/Plugins/ImagePlugin/Core.pm (modified) (7 diffs)
• pub/System/ImagePlugin/jquery.tooltippreview.js.gz (modified) (previous)
• pub/System/ImagePlugin/style.css.gz (modified) (previous)

trunk/ImagePlugin/data/System/ImagePlugin.txt

@@ -93 +93 @@
 | =refresh= | on/off/img to trigger recomputing images | off |
 | =size=  | geometry specification | image geometry  |
+| =zoom=  | on/off | if set to "on" scaling up images is allowed, otherwise it downscales only | off |
 | =style= | (see html specs) | empty |
 | =title= | title text | *alt* value |
@@ -118 +119 @@
 measure use the =width= and =height= arguments.
 
+Note, that you must set =zoom="on"= to scale images up. Otherwise images smaller
+than the given gemoentry will stay as hey are. For instance, when generating thumbnails
+it is preferable to keep small icons as they are instead of bloating them up
+to a standard thumbnail size.
 
 ---+++ Format specification
@@ -176 +181 @@
 | =height= | height of thumbnail  | |
 | =size= | geometry of thumbnail  | |
+| =zoom= | switch on/off upscaling  | |
 | =refresh= | on/off/img to trigger recomputing images | off |
 
@@ -239 +245 @@
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  17 Nov 2009: | added =zoom= parameter; fixed manual refresh via url params |
 |  24 Sep 2009: | updated =imageplugin.template= to help XHTML validation (stop rendering empty id attribute) |
 |  14 Sep 2009: | using Foswiki's proxy settings instead of ENV; disabled tooltip previews for Internet Explorers |
@@ -277 +284 @@
 
 
-%META:FILEATTACHMENT{name="WestminstpalaceSample.png" attr="h" autoattached="1" comment="" date="1185796830" path="WestminstpalaceSample.png" size="107728" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="WestminstpalaceSample.png" attr="h" comment="" date="1185796830" path="WestminstpalaceSample.png" size="107728" user="ProjectContributor" version="1"}%

trunk/ImagePlugin/lib/Foswiki/Plugins/ImagePlugin.pm

@@ -32 +32 @@
 
 $VERSION = '$Rev$';
-$RELEASE = '2.12';
+$RELEASE = '2.20';
 
-use Foswiki::Plugins;
-use Foswiki::Render;
+use Foswiki::Plugins ();
+use Foswiki::Render ();
 
 ###############################################################################

trunk/ImagePlugin/lib/Foswiki/Plugins/ImagePlugin/Core.pm

@@ -102 +102 @@
   my $height = $query->param('height') || '';
   my $size = $query->param('size') || '';
+  my $zoom = $query->param('zoom') || 'off';
   my $refresh = $query->param('refresh') || '';
   $refresh = ($refresh =~ /^(on|1|yes|img)$/g)?1:0;
@@ -107 +108 @@
   #writeDebug("processing image");
   my $imgInfo = $this->processImage($imgWeb, $imgTopic, $imgFile, 
-    $size, $width, $height, $refresh);
+    $size, $zoom, $width, $height, $refresh);
   unless ($imgInfo) {
     Foswiki::Func::writeWarning("ImagePlugin - $this->{errorMsg}");
@@ -153 +154 @@
   $params->{mouseout} ||= '';
   $params->{style} ||= '';
+  $params->{zoom} ||= 'off';
   $params->{tooltip} ||= 'off';
   $params->{tooltipwidth} ||= '300';
@@ -305 +307 @@
   my $imgInfo = 
     $this->processImage($imgWeb, $imgTopic, $origFile, 
-      $params->{size}, $params->{width}, $params->{height}, $doRefresh);
+      $params->{size}, $params->{zoom}, $params->{width}, $params->{height}, $doRefresh);
 
   unless ($imgInfo) {
@@ -442 +444 @@
 # returns undef on error
 sub processImage {
-  my ($this, $imgWeb, $imgTopic, $imgFile, $size, $width, $height, $doRefresh) = @_;
-
-  writeDebug("called processImage($imgWeb, $imgTopic, $imgFile, $size, $width, $height, $doRefresh)");
+  my ($this, $imgWeb, $imgTopic, $imgFile, $size, $zoom, $width, $height, $doRefresh) = @_;
+
+  writeDebug("called processImage($imgWeb, $imgTopic, $imgFile, $size, $zoom, $width, $height, $doRefresh)");
 
   $this->{errorMsg} = '';
@@ -460 +462 @@
   $imgInfo{origHeight} ||= 0;
 
+  if ($size) {
+    if ($zoom ne 'on' && ($size > $imgInfo{origHeight} || $size > $imgInfo{origWidth})) {
+      writeDebug("not zooming to size $size");
+      $size = '';
+    }
+  }
+
   if ($size || $width || $height || $doRefresh) {
     # read orig width and height
     if ($width || $height) {
+
       # keep aspect ratio
       my $aspect = $imgInfo{origWidth} ? $imgInfo{origHeight} / $imgInfo{origWidth} : 0;
       my $newHeight = $imgInfo{origHeight};
       my $newWidth = $imgInfo{origWidth};
-      if ($width && $newWidth > $width) {
+
+      if ($width && $imgInfo{origWidth} > $width) { # scale down width
         $newHeight = $width * $aspect;
         $newWidth = $width;
       }
-      if ($height && $newHeight > $height) {
+
+      if ($height && $newHeight > $height) { # scale down height
         $newWidth = $aspect ? $height / $aspect : 0;
         $newHeight = $height;
       }
+
+      if ($zoom ne 'on' && ($newHeight > $imgInfo{origHeight} || $newWidth > $imgInfo{origWidth})) {
+        writeDebug("not zooming");
+        $newHeight = $imgInfo{origHeight};
+        $newWidth = $imgInfo{origWidth};
+      }
+
       $width = int($newWidth+0.5);
       $height = int($newHeight+0.5);
-      #writeDebug("origWidth=$imgInfo{origWidth} origHeight=$imgInfo{origHeight} aspect=$aspect width=$width height=$height");
-    }
-      
+      writeDebug("origWidth=$imgInfo{origWidth} origHeight=$imgInfo{origHeight} aspect=$aspect width=$width height=$height");
+    }
+
     my $newImgFile = $this->getImageFile($width, $height, $size, $imgFile);
     my $newImgPath = $imgPath.'/'.$newImgFile;
@@ -680 +699 @@
     my $topicInfo = $meta->get('TOPICINFO');
     $attachment->{name} = $baseFilename;
-    $attachment->{attachment} = $filename;
+    $attachment->{attachment} = $baseFilename; # BTW: not documented in System.MetaData 
     $attachment->{date} = time();
     $attachment->{version} ||= 1;