Mercurial > hg > digilib-old

annotate servlet/src/digilib/io/ImageFileset.java @ 472:f8ca069517a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
author hertzhaft
date Fri, 07 Apr 2006 20:39:07 +0200
parents ee2b943420f5
children 1fc30116efc3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
1 /* ImageFileset -- digilib image file info class.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
2 * Digital Image Library servlet components
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
3 * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
4 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
5 * This program is free software; you can
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
6 * redistribute it and/or modify it under the terms of the GNU General Public
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
7 * License as published by the Free Software Foundation; either version 2 of
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
8 * the License, or (at your option) any later version.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
9 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
10 * Please read license.txt for the full details. A copy of the GPL may be
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
11 * found at http://www.gnu.org/copyleft/lgpl.html
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
12 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
13 * You should have received a copy of the GNU General Public License along
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
14 * with this program; if not, write to the Free Software Foundation, Inc.,
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
15 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
16 */
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
17
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
18 package digilib.io;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
19
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
20 import java.io.File;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
21 import java.io.IOException;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
22 import java.util.ArrayList;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
23 import java.util.Arrays;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
24 import java.util.Iterator;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
25 import java.util.ListIterator;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
26 import java.util.Map;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
27
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
28 import digilib.image.ImageOps;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
29 import digilib.image.ImageSize;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
30
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
31 /**
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
32 * @author casties
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
33 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
34 public class ImageFileset extends DocuDirent {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
35
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
36 /** this is an image file */
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
37 protected static int fileClass = FileOps.CLASS_IMAGE;
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
38
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
39 /** list of files (ImageFile) */
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
40 private ArrayList list = null;
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
41
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
42 /** aspect ratio (width/height) */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
43 private float aspect = 0;
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
44
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
45 /** resolution of the biggest image (DPI) */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
46 private float resX = 0;
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
47
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
48 /** resolution of the biggest image (DPI) */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
49 private float resY = 0;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
50
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
51 /**
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
52 * Creator for empty fileset.
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
53 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
54 *
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
55 * @param initialCapacity
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
56 */
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
57 public ImageFileset() {
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
58 list = new ArrayList();
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
59 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
60
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
61 /**
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
62 * Constructor with a file and hints.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
63 *
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
64 * The hints are expected to contain 'basedirs' and 'scaledfilext' keys.
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
65 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
66 * @param file
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
67 * @param hints
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
68 */
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
69 public ImageFileset(File file, Map hints) {
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
70 Directory[] dirs = (Directory[]) hints.get(FileOps.HINT_BASEDIRS);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
71 int nb = dirs.length;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
72 list = new ArrayList(nb);
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
73 parent = dirs[0];
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
74 fill(dirs, file, hints);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
75 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
76
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
77 /**
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
78 * Adds an ImageFile to this Fileset.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
79 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
80 * The files should be added in the order of higher to lower resolutions.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
81 * The first file is considered the hires "original".
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
82 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
83 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
84 * @param f
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
85 * file to add
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
86 * @return true (always)
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
87 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
88 public boolean add(ImageFile f) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
89 f.setParent(this);
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
90 return list.add(f);
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
91 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
92
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
93 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
94 * The number of image files in this Fileset.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
95 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
96 *
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
97 * @return number of image files
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
98 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
99 public int size() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
100 return (list != null) ? list.size() : 0;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
101 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
102
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
103 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
104 * Gets the default File.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
105 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
106 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
107 public File getFile() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
108 return (list != null) ? ((ImageFile) list.get(0)).getFile() : null;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
109 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
110
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
111 /**
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
112 * Compares to a String (for binarySearch)
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
113 * or to another ImageFileset (for sort)
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
114 */
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
115 public int compareTo(Object arg0) {
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
116 return (arg0 instanceof ImageFileset)
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
117 ? getName().compareTo(((ImageFileset) arg0).getName())
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
118 : getName().compareTo((String) arg0);
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
119 }
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
120
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 402
diff changeset
121 /**
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
122 * Get the ImageFile at the index.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
123 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
124 *
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
125 * @param index
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
126 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
127 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
128 public ImageFile get(int index) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
129 return (ImageFile) list.get(index);
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
130 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
131
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
132 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
133 * Get the next smaller ImageFile than the given size.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
134 *
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
135 * Returns the ImageFile from the set that has a width and height smaller or
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
136 * equal the given size. Returns null if there isn't any smaller image.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
137 * Needs DocuInfo instance to checkFile().
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
138 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
139 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
140 * @param size
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
141 * @param info
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
142 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
143 */
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
144 public ImageFile getNextSmaller(ImageSize size) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
145 for (Iterator i = getHiresIterator(); i.hasNext();) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
146 ImageFile f = (ImageFile) i.next();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
147 try {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
148 if (!f.isChecked()) {
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
149 ImageOps.checkFile(f);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
150 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
151 if (f.getSize().isTotallySmallerThan(size)) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
152 return f;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
153 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
154 } catch (IOException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
155 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
156 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
157 return null;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
158 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
159
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
160 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
161 * Get the next bigger ImageFile than the given size.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
162 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
163 * Returns the ImageFile from the set that has a width or height bigger or
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
164 * equal the given size. Returns null if there isn't any bigger image. Needs
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
165 * DocuInfo instance to checkFile().
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
166 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
167 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
168 * @param size
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
169 * @param info
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
170 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
171 */
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
172 public ImageFile getNextBigger(ImageSize size) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
173 for (ListIterator i = getLoresIterator(); i.hasPrevious();) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
174 ImageFile f = (ImageFile) i.previous();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
175 try {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
176 if (!f.isChecked()) {
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
177 ImageOps.checkFile(f);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
178 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
179 if (f.getSize().isBiggerThan(size)) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
180 return f;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
181 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
182 } catch (IOException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
183 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
184 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
185 return null;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
186 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
187
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
188 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
189 * Returns the biggest ImageFile in the set.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
190 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
191 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
192 * @return
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
193 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
194 public ImageFile getBiggest() {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
195 return this.get(0);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
196 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
197
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
198 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
199 * Returns the biggest ImageFile in the set.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
200 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
201 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
202 * @return
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
203 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
204 public ImageFile getSmallest() {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
205 return this.get(this.size() - 1);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
206 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
207
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
208 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
209 * Get an Iterator for this Fileset starting at the highest resolution
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
210 * images.
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
211 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
212 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
213 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
214 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
215 public ListIterator getHiresIterator() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
216 return list.listIterator();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
217 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
218
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
219 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
220 * Get an Iterator for this Fileset starting at the lowest resolution
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
221 * images.
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
222 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
223 * The Iterator starts at the last element, so you have to use it backwards
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
224 * with hasPrevious() and previous().
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
225 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
226 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
227 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
228 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
229 public ListIterator getLoresIterator() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
230 return list.listIterator(list.size());
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
231 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
232
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
233 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
234 * Fill the ImageFileset with files from different base directories.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
235 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
236 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
237 * @param dirs
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
238 * list of base directories
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
239 * @param fl
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
240 * file (from first base dir)
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
241 * @param hints
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
242 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
243 */
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
244 void fill(Directory[] dirs, File fl, Map hints) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
245 int nb = dirs.length;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
246 String fn = fl.getName();
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
247 String baseFn = FileOps.basename(fn);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
248 // add the first ImageFile to the ImageFileset
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
249 add(new ImageFile(fn, this, parent));
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
250 // iterate the remaining base directories
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
251 for (int dirIdx = 1; dirIdx < nb; dirIdx++) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
252 if (dirs[dirIdx] == null) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
253 continue;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
254 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
255 // read the directory
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
256 if (dirs[dirIdx].getFilenames() == null) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
257 dirs[dirIdx].readDir();
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
258 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
259 String[] dirFiles = dirs[dirIdx].getFilenames();
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
260 // try the same filename as the original
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
261 int fileIdx = Arrays.binarySearch(dirFiles, fn);
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
262 if (fileIdx < 0) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
263 // try closest matches without extension
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
264 fileIdx = -fileIdx - 1;
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
265 // try idx
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
266 if ((fileIdx < dirFiles.length)
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
267 && (FileOps.basename(dirFiles[fileIdx]).equals(baseFn))) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
268 // idx ok
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
269 } else if ((fileIdx > 0)
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
270 && (FileOps.basename(dirFiles[fileIdx - 1])
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
271 .equals(baseFn))) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
272 // idx-1 ok
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
273 fileIdx = fileIdx - 1;
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
274 } else if ((fileIdx+1 < dirFiles.length)
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
275 && (FileOps.basename(dirFiles[fileIdx + 1])
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
276 .equals(baseFn))) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
277 // idx+1 ok
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
278 fileIdx = fileIdx + 1;
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
279 } else {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
280 // basename doesn't match
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
281 continue;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
282 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
283 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
284 if (FileOps.classForFilename(dirFiles[fileIdx]) == FileOps.CLASS_IMAGE) {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
285 /* logger.debug("adding file " + dirFiles[fileIdx]
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
286 + " to Fileset " + this.getName()); */
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
287 add(new ImageFile(dirFiles[fileIdx], this, dirs[dirIdx]));
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
288 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
289 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
290 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
291
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
292 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
293 * Checks metadata and sets resolution in resX and resY.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
294 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
295 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
296 public void checkMeta() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
297 if (metaChecked) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
298 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
299 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
300 if (fileMeta == null) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
301 // try to read metadata file
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
302 readMeta();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
303 if (fileMeta == null) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
304 // try directory metadata
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
305 ((DocuDirectory) parent).checkMeta();
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
306 if (((DocuDirectory) parent).getDirMeta() != null) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
307 fileMeta = ((DocuDirectory) parent).getDirMeta();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
308 } else {
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
309 // try parent directory metadata
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
310 DocuDirectory gp = (DocuDirectory) parent.getParent();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
311 if (gp != null) {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
312 gp.checkMeta();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
313 if (gp.getDirMeta() != null) {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
314 fileMeta = gp.getDirMeta();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
315 }
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
316 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
317 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
318 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
319 }
354
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
320 if (fileMeta == null) {
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
321 // no metadata available
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
322 metaChecked = true;
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
323 return;
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
324 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
325 metaChecked = true;
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
326 float dpi = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
327 float dpix = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
328 float dpiy = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
329 float sizex = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
330 float sizey = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
331 float pixx = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
332 float pixy = 0;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
333 // DPI is valid for X and Y
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
334 if (fileMeta.containsKey("original-dpi")) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
335 try {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
336 dpi = Float.parseFloat((String) fileMeta.get("original-dpi"));
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
337 } catch (NumberFormatException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
338 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
339 if (dpi != 0) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
340 resX = dpi;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
341 resY = dpi;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
342 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
343 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
344 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
345 // DPI-X and DPI-Y
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
346 if (fileMeta.containsKey("original-dpi-x")
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
347 && fileMeta.containsKey("original-dpi-y")) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
348 try {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
349 dpix = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
350 .get("original-dpi-x"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
351 dpiy = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
352 .get("original-dpi-y"));
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
353 } catch (NumberFormatException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
354 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
355 if ((dpix != 0) && (dpiy != 0)) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
356 resX = dpix;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
357 resY = dpiy;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
358 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
359 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
360 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
361 // SIZE-X and SIZE-Y and PIXEL-X and PIXEL-Y
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
362 if (fileMeta.containsKey("original-size-x")
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
363 && fileMeta.containsKey("original-size-y")
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
364 && fileMeta.containsKey("original-pixel-x")
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
365 && fileMeta.containsKey("original-pixel-y")) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
366 try {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
367 sizex = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
368 .get("original-size-x"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
369 sizey = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
370 .get("original-size-y"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
371 pixx = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
372 .get("original-pixel-x"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
373 pixy = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
374 .get("original-pixel-y"));
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
375 } catch (NumberFormatException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
376 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
377 if ((sizex != 0) && (sizey != 0) && (pixx != 0) && (pixy != 0)) {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
378 resX = pixx / (sizex * 100 / 2.54f);
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
379 resY = pixy / (sizey * 100 / 2.54f);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
380 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
381 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
382 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
383 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
384
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
385 /**
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
386 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
387 */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
388 public float getResX() {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
389 return resX;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
390 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
391
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
392 /**
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
393 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
394 */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
395 public float getResY() {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
396 return resY;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
397 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
398
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
399 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
400 * Sets the aspect ratio from an ImageSize.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
401 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
402 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
403 * @param f
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
404 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
405 public void setAspect(ImageSize s) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
406 aspect = s.getAspect();
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
407 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
408
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
409 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
410 * Returns the aspect ratio.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
411 *
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
412 * Aspect ratio is (width/height). So it's <1 for portrait and >1 for
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
413 * landscape.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
414 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
415 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
416 * @return
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
417 */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
418 public float getAspect() {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
419 return aspect;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
420 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
421
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
422 }