Mercurial > hg > digilib-old

annotate servlet/src/digilib/io/ImageFileset.java @ 567:70c135bd17aa stream

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Starting 'stream' branch
author robcast
date Tue, 21 Dec 2010 10:05:54 +0100
parents 686086d6e6d6
children
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;
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
25 import java.util.List;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
26 import java.util.ListIterator;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
27 import java.util.Map;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
28
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
29 import digilib.image.ImageSize;
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 536
diff changeset
30 import digilib.io.FileOps.FileClass;
686086d6e6d6 more refactoring and rearranging
robcast
parents: 536
diff changeset
31 import digilib.servlet.DigilibConfiguration;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
32
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
33 /**
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
34 * @author casties
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
35 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
36 public class ImageFileset extends DocuDirent {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
37
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
38 /** this is an image file */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 536
diff changeset
39 protected static FileClass fileClass = FileClass.IMAGE;
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
40
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
41 /** list of files (ImageFile) */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
42 private List<ImageFile> list = null;
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
43
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
44 /** aspect ratio (width/height) */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
45 private float aspect = 0;
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
46
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
47 /** resolution of the biggest image (DPI) */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
48 private float resX = 0;
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
49
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
50 /** resolution of the biggest image (DPI) */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
51 private float resY = 0;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
52
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
53 /**
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
54 * Creator for empty fileset.
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
55 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
56 *
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
57 * @param initialCapacity
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
58 */
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
59 public ImageFileset() {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
60 list = new ArrayList<ImageFile>();
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
61 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
62
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
63 /**
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
64 * Constructor with a file and hints.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
65 *
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
66 * The hints are expected to contain 'basedirs' and 'scaledfilext' keys.
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
67 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
68 * @param file
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
69 * @param hints
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
70 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
71 public ImageFileset(File file, Map<Integer,Object> hints) {
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
72 Directory[] dirs = (Directory[]) hints.get(FileOps.HINT_BASEDIRS);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
73 int nb = dirs.length;
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
74 list = new ArrayList<ImageFile>(nb);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
75 parent = dirs[0];
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
76 fill(dirs, file, hints);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
77 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
78
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
79 /**
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 170
diff changeset
80 * Adds an ImageFile to this Fileset.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
81 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
82 * 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
83 * The first file is considered the hires "original".
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
84 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
85 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
86 * @param f
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
87 * file to add
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
88 * @return true (always)
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
89 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
90 public boolean add(ImageFile f) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
91 f.setParent(this);
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
92 return list.add(f);
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
93 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
94
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
95 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
96 * The number of image files in this Fileset.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
97 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
98 *
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
99 * @return number of image files
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
100 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
101 public int size() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
102 return (list != null) ? list.size() : 0;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
103 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
104
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
105 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
106 * Gets the default File.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
107 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
108 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
109 public File getFile() {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
110 return (list != null) ? list.get(0).getFile() : null;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
111 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
112
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
113 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
114 * Get the ImageFile at the index.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
115 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
116 *
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
117 * @param index
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
118 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
119 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
120 public ImageFile get(int index) {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
121 return list.get(index);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
122 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
123
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
124 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
125 * Get the next smaller ImageFile than the given size.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
126 *
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
127 * 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
128 * equal the given size. Returns null if there isn't any smaller image.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
129 * Needs DocuInfo instance to checkFile().
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
130 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
131 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
132 * @param size
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
133 * @param info
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
134 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
135 */
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
136 public ImageFile getNextSmaller(ImageSize size) {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
137 for (Iterator<ImageFile> i = getHiresIterator(); i.hasNext();) {
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
138 ImageFile f = i.next();
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
139 try {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
140 if (!f.isChecked()) {
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 536
diff changeset
141 DigilibConfiguration.docuImageIdentify(f);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
142 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
143 if (f.getSize().isTotallySmallerThan(size)) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
144 return f;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
145 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
146 } catch (IOException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
147 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
148 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
149 return null;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
150 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
151
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
152 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
153 * Get the next bigger ImageFile than the given size.
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
154 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
155 * 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
156 * 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
157 * DocuInfo instance to checkFile().
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
158 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
159 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
160 * @param size
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
161 * @param info
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
162 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
163 */
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
164 public ImageFile getNextBigger(ImageSize size) {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
165 for (ListIterator<ImageFile> i = getLoresIterator(); i.hasPrevious();) {
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
166 ImageFile f = i.previous();
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
167 try {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
168 if (!f.isChecked()) {
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 536
diff changeset
169 DigilibConfiguration.docuImageIdentify(f);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
170 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
171 if (f.getSize().isBiggerThan(size)) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
172 return f;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
173 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
174 } catch (IOException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
175 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
176 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
177 return null;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
178 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
179
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
180 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
181 * Returns the biggest ImageFile in the set.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
182 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
183 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
184 * @return
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
185 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
186 public ImageFile getBiggest() {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
187 return this.get(0);
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
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 * Returns the biggest ImageFile in the set.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
192 *
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 * @return
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
195 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
196 public ImageFile getSmallest() {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
197 return this.get(this.size() - 1);
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
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 * Get an Iterator for this Fileset starting at the highest resolution
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
202 * images.
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
203 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
204 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
205 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
206 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
207 public ListIterator<ImageFile> getHiresIterator() {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
208 return list.listIterator();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
209 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
210
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
211 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
212 * Get an Iterator for this Fileset starting at the lowest resolution
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
213 * images.
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
214 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
215 * The Iterator starts at the last element, so you have to use it backwards
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
216 * with hasPrevious() and previous().
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
217 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
218 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
219 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
220 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
221 public ListIterator<ImageFile> getLoresIterator() {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
222 return list.listIterator(list.size());
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
223 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
224
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
225 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
226 * Fill the ImageFileset with files from different base directories.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
227 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
228 *
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
229 * @param dirs
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
230 * list of base directories
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
231 * @param fl
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
232 * file (from first base dir)
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
233 * @param hints
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
234 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
235 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
236 void fill(Directory[] dirs, File fl, Map<Integer,Object> hints) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
237 int nb = dirs.length;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
238 String fn = fl.getName();
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
239 String baseFn = FileOps.basename(fn);
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
240 // add the first ImageFile to the ImageFileset
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
241 add(new ImageFile(fn, this, parent));
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
242 // iterate the remaining base directories
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
243 for (int dirIdx = 1; dirIdx < nb; dirIdx++) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
244 if (dirs[dirIdx] == null) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
245 continue;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
246 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
247 // read the directory
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
248 if (dirs[dirIdx].getFilenames() == null) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
249 dirs[dirIdx].readDir();
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
250 }
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
251 String[] dirFiles = dirs[dirIdx].getFilenames();
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
252 // try the same filename as the original
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
253 int fileIdx = Arrays.binarySearch(dirFiles, fn);
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
254 if (fileIdx < 0) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
255 // try closest matches without extension
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
256 fileIdx = -fileIdx - 1;
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
257 // try idx
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
258 if ((fileIdx < dirFiles.length)
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
259 && (FileOps.basename(dirFiles[fileIdx]).equals(baseFn))) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
260 // idx ok
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
261 } else if ((fileIdx > 0)
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
262 && (FileOps.basename(dirFiles[fileIdx - 1])
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
263 .equals(baseFn))) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
264 // idx-1 ok
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
265 fileIdx = fileIdx - 1;
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
266 } else if ((fileIdx+1 < dirFiles.length)
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
267 && (FileOps.basename(dirFiles[fileIdx + 1])
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
268 .equals(baseFn))) {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
269 // idx+1 ok
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
270 fileIdx = fileIdx + 1;
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
271 } else {
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
272 // basename doesn't match
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
273 continue;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
274 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
275 }
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 536
diff changeset
276 if (FileOps.classForFilename(dirFiles[fileIdx]) == fileClass) {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
277 /* logger.debug("adding file " + dirFiles[fileIdx]
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
278 + " to Fileset " + this.getName()); */
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 259
diff changeset
279 add(new ImageFile(dirFiles[fileIdx], this, dirs[dirIdx]));
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 233
diff changeset
280 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
281 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
282 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
283
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
284 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
285 * Checks metadata and sets resolution in resX and resY.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
286 *
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
287 */
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
288 public void checkMeta() {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
289 if (metaChecked) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
290 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
291 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
292 if (fileMeta == null) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
293 // try to read metadata file
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
294 readMeta();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
295 if (fileMeta == null) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
296 // try directory metadata
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
297 ((DocuDirectory) parent).checkMeta();
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
298 if (((DocuDirectory) parent).getDirMeta() != null) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
299 fileMeta = ((DocuDirectory) parent).getDirMeta();
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
300 } else {
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
301 // try parent directory metadata
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
302 DocuDirectory gp = (DocuDirectory) parent.getParent();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
303 if (gp != null) {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
304 gp.checkMeta();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
305 if (gp.getDirMeta() != null) {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
306 fileMeta = gp.getDirMeta();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
307 }
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
308 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
309 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
310 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
311 }
354
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
312 if (fileMeta == null) {
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
313 // no metadata available
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
314 metaChecked = true;
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
315 return;
7958035abec1 Servlet version 1.5.9d
robcast
parents: 295
diff changeset
316 }
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
317 metaChecked = true;
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
318 float dpi = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
319 float dpix = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
320 float dpiy = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
321 float sizex = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
322 float sizey = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
323 float pixx = 0;
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
324 float pixy = 0;
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
325 // DPI is valid for X and Y
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
326 if (fileMeta.containsKey("original-dpi")) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
327 try {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
328 dpi = Float.parseFloat((String) fileMeta.get("original-dpi"));
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
329 } catch (NumberFormatException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
330 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
331 if (dpi != 0) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
332 resX = dpi;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
333 resY = dpi;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
334 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
335 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
336 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
337 // DPI-X and DPI-Y
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
338 if (fileMeta.containsKey("original-dpi-x")
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
339 && fileMeta.containsKey("original-dpi-y")) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
340 try {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
341 dpix = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
342 .get("original-dpi-x"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
343 dpiy = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
344 .get("original-dpi-y"));
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
345 } catch (NumberFormatException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
346 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
347 if ((dpix != 0) && (dpiy != 0)) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
348 resX = dpix;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
349 resY = dpiy;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
350 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
351 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
352 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
353 // SIZE-X and SIZE-Y and PIXEL-X and PIXEL-Y
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
354 if (fileMeta.containsKey("original-size-x")
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
355 && fileMeta.containsKey("original-size-y")
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
356 && fileMeta.containsKey("original-pixel-x")
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
357 && fileMeta.containsKey("original-pixel-y")) {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
358 try {
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
359 sizex = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
360 .get("original-size-x"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
361 sizey = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
362 .get("original-size-y"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
363 pixx = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
364 .get("original-pixel-x"));
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
365 pixy = Float.parseFloat((String) fileMeta
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
366 .get("original-pixel-y"));
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
367 } catch (NumberFormatException e) {
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
368 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
369 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
370 resX = pixx / (sizex * 100 / 2.54f);
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
371 resY = pixy / (sizey * 100 / 2.54f);
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
372 return;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
373 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
374 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
375 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
376
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
377 /**
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
378 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
379 */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
380 public float getResX() {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
381 return resX;
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 * @return
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
386 */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
387 public float getResY() {
159
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
388 return resY;
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
389 }
e743b853efca servlet version 1.16a4
robcast
parents:
diff changeset
390
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
391 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
392 * Sets the aspect ratio from an ImageSize.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
393 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
394 *
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
395 * @param f
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
396 */
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
397 public void setAspect(ImageSize s) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
398 aspect = s.getAspect();
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
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 * Returns the aspect ratio.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
403 *
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
404 * 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
405 * landscape.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
406 *
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 * @return
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
409 */
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 284
diff changeset
410 public float getAspect() {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
411 return aspect;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
412 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 159
diff changeset
413
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 181
diff changeset
414 }