diff --git a/build/classes/image2d/EdgeDetector.class b/build/classes/image2d/EdgeDetector.class index 3925f67..54cd5d5 100644 Binary files a/build/classes/image2d/EdgeDetector.class and b/build/classes/image2d/EdgeDetector.class differ diff --git a/build/classes/image2d/EdgeOperator.class b/build/classes/image2d/EdgeOperator.class index 3e9d511..441c94a 100644 Binary files a/build/classes/image2d/EdgeOperator.class and b/build/classes/image2d/EdgeOperator.class differ diff --git a/build/classes/image2d/Image2D.class b/build/classes/image2d/Image2D.class index 5460122..bd30a09 100644 Binary files a/build/classes/image2d/Image2D.class and b/build/classes/image2d/Image2D.class differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 895482e..ba3798f 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -370,6 +370,11 @@ is divided into following sections: + + + + + @@ -393,7 +398,7 @@ is divided into following sections: - + @@ -407,6 +412,9 @@ is divided into following sections: + + + @@ -534,7 +542,7 @@ is divided into following sections: - + @@ -548,6 +556,9 @@ is divided into following sections: + + + @@ -920,7 +931,7 @@ is divided into following sections: - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 25b228c..4828ea9 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.50.2.46 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=464b3301 -nbproject/build-impl.xml.script.CRC32=2a31616b -nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46 +nbproject/build-impl.xml.script.CRC32=662ac0ff +nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 445b0eb..d60f9d3 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -1,2 +1,2 @@ compile.on.save=true -user.properties.file=C:\\Documents and Settings\\pratchaya\\.netbeans\\7.1.2\\build.properties +user.properties.file=C:\\Documents and Settings\\pratchaya\\Application Data\\NetBeans\\7.3\\build.properties diff --git a/src/image2d/EdgeDetector.java b/src/image2d/EdgeDetector.java index e62c2e0..96f23df 100644 --- a/src/image2d/EdgeDetector.java +++ b/src/image2d/EdgeDetector.java @@ -1,25 +1,25 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package image2d; - -import java.awt.Color; -import java.awt.image.BufferedImage; - -/** - * - * @author pratchaya - */ -public class EdgeDetector { - - public static BufferedImage findEdgeSobel(BufferedImage _image) { - // get kernel horizontal - int horizontal[][] = EdgeOperator.edgeHorizontal(); - // get kernel vertical - int vertical[][] = EdgeOperator.edgeVertical(); - // get result - return EdgeOperator.sobelOperation(_image, horizontal, vertical); - - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package image2d; + +import java.awt.Color; +import java.awt.image.BufferedImage; + +/** + * + * @author pratchaya + */ +public class EdgeDetector { + + public static BufferedImage EdgeSobel(BufferedImage _image) { + // get kernel horizontal + int horizontal[][] = EdgeOperator.edgeHorizontal(); + // get kernel vertical + int vertical[][] = EdgeOperator.edgeVertical(); + // get result + return EdgeOperator.apply(_image, horizontal, vertical); + + } +} diff --git a/src/image2d/EdgeOperator.java b/src/image2d/EdgeOperator.java index 1769f27..51d953d 100644 --- a/src/image2d/EdgeOperator.java +++ b/src/image2d/EdgeOperator.java @@ -37,7 +37,7 @@ public static int[][] edgeVertical() { } // ----------------------------- end sobel --------------------------------- - public static BufferedImage sobelOperation(BufferedImage _image, int horizon[][], int vertical[][]) { + public static BufferedImage apply(BufferedImage _image, int horizon[][], int vertical[][]) { BufferedImage imageOutput = new BufferedImage(_image.getWidth(), _image.getHeight(), BufferedImage.TYPE_3BYTE_BGR); // Set initial BufferedImage int kernelXY = horizon.length / 2; diff --git a/src/image2d/Image2D.java b/src/image2d/Image2D.java index 8f9e698..b1526af 100644 --- a/src/image2d/Image2D.java +++ b/src/image2d/Image2D.java @@ -16,17 +16,17 @@ public class Image2D { public Image2D() { Toolkit toolkit = Toolkit.getDefaultToolkit(); Dimension dim = toolkit.getScreenSize(); - String url = "images/wl2.jpg"; // this program have 4 images : wr.png ,sh.jpg , ca.jpg , icon.jpg ,r1,r2,r3,r4.jpg + String url = "C:\\javacv-bin\\samples\\rice.jpg"; // this program have 4 images : wr.png ,sh.jpg , ca.jpg , icon.jpg ,r1,r2,r3,r4.jpg BufferedImage image = ImageReader.load_image(url); image = Gaussian.apply(image, 7, 0.84089642); //.94089642 image = Grayscale.apply(image); - //image = AutoBalance.apply(image); - image = Threshold.apply(image); - image = Opening.apply(image, 3); - image = Opening.apply(image, 3); - image = Opening.apply(image, 3); - image = Closing.apply(image, 2); - image = EdgeDetector.findEdgeSobel(image); + // image = AutoBalance.apply(image); + image = Threshold.apply(image); + image = Opening.apply(image, 3); + image = Opening.apply(image, 3); + image = Opening.apply(image, 3); + // image = Closing.apply(image, 2); + //image = EdgeDetector.EdgeSobel(image); // swing for tester { JFrame frame = new JFrame("Display Image");