From 5b1dc8338201f71bc53fe6ec204cf24dcce0174d Mon Sep 17 00:00:00 2001 From: Kaori Hagihara Date: Tue, 10 May 2011 16:39:17 +0000 Subject: [PATCH] temporal commit to resort the opj_viewer --- .../jpip/opj_client/opj_viewer/build.xml | 35 -- .../opj_client/opj_viewer/dist/manifest.txt | 5 - .../opj_viewer/dist/opj_viewer-20110218.jar | Bin 19360 -> 0 bytes .../opj_client/opj_viewer/dist/opj_viewer.jar | 1 - .../opj_viewer/src/ImageManager.java | 99 ------ .../opj_viewer/src/ImageViewer.java | 267 ---------------- .../opj_viewer/src/ImageWindow.java | 93 ------ .../opj_viewer/src/ImgdecClient.java | 268 ---------------- .../opj_viewer/src/JP2XMLparser.java | 122 ------- .../opj_viewer/src/JPIPHttpClient.java | 301 ------------------ .../jpip/opj_client/opj_viewer/src/MML.java | 116 ------- .../opj_viewer/src/OptionPanel.java | 98 ------ .../opj_client/opj_viewer/src/PnmImage.java | 141 -------- .../opj_viewer/src/RegimViewer.java | 115 ------- .../opj_viewer/src/ResizeListener.java | 59 ---- 15 files changed, 1720 deletions(-) delete mode 100644 applications/jpip/opj_client/opj_viewer/build.xml delete mode 100644 applications/jpip/opj_client/opj_viewer/dist/manifest.txt delete mode 100755 applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110218.jar delete mode 120000 applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar delete mode 100644 applications/jpip/opj_client/opj_viewer/src/ImageManager.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/ImageViewer.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/ImageWindow.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/ImgdecClient.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/JP2XMLparser.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/MML.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/OptionPanel.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/PnmImage.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/RegimViewer.java delete mode 100644 applications/jpip/opj_client/opj_viewer/src/ResizeListener.java diff --git a/applications/jpip/opj_client/opj_viewer/build.xml b/applications/jpip/opj_client/opj_viewer/build.xml deleted file mode 100644 index 0608132a..00000000 --- a/applications/jpip/opj_client/opj_viewer/build.xml +++ /dev/null @@ -1,35 +0,0 @@ - - OpenJPIP client image viewer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/applications/jpip/opj_client/opj_viewer/dist/manifest.txt b/applications/jpip/opj_client/opj_viewer/dist/manifest.txt deleted file mode 100644 index 6bba2ab8..00000000 --- a/applications/jpip/opj_client/opj_viewer/dist/manifest.txt +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.7.0 -Created-By: Kaori Hagihara -Main-Class: ImageWindow -Class-Path: /usr/share/java/xerces-j2.jar diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110218.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110218.jar deleted file mode 100755 index 1c5d72e242615c593258c699a916921665783493..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19360 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 diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar deleted file mode 120000 index 9e12f491..00000000 --- a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar +++ /dev/null @@ -1 +0,0 @@ -opj_viewer-20110218.jar \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/ImageManager.java b/applications/jpip/opj_client/opj_viewer/src/ImageManager.java deleted file mode 100644 index f3d01bef..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/ImageManager.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.awt.Image; - -public class ImageManager extends JPIPHttpClient -{ - private PnmImage pnmimage; - - public ImageManager( String uri) - { - super( uri); - pnmimage = null; - } - - public int getOrigWidth(){ return pnmimage.width;} - public int getOrigHeight(){ return pnmimage.height;} - - public Image getImage( String j2kfilename, int reqfw, int reqfh) - { - System.err.println(); - - String refcid = ImgdecClient.query_cid( j2kfilename); - byte[] jptstream; - - if( refcid == null) - jptstream = super.requestViewWindow( j2kfilename, reqfw, reqfh, true); - else - jptstream = super.requestViewWindow( reqfw, reqfh, refcid, true); - - System.err.println( "decoding to PNM image"); - pnmimage = ImgdecClient.decode_jptstream( jptstream, j2kfilename, cid, fw, fh); - System.err.println( " done"); - - // System.out.println( "fw: " + fw + " fh: " + fh + "pnm w: "); - - return pnmimage.createROIImage( rx, ry, rw, rh); - } - - public Image getImage( int reqfw, int reqfh, int reqrx, int reqry, int reqrw, int reqrh) - { - System.err.println(); - - byte[] jptstream = super.requestViewWindow( reqfw, reqfh, reqrx, reqry, reqrw, reqrh); - - System.err.println( "decoding to PNM image"); - pnmimage = ImgdecClient.decode_jptstream( jptstream, cid, fw, fh); - System.err.println( " done"); - - return pnmimage.createROIImage( rx, ry, rw, rh); - } - - public byte[] getXML() - { - System.err.println(); - - byte []xmldata = null; - byte[] jptstream = super.requestXML(); - - if( jptstream != null){ - ImgdecClient.send_JPTstream( jptstream); - - xmldata = ImgdecClient.get_XMLstream( cid); - } - return xmldata; - } - public void closeChannel() - { - ImgdecClient.destroy_cid( cid); - super.closeChannel(); - } -} \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java b/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java deleted file mode 100644 index 9fab7f0a..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import java.awt.image.*; -import java.awt.geom.*; -import java.net.URL; -import javax.swing.border.*; -import java.util.*; -import java.io.*; - -public class ImageViewer extends JPanel -{ - private MML myMML; - private ResizeListener myRL; - private ImageManager imgmanager; - private int vw, vh; - private int iw, ih; - private int selected = 0; - private Image img; - - private String cmdline = new String(); - private boolean fullRefresh = false; - private Point offset = new Point(0,0); - private Rectangle rect = new Rectangle(); - private Rectangle roirect[] = null; - private String roiname[] = null; - - public ImageViewer( String j2kfilename, ImageManager manager) - { - String str; - - this.setSize( 200, 200); - Dimension asz = this.getSize(); - - vw = asz.width; - vh = asz.height; - - setBackground(Color.black); - myMML = new MML(this); - myRL = new ResizeListener(this); - - imgmanager = manager; - img = imgmanager.getImage( j2kfilename, vw, vh); - - addMouseListener(myMML); - addMouseMotionListener(myMML); - addComponentListener(myRL); - } - - public Image getImage() - { - return img; - } - - public void zoomIn() - { - roirect = null; - roiname = null; - - double scalex = vw/(double)rect.width; - double scaley = vh/(double)rect.height; - - int fw = (int)(imgmanager.getFw()*scalex); - int fh = (int)(imgmanager.getFh()*scaley); - int rx = (int)((imgmanager.getRx()+rect.x)*scalex); - int ry = (int)((imgmanager.getRy()+rect.y)*scaley); - - img = imgmanager.getImage( fw, fh, rx, ry, vw, vh); - - rect.x = rect.y = rect.width = rect.height = 0; - - selected = 0; - fullRefresh = true; - repaint(); - } - - public void enlarge() - { - roirect = null; - roiname = null; - - Dimension asz = this.getSize(); - - vw = asz.width; - vh = asz.height; - - double scalex = vw/(double)imgmanager.getRw(); - double scaley = vh/(double)imgmanager.getRh(); - - int fw = (int)(imgmanager.getFw()*scalex); - int fh = (int)(imgmanager.getFh()*scaley); - int rx = (int)(imgmanager.getRx()*scalex); - int ry = (int)(imgmanager.getRy()*scaley); - - img = imgmanager.getImage( fw, fh, rx, ry, vw, vh); - - fullRefresh = true; - repaint(); - } - - public void setSelected(int state) - { - roirect = null; - roiname = null; - - if (state != selected) { - - selected = state; - repaint(); - } - } - - public boolean isInsideRect(int x, int y) - { - return rect.contains(x - offset.x, y - offset.y); - } - - public void setRGeom(int x1, int y1, int x2, int y2) - { - rect.x = Math.min(x1,x2) - offset.x; - rect.y = Math.min(y1,y2) - offset.y; - rect.width = Math.abs(x2-x1); - rect.height = Math.abs(y2-y1); - } - - public void annotate( JP2XMLparser.ROIparams roi[]) - { - int numofroi = roi.length; - - roirect = new Rectangle [numofroi]; - roiname = new String [numofroi]; - - double scale_x = imgmanager.getFw()/(double)imgmanager.getOrigWidth(); - double scale_y = imgmanager.getFh()/(double)imgmanager.getOrigHeight(); - int rx = imgmanager.getRx(); - int ry = imgmanager.getRy(); - int rw = imgmanager.getRw(); - int rh = imgmanager.getRh(); - - for( int i=0; i 0) && (rect.height > 0)) - big.draw(rect); - - if( roirect != null){ - for( int i=0; i 0){ - uri = s[0]; - j2kfilename = s[1]; - } - else{ - System.out.println("Usage: java -jar opj_viewer.jar HTTP_server_URI imagefile.jp2"); - return; - } - ImageWindow frame = new ImageWindow( uri, j2kfilename); - - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - - //Display the window. - frame.pack(); - frame.setSize(new Dimension(400,200)); - frame.setLocation( 0, 50); - frame.setVisible(true); - } -} \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/ImgdecClient.java b/applications/jpip/opj_client/opj_viewer/src/ImgdecClient.java deleted file mode 100644 index 80e8f8ba..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/ImgdecClient.java +++ /dev/null @@ -1,268 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.io.*; -import java.net.*; - -public class ImgdecClient{ - - public static PnmImage decode_jptstream( byte[] jptstream, String cid, int fw, int fh) - { - if( jptstream != null) - send_JPTstream( jptstream); - return get_PNMstream( cid, fw, fh); - } - - public static PnmImage decode_jptstream( byte[] jptstream, String j2kfilename, String cid, int fw, int fh) - { - send_JPTstream( jptstream, j2kfilename, cid); - return get_PNMstream( cid, fw, fh); - } - - public static void send_JPTstream( byte[] jptstream) - { - try{ - Socket imgdecSocket = new Socket( "localhost", 5000); - DataOutputStream os = new DataOutputStream( imgdecSocket.getOutputStream()); - DataInputStream is = new DataInputStream( imgdecSocket.getInputStream()); - - System.err.println("Sending " + jptstream.length + "Data Bytes to decodingServer"); - - os.writeBytes("JPT-stream\n"); - os.writeBytes("version 1.0\n"); - os.writeBytes( jptstream.length + "\n"); - os.write( jptstream, 0, jptstream.length); - - byte signal = is.readByte(); - - if( signal == 0) - System.err.println(" failed"); - } catch (UnknownHostException e) { - System.err.println("Trying to connect to unknown host: " + e); - } catch (IOException e) { - System.err.println("IOException: " + e); - } - } - - public static void send_JPTstream( byte[] jptstream, String j2kfilename, String cid) - { - try{ - Socket imgdecSocket = new Socket( "localhost", 5000); - DataOutputStream os = new DataOutputStream( imgdecSocket.getOutputStream()); - DataInputStream is = new DataInputStream( imgdecSocket.getInputStream()); - int length = 0; - - if( jptstream != null) - length = jptstream.length; - - System.err.println("Sending " + length + "Data Bytes to decodingServer"); - - os.writeBytes("JPT-stream\n"); - os.writeBytes("version 1.0\n"); - os.writeBytes( j2kfilename + "\n"); - os.writeBytes( cid + "\n"); - os.writeBytes( length + "\n"); - os.write( jptstream, 0, length); - - byte signal = is.readByte(); - - if( signal == 0) - System.err.println(" failed"); - } catch (UnknownHostException e) { - System.err.println("Trying to connect to unknown host: " + e); - } catch (IOException e) { - System.err.println("IOException: " + e); - } - } - - public static PnmImage get_PNMstream( String cid, int fw, int fh) - { - PnmImage pnmstream = new PnmImage(); - try { - Socket imgdecSocket = new Socket( "localhost", 5000); - DataOutputStream os = new DataOutputStream( imgdecSocket.getOutputStream()); - DataInputStream is = new DataInputStream( imgdecSocket.getInputStream()); - byte []header = new byte[7]; - - os.writeBytes("PNM request\n"); - os.writeBytes( cid + "\n"); - os.writeBytes( fw + "\n"); - os.writeBytes( fh + "\n"); - - read_stream( is, header, 7); - - if( header[0] == 80){ - // P5: gray, P6: color - byte magicknum = header[1]; - if( magicknum == 5 || magicknum == 6){ - int length; - boolean iscolor = magicknum==6 ? true:false; - if( iscolor) - pnmstream.channel = 3; - else - pnmstream.channel = 1; - pnmstream.width = (header[2]&0xff)<<8 | (header[3]&0xff); - pnmstream.height = (header[4]&0xff)<<8 | (header[5]&0xff); - int maxval = header[6]&0xff; - - if( maxval == 255){ - length = pnmstream.width*pnmstream.height*pnmstream.channel; - pnmstream.data = new byte [ length]; - read_stream( is, pnmstream.data, length); - } - else - System.err.println("Error in get_PNMstream(), only 255 is accepted"); - } - else - System.err.println("Error in get_PNMstream(), wrong magick number" + header[1]); - } - else - System.err.println("Error in get_PNMstream(), Not starting with P"); - os.close(); - is.close(); - imgdecSocket.close(); - } catch (UnknownHostException e) { - System.err.println("Trying to connect to unknown host: " + e); - } catch (IOException e) { - System.err.println("IOException: " + e); - } - return pnmstream; - } - - public static byte [] get_XMLstream( String cid) - { - byte []xmldata = null; - - try{ - Socket imgdecSocket = new Socket( "localhost", 5000); - DataOutputStream os = new DataOutputStream( imgdecSocket.getOutputStream()); - DataInputStream is = new DataInputStream( imgdecSocket.getInputStream()); - byte []header = new byte[5]; - - os.writeBytes("XML request\n"); - os.writeBytes( cid + "\n"); - - read_stream( is, header, 5); - - if( header[0] == 88 && header[1] == 77 && header[2] == 76){ - int length = (header[3]&0xff)<<8 | (header[4]&0xff); - - xmldata = new byte[ length]; - read_stream( is, xmldata, length); - } - else - System.err.println("Error in get_XMLstream(), not starting with XML"); - } catch (UnknownHostException e) { - System.err.println("Trying to connect to unknown host: " + e); - } catch (IOException e) { - System.err.println("IOException: " + e); - } - return xmldata; - } - - public static String query_cid( String j2kfilename) - { - String cid = null; - - try{ - Socket imgdecSocket = new Socket( "localhost", 5000); - DataOutputStream os = new DataOutputStream( imgdecSocket.getOutputStream()); - DataInputStream is = new DataInputStream( imgdecSocket.getInputStream()); - byte []header = new byte[4]; - - os.writeBytes("CID request\n"); - os.writeBytes( j2kfilename + "\n"); - - read_stream( is, header, 4); - - if( header[0] == 67 && header[1] == 73 && header[2] == 68){ - int length = header[3]&0xff; - - if( length > 0){ - - byte []ciddata = new byte[ length]; - read_stream( is, ciddata, length); - cid = new String( ciddata); - } - } - else - System.err.println("Error in query_cid(), not starting with CID"); - } - catch (UnknownHostException e) { - System.err.println("Trying to connect to unknown host: " + e); - } catch (IOException e) { - System.err.println("IOException: " + e); - } - - return cid; - } - - public static void read_stream( DataInputStream is, byte []stream, int length) - { - int remlen = length; - int off = 0; - - try{ - while( remlen > 0){ - int redlen = is.read( stream, off, remlen); - - if( redlen == -1){ - System.err.println(" failed to read_stream()"); - break; - } - off += redlen; - remlen -= redlen; - } - } catch (IOException e) { - System.err.println("IOException: " + e); - } - } - - public static void destroy_cid( String cid) - { - try{ - Socket imgdecSocket = new Socket( "localhost", 5000); - DataOutputStream os = new DataOutputStream( imgdecSocket.getOutputStream()); - DataInputStream is = new DataInputStream( imgdecSocket.getInputStream()); - - os.writeBytes("CID destroy\n"); - os.writeBytes( cid + "\n"); - - byte signal = is.readByte(); - - if( signal == 0) - System.err.println(" failed"); - } catch (UnknownHostException e) { - System.err.println("Trying to connect to unknown host: " + e); - } catch (IOException e) { - System.err.println("IOException: " + e); - } - } -} diff --git a/applications/jpip/opj_client/opj_viewer/src/JP2XMLparser.java b/applications/jpip/opj_client/opj_viewer/src/JP2XMLparser.java deleted file mode 100644 index bec1d4db..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/JP2XMLparser.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXParseException; -import org.xml.sax.ErrorHandler; -import org.apache.xerces.parsers.DOMParser; -import org.xml.sax.InputSource; -import java.io.*; -import java.lang.Integer; - -public class JP2XMLparser -{ - Document document; - - public static class ROIparams{ - public String name = null; - public int x = 0; - public int y = 0; - public int w = 0; - public int h = 0; - } - - public static class IRTparams{ - public String refimg = null; - public double []mat = { 0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0}; - } - - public JP2XMLparser( byte[] buf) - { - try{ - InputSource source = new InputSource( new ByteArrayInputStream( buf)); - DOMParser parser = new DOMParser(); - parser.setErrorHandler(new MyHandler()); - parser.parse( source); - document = parser.getDocument(); - } - catch (Exception e) { - e.printStackTrace(); - } - } - - public ROIparams [] getROIparams() - { - ROIparams roi[]; - NodeList elements = document.getElementsByTagName("roi"); - int elementCount = elements.getLength(); - - roi = new ROIparams [elementCount]; - - for( int i = 0; i < elementCount; i++) { - Element element = (Element)elements.item(i); - - roi[i] = new ROIparams(); - roi[i].name = element.getAttribute( "name"); - roi[i].x = Integer.parseInt( element.getAttribute( "x")) ; - roi[i].y = Integer.parseInt( element.getAttribute( "y")) ; - roi[i].w = Integer.parseInt( element.getAttribute( "w")) ; - roi[i].h = Integer.parseInt( element.getAttribute( "h")) ; - } - return roi; - } - - public IRTparams getIRTparams() - { - IRTparams irt = new IRTparams(); - NodeList elements = document.getElementsByTagName("irt"); - int elementCount = elements.getLength(); - - Element element = (Element)elements.item(0); - irt.refimg = element.getAttribute( "refimg"); - for( int i=1; i<=9; i++) - irt.mat[i-1] = Double.parseDouble( element.getAttribute("m" + i)); - - return irt; - } -} - -class MyHandler implements ErrorHandler { - public void warning(SAXParseException e) { - System.out.println("Warning: line" + e.getLineNumber()); - System.out.println(e.getMessage()); - } - public void error(SAXParseException e) { - System.out.println("Error: line" + e.getLineNumber()); - System.out.println(e.getMessage()); - } - public void fatalError(SAXParseException e) { - System.out.println("Critical error: line" + e.getLineNumber()); - System.out.println(e.getMessage()); - } -} \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java b/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java deleted file mode 100644 index c8f04714..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java +++ /dev/null @@ -1,301 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.net.*; -import java.io.*; -import java.util.*; - - -public class JPIPHttpClient -{ - private String comURL; - protected int fw, fh; - protected int rx, ry; - protected int rw, rh; - protected String cid; - - public JPIPHttpClient( String URI) - { - comURL = URI + "?"; - fw = fh = -1; - rx = ry = -1; - rw = rh = -1; - cid = null; - } - - public int getFw(){ return fw;} - public int getFh(){ return fh;} - public int getRx(){ return rx;} - public int getRy(){ return ry;} - public int getRw(){ return rw;} - public int getRh(){ return rh;} - - public byte[] requestViewWindow( int reqfw, int reqfh) - { - if( cid != null) - return requestViewWindow( reqfw, reqfh, cid); - else - return null; - } - - public byte[] requestViewWindow( int reqfw, int reqfh, int reqrx, int reqry, int reqrw, int reqrh) - { - if( cid != null) - return requestViewWindow( reqfw, reqfh, reqrx, reqry, reqrw, reqrh, cid); - else - return null; - } - - public byte[] requestViewWindow( int reqfw, int reqfh, String reqcid) - { - return requestViewWindow( null, reqfw, reqfh, -1, -1, -1, -1, reqcid, false); - } - - public byte[] requestViewWindow( int reqfw, int reqfh, int reqrx, int reqry, int reqrw, int reqrh, String reqcid) - { - return requestViewWindow( null, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, reqcid, false); - } - - public byte[] requestViewWindow( String target, int reqfw, int reqfh) - { - return requestViewWindow( target, reqfw, reqfh, -1, -1, -1, -1, null, false); - } - - public byte[] requestViewWindow( String target, int reqfw, int reqfh, boolean reqcnew) - { - if( cid == null) // 1 channel allocation only - return requestViewWindow( target, reqfw, reqfh, -1, -1, -1, -1, null, reqcnew); - else - return null; - } - - public byte[] requestViewWindow( String target, int reqfw, int reqfh, int reqrx, int reqry, int reqrw, int reqrh) - { - return requestViewWindow( target, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, null, false); - } - - - public byte[] requestViewWindow( int reqfw, int reqfh, String reqcid, boolean reqcnew) - { - return requestViewWindow( null, reqfw, reqfh, -1, -1, -1, -1, reqcid, reqcnew); - } - - public byte[] requestViewWindow( String target, - int reqfw, int reqfh, - int reqrx, int reqry, - int reqrw, int reqrh, - String reqcid, boolean reqcnew) - { - String urlstring = const_urlstring( target, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, reqcid, reqcnew); - return GETrequest( urlstring); - } - - public byte[] requestXML() - { - String urlstring = comURL; - - if( cid == null) - return null; - - urlstring = urlstring.concat( "cid=" + cid); - urlstring = urlstring.concat( "&metareq=[xml_]"); - - return GETrequest( urlstring); - } - - private byte[] GETrequest( String urlstring) - { - int buflen = 0; - URL url = null; - HttpURLConnection urlconn = null; - byte[] jptstream = null; - - try{ - url = new URL( urlstring); - - System.err.println("Requesting: " + url); - - urlconn = (HttpURLConnection)url.openConnection(); - urlconn.setRequestMethod("GET"); - urlconn.setInstanceFollowRedirects(false); - urlconn.connect(); - - Map> headers = urlconn.getHeaderFields(); - java.util.List hvaluelist; - - if(( hvaluelist = headers.get("JPIP-fsiz")) != null){ - String hvalueline = hvaluelist.get(0); - fw = Integer.valueOf( hvalueline.substring( 0, hvalueline.indexOf(','))).intValue(); - fh = Integer.valueOf( hvalueline.substring( hvalueline.indexOf(',')+1 )).intValue(); - - System.err.println("fw,fh: " + fw + "," + fh); - } - - if(( hvaluelist = headers.get("JPIP-roff")) != null){ - String hvalueline = hvaluelist.get(0); - rx = Integer.valueOf( hvalueline.substring( 0, hvalueline.indexOf(','))).intValue(); - ry = Integer.valueOf( hvalueline.substring( hvalueline.indexOf(',')+1 )).intValue(); - System.err.println("rx,ry: " + rx + "," + ry); - } - - if(( hvaluelist = headers.get("JPIP-rsiz")) != null){ - String hvalueline = hvaluelist.get(0); - rw = Integer.valueOf( hvalueline.substring( 0, hvalueline.indexOf(','))).intValue(); - rh = Integer.valueOf( hvalueline.substring( hvalueline.indexOf(',')+1 )).intValue(); - System.err.println("rw,rh: " + rw + "," + rh); - } - - if(( hvaluelist = headers.get("JPIP-cnew")) != null){ - String hvalueline = hvaluelist.get(0); - cid = hvalueline.substring( hvalueline.indexOf('=')+1, hvalueline.indexOf(',')); - System.err.println("cid: " + cid); - } - - InputStream input = urlconn.getInputStream(); - buflen = input.available(); - - if( buflen > 0){ - ByteArrayOutputStream tmpstream = new ByteArrayOutputStream(); - byte[] buf = new byte[ 1024]; - - System.err.println("reading jptstream..."); - - int redlen; - do{ - redlen = input.read( buf); - - if( redlen == -1) - break; - tmpstream.write( buf, 0, redlen); - }while( redlen > 0); - - buflen = tmpstream.size(); - - jptstream = tmpstream.toByteArray(); - - tmpstream = null; - - System.err.println("jptlen: " + buflen); - System.err.println(" succeeded"); - } - else{ - System.err.println("No new jptstream"); - } - input.close(); - } - catch ( MalformedURLException e){ - e.printStackTrace(); - } - catch ( ProtocolException e){ - e.printStackTrace(); - } - catch( ClassCastException e){ - e.printStackTrace(); - } - catch( NullPointerException e){ - e.printStackTrace(); - } - catch( UnknownServiceException e){ - e.printStackTrace(); - } - catch ( IOException e){ - e.printStackTrace(); - } - - urlconn.disconnect(); - - return jptstream; - } - - private String const_urlstring( String target, - int reqfw, int reqfh, - int reqrx, int reqry, - int reqrw, int reqrh, - String reqcid, boolean reqcnew) - { - String urlstring = comURL; - - if( target != null){ - if( !urlstring.endsWith("?")) - urlstring = urlstring.concat( "&"); - urlstring = urlstring.concat( "target=" + target); - } - if( reqfw != -1 && reqfh != -1){ - if( !urlstring.endsWith("?")) - urlstring = urlstring.concat( "&"); - urlstring = urlstring.concat( "fsiz=" + reqfw + "," + reqfh); - } - if( reqrx != -1 && reqry != -1){ - if( !urlstring.endsWith("?")) - urlstring = urlstring.concat( "&"); - urlstring = urlstring.concat( "roff=" + reqrx + "," + reqry); - } - if( reqrw != -1 && reqrh != -1){ - if( !urlstring.endsWith("?")) - urlstring = urlstring.concat( "&"); - urlstring = urlstring.concat( "rsiz=" + reqrw + "," + reqrh); - } - if( reqcid != null){ - if( !urlstring.endsWith("?")) - urlstring = urlstring.concat( "&"); - urlstring = urlstring.concat( "cid=" + reqcid); - } - if( reqcnew){ - if( !urlstring.endsWith("?")) - urlstring = urlstring.concat( "&"); - urlstring = urlstring.concat( "cnew=http"); - } - return urlstring; - } - - public void closeChannel() - { - if( cid == null) - return; - - try{ - URL url = new URL( comURL + "cclose=" + cid); - System.err.println( "closing cid: " + cid); - - HttpURLConnection urlconn = (HttpURLConnection)url.openConnection(); - urlconn.setRequestMethod("GET"); - urlconn.setInstanceFollowRedirects(false); - urlconn.connect(); - - Map headers = urlconn.getHeaderFields(); - - urlconn.disconnect(); - } catch ( MalformedURLException e){ - e.printStackTrace(); - } catch ( IOException e){ - e.printStackTrace(); - } - } -} diff --git a/applications/jpip/opj_client/opj_viewer/src/MML.java b/applications/jpip/opj_client/opj_viewer/src/MML.java deleted file mode 100644 index 983ff200..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/MML.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.awt.event.*; - -class MML implements MouseMotionListener, MouseListener -{ - public void mouseExited(MouseEvent e) {} - public void mouseEntered(MouseEvent e) {} - public void mouseClicked(MouseEvent e) {} - - private ImageViewer iv; - private int x1, y1, x2, y2, zf, btn; - private boolean zoomrq; - - public MML(ImageViewer imageviewer) - { - x1 = y1 = -1; - iv = imageviewer; - zoomrq = false; - zf = 0; - } - - private boolean isInside(int x, int y) - { - x -= iv.getX(); - y -= iv.getY(); - return (x >= 0) && (x < iv.getWidth()) - && (y >= 0) && (y < iv.getHeight()); - } - - public void mousePressed(MouseEvent e) - { - btn = e.getButton(); - - if( iv.hasAnnotation()){ - if( iv.isInsideROIRect(e.getX(), e.getY())){ - iv.zoomIn(); - System.out.println("annotation click"); - return; - } - } - if (iv.isInsideRect(e.getX(), e.getY())) { - iv.setSelected(2); - iv.repaint(); - zoomrq = true; - } else { - iv.setRGeom(0, 0, 0, 0); - iv.setSelected(0); - iv.repaint(); - x1 = y1 = -1; - } - } - - public void mouseReleased(MouseEvent e) - { - if(e.getButton() == 1) { - if (zoomrq) { - iv.zoomIn(); - zoomrq = false; - } - } - } - - public void mouseMoved(MouseEvent e) - { - } - - public void mouseDragged(MouseEvent e) - { - if (btn == 1) { - x2 = e.getX(); - y2 = e.getY(); - - iv.setSelected(0); - zoomrq = false; - - if (isInside(x2, y2)) { - if (x1 == -1) { - x1 = x2; - y1 = y2; - } else { - iv.setRGeom(x1, y1, x2, y2); - iv.repaint(); - } - } - } - } -} diff --git a/applications/jpip/opj_client/opj_viewer/src/OptionPanel.java b/applications/jpip/opj_client/opj_viewer/src/OptionPanel.java deleted file mode 100644 index 822e2dd8..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/OptionPanel.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; - -public class OptionPanel extends JPanel implements ActionListener -{ - private JButton roibutton; - private JButton imregbutton; - private ImageManager imgmanager; - private ImageViewer iv; - private JP2XMLparser xmlparser; - private JFrame regimwindow; - private RegimViewer regimgviewer; - - public OptionPanel( ImageManager manager, ImageViewer imgviewer) - { - this.setLayout(new BoxLayout( this, BoxLayout.Y_AXIS)); - - roibutton = new JButton("Region Of Interest"); - imregbutton = new JButton("Image Registration"); - - roibutton.setAlignmentX( Component.CENTER_ALIGNMENT); - imregbutton.setAlignmentX( Component.CENTER_ALIGNMENT); - - add( roibutton); - add( imregbutton); - roibutton.addActionListener(this); - imregbutton.addActionListener(this); - - imgmanager = manager; - iv = imgviewer; - xmlparser = null; - } - - public void actionPerformed(ActionEvent e) - { - if( xmlparser == null){ - byte []xmldata = imgmanager.getXML(); - if( xmldata != null) - xmlparser = new JP2XMLparser( xmldata); - } - if( e.getSource() == roibutton){ - if( xmlparser != null){ - JP2XMLparser.ROIparams roi[] = xmlparser.getROIparams(); - iv.annotate( roi); - } - } - if( e.getSource() == imregbutton){ - if( xmlparser != null){ - if( regimwindow == null){ - JP2XMLparser.IRTparams irt = xmlparser.getIRTparams(); - - regimgviewer = new RegimViewer( irt.refimg, irt.mat); - regimgviewer.setOpaque(false); - - regimwindow = new JFrame("Registered Image"); - regimwindow.getContentPane().add("Center", regimgviewer); - regimwindow.pack(); - regimwindow.setLocation( 500, 50); - regimwindow.setVisible(true); - } - regimgviewer.projection( iv.getImage(), (double)imgmanager.getRw()/(double)imgmanager.getOrigWidth()); - regimwindow.setSize( regimgviewer.get_imsize()); - regimwindow.show(); - } - } - } -} \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/PnmImage.java b/applications/jpip/opj_client/opj_viewer/src/PnmImage.java deleted file mode 100644 index 5fdfb608..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/PnmImage.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.awt.*; -import java.awt.image.*; -import java.io.*; -import java.util.regex.*; - -public class PnmImage extends Component -{ - public byte[] data = null; - public int width = 0; - public int height = 0; - public int channel = 0; - - public Image createROIImage( int rx, int ry, int rw, int rh) - { - int []pix = new int[ rw*rh]; - - for( int i=0; i 0){ - try { - r = is.read(data, offset, bytes); - if( r == -1){ - System.err.println(" failed to read()"); - break; - } - offset += r; - bytes -= r; - } - catch (IOException e) { e.printStackTrace(); } - } - fis.close(); - } catch (IOException e) { e.printStackTrace(); } - } -} \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/RegimViewer.java b/applications/jpip/opj_client/opj_viewer/src/RegimViewer.java deleted file mode 100644 index 85beb533..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/RegimViewer.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import javax.swing.*; -import java.awt.*; -import java.awt.image.*; -import java.awt.geom.AffineTransform; - -public class RegimViewer extends JPanel -{ - private PnmImage refpnm; - private int vw, vh; - private Image refimg; - private Image jpipImg; - private double[] affine_matrix; - private AffineTransform affine; - - public RegimViewer( String refname, double[] mat) - { - refpnm = new PnmImage(); - refpnm.openimage(refname.replaceFirst("jp2", "pgm")); // decoding not realized - affine_matrix = new double[6]; - - affine_matrix[0] = mat[0]; - affine_matrix[1] = mat[3]; - affine_matrix[2] = mat[1]; - affine_matrix[3] = mat[4]; - affine_matrix[4] = mat[2]; - affine_matrix[5] = mat[5]; - - affine = new AffineTransform(); - - for( int i=0; i<3; i++){ - for( int j=0; j<3; j++) - System.out.print( mat[i*3+j] + " "); - System.out.println(); - } - } - - public void projection( Image jpipimg, double scale) - { - jpipImg = jpipimg; - refimg = refpnm.createScaleImage( scale); - vw = refimg.getWidth(this); - vh = refimg.getHeight(this); - this.setSize( vw, vh); - - affine.setTransform( affine_matrix[0], affine_matrix[1], affine_matrix[2], affine_matrix[3], affine_matrix[4], affine_matrix[5]); - repaint(); - } - - public void paint(Graphics g) - { - int iw, ih; - BufferedImage bi, bi2; - Graphics2D big, big2; - Graphics2D g2 = (Graphics2D) g; - - g2.clearRect(0, 0, vw, vh); - - g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - g2.setRenderingHint(RenderingHints.KEY_RENDERING, - RenderingHints.VALUE_RENDER_QUALITY); - - iw = refimg.getWidth(this); - ih = refimg.getHeight(this); - - bi = new BufferedImage( iw, ih, BufferedImage.TYPE_INT_RGB); - big = bi.createGraphics(); - big.drawImage(refimg, 0, 0, this); - - g2.drawImage(bi, 0, 0, this); - - bi2 = new BufferedImage( jpipImg.getWidth(this), jpipImg.getHeight(this), BufferedImage.TYPE_INT_RGB); - big2 = bi2.createGraphics(); - big2.drawImage( jpipImg, 0, 0, this); - - g2.setTransform(affine); - - g2.drawImage(bi2, 0, 0, this); - } - - public Dimension get_imsize() - { - return (new Dimension( vw, vh)); - } -} \ No newline at end of file diff --git a/applications/jpip/opj_client/opj_viewer/src/ResizeListener.java b/applications/jpip/opj_client/opj_viewer/src/ResizeListener.java deleted file mode 100644 index 28688c1b..00000000 --- a/applications/jpip/opj_client/opj_viewer/src/ResizeListener.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * $Id$ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; - -class ResizeListener implements ComponentListener -{ - private ImageViewer iv; - private Dimension largest; - - public ResizeListener( ImageViewer _iv) - { - iv = _iv; - largest = iv.getSize(); - } - - public void componentHidden(ComponentEvent e) {} - - public void componentMoved(ComponentEvent e) {} - - public void componentResized(ComponentEvent e) { - Dimension cursize = iv.getSize(); - if( largest.getWidth() < cursize.getWidth() || largest.getHeight() < cursize.getHeight()){ - largest = cursize; - iv.enlarge(); - } - } - - public void componentShown(ComponentEvent e) {} -} \ No newline at end of file