diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
index 946e31b1..b605cfa4 100755
--- a/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
+++ b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
@@ -33,6 +33,8 @@ import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
import com.twelvemonkeys.servlet.ServletUtil;
+import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest;
+import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory;
import javax.imageio.*;
import javax.imageio.stream.ImageInputStream;
@@ -583,7 +585,9 @@ class ImageServletResponseImpl extends HttpServletResponseWrapper implements Ima
if (aoiX >= 0 || aoiY >= 0 || aoiW >= 0 || aoiH >= 0) {
- aoi = new AreaOfInterest(pDefaultWidth, pDefaultHeight, aoiPercent, aoiUniform).getAOI(aoiX, aoiY, aoiW, aoiH);
+ AreaOfInterest areaOfInterest = AreaOfInterestFactory.getDefault().
+ createAreaOfInterest(pDefaultWidth, pDefaultHeight, aoiPercent, aoiUniform);
+ aoi = areaOfInterest.getAOI(aoiX, aoiY, aoiW, aoiH);
return aoi;
}
diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
index fc3a7803..d2673958 100755
--- a/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
+++ b/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
@@ -66,7 +66,7 @@ public class ImageServletResponseImplTestCase {
when(context.getMimeType("file.txt")).thenReturn(CONTENT_TYPE_TEXT);
}
- private void fakeResponse(HttpServletRequest pRequest, ImageServletResponseImpl pImageResponse) throws IOException {
+ private void fakeResponse(HttpServletRequest pRequest, DefaultImageServletResponse pImageResponse) throws IOException {
String uri = pRequest.getRequestURI();
int index = uri.lastIndexOf('/');
assertTrue(uri, index >= 0);
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/AreaOfInterest.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/AreaOfInterest.java
deleted file mode 100644
index dd3b372f..00000000
--- a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/AreaOfInterest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.twelvemonkeys.servlet.image;
-
-import java.awt.*;
-
-/**
- * @author Harald Kuhr
- * @author Erlend Hamnaberg
- * @version $Revision: $
- */
-public class AreaOfInterest {
- protected final int mOriginalWidth;
- protected final int mOriginalHeight;
- protected final boolean mPercent;
- protected final boolean pUniform;
-
- public AreaOfInterest(int pOriginalWidth, int pOriginalHeight, boolean pPercent, boolean pUniform) {
- this.mOriginalWidth = pOriginalWidth;
- this.mOriginalHeight = pOriginalHeight;
- this.mPercent = pPercent;
- this.pUniform = pUniform;
- }
-
- public Rectangle getAOI(final int pX, final int pY, final int pWidth, final int pHeight) {
- return getAOI(new Rectangle(pX, pY, pWidth, pHeight));
- }
-
- public Rectangle getAOI(final Rectangle pCrop) {
- int y = pCrop.y;
- int x = pCrop.x;
-
- Dimension crop;
- if (mPercent) {
- crop = getPercentCrop(pCrop);
- }
- else if (pUniform) {
- crop = getAOIUniform(pCrop);
- }
- else {
- crop = getOriginalDimension(pCrop);
- }
-
- // Center
- if (y < 0) {
- y = calculateY(crop.height);
- }
-
- if (x < 0) {
- x = calculateX(crop.width);
- }
- return new Rectangle(x, y, crop.width, crop.height);
- }
-
- protected int calculateX(int pWidth) {
- return (mOriginalWidth - pWidth) / 2;
- }
-
-
- protected int calculateY(int pHeight) {
- return (mOriginalHeight - pHeight) / 2;
- }
-
- private int calculateRuleOfThirds(final int pY, final int pCropWidth, final int pCropHeight) {
- int y = pY;
- if (y < 0) {
- float origRatio = (float) mOriginalWidth / (float) mOriginalHeight;
- float cropRatio = (float) pCropWidth / (float) pCropHeight;
- if (cropRatio > origRatio && origRatio < 1) {
- y = (int) ((mOriginalHeight * 0.33f) - (pCropHeight / 2));
- if (y < 0) {
- y = 0;
- }
- }
- }
- return y;
- }
-
- private Dimension getAOIUniform(final Rectangle pCrop) {
- float ratio;
-
- if (pCrop.width >= 0 && pCrop.height >= 0) {
- // Compute both ratios
- ratio = (float) pCrop.width / (float) pCrop.height;
- float originalRatio = (float) mOriginalWidth / (float) mOriginalHeight;
- if (ratio > originalRatio) {
- pCrop.width = mOriginalWidth;
- pCrop.height = Math.round((float) mOriginalWidth / ratio);
- }
- else {
- pCrop.height = mOriginalHeight;
- pCrop.width = Math.round((float) mOriginalHeight * ratio);
- }
- }
- else if (pCrop.width >= 0) {
- // Find ratio from pWidth
- ratio = (float) pCrop.width / (float) mOriginalWidth;
- pCrop.height = Math.round((float) mOriginalHeight * ratio);
- }
- else if (pCrop.height >= 0) {
- // Find ratio from pHeight
- ratio = (float) pCrop.height / (float) mOriginalHeight;
- pCrop.width = Math.round((float) mOriginalWidth * ratio);
- }
- // Else: No crop
- return new Dimension(pCrop.width, pCrop.height);
- }
-
- private Dimension getPercentCrop(final Rectangle pCrop) {
- int cropWidth = pCrop.width;
- int cropHeight = pCrop.height;
- float ratio;
-
- if (cropWidth >= 0 && cropHeight >= 0) {
- // Non-uniform
- cropWidth = Math.round((float) mOriginalWidth * (float) pCrop.width / 100f);
- cropHeight = Math.round((float) mOriginalHeight * (float) pCrop.height / 100f);
- }
- else if (cropWidth >= 0) {
- // Find ratio from pWidth
- ratio = (float) cropWidth / 100f;
- cropWidth = Math.round((float) mOriginalWidth * ratio);
- cropHeight = Math.round((float) mOriginalHeight * ratio);
-
- }
- else if (cropHeight >= 0) {
- // Find ratio from pHeight
- ratio = (float) cropHeight / 100f;
- cropWidth = Math.round((float) mOriginalWidth * ratio);
- cropHeight = Math.round((float) mOriginalHeight * ratio);
- }
- // Else: No crop
-
- return new Dimension(cropWidth, cropHeight);
- }
-
- private Dimension getOriginalDimension(Rectangle pCrop) {
- int x = pCrop.x;
- int y = pCrop.y;
- int cropWidth = pCrop.width;
- int cropHeight = pCrop.height;
-
- if (cropWidth < 0 || (x < 0 && cropWidth > mOriginalWidth)
- || (x >= 0 && (x + cropWidth) > mOriginalWidth)) {
- cropWidth = (x >= 0 ? mOriginalWidth - x : mOriginalWidth);
- }
- if (cropHeight < 0 || (y < 0 && cropHeight > mOriginalHeight)
- || (y >= 0 && (y + cropHeight) > mOriginalHeight)) {
- cropHeight = (y >= 0 ? mOriginalHeight - y : mOriginalHeight);
- }
- return new Dimension(cropWidth, cropHeight);
- }
-}
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java
new file mode 100644
index 00000000..63ba79db
--- /dev/null
+++ b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java
@@ -0,0 +1,13 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author Erlend Hamnaberg
+ * @version $Revision: $
+ */
+public interface AreaOfInterest {
+ Rectangle getAOI(int pX, int pY, int pWidth, int pHeight);
+
+ Rectangle getAOI(Rectangle pCrop);
+}
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java
new file mode 100644
index 00000000..fd059682
--- /dev/null
+++ b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java
@@ -0,0 +1,33 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author Erlend Hamnaberg
+ * @version $Revision: $
+ */
+public class AreaOfInterestFactory {
+ private final static AtomicReference DEFAULT =
+ new AtomicReference(new AreaOfInterestFactory());
+
+ public static void setDefault(AreaOfInterestFactory factory) {
+ DEFAULT.set(factory);
+ }
+
+ public static AreaOfInterestFactory getDefault() {
+ return DEFAULT.get();
+ }
+
+ public AreaOfInterest createAreaOfInterest(int pDefaultWidth, int pDefaultHeight, boolean aoiPercent, boolean aoiUniform) {
+ if (aoiPercent && aoiUniform) {
+ throw new IllegalArgumentException("Cannot be both uniform and percent Area of Interest");
+ }
+ if (aoiPercent) {
+ return new PercentAreaOfInterest(pDefaultWidth, pDefaultHeight);
+ }
+ else if (aoiUniform) {
+ return new UniformAreaOfInterest(pDefaultWidth, pDefaultHeight);
+ }
+ return new DefaultAreaOfInterest(pDefaultWidth, pDefaultHeight);
+ }
+}
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java
new file mode 100644
index 00000000..a5564efc
--- /dev/null
+++ b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java
@@ -0,0 +1,25 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.awt.*;
+
+/**
+ * @author Erlend Hamnaberg
+ * @version $Revision: $
+ */
+public class AreaOfInterestWrapper implements AreaOfInterest {
+ private AreaOfInterest mDelegate;
+
+ public AreaOfInterestWrapper(AreaOfInterest mDelegate) {
+ this.mDelegate = Validate.notNull(mDelegate);
+ }
+
+ public Rectangle getAOI(int pX, int pY, int pWidth, int pHeight) {
+ return mDelegate.getAOI(pX, pY, pWidth, pHeight);
+ }
+
+ public Rectangle getAOI(Rectangle pCrop) {
+ return mDelegate.getAOI(pCrop);
+ }
+}
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java
new file mode 100644
index 00000000..56c06709
--- /dev/null
+++ b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java
@@ -0,0 +1,84 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author Harald Kuhr
+ * @author Erlend Hamnaberg
+ * @version $Revision: $
+ */
+public class DefaultAreaOfInterest implements AreaOfInterest {
+ protected final int mOriginalWidth;
+ protected final int mOriginalHeight;
+
+ public DefaultAreaOfInterest(int pOriginalWidth, int pOriginalHeight) {
+ this.mOriginalWidth = pOriginalWidth;
+ this.mOriginalHeight = pOriginalHeight;
+ }
+
+ public Rectangle getAOI(final int pX, final int pY, final int pWidth, final int pHeight) {
+ return getAOI(new Rectangle(pX, pY, pWidth, pHeight));
+ }
+
+ public Rectangle getAOI(final Rectangle pCrop) {
+ int y = pCrop.y;
+ int x = pCrop.x;
+
+ Dimension crop = getCrop(pCrop);
+
+ // Center
+ if (y < 0) {
+ y = calculateY(crop.height);
+ }
+
+ if (x < 0) {
+ x = calculateX(crop.width);
+ }
+ return new Rectangle(x, y, crop.width, crop.height);
+ }
+
+ protected int calculateX(int pWidth) {
+ return (mOriginalWidth - pWidth) / 2;
+ }
+
+
+ protected int calculateY(int pHeight) {
+ return (mOriginalHeight - pHeight) / 2;
+ }
+
+ private int calculateRuleOfThirds(final int pY, final int pCropWidth, final int pCropHeight) {
+ int y = pY;
+ if (y < 0) {
+ float origRatio = (float) mOriginalWidth / (float) mOriginalHeight;
+ float cropRatio = (float) pCropWidth / (float) pCropHeight;
+ if (cropRatio > origRatio && origRatio < 1) {
+ y = (int) ((mOriginalHeight * 0.33f) - (pCropHeight / 2));
+ if (y < 0) {
+ y = 0;
+ }
+ }
+ }
+ return y;
+ }
+
+ protected Dimension getCrop(final Rectangle pCrop) {
+ return getOriginalDimension(pCrop);
+ }
+
+ private Dimension getOriginalDimension(Rectangle pCrop) {
+ int x = pCrop.x;
+ int y = pCrop.y;
+ int cropWidth = pCrop.width;
+ int cropHeight = pCrop.height;
+
+ if (cropWidth < 0 || (x < 0 && cropWidth > mOriginalWidth)
+ || (x >= 0 && (x + cropWidth) > mOriginalWidth)) {
+ cropWidth = (x >= 0 ? mOriginalWidth - x : mOriginalWidth);
+ }
+ if (cropHeight < 0 || (y < 0 && cropHeight > mOriginalHeight)
+ || (y >= 0 && (y + cropHeight) > mOriginalHeight)) {
+ cropHeight = (y >= 0 ? mOriginalHeight - y : mOriginalHeight);
+ }
+ return new Dimension(cropWidth, cropHeight);
+ }
+}
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java
new file mode 100644
index 00000000..e23bd7d9
--- /dev/null
+++ b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java
@@ -0,0 +1,43 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author Erlend Hamnaberg
+ * @version $Revision: $
+ */
+public class PercentAreaOfInterest extends DefaultAreaOfInterest {
+
+ public PercentAreaOfInterest(int pOriginalWidth, int pOriginalHeight) {
+ super(pOriginalWidth, pOriginalHeight);
+ }
+
+ protected Dimension getCrop(final Rectangle pCrop) {
+ int cropWidth = pCrop.width;
+ int cropHeight = pCrop.height;
+ float ratio;
+
+ if (cropWidth >= 0 && cropHeight >= 0) {
+ // Non-uniform
+ cropWidth = Math.round((float) mOriginalWidth * (float) pCrop.width / 100f);
+ cropHeight = Math.round((float) mOriginalHeight * (float) pCrop.height / 100f);
+ }
+ else if (cropWidth >= 0) {
+ // Find ratio from pWidth
+ ratio = (float) cropWidth / 100f;
+ cropWidth = Math.round((float) mOriginalWidth * ratio);
+ cropHeight = Math.round((float) mOriginalHeight * ratio);
+
+ }
+ else if (cropHeight >= 0) {
+ // Find ratio from pHeight
+ ratio = (float) cropHeight / 100f;
+ cropWidth = Math.round((float) mOriginalWidth * ratio);
+ cropHeight = Math.round((float) mOriginalHeight * ratio);
+ }
+ // Else: No crop
+
+ return new Dimension(cropWidth, cropHeight);
+ }
+
+}
diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java
new file mode 100644
index 00000000..3623d4c8
--- /dev/null
+++ b/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java
@@ -0,0 +1,45 @@
+package com.twelvemonkeys.servlet.image.aoi;
+
+import java.awt.*;
+
+/**
+ * @author Erlend Hamnaberg
+ * @version $Revision: $
+ */
+public class UniformAreaOfInterest extends DefaultAreaOfInterest {
+
+ public UniformAreaOfInterest(int pOriginalWidth, int pOriginalHeight) {
+ super(pOriginalWidth, pOriginalHeight);
+ }
+
+ protected Dimension getCrop(final Rectangle pCrop) {
+ float ratio;
+
+ if (pCrop.width >= 0 && pCrop.height >= 0) {
+ // Compute both ratios
+ ratio = (float) pCrop.width / (float) pCrop.height;
+ float originalRatio = (float) mOriginalWidth / (float) mOriginalHeight;
+ if (ratio > originalRatio) {
+ pCrop.width = mOriginalWidth;
+ pCrop.height = Math.round((float) mOriginalWidth / ratio);
+ }
+ else {
+ pCrop.height = mOriginalHeight;
+ pCrop.width = Math.round((float) mOriginalHeight * ratio);
+ }
+ }
+ else if (pCrop.width >= 0) {
+ // Find ratio from pWidth
+ ratio = (float) pCrop.width / (float) mOriginalWidth;
+ pCrop.height = Math.round((float) mOriginalHeight * ratio);
+ }
+ else if (pCrop.height >= 0) {
+ // Find ratio from pHeight
+ ratio = (float) pCrop.height / (float) mOriginalHeight;
+ pCrop.width = Math.round((float) mOriginalWidth * ratio);
+ }
+ // Else: No crop
+ return new Dimension(pCrop.width, pCrop.height);
+ }
+
+}
diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/AreaOfInterestTestCase.java b/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/AreaOfInterestTestCase.java
index 28950eb0..feab7f5c 100644
--- a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/AreaOfInterestTestCase.java
+++ b/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/AreaOfInterestTestCase.java
@@ -1,5 +1,7 @@
package com.twelvemonkeys.servlet.image;
+import com.twelvemonkeys.servlet.image.aoi.DefaultAreaOfInterest;
+import com.twelvemonkeys.servlet.image.aoi.UniformAreaOfInterest;
import org.junit.Test;
import java.awt.*;
@@ -17,30 +19,30 @@ public class AreaOfInterestTestCase {
@Test
public void testGetAOIAbsolute() {
- assertEquals(new Rectangle(10, 10, 100, 100), new AreaOfInterest(200, 200, false, false).getAOI(10, 10, 100, 100));
+ assertEquals(new Rectangle(10, 10, 100, 100), new DefaultAreaOfInterest(200, 200).getAOI(10, 10, 100, 100));
}
@Test
public void testGetAOIAbsoluteOverflowX() {
- assertEquals(new Rectangle(10, 10, 90, 100), new AreaOfInterest(100, 200, false, false).getAOI(10, 10, 100, 100));
+ assertEquals(new Rectangle(10, 10, 90, 100), new DefaultAreaOfInterest(100, 200).getAOI(10, 10, 100, 100));
}
@Test
public void testGetAOIAbsoluteOverflowW() {
- assertEquals(new Rectangle(0, 10, 100, 100), new AreaOfInterest(100, 200, false, false).getAOI(0, 10, 110, 100));
+ assertEquals(new Rectangle(0, 10, 100, 100), new DefaultAreaOfInterest(100, 200).getAOI(0, 10, 110, 100));
}
@Test
public void testGetAOIAbsoluteOverflowY() {
- assertEquals(new Rectangle(10, 10, 100, 90), new AreaOfInterest(200, 100, false, false).getAOI(10, 10, 100, 100));
+ assertEquals(new Rectangle(10, 10, 100, 90), new DefaultAreaOfInterest(200, 100).getAOI(10, 10, 100, 100));
}
@Test
public void testGetAOIAbsoluteOverflowH() {
- assertEquals(new Rectangle(10, 0, 100, 100), new AreaOfInterest(200, 100, false, false).getAOI(10, 0, 100, 110));
+ assertEquals(new Rectangle(10, 0, 100, 100), new DefaultAreaOfInterest(200, 100).getAOI(10, 0, 100, 110));
}
// -----------------------------------------------------------------------------------------------------------------
@@ -49,127 +51,127 @@ public class AreaOfInterestTestCase {
@Test
public void testGetAOIUniformCenteredS2SUp() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 333, 333));
+ assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 333, 333));
}
@Test
public void testGetAOIUniformCenteredS2SDown() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 33, 33));
+ assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 33, 33));
}
@Test
public void testGetAOIUniformCenteredS2SNormalized() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 100, 100));
+ assertEquals(new Rectangle(0, 0, 100, 100), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 100, 100));
}
@Test
public void testGetAOIUniformCenteredS2W() {
- assertEquals(new Rectangle(0, 25, 100, 50), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 200, 100));
+ assertEquals(new Rectangle(0, 25, 100, 50), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 200, 100));
}
@Test
public void testGetAOIUniformCenteredS2WNormalized() {
- assertEquals(new Rectangle(0, 25, 100, 50), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 100, 50));
+ assertEquals(new Rectangle(0, 25, 100, 50), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 100, 50));
}
@Test
public void testGetAOIUniformCenteredS2N() {
- assertEquals(new Rectangle(25, 0, 50, 100), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(25, 0, 50, 100), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 100, 200));
}
@Test
public void testGetAOIUniformCenteredS2NNormalized() {
- assertEquals(new Rectangle(25, 0, 50, 100), new AreaOfInterest(100, 100, false, true).getAOI(-1, -1, 50, 100));
+ assertEquals(new Rectangle(25, 0, 50, 100), new UniformAreaOfInterest(100, 100).getAOI(-1, -1, 50, 100));
}
@Test
public void testGetAOIUniformCenteredW2S() {
- assertEquals(new Rectangle(50, 0, 100, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 333, 333));
+ assertEquals(new Rectangle(50, 0, 100, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 333, 333));
}
@Test
public void testGetAOIUniformCenteredW2SNormalized() {
- assertEquals(new Rectangle(50, 0, 100, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 100, 100));
+ assertEquals(new Rectangle(50, 0, 100, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 100, 100));
}
@Test
public void testGetAOIUniformCenteredW2W() {
- assertEquals(new Rectangle(0, 0, 200, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 100, 50));
+ assertEquals(new Rectangle(0, 0, 200, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 100, 50));
}
@Test
public void testGetAOIUniformCenteredW2WW() {
- assertEquals(new Rectangle(0, 25, 200, 50), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 200, 50));
+ assertEquals(new Rectangle(0, 25, 200, 50), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 200, 50));
}
@Test
public void testGetAOIUniformCenteredW2WN() {
- assertEquals(new Rectangle(25, 0, 150, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 75, 50));
+ assertEquals(new Rectangle(25, 0, 150, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 75, 50));
}
@Test
public void testGetAOIUniformCenteredW2WNNormalized() {
- assertEquals(new Rectangle(25, 0, 150, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 150, 100));
+ assertEquals(new Rectangle(25, 0, 150, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 150, 100));
}
@Test
public void testGetAOIUniformCenteredW2WNormalized() {
- assertEquals(new Rectangle(0, 0, 200, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 200, 100));
+ assertEquals(new Rectangle(0, 0, 200, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 200, 100));
}
@Test
public void testGetAOIUniformCenteredW2N() {
- assertEquals(new Rectangle(75, 0, 50, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(75, 0, 50, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 100, 200));
}
@Test
public void testGetAOIUniformCenteredW2NNormalized() {
- assertEquals(new Rectangle(75, 0, 50, 100), new AreaOfInterest(200, 100, false, true).getAOI(-1, -1, 50, 100));
+ assertEquals(new Rectangle(75, 0, 50, 100), new UniformAreaOfInterest(200, 100).getAOI(-1, -1, 50, 100));
}
@Test
public void testGetAOIUniformCenteredN2S() {
- assertEquals(new Rectangle(0, 50, 100, 100), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 333, 333));
+ assertEquals(new Rectangle(0, 50, 100, 100), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 333, 333));
}
@Test
public void testGetAOIUniformCenteredN2SNormalized() {
- assertEquals(new Rectangle(0, 50, 100, 100), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 100, 100));
+ assertEquals(new Rectangle(0, 50, 100, 100), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 100, 100));
}
@Test
public void testGetAOIUniformCenteredN2W() {
- assertEquals(new Rectangle(0, 75, 100, 50), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 200, 100));
+ assertEquals(new Rectangle(0, 75, 100, 50), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 200, 100));
}
@Test
public void testGetAOIUniformCenteredN2WNormalized() {
- assertEquals(new Rectangle(0, 75, 100, 50), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 100, 50));
+ assertEquals(new Rectangle(0, 75, 100, 50), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 100, 50));
}
@Test
public void testGetAOIUniformCenteredN2N() {
- assertEquals(new Rectangle(0, 0, 100, 200), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 50, 100));
+ assertEquals(new Rectangle(0, 0, 100, 200), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 50, 100));
}
@Test
public void testGetAOIUniformCenteredN2NN() {
- assertEquals(new Rectangle(25, 0, 50, 200), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 25, 100));
+ assertEquals(new Rectangle(25, 0, 50, 200), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 25, 100));
}
@Test
public void testGetAOIUniformCenteredN2NW() {
- assertEquals(new Rectangle(0, 33, 100, 133), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 75, 100));
+ assertEquals(new Rectangle(0, 33, 100, 133), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 75, 100));
}
@Test
public void testGetAOIUniformCenteredN2NWNormalized() {
- assertEquals(new Rectangle(0, 37, 100, 125), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 100, 125));
+ assertEquals(new Rectangle(0, 37, 100, 125), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 100, 125));
}
@Test
public void testGetAOIUniformCenteredN2NNormalized() {
- assertEquals(new Rectangle(0, 0, 100, 200), new AreaOfInterest(100, 200, false, true).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(0, 0, 100, 200), new UniformAreaOfInterest(100, 200).getAOI(-1, -1, 100, 200));
}
// -----------------------------------------------------------------------------------------------------------------
@@ -178,157 +180,157 @@ public class AreaOfInterestTestCase {
@Test
public void testGetAOICenteredS2SUp() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 333, 333));
+ assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 333, 333));
}
@Test
public void testGetAOICenteredS2SDown() {
- assertEquals(new Rectangle(33, 33, 33, 33), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 33, 33));
+ assertEquals(new Rectangle(33, 33, 33, 33), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 33, 33));
}
@Test
public void testGetAOICenteredS2SSame() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 100, 100));
+ assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 100, 100));
}
@Test
public void testGetAOICenteredS2WOverflow() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 200, 100));
+ assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 200, 100));
}
@Test
public void testGetAOICenteredS2W() {
- assertEquals(new Rectangle(40, 45, 20, 10), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 20, 10));
+ assertEquals(new Rectangle(40, 45, 20, 10), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 20, 10));
}
@Test
public void testGetAOICenteredS2WMax() {
- assertEquals(new Rectangle(0, 25, 100, 50), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 100, 50));
+ assertEquals(new Rectangle(0, 25, 100, 50), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 100, 50));
}
@Test
public void testGetAOICenteredS2NOverflow() {
- assertEquals(new Rectangle(0, 0, 100, 100), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(0, 0, 100, 100), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 100, 200));
}
@Test
public void testGetAOICenteredS2N() {
- assertEquals(new Rectangle(45, 40, 10, 20), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 10, 20));
+ assertEquals(new Rectangle(45, 40, 10, 20), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 10, 20));
}
@Test
public void testGetAOICenteredS2NMax() {
- assertEquals(new Rectangle(25, 0, 50, 100), new AreaOfInterest(100, 100, false, false).getAOI(-1, -1, 50, 100));
+ assertEquals(new Rectangle(25, 0, 50, 100), new DefaultAreaOfInterest(100, 100).getAOI(-1, -1, 50, 100));
}
@Test
public void testGetAOICenteredW2SOverflow() {
- assertEquals(new Rectangle(0, 0, 200, 100), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 333, 333));
+ assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 333, 333));
}
@Test
public void testGetAOICenteredW2S() {
- assertEquals(new Rectangle(75, 25, 50, 50), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 50, 50));
+ assertEquals(new Rectangle(75, 25, 50, 50), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 50, 50));
}
@Test
public void testGetAOICenteredW2SMax() {
- assertEquals(new Rectangle(50, 0, 100, 100), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 100, 100));
+ assertEquals(new Rectangle(50, 0, 100, 100), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 100, 100));
}
@Test
public void testGetAOICenteredW2WOverflow() {
- assertEquals(new Rectangle(0, 0, 200, 100), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 300, 200));
+ assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 300, 200));
}
@Test
public void testGetAOICenteredW2W() {
- assertEquals(new Rectangle(50, 25, 100, 50), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 100, 50));
+ assertEquals(new Rectangle(50, 25, 100, 50), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 100, 50));
}
@Test
public void testGetAOICenteredW2WW() {
- assertEquals(new Rectangle(10, 40, 180, 20), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 180, 20));
+ assertEquals(new Rectangle(10, 40, 180, 20), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 180, 20));
}
@Test
public void testGetAOICenteredW2WN() {
- assertEquals(new Rectangle(62, 25, 75, 50), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 75, 50));
+ assertEquals(new Rectangle(62, 25, 75, 50), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 75, 50));
}
@Test
public void testGetAOICenteredW2WSame() {
- assertEquals(new Rectangle(0, 0, 200, 100), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 200, 100));
+ assertEquals(new Rectangle(0, 0, 200, 100), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 200, 100));
}
@Test
public void testGetAOICenteredW2NOverflow() {
- assertEquals(new Rectangle(50, 0, 100, 100), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(50, 0, 100, 100), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 100, 200));
}
@Test
public void testGetAOICenteredW2N() {
- assertEquals(new Rectangle(83, 25, 33, 50), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 33, 50));
+ assertEquals(new Rectangle(83, 25, 33, 50), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 33, 50));
}
@Test
public void testGetAOICenteredW2NMax() {
- assertEquals(new Rectangle(75, 0, 50, 100), new AreaOfInterest(200, 100, false, false).getAOI(-1, -1, 50, 100));
+ assertEquals(new Rectangle(75, 0, 50, 100), new DefaultAreaOfInterest(200, 100).getAOI(-1, -1, 50, 100));
}
@Test
public void testGetAOICenteredN2S() {
- assertEquals(new Rectangle(33, 83, 33, 33), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 33, 33));
+ assertEquals(new Rectangle(33, 83, 33, 33), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 33, 33));
}
@Test
public void testGetAOICenteredN2SMax() {
- assertEquals(new Rectangle(0, 50, 100, 100), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 100, 100));
+ assertEquals(new Rectangle(0, 50, 100, 100), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 100, 100));
}
@Test
public void testGetAOICenteredN2WOverflow() {
- assertEquals(new Rectangle(0, 50, 100, 100), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 200, 100));
+ assertEquals(new Rectangle(0, 50, 100, 100), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 200, 100));
}
@Test
public void testGetAOICenteredN2W() {
- assertEquals(new Rectangle(40, 95, 20, 10), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 20, 10));
+ assertEquals(new Rectangle(40, 95, 20, 10), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 20, 10));
}
@Test
public void testGetAOICenteredN2WMax() {
- assertEquals(new Rectangle(0, 75, 100, 50), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 100, 50));
+ assertEquals(new Rectangle(0, 75, 100, 50), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 100, 50));
}
@Test
public void testGetAOICenteredN2N() {
- assertEquals(new Rectangle(45, 90, 10, 20), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 10, 20));
+ assertEquals(new Rectangle(45, 90, 10, 20), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 10, 20));
}
@Test
public void testGetAOICenteredN2NSame() {
- assertEquals(new Rectangle(0, 0, 100, 200), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(0, 0, 100, 200), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 100, 200));
}
@Test
public void testGetAOICenteredN2NN() {
- assertEquals(new Rectangle(37, 50, 25, 100), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 25, 100));
+ assertEquals(new Rectangle(37, 50, 25, 100), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 25, 100));
}
@Test
public void testGetAOICenteredN2NW() {
- assertEquals(new Rectangle(12, 50, 75, 100), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 75, 100));
+ assertEquals(new Rectangle(12, 50, 75, 100), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 75, 100));
}
@Test
public void testGetAOICenteredN2NWMax() {
- assertEquals(new Rectangle(0, 37, 100, 125), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 100, 125));
+ assertEquals(new Rectangle(0, 37, 100, 125), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 100, 125));
}
@Test
public void testGetAOICenteredN2NMax() {
- assertEquals(new Rectangle(0, 0, 100, 200), new AreaOfInterest(100, 200, false, false).getAOI(-1, -1, 100, 200));
+ assertEquals(new Rectangle(0, 0, 100, 200), new DefaultAreaOfInterest(100, 200).getAOI(-1, -1, 100, 200));
}
/* @Test