Merging DEV_TEMPORARY to HEAD (RenditionService)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/content/transform/magick/ImageCropOptions.java

@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+
+package org.alfresco.repo.content.transform.magick;
+
+/**
+ * DTO used to store options for ImageMagick cropping.
+ * 
+ * @author Nick Smith
+ */
+public class ImageCropOptions
+{
+    private int height = -1;
+    private int width = -1;
+    private int xOffset = 0;
+    private int yOffset = 0;
+    private boolean isPercentageCrop = false;
+    private String gravity = null;
+
+    /**
+     * Gets the height of the cropped image. By default this is in pixels but if
+     * <code>isPercentageCrop</code> is set to true then it changes to
+     * percentage.
+     * 
+     * @return the height
+     */
+    public int getHeight()
+    {
+        return this.height;
+    }
+
+    /**
+     * Sets the height of the cropped image. By default this is in pixels but if
+     * <code>isPercentageCrop</code> is set to true then it changes to
+     * percentage.
+     * 
+     * @param height the height to set
+     */
+    public void setHeight(int height)
+    {
+        this.height = height;
+    }
+
+    /**
+     * Sets the width of the cropped image. By default this is in pixels but if
+     * <code>isPercentageCrop</code> is set to true then it changes to
+     * percentage.
+     * 
+     * @return the width
+     */
+    public int getWidth()
+    {
+        return this.width;
+    }
+
+    /**
+     * Sets the width of the cropped image. By default this is in pixels but if
+     * <code>isPercentageCrop</code> is set to true then it changes to
+     * percentage.
+     * 
+     * @param width the width to set
+     */
+    public void setWidth(int width)
+    {
+        this.width = width;
+    }
+
+    /**
+     * Gets the horizontal offset. By default this starts fromt he top-left
+     * corner of the image and moves right, however the <code>gravity</code>
+     * property can change this.
+     * 
+     * @return the xOffset
+     */
+    public int getXOffset()
+    {
+        return this.xOffset;
+    }
+
+    /**
+     * Sets the horizontal offset. By default this starts fromt he top-left
+     * corner of the image and moves right, however the <code>gravity</code>
+     * property can change this.
+     * 
+     * @param xOffset the xOffset to set
+     */
+    public void setXOffset(int xOffset)
+    {
+        this.xOffset = xOffset;
+    }
+
+    /**
+     * Gets the vertical offset. By default this starts fromt he top-left corner
+     * of the image and moves down, however the <code>gravity</code> property
+     * can change this.
+     * 
+     * @return the yOffset
+     */
+    public int getYOffset()
+    {
+        return this.yOffset;
+    }
+
+    /**
+     * Sets the vertical offset. By default this starts fromt he top-left corner
+     * of the image and moves down, however the <code>gravity</code> property
+     * can change this.
+     * 
+     * @param yOffset the yOffset to set
+     */
+    public void setYOffset(int yOffset)
+    {
+        this.yOffset = yOffset;
+    }
+
+    /**
+     * @return the isPercentageCrop
+     */
+    public boolean isPercentageCrop()
+    {
+        return this.isPercentageCrop;
+    }
+
+    /**
+     * @param isPercentageCrop the isPercentageCrop to set
+     */
+    public void setPercentageCrop(boolean isPercentageCrop)
+    {
+        this.isPercentageCrop = isPercentageCrop;
+    }
+
+    /**
+     * Sets the 'gravity' which determines how the offset is applied. It affects
+     * both the origin of offset and the direction(s).
+     * 
+     * @param gravity the gravity to set
+     */
+    public void setGravity(String gravity)
+    {
+        this.gravity = gravity;
+    }
+
+    /**
+     * Gets the 'gravity' which determines how the offset is applied. It affects
+     * both the origin of offset and the direction(s).
+     * 
+     * @return the gravity
+     */
+    public String getGravity()
+    {
+        return this.gravity;
+    }
+}

source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java

@@ -149,8 +149,13 @@ public class ImageMagickContentTransformerWorker extends AbstractImageMagickCont
         if (options instanceof ImageTransformationOptions)
         {
             ImageTransformationOptions imageOptions = (ImageTransformationOptions)options;
+            ImageCropOptions cropOptions = imageOptions.getCropOptions();
             ImageResizeOptions resizeOptions = imageOptions.getResizeOptions();
             String commandOptions = imageOptions.getCommandOptions();
+            if (cropOptions != null)
+            {
+                commandOptions = commandOptions + " " + getImageCropCommandOptions(cropOptions);
+            }
             if (resizeOptions != null)
             {
                 commandOptions = commandOptions + " " + getImageResizeCommandOptions(resizeOptions);
@@ -173,6 +178,59 @@ public class ImageMagickContentTransformerWorker extends AbstractImageMagickCont
         }
     }
     
+    /**
+     * Gets the imagemagick command string for the image crop options provided
+     * 
+     * @param imageResizeOptions    image resize options
+     * @return String               the imagemagick command options
+     */
+    private String getImageCropCommandOptions(ImageCropOptions cropOptions)
+    {
+        StringBuilder builder = new StringBuilder(32);
+        String gravity = cropOptions.getGravity();
+        if(gravity!=null)
+        {
+            builder.append("-gravity ");
+            builder.append(gravity);
+            builder.append(" ");
+        }
+        builder.append("-crop ");
+        int width = cropOptions.getWidth();
+        if (width > -1)
+        {
+            builder.append(width);
+        }
+        
+        int height = cropOptions.getHeight();
+        if (height > -1)
+        {
+            builder.append("x");
+            builder.append(height);
+        }
+        
+        if (cropOptions.isPercentageCrop())
+        {
+            builder.append("%");
+        }
+        appendOffset(builder, cropOptions.getXOffset());
+        appendOffset(builder, cropOptions.getYOffset());
+        builder.append(" +repage");
+        return builder.toString();
+    }
+
+    /**
+     * @param builder
+     * @param xOffset
+     */
+    private void appendOffset(StringBuilder builder, int xOffset)
+    {
+        if(xOffset>=0)
+        {
+            builder.append("+");
+        }
+        builder.append(xOffset);
+    }
+
     /**
      * Gets the imagemagick command string for the image resize options provided
      * 

source/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java

@@ -33,6 +33,9 @@ public class ImageTransformationOptions extends TransformationOptions
     /** Image resize options */
     private ImageResizeOptions resizeOptions;
     
+    /** Image crop options */
+    private ImageCropOptions cropOptions;
+    
     /**
      * Set the command string options
      * 
@@ -84,4 +87,20 @@ public class ImageTransformationOptions extends TransformationOptions
     	
     	return msg.toString();
     }
+    
+    /**
+     * @param cropOptions the cropOptions to set
+     */
+    public void setCropOptions(ImageCropOptions cropOptions)
+    {
+        this.cropOptions = cropOptions;
+    }
+    
+    /**
+     * @return the cropOptions
+     */
+    public ImageCropOptions getCropOptions()
+    {
+        return this.cropOptions;
+    }
 }