Changeset 1917 for plugins/apostrophePlugin/trunk/lib/action/BaseaMediaBackendActions.class.php

Timestamp:

08/08/10 12:18:34 (22 months ago)

Author:

tboutell

Message:

Merged the cropping branch back to trunk:

Cropping is now available in the media repository. Every time you select an image for use on the site you have the opportunity to crop it. The image size constraints of the slot are taken into account. This means that you can satisfy a given set of constraints by cropping a wide variety of images that would not have been eligible for selection before.

Crops of existing images appear in the database as separate aMediaItem objects but do not duplicate the original image file. This means that many crops of a single source image can exist without significant overhead.

The slug field of a cropped version of an image contains cropping parameters. When rendering the image, Symfony routes spot these and crop the original file as needed.

By approaching the problem this way we have avoided the need for code that takes advantage of the media repository's image selection capabilities to change in any way in order to take advantage of cropping.

The single-image-select behavior of Apostrophe has changed to accommodate the extra cropping step. Single select for PDFs and videos still uses the selectSingle partial because they cannot be cropped.

Thanks to Spike Broehm for his contributions to the cropping project.

Fixes #227

Location:

plugins/apostrophePlugin/trunk

Files:

• . (modified) (1 prop)
• lib/action/BaseaMediaBackendActions.class.php (modified) (3 diffs)

plugins/apostrophePlugin/trunk/lib/action/BaseaMediaBackendActions.class.php

@@ -39 +39 @@
       array_keys(aMediaItemTable::$mimeTypes)));
     $this->forward404Unless(($resizeType !== 'c') || ($resizeType !== 's'));
-    $output = $this->getDirectory() . 
-      DIRECTORY_SEPARATOR . "$slug.$width.$height.$resizeType.$format";
+    // EDITED FOR ARBITRARY CROPPING
+    $cropLeft = $request->getParameter('cropLeft');
+    $cropTop = $request->getParameter('cropTop');
+    $cropWidth = $request->getParameter('cropWidth');
+    $cropHeight = $request->getParameter('cropHeight');
+    
+    if (!is_null($cropWidth) && !is_null($cropHeight) && !is_null($cropLeft) && !is_null($cropTop))
+    {
+      $cropLeft = ceil($cropLeft + 0);
+      $cropTop = ceil($cropTop + 0);
+      $cropWidth = ceil($cropWidth + 0);
+      $cropHeight = ceil($cropHeight + 0);
+      // Explicit cropping always preempts any automatic cropping, so there's no difference between c and s,
+      // and only the cropOriginal method actually supports cropping parameters, so
+      $resizeType = 'c';
+      
+      $output = $this->getDirectory() . 
+        DIRECTORY_SEPARATOR . "$slug.$cropLeft.$cropTop.$cropWidth.$cropHeight.$width.$height.$resizeType.$format";      
+    }
+    else
+    {
+      $cropLeft = null;
+      $cropTop = null;
+      $cropWidth = null;
+      $cropHeight = null;
+      $output = $this->getDirectory() . 
+        DIRECTORY_SEPARATOR . "$slug.$width.$height.$resizeType.$format";
+    }
+
     // If .htaccess has not been set up, or we are not running
     // from the default front controller, then we may get here
@@ -57 +84 @@
         $method = 'scaleToFit';
       }
-      $quality = sfConfig::get('app_aMedia_jpeg_quality', 75);
       aImageConverter::$method(
         aMediaItemTable::getDirectory() .
@@ -65 +91 @@
         $width,
         $height,
-        sfConfig::get('app_aMedia_jpeg_quality', 75));
+        sfConfig::get('app_aMedia_jpeg_quality', 75),
+        $cropLeft,
+        $cropTop,
+        $cropWidth,
+        $cropHeight);
     }
     // The FIRST time, we output this here. Later it