Revision 1426
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.app/org.gvsig.raster.wcs.app.wcsclient/src/main/java/org/gvsig/raster/wcs/app/wcsclient/layer/FLyrWCS.java | ||
---|---|---|
50 | 50 |
import java.awt.geom.Rectangle2D; |
51 | 51 |
import java.awt.image.BufferedImage; |
52 | 52 |
import java.io.IOException; |
53 |
import java.util.ArrayList; |
|
54 | 53 |
import java.util.HashMap; |
54 |
import java.util.List; |
|
55 | 55 |
|
56 | 56 |
import javax.print.attribute.PrintRequestAttributeSet; |
57 | 57 |
import javax.swing.JOptionPane; |
... | ... | |
477 | 477 |
layer.params = params; |
478 | 478 |
layer.explorer = explorer; |
479 | 479 |
|
480 |
ArrayList<RasterFilter> filters = getRender().getFilterList().getStatusCloned();
|
|
480 |
List<RasterFilter> filters = getRender().getFilterList().getStatusCloned(); |
|
481 | 481 |
|
482 | 482 |
//Hacemos una copia de las bandas a renderizar |
483 | 483 |
if(getRender().getRenderBands() != null) { |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/enhanced/ui/PreviewFiltering.java | ||
---|---|---|
52 | 52 |
public class PreviewFiltering implements PreviewRenderProcess { |
53 | 53 |
|
54 | 54 |
private boolean showFiltersSelected = true; |
55 |
private ArrayList<ParamStruct> paramsList = new ArrayList<ParamStruct>();
|
|
56 |
private ArrayList<RasterFilter> filtersInit = new ArrayList<RasterFilter>();
|
|
55 |
private List<ParamStruct> paramsList = new ArrayList<ParamStruct>();
|
|
56 |
private List<RasterFilter> filtersInit = new ArrayList<RasterFilter>();
|
|
57 | 57 |
private boolean showPreview = true; |
58 | 58 |
private boolean saveLayerFilters = true; |
59 | 59 |
|
... | ... | |
73 | 73 |
* Obtiene la lista de par?metros |
74 | 74 |
* @return the paramsList |
75 | 75 |
*/ |
76 |
public ArrayList<ParamStruct> getParamsList() {
|
|
76 |
public List<ParamStruct> getParamsList() { |
|
77 | 77 |
return paramsList; |
78 | 78 |
} |
79 | 79 |
|
... | ... | |
81 | 81 |
* Asigna la lista de par?metros |
82 | 82 |
* @param params |
83 | 83 |
*/ |
84 |
public void setParamsList(ArrayList<ParamStruct> params) {
|
|
84 |
public void setParamsList(List<ParamStruct> params) { |
|
85 | 85 |
this.paramsList = params; |
86 | 86 |
} |
87 | 87 |
|
... | ... | |
91 | 91 |
* lyr.getRender().getFilterList().getStatusCloned(). |
92 | 92 |
* @param params Lista de filtros aplicados. |
93 | 93 |
*/ |
94 |
public void setFilterStatus(ArrayList<RasterFilter> filtersInit) {
|
|
94 |
public void setFilterStatus(List<RasterFilter> filtersInit) { |
|
95 | 95 |
this.filtersInit = filtersInit; |
96 | 96 |
} |
97 | 97 |
|
... | ... | |
99 | 99 |
* Devuelve el arrayList de filtros inicial |
100 | 100 |
* @return |
101 | 101 |
*/ |
102 |
public ArrayList<RasterFilter> getFilterStatus() {
|
|
102 |
public List<RasterFilter> getFilterStatus() { |
|
103 | 103 |
return filtersInit; |
104 | 104 |
} |
105 | 105 |
|
... | ... | |
180 | 180 |
RasterFilterList filterList = RasterLocator.getManager().createEmptyFilterList(initDataType); |
181 | 181 |
filterList.setEnv(layerRaster.getRender().getFilterList().getEnv()); |
182 | 182 |
filterList.setInitDataType(initDataType); |
183 |
ArrayList<Class> registeredFilters = filterList.getRegisteredFilterList();
|
|
183 |
List<Class<?>> registeredFilters = filterList.getRegisteredFilterList();
|
|
184 | 184 |
|
185 | 185 |
if(filtersInit == null) |
186 | 186 |
return listFilterUsed; |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/enhanced/ui/EnhancedHistogramController.java | ||
---|---|---|
46 | 46 |
this.enhancedDialog = enhancedDialog; |
47 | 47 |
} |
48 | 48 |
|
49 |
@SuppressWarnings("unchecked") |
|
50 | 49 |
public void updatePreview() { |
51 | 50 |
Params params = RasterLocator.getManager().createParams("", 0, 0, null); |
52 | 51 |
|
... | ... | |
146 | 145 |
params.setParam("RenderBands", render, -1, null); |
147 | 146 |
|
148 | 147 |
enhancedDialog.getFilteredPreview().getParamsList().clear(); |
149 |
Class filterClass = enhancedDialog.getLayer().getRender().getFilterList().getFilterClassByID("enhanced_stretch"); |
|
148 |
Class<?> filterClass = enhancedDialog.getLayer().getRender().getFilterList().getFilterClassByID("enhanced_stretch");
|
|
150 | 149 |
enhancedDialog.getFilteredPreview().addNewParam("enhanced_stretch", params, filterClass); |
151 | 150 |
|
152 | 151 |
enhancedDialog.getPreviewBasePanel().refreshPreview(); |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/enhanced/ui/EnhancedListener.java | ||
---|---|---|
104 | 104 |
graphicsPanel.getRGB().addActionListener(this); |
105 | 105 |
} |
106 | 106 |
|
107 |
/* |
|
108 |
* (non-Javadoc) |
|
109 |
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) |
|
110 |
*/ |
|
111 |
@SuppressWarnings("unchecked") |
|
112 | 107 |
public void actionPerformed(ActionEvent e) { |
113 | 108 |
//Cambio del tipo de de dibujado del histograma |
114 | 109 |
if(e.getSource() == selectorsPanel.getDrawType()) { |
... | ... | |
232 | 227 |
params.setParam("RenderBands", values, -1, null); |
233 | 228 |
params.setParam("EcualizedBands", new int[]{0, 1, 2}, -1, null); |
234 | 229 |
|
235 |
Class filterClass = enhancedDialog.getLayer().getRender().getFilterList().getFilterClassByID("equalization"); |
|
230 |
Class<?> filterClass = enhancedDialog.getLayer().getRender().getFilterList().getFilterClassByID("equalization");
|
|
236 | 231 |
filteredPreview.addNewParam("equalization", params, filterClass); |
237 | 232 |
updatePreview(); |
238 | 233 |
} |
... | ... | |
289 | 284 |
* Actualiza el combo de EnhancedType para que este seleccionado siempre el |
290 | 285 |
* item que corresponde con la grafica mostrada en ese momento |
291 | 286 |
*/ |
292 |
@SuppressWarnings("unchecked") |
|
293 | 287 |
private void updateTypeSelected() { |
294 | 288 |
HistogramStatus status = graphicsPanel.getInputHistogram().getHistogramStatus(HistogramGraphicBase.DRAWED); |
295 | 289 |
|
... | ... | |
299 | 293 |
if (status.getBaseFunction().getClass().equals(StraightLine.class)) |
300 | 294 |
selectorsPanel.setSelectedEnhancedType(RasterToolsUtil.getText(this, "lineal")); |
301 | 295 |
|
302 |
Class filterClass = enhancedDialog.getLayer().getRender().getFilterList().getFilterClassByID("equalization"); |
|
296 |
Class<?> filterClass = enhancedDialog.getLayer().getRender().getFilterList().getFilterClassByID("equalization");
|
|
303 | 297 |
if (status.getBaseFunction().getClass().equals(filterClass)) |
304 | 298 |
selectorsPanel.setSelectedEnhancedType(RasterToolsUtil.getText(this, "equalization")); |
305 | 299 |
|
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/filter/ui/FilterPanel.java | ||
---|---|---|
26 | 26 |
import java.awt.Insets; |
27 | 27 |
import java.util.ArrayList; |
28 | 28 |
import java.util.Hashtable; |
29 |
import java.util.List; |
|
29 | 30 |
|
30 | 31 |
import javax.swing.BorderFactory; |
31 | 32 |
import javax.swing.DefaultListModel; |
... | ... | |
194 | 195 |
private void menuBuild() { |
195 | 196 |
Hashtable keys = new Hashtable(); |
196 | 197 |
RasterFilterList filterList = layer.getRender().getFilterList(); |
197 |
ArrayList registeredFilters = filterList.getRegisteredFilterList();
|
|
198 |
List<Class<?>> registeredFilters = filterList.getRegisteredFilterList();
|
|
198 | 199 |
|
199 | 200 |
int count = 0; |
200 | 201 |
RasterFilter obj = null; |
... | ... | |
268 | 269 |
@SuppressWarnings("unchecked") |
269 | 270 |
private boolean hasThisFilter(String filter) { |
270 | 271 |
RasterFilterList filterList = RasterLocator.getManager().createEmptyFilterList(Buffer.TYPE_BYTE); |
271 |
ArrayList registeredFilters = filterList.getRegisteredFilterList();
|
|
272 |
List<Class<?>> registeredFilters = filterList.getRegisteredFilterList();
|
|
272 | 273 |
|
273 | 274 |
boolean error; |
274 | 275 |
RasterFilter obj = null; |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/filter/regionalpha/RegionAlphaListManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.tools.app.basic.tool.filter.regionalpha; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
54 | 55 |
point.append("RegionAlpha", "", RegionAlphaListManager.class); |
55 | 56 |
} |
56 | 57 |
|
57 |
/* |
|
58 |
* (non-Javadoc) |
|
59 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
60 |
*/ |
|
61 |
@SuppressWarnings("unchecked") |
|
62 |
public Class getFilterClassByID(String id) { |
|
58 |
public Class<?> getFilterClassByID(String id) { |
|
63 | 59 |
if( id.compareTo("regionalpha") == 0) |
64 | 60 |
return RegionAlphaFilter.class; |
65 | 61 |
return null; |
66 | 62 |
} |
67 | 63 |
|
68 |
public void addRegionAlphaFilter(ArrayList<ROI> rois, int alpha, Boolean inverse) throws FilterTypeException {
|
|
64 |
public void addRegionAlphaFilter(List<ROI> rois, int alpha, Boolean inverse) throws FilterTypeException { |
|
69 | 65 |
RasterFilter filter = new RegionAlphaByteFilter(); |
70 | 66 |
|
71 | 67 |
//Cuando el filtro esta creado, tomamos los valores y lo a?adimos a la pila |
... | ... | |
77 | 73 |
} |
78 | 74 |
} |
79 | 75 |
|
80 |
/* |
|
81 |
* (non-Javadoc) |
|
82 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
83 |
*/ |
|
84 |
@SuppressWarnings("unchecked") |
|
85 |
public ArrayList getRasterFilterList() { |
|
86 |
ArrayList filters = new ArrayList(); |
|
76 |
public List<Class<?>> getRasterFilterList() { |
|
77 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
87 | 78 |
filters.add(RegionAlphaFilter.class); |
88 | 79 |
return filters; |
89 | 80 |
} |
90 | 81 |
|
91 |
/* |
|
92 |
* (non-Javadoc) |
|
93 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#createFilter(org.gvsig.fmap.dal.coverage.datastruct.Params) |
|
94 |
*/ |
|
95 | 82 |
@SuppressWarnings("unchecked") |
96 | 83 |
public RasterFilter createFilter(Params params) { |
97 |
ArrayList<ROI> rois = ((ArrayList<ROI>) params.getParamById("rois").getDefaultValue());
|
|
84 |
List<ROI> rois = ((List<ROI>) params.getParamById("rois").getDefaultValue());
|
|
98 | 85 |
Boolean inverse = ((Boolean) params.getParamById("inverse").getDefaultValue()); |
99 | 86 |
Integer alpha = ((Integer) params.getParamById("Alpha").getDefaultValue()); |
100 | 87 |
|
... | ... | |
147 | 134 |
} |
148 | 135 |
} |
149 | 136 |
|
150 |
/* |
|
151 |
* (non-Javadoc) |
|
152 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
|
153 |
*/ |
|
154 |
@SuppressWarnings("unchecked") |
|
155 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
137 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
156 | 138 |
return filteri; |
157 | 139 |
} |
158 | 140 |
|
159 |
/* |
|
160 |
* (non-Javadoc) |
|
161 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
|
162 |
*/ |
|
163 |
@SuppressWarnings("unchecked") |
|
164 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
141 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
165 | 142 |
return filterList; |
166 | 143 |
} |
167 | 144 |
|
168 |
/* |
|
169 |
* (non-Javadoc) |
|
170 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#getFilterList() |
|
171 |
*/ |
|
172 | 145 |
public RasterFilterList getFilterList() { |
173 | 146 |
return filterList; |
174 | 147 |
} |
175 | 148 |
|
176 |
/* |
|
177 |
* (non-Javadoc) |
|
178 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#setFilterList(org.gvsig.fmap.dal.coverage.grid.RasterFilterList) |
|
179 |
*/ |
|
180 | 149 |
public void setFilterList(RasterFilterList filterList) { |
181 | 150 |
this.filterList = filterList; |
182 | 151 |
} |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/filter/grayscale/GrayScaleManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.tools.app.basic.tool.filter.grayscale; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
48 | 49 |
point.append("GrayScale", "", GrayScaleManager.class); |
49 | 50 |
} |
50 | 51 |
|
51 |
/* |
|
52 |
* (non-Javadoc) |
|
53 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
54 |
*/ |
|
55 |
@SuppressWarnings("unchecked") |
|
56 |
public Class getFilterClassByID(String id) { |
|
52 |
public Class<?> getFilterClassByID(String id) { |
|
57 | 53 |
if( id.compareTo("grayscale") == 0) |
58 | 54 |
return GrayScaleFilter.class; |
59 | 55 |
return null; |
... | ... | |
153 | 149 |
* (non-Javadoc) |
154 | 150 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
155 | 151 |
*/ |
156 |
@SuppressWarnings("unchecked") |
|
157 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
152 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
158 | 153 |
return filteri; |
159 | 154 |
} |
160 | 155 |
|
... | ... | |
162 | 157 |
* (non-Javadoc) |
163 | 158 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
164 | 159 |
*/ |
165 |
@SuppressWarnings("unchecked") |
|
166 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
160 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
167 | 161 |
return filterList; |
168 | 162 |
} |
169 | 163 |
} |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/filter/FilterListener.java | ||
---|---|---|
24 | 24 |
import java.util.ArrayList; |
25 | 25 |
import java.util.EventObject; |
26 | 26 |
import java.util.Hashtable; |
27 |
import java.util.List; |
|
27 | 28 |
|
28 | 29 |
import javax.swing.ListModel; |
29 | 30 |
|
... | ... | |
219 | 220 |
RasterFilterList filterList = RasterLocator.getManager().createEmptyFilterList(initDataType); |
220 | 221 |
filterList.setEnv(layerRaster.getRender().getFilterList().getEnv()); |
221 | 222 |
filterList.setInitDataType(initDataType); |
222 |
ArrayList<Class> registeredFilters = filterList.getRegisteredFilterList();
|
|
223 |
List<Class<?>> registeredFilters = filterList.getRegisteredFilterList();
|
|
223 | 224 |
|
224 | 225 |
// Conservamos filtros no visibles ya existentes |
225 |
ArrayList<RasterFilter> filtersInit = getFilterPanel().getLayerVisualStatus().getLast().getFilterStatus();
|
|
226 |
List<RasterFilter> filtersInit = getFilterPanel().getLayerVisualStatus().getLast().getFilterStatus(); |
|
226 | 227 |
for (int i = 0; i < filtersInit.size(); i++) { |
227 | 228 |
// Si es visible no hacemos nada |
228 | 229 |
if (((RasterFilter) filtersInit.get(i)).isVisible()) |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/filter/mask/MaskListManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.tools.app.basic.tool.filter.mask; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.RasterLocator; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.NoData; |
... | ... | |
65 | 66 |
point.append("Mask", "", MaskListManager.class); |
66 | 67 |
} |
67 | 68 |
|
68 |
/* |
|
69 |
* (non-Javadoc) |
|
70 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
71 |
*/ |
|
72 |
@SuppressWarnings("unchecked") |
|
73 |
public Class getFilterClassByID(String id) { |
|
69 |
public Class<?> getFilterClassByID(String id) { |
|
74 | 70 |
if( id.compareTo("mask") == 0) |
75 | 71 |
return MaskFilter.class; |
76 | 72 |
return null; |
... | ... | |
83 | 79 |
* @param inverse Inversa |
84 | 80 |
* @throws FilterTypeException |
85 | 81 |
*/ |
86 |
@SuppressWarnings("unchecked") |
|
87 |
public void addMaskFilter(ArrayList rois, NoData noData, Boolean inverse, Boolean transp) throws FilterTypeException { |
|
82 |
public void addMaskFilter(List<ROI> rois, NoData noData, Boolean inverse, Boolean transp) throws FilterTypeException { |
|
88 | 83 |
RasterFilter filter = new MaskByteFilter(); |
89 | 84 |
|
90 | 85 |
//Cuando el filtro esta creado, tomamos los valores y lo a?adimos a la pila |
... | ... | |
97 | 92 |
} |
98 | 93 |
} |
99 | 94 |
|
100 |
/* |
|
101 |
* (non-Javadoc) |
|
102 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
103 |
*/ |
|
104 |
@SuppressWarnings("unchecked") |
|
105 |
public ArrayList getRasterFilterList() { |
|
106 |
ArrayList filters = new ArrayList(); |
|
95 |
public List<Class<?>> getRasterFilterList() { |
|
96 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
107 | 97 |
filters.add(MaskFilter.class); |
108 | 98 |
return filters; |
109 | 99 |
} |
... | ... | |
187 | 177 |
} |
188 | 178 |
} |
189 | 179 |
|
190 |
/* |
|
191 |
* (non-Javadoc) |
|
192 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
|
193 |
*/ |
|
194 |
@SuppressWarnings("unchecked") |
|
195 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
180 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
196 | 181 |
return filteri; |
197 | 182 |
} |
198 | 183 |
|
199 |
/* |
|
200 |
* (non-Javadoc) |
|
201 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
|
202 |
*/ |
|
203 |
@SuppressWarnings("unchecked") |
|
204 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
184 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
205 | 185 |
return filterList; |
206 | 186 |
} |
207 | 187 |
} |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/GenericToolBarModule.java | ||
---|---|---|
139 | 139 |
point.append("EnhancedPanel", "", EnhancedTocMenuEntry.getSingleton()); |
140 | 140 |
point.append("GeoLocation", "", GeoLocationTocMenuEntry.getSingleton()); |
141 | 141 |
point.append("InfoByPoint", "", InfoByRasterPointTocMenuEntry.getSingleton()); |
142 |
//point.append("LayerDatatype", "", LayerDatatypeTocMenuEntry.getSingleton());
|
|
142 |
point.append("LayerDatatype", "", LayerDatatypeTocMenuEntry.getSingleton()); |
|
143 | 143 |
//point.append("Vectorization", "", VectorizationTocMenuEntry.getSingleton()); |
144 | 144 |
//point.append("Reproject", "", ReprojectTocMenuEntry.getSingleton()); |
145 | 145 |
|
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/colortable/ui/ColorTablePanel.java | ||
---|---|---|
24 | 24 |
import java.awt.BorderLayout; |
25 | 25 |
import java.io.IOException; |
26 | 26 |
import java.util.ArrayList; |
27 |
import java.util.List; |
|
27 | 28 |
|
28 | 29 |
import javax.swing.JPanel; |
29 | 30 |
import javax.swing.event.ChangeEvent; |
... | ... | |
69 | 70 |
|
70 | 71 |
private ColorTableListener colorTableListener = null; |
71 | 72 |
private FLyrRaster fLayer = null; |
72 |
private ArrayList<RasterFilter> filterStatus = null;
|
|
73 |
private List<RasterFilter> filterStatus = null;
|
|
73 | 74 |
private ColorTableData colorTableData = null; |
74 | 75 |
|
75 | 76 |
private IColorTableUI tabTable = null; |
... | ... | |
203 | 204 |
* Devuelve el arrayList de filtros inicial |
204 | 205 |
* @return |
205 | 206 |
*/ |
206 |
private ArrayList<RasterFilter> getFilterStatus() {
|
|
207 |
private List<RasterFilter> getFilterStatus() { |
|
207 | 208 |
return filterStatus; |
208 | 209 |
} |
209 | 210 |
|
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/properties/control/EnhancedControl.java | ||
---|---|---|
24 | 24 |
import java.awt.event.ActionEvent; |
25 | 25 |
import java.awt.event.ActionListener; |
26 | 26 |
import java.util.ArrayList; |
27 |
import java.util.List; |
|
27 | 28 |
|
28 | 29 |
import javax.swing.JCheckBox; |
29 | 30 |
|
... | ... | |
328 | 329 |
@SuppressWarnings("unchecked") |
329 | 330 |
private void endActionsForFilterSettings() throws FilterTypeException { |
330 | 331 |
ArrayList listOrder = (ArrayList) panelGroup.getProperties().get("filterOrder"); |
331 |
ArrayList listCopy = filterList.getStatusCloned();
|
|
332 |
List<RasterFilter> listCopy = filterList.getStatusCloned();
|
|
332 | 333 |
int cont = 0; |
333 | 334 |
for (int i = 0; i < listOrder.size(); i++) { |
334 | 335 |
int pos = hasFilter(listCopy, ((RasterFilter) listOrder.get(i)).getName()); |
335 | 336 |
if (pos != -1) { |
336 | 337 |
// Esta pero en posicion equivocada |
337 | 338 |
if (pos != cont) { |
338 |
Object copy = listCopy.remove(pos);
|
|
339 |
RasterFilter copy = listCopy.remove(pos);
|
|
339 | 340 |
listCopy.add(cont, copy); |
340 | 341 |
} |
341 | 342 |
cont++; |
... | ... | |
404 | 405 |
* @param name Nombre a comprobar si est� en la lista |
405 | 406 |
* @return true si est� en la lista y false si no est�. |
406 | 407 |
*/ |
407 |
@SuppressWarnings("unchecked") |
|
408 |
private int hasFilter(ArrayList filter, String name) { |
|
408 |
private int hasFilter(List<RasterFilter> filter, String name) { |
|
409 | 409 |
for (int i = 0; i < filter.size(); i++) { |
410 | 410 |
if (((RasterFilter) filter.get(i)).getName().equals(name)) |
411 | 411 |
return i; |
... | ... | |
417 | 417 |
public void saveStatus() throws FilterManagerException, FilterTypeException { |
418 | 418 |
panelGroup.getProperties().put("filterStatus", filterList.getStatusCloned()); |
419 | 419 |
|
420 |
ArrayList filterOrder = filterList.getStatusCloned();
|
|
420 |
List<RasterFilter> filterOrder = filterList.getStatusCloned();
|
|
421 | 421 |
int posEnhanced = hasFilter(filterOrder, "enhanced_stretch"); |
422 | 422 |
int posTailTrim = hasFilter(filterOrder, "tailTrim"); |
423 | 423 |
|
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/properties/control/TransparencyListener.java | ||
---|---|---|
93 | 93 |
// Asignamos los rangos de transparencia al objeto |
94 | 94 |
if (tPanel.getPTranspByPixel().getActiveCheck().isSelected()) { |
95 | 95 |
transparency.clearListOfTransparencyRange(); |
96 |
ArrayList entries = tPanel.getPTranspByPixel().getEntries(); |
|
96 |
ArrayList<TransparencyRange> entries = tPanel.getPTranspByPixel().getEntries();
|
|
97 | 97 |
for (int i = 0; i < entries.size(); i++) |
98 | 98 |
transparency.setTransparencyRange((TransparencyRange) entries.get(i)); |
99 | 99 |
} else |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/src/main/java/org/gvsig/raster/fmap/layers/DefaultFLyrRaster.java | ||
---|---|---|
1821 | 1821 |
newLayer.setOpenRasterStore(ds); |
1822 | 1822 |
newLayer.firstLoad = firstLoad; |
1823 | 1823 |
|
1824 |
ArrayList<RasterFilter> filters = getRender().getFilterList().getStatusCloned();
|
|
1824 |
List<RasterFilter> filters = getRender().getFilterList().getStatusCloned(); |
|
1825 | 1825 |
|
1826 | 1826 |
//Hacemos una copia de las bandas a renderizar |
1827 | 1827 |
if(getRender().getRenderBands() != null) { |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/src/main/java/org/gvsig/raster/util/LayerVisualStatusList.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.util; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.grid.RasterFilter; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.grid.render.Render; |
... | ... | |
45 | 46 |
* @author Nacho Brodin nachobrodin@gmail.com |
46 | 47 |
*/ |
47 | 48 |
public class LayerVisualStatus { |
48 |
private ArrayList<RasterFilter> filterStatus = null;
|
|
49 |
private List<RasterFilter> filterStatus = null;
|
|
49 | 50 |
private Transparency transparency = null; |
50 | 51 |
|
51 | 52 |
/** |
52 | 53 |
* Obtiene el estado de la lista de filtros |
53 | 54 |
* @return Array con el estado de la lista de filtros |
54 | 55 |
*/ |
55 |
public ArrayList<RasterFilter> getFilterStatus() {
|
|
56 |
public List<RasterFilter> getFilterStatus() { |
|
56 | 57 |
return filterStatus; |
57 | 58 |
} |
58 | 59 |
|
... | ... | |
60 | 61 |
* Asigna el estado de la lista de filtros |
61 | 62 |
* @return Array con el estado de la lista de filtros |
62 | 63 |
*/ |
63 |
public void setFilterStatus(ArrayList<RasterFilter> filterStatus) {
|
|
64 |
public void setFilterStatus(List<RasterFilter> filterStatus) { |
|
64 | 65 |
this.filterStatus = filterStatus; |
65 | 66 |
} |
66 | 67 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/ColorBalanceCMYManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.band; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
52 | 53 |
point.append("ColorBalanceCMY", "", ColorBalanceCMYManager.class); |
53 | 54 |
} |
54 | 55 |
|
55 |
/* |
|
56 |
* (non-Javadoc) |
|
57 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
58 |
*/ |
|
59 |
@SuppressWarnings("unchecked") |
|
60 |
public Class getFilterClassByID(String id) { |
|
56 |
public Class<?> getFilterClassByID(String id) { |
|
61 | 57 |
if( id.compareTo("colorbalancecmy") == 0) |
62 | 58 |
return ColorBalanceCMYFilter.class; |
63 | 59 |
return null; |
... | ... | |
101 | 97 |
|
102 | 98 |
} |
103 | 99 |
|
104 |
/* |
|
105 |
* (non-Javadoc) |
|
106 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
107 |
*/ |
|
108 |
@SuppressWarnings("unchecked") |
|
109 |
public ArrayList getRasterFilterList() { |
|
110 |
ArrayList filters = new ArrayList(); |
|
100 |
public List<Class<?>> getRasterFilterList() { |
|
101 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
111 | 102 |
filters.add(ColorBalanceCMYFilter.class); |
112 | 103 |
return filters; |
113 | 104 |
} |
... | ... | |
128 | 119 |
this.filterList = filterList; |
129 | 120 |
} |
130 | 121 |
|
131 |
/* |
|
132 |
* (non-Javadoc) |
|
133 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#addFilter(java.lang.Class, org.gvsig.fmap.dal.coverage.datastruct.Params) |
|
134 |
*/ |
|
135 |
@SuppressWarnings("unchecked") |
|
136 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
122 |
|
|
123 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
137 | 124 |
if (ColorBalanceCMYFilter.class.isAssignableFrom(classFilter)) { |
138 | 125 |
double cyan = 0, magenta = 0, yellow = 0; |
139 | 126 |
boolean luminosity = false; |
... | ... | |
199 | 186 |
* (non-Javadoc) |
200 | 187 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
201 | 188 |
*/ |
202 |
@SuppressWarnings("unchecked") |
|
203 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
189 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
204 | 190 |
return filteri; |
205 | 191 |
} |
206 | 192 |
|
... | ... | |
208 | 194 |
* (non-Javadoc) |
209 | 195 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
210 | 196 |
*/ |
211 |
@SuppressWarnings("unchecked") |
|
212 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
197 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
213 | 198 |
return filterList; |
214 | 199 |
} |
215 | 200 |
} |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/RGBToCMYKManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.band; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.dataset.Buffer; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
... | ... | |
54 | 55 |
point.append("RGBToCMYK", "", RGBToCMYKManager.class); |
55 | 56 |
} |
56 | 57 |
|
57 |
/* |
|
58 |
* (non-Javadoc) |
|
59 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
60 |
*/ |
|
61 |
@SuppressWarnings("unchecked") |
|
62 |
public Class getFilterClassByID(String id) { |
|
58 |
public Class<?> getFilterClassByID(String id) { |
|
63 | 59 |
if( id.compareTo("rgbtocmyk") == 0) |
64 | 60 |
return RGBToCMYKFilter.class; |
65 | 61 |
return null; |
... | ... | |
98 | 94 |
} |
99 | 95 |
} |
100 | 96 |
|
101 |
/* |
|
102 |
* (non-Javadoc) |
|
103 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
104 |
*/ |
|
105 |
@SuppressWarnings("unchecked") |
|
106 |
public ArrayList getRasterFilterList() { |
|
107 |
ArrayList filters = new ArrayList(); |
|
97 |
public List<Class<?>> getRasterFilterList() { |
|
98 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
108 | 99 |
filters.add(RGBToCMYKFilter.class); |
109 | 100 |
return filters; |
110 | 101 |
} |
111 | 102 |
|
112 |
/* |
|
113 |
* (non-Javadoc) |
|
114 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
|
115 |
*/ |
|
116 |
@SuppressWarnings("unchecked") |
|
117 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
103 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
118 | 104 |
int[] renderBands = { 0, 1, 2 }; |
119 | 105 |
if (RGBToCMYKFilter.class.isAssignableFrom(classFilter)) { |
120 | 106 |
int out = Buffer.TYPE_BYTE; |
... | ... | |
170 | 156 |
* (non-Javadoc) |
171 | 157 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
172 | 158 |
*/ |
173 |
@SuppressWarnings("unchecked") |
|
174 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
159 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
175 | 160 |
return filteri; |
176 | 161 |
} |
177 | 162 |
|
... | ... | |
179 | 164 |
* (non-Javadoc) |
180 | 165 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
181 | 166 |
*/ |
182 |
@SuppressWarnings("unchecked") |
|
183 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
167 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
184 | 168 |
return filterList; |
185 | 169 |
} |
186 | 170 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/ColorBalanceRGBManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.band; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
53 | 54 |
point.append("ColorBalanceRGB", "", ColorBalanceRGBManager.class); |
54 | 55 |
} |
55 | 56 |
|
56 |
/* |
|
57 |
* (non-Javadoc) |
|
58 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
59 |
*/ |
|
60 |
@SuppressWarnings("unchecked") |
|
61 |
public Class getFilterClassByID(String id) { |
|
57 |
public Class<?> getFilterClassByID(String id) { |
|
62 | 58 |
if( id.compareTo("colorbalancergb") == 0) |
63 | 59 |
return ColorTableFilter.class; |
64 | 60 |
return null; |
... | ... | |
104 | 100 |
|
105 | 101 |
} |
106 | 102 |
|
107 |
/* |
|
108 |
* (non-Javadoc) |
|
109 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
110 |
*/ |
|
111 |
@SuppressWarnings("unchecked") |
|
112 |
public ArrayList getRasterFilterList() { |
|
113 |
ArrayList filters = new ArrayList(); |
|
103 |
public List<Class<?>> getRasterFilterList() { |
|
104 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
114 | 105 |
filters.add(ColorBalanceRGBFilter.class); |
115 | 106 |
return filters; |
116 | 107 |
} |
117 | 108 |
|
118 |
/* |
|
119 |
* (non-Javadoc) |
|
120 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
|
121 |
*/ |
|
122 |
@SuppressWarnings("unchecked") |
|
123 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
109 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
124 | 110 |
if (ColorBalanceRGBFilter.class.isAssignableFrom(classFilter)) { |
125 | 111 |
int red = 0, green = 0, blue = 0; |
126 | 112 |
boolean luminosity = false; |
... | ... | |
185 | 171 |
* (non-Javadoc) |
186 | 172 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
187 | 173 |
*/ |
188 |
@SuppressWarnings("unchecked") |
|
189 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
174 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
190 | 175 |
return filteri; |
191 | 176 |
} |
192 | 177 |
|
... | ... | |
194 | 179 |
* (non-Javadoc) |
195 | 180 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
196 | 181 |
*/ |
197 |
@SuppressWarnings("unchecked") |
|
198 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
182 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
199 | 183 |
return filterList; |
200 | 184 |
} |
201 | 185 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/ColorTableListManager.java | ||
---|---|---|
23 | 23 |
|
24 | 24 |
import java.awt.Color; |
25 | 25 |
import java.util.ArrayList; |
26 |
import java.util.List; |
|
26 | 27 |
|
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.ColorItem; |
28 | 29 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
... | ... | |
59 | 60 |
point.append("ColorTable", "", ColorTableListManager.class); |
60 | 61 |
} |
61 | 62 |
|
62 |
/* |
|
63 |
* (non-Javadoc) |
|
64 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
65 |
*/ |
|
66 |
@SuppressWarnings("unchecked") |
|
67 |
public Class getFilterClassByID(String id) { |
|
63 |
public Class<?> getFilterClassByID(String id) { |
|
68 | 64 |
if( id.compareTo("colortable") == 0) |
69 | 65 |
return ColorTableFilter.class; |
70 | 66 |
return null; |
... | ... | |
104 | 100 |
} |
105 | 101 |
} |
106 | 102 |
|
107 |
/* |
|
108 |
* (non-Javadoc) |
|
109 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
110 |
*/ |
|
111 |
@SuppressWarnings("unchecked") |
|
112 |
public ArrayList getRasterFilterList() { |
|
113 |
ArrayList filters = new ArrayList(); |
|
103 |
public List<Class<?>> getRasterFilterList() { |
|
104 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
114 | 105 |
filters.add(ColorTableFilter.class); |
115 | 106 |
return filters; |
116 | 107 |
} |
117 | 108 |
|
118 |
/* |
|
119 |
* (non-Javadoc) |
|
120 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#addFilter(java.lang.Class, org.gvsig.fmap.dal.coverage.datastruct.Params) |
|
121 |
*/ |
|
122 |
@SuppressWarnings("unchecked") |
|
123 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
109 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
124 | 110 |
if (ColorTableFilter.class.isAssignableFrom(classFilter)) { |
125 | 111 |
ColorTable colorTable = null; |
126 | 112 |
for (int i = 0; i < params.getNumParams(); i++) { |
... | ... | |
149 | 135 |
} |
150 | 136 |
|
151 | 137 |
@SuppressWarnings("unchecked") |
152 |
public static ColorTable createColorTableFromArray(ArrayList lines) {
|
|
138 |
public static ColorTable createColorTableFromArray(List<String> lines) {
|
|
153 | 139 |
String pkgBase = "filter.colortable."; |
154 |
ArrayList linesCloned = (ArrayList) lines.clone(); |
|
140 |
List<String> linesCloned = null; |
|
141 |
|
|
142 |
if(lines instanceof ArrayList) { |
|
143 |
linesCloned = (List<String>)((ArrayList) lines).clone(); |
|
144 |
} else { |
|
145 |
linesCloned = new ArrayList<String>(); |
|
146 |
for (int i = 0; i < lines.size(); i++) { |
|
147 |
linesCloned.add(lines.get(i)); |
|
148 |
} |
|
149 |
} |
|
155 | 150 |
|
156 | 151 |
String paletteName = ""; |
157 | 152 |
int color = 0; |
... | ... | |
242 | 237 |
* (non-Javadoc) |
243 | 238 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
244 | 239 |
*/ |
245 |
@SuppressWarnings("unchecked") |
|
246 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
240 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
247 | 241 |
String pkgBase = "filter.colortable."; |
248 | 242 |
if (fil.startsWith(pkgBase + "active")) { |
249 | 243 |
boolean exec = true; |
... | ... | |
266 | 260 |
* (non-Javadoc) |
267 | 261 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
268 | 262 |
*/ |
269 |
@SuppressWarnings("unchecked") |
|
270 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
263 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
271 | 264 |
if (rf instanceof ColorTableFilter) { |
272 | 265 |
String pkgBase = "filter.colortable."; |
273 | 266 |
ColorTableFilter colorTableFilter = (ColorTableFilter) rf; |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/HSLToRGBManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.band; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
54 | 55 |
point.append("HSLToRGB", "", HSLToRGBManager.class); |
55 | 56 |
} |
56 | 57 |
|
57 |
/* |
|
58 |
* (non-Javadoc) |
|
59 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
60 |
*/ |
|
61 |
@SuppressWarnings("unchecked") |
|
62 |
public Class getFilterClassByID(String id) { |
|
58 |
public Class<?> getFilterClassByID(String id) { |
|
63 | 59 |
if( id.compareTo("hsltorgb") == 0) |
64 | 60 |
return HSLToRGBFilter.class; |
65 | 61 |
return null; |
... | ... | |
98 | 94 |
} |
99 | 95 |
} |
100 | 96 |
|
101 |
/* |
|
102 |
* (non-Javadoc) |
|
103 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
104 |
*/ |
|
105 |
@SuppressWarnings("unchecked") |
|
106 |
public ArrayList getRasterFilterList() { |
|
107 |
ArrayList filters = new ArrayList(); |
|
97 |
public List<Class<?>> getRasterFilterList() { |
|
98 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
108 | 99 |
filters.add(HSLToRGBFilter.class); |
109 | 100 |
return filters; |
110 | 101 |
} |
... | ... | |
113 | 104 |
* (non-Javadoc) |
114 | 105 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
115 | 106 |
*/ |
116 |
@SuppressWarnings("unchecked") |
|
117 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
107 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
118 | 108 |
if (HSLToRGBFilter.class.isAssignableFrom(classFilter)) { |
119 | 109 |
int[] renderBands = { 0, 1, 2 }; |
120 | 110 |
for (int i = 0; i < params.getNumParams(); i++) { |
... | ... | |
160 | 150 |
* (non-Javadoc) |
161 | 151 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
162 | 152 |
*/ |
163 |
@SuppressWarnings("unchecked") |
|
164 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
153 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
165 | 154 |
return filteri; |
166 | 155 |
} |
167 | 156 |
|
... | ... | |
169 | 158 |
* (non-Javadoc) |
170 | 159 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
171 | 160 |
*/ |
172 |
@SuppressWarnings("unchecked") |
|
173 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
161 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
174 | 162 |
return filterList; |
175 | 163 |
} |
176 | 164 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/RGBToHSLManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.band; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.dataset.Buffer; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
... | ... | |
54 | 55 |
point.append("RGBToHSL", "", RGBToHSLManager.class); |
55 | 56 |
} |
56 | 57 |
|
57 |
/* |
|
58 |
* (non-Javadoc) |
|
59 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
60 |
*/ |
|
61 |
@SuppressWarnings("unchecked") |
|
62 |
public Class getFilterClassByID(String id) { |
|
58 |
public Class<?> getFilterClassByID(String id) { |
|
63 | 59 |
if( id.compareTo("rgbtohsl") == 0) |
64 | 60 |
return RGBToCMYKFilter.class; |
65 | 61 |
return null; |
... | ... | |
100 | 96 |
|
101 | 97 |
} |
102 | 98 |
|
103 |
/* |
|
104 |
* (non-Javadoc) |
|
105 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
106 |
*/ |
|
107 |
@SuppressWarnings("unchecked") |
|
108 |
public ArrayList getRasterFilterList() { |
|
109 |
ArrayList filters = new ArrayList(); |
|
99 |
public List<Class<?>> getRasterFilterList() { |
|
100 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
110 | 101 |
filters.add(RGBToHSLFilter.class); |
111 | 102 |
return filters; |
112 | 103 |
} |
113 | 104 |
|
114 |
/* |
|
115 |
* (non-Javadoc) |
|
116 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
|
117 |
*/ |
|
118 |
@SuppressWarnings("unchecked") |
|
119 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
105 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
120 | 106 |
if (RGBToHSLFilter.class.isAssignableFrom(classFilter)) { |
121 | 107 |
int[] renderBands = { 0, 1, 2 }; |
122 | 108 |
int out = Buffer.TYPE_BYTE; |
... | ... | |
172 | 158 |
* (non-Javadoc) |
173 | 159 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
174 | 160 |
*/ |
175 |
@SuppressWarnings("unchecked") |
|
176 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
161 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
177 | 162 |
return filteri; |
178 | 163 |
} |
179 | 164 |
|
... | ... | |
181 | 166 |
* (non-Javadoc) |
182 | 167 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
183 | 168 |
*/ |
184 |
@SuppressWarnings("unchecked") |
|
185 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
169 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
186 | 170 |
return filterList; |
187 | 171 |
} |
188 | 172 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/band/ToLumSaManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.band; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
53 | 54 |
point.append("ToLumSa", "", ToLumSaManager.class); |
54 | 55 |
} |
55 | 56 |
|
56 |
/* |
|
57 |
* (non-Javadoc) |
|
58 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
59 |
*/ |
|
60 |
@SuppressWarnings("unchecked") |
|
61 |
public Class getFilterClassByID(String id) { |
|
57 |
public Class<?> getFilterClassByID(String id) { |
|
62 | 58 |
if( id.compareTo("tolumsa") == 0) |
63 | 59 |
return ToLumSaFilter.class; |
64 | 60 |
return null; |
... | ... | |
99 | 95 |
} |
100 | 96 |
} |
101 | 97 |
|
102 |
/* |
|
103 |
* (non-Javadoc) |
|
104 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
105 |
*/ |
|
106 |
@SuppressWarnings("unchecked") |
|
107 |
public ArrayList getRasterFilterList() { |
|
108 |
ArrayList filters = new ArrayList(); |
|
98 |
public List<Class<?>> getRasterFilterList() { |
|
99 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
109 | 100 |
filters.add(ToLumSaFilter.class); |
110 | 101 |
return filters; |
111 | 102 |
} |
112 | 103 |
|
113 |
/* |
|
114 |
* (non-Javadoc) |
|
115 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
|
116 |
*/ |
|
117 |
@SuppressWarnings("unchecked") |
|
118 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
104 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
119 | 105 |
if (ToLumSaFilter.class.isAssignableFrom(classFilter)) { |
120 | 106 |
double hue = 0, saturation = 0, luminosity = 0; |
121 | 107 |
int[] renderBands = { 0, 1, 2 }; |
... | ... | |
176 | 162 |
* (non-Javadoc) |
177 | 163 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
178 | 164 |
*/ |
179 |
@SuppressWarnings("unchecked") |
|
180 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) { |
|
165 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) { |
|
181 | 166 |
return filteri; |
182 | 167 |
} |
183 | 168 |
|
... | ... | |
185 | 170 |
* (non-Javadoc) |
186 | 171 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
187 | 172 |
*/ |
188 |
@SuppressWarnings("unchecked") |
|
189 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
173 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
190 | 174 |
return filterList; |
191 | 175 |
} |
192 | 176 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/enhancement/EnhancementListManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.enhancement; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.RasterLibrary; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
... | ... | |
58 | 59 |
stats = (Statistics)filterList.getEnvParam("IStatistics"); |
59 | 60 |
} |
60 | 61 |
|
61 |
/* |
|
62 |
* (non-Javadoc) |
|
63 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
64 |
*/ |
|
65 |
@SuppressWarnings("unchecked") |
|
66 |
public Class getFilterClassByID(String id) { |
|
62 |
public Class<?> getFilterClassByID(String id) { |
|
67 | 63 |
if(id.compareTo("enhanced") == 0) |
68 | 64 |
return LinearEnhancementFilter.class; |
69 | 65 |
return null; |
... | ... | |
150 | 146 |
* Obtiene un Array de Strings a partir de una pila de filtros. Cada elemento |
151 | 147 |
* del array tendr? la forma de elemento=valor. |
152 | 148 |
*/ |
153 |
@SuppressWarnings("unchecked") |
|
154 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
149 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
155 | 150 |
if (rf instanceof LinearEnhancementFilter) { |
156 | 151 |
filterList.add("filter.enhanced.active=true"); |
157 | 152 |
filterList.add("filter.enhanced.tailTrim=" + ((LinearEnhancementFilter) rf).getTailTrim().toString()); |
... | ... | |
168 | 163 |
return filterList; |
169 | 164 |
} |
170 | 165 |
|
171 |
/* |
|
172 |
* (non-Javadoc) |
|
173 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
|
174 |
*/ |
|
175 |
@SuppressWarnings("unchecked") |
|
176 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
166 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
177 | 167 |
if (fil.startsWith("filter.enhanced.active") && RasterFilterListManagerImpl.getValue(fil).equals("true") && stats != null) { |
178 | 168 |
filters.remove(filteri); |
179 | 169 |
double tailTrim = 0D; |
... | ... | |
217 | 207 |
return filteri; |
218 | 208 |
} |
219 | 209 |
|
220 |
/* |
|
221 |
* (non-Javadoc) |
|
222 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
223 |
*/ |
|
224 |
@SuppressWarnings("unchecked") |
|
225 |
public ArrayList getRasterFilterList() { |
|
226 |
ArrayList filters = new ArrayList(); |
|
210 |
public List<Class<?>> getRasterFilterList() { |
|
211 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
227 | 212 |
filters.add(LinearEnhancementFilter.class); |
228 | 213 |
return filters; |
229 | 214 |
} |
230 | 215 |
|
231 |
@SuppressWarnings("unchecked") |
|
232 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
216 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
233 | 217 |
if (LinearEnhancementFilter.class.isAssignableFrom(classFilter)) { |
234 | 218 |
boolean removeEnds = false; |
235 | 219 |
double tailTrim = 0.0; |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/enhancement/EqualizationManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.enhancement; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.RasterLibrary; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.BufferHistogram; |
... | ... | |
73 | 74 |
point.append("Equalization", "", EqualizationManager.class); |
74 | 75 |
} |
75 | 76 |
|
76 |
/* |
|
77 |
* (non-Javadoc) |
|
78 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
79 |
*/ |
|
80 |
@SuppressWarnings("unchecked") |
|
81 |
public Class getFilterClassByID(String id) { |
|
77 |
public Class<?> getFilterClassByID(String id) { |
|
82 | 78 |
if(id.compareTo("equalization") == 0) |
83 | 79 |
return EqualizationFilter.class; |
84 | 80 |
return null; |
... | ... | |
132 | 128 |
* Obtiene un Array de Strings a partir de una pila de filtros. Cada elemento |
133 | 129 |
* del array tendr? la forma de elemento=valor. |
134 | 130 |
*/ |
135 |
@SuppressWarnings("unchecked") |
|
136 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
131 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
137 | 132 |
return filterList; |
138 | 133 |
} |
139 | 134 |
|
140 |
/* |
|
141 |
* (non-Javadoc) |
|
142 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
|
143 |
*/ |
|
144 |
@SuppressWarnings("unchecked") |
|
145 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
135 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
146 | 136 |
return filteri; |
147 | 137 |
} |
148 | 138 |
|
149 |
/* |
|
150 |
* (non-Javadoc) |
|
151 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#getRasterFilterList() |
|
152 |
*/ |
|
153 |
@SuppressWarnings("unchecked") |
|
154 |
public ArrayList getRasterFilterList() { |
|
155 |
ArrayList filters = new ArrayList(); |
|
139 |
public List<Class<?>> getRasterFilterList() { |
|
140 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
156 | 141 |
filters.add(EqualizationFilter.class); |
157 | 142 |
return filters; |
158 | 143 |
} |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/enhancement/EnhancementStretchListManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.enhancement; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.RasterLibrary; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
... | ... | |
69 | 70 |
stats = (Statistics)filterList.getEnvParam("IStatistics"); |
70 | 71 |
} |
71 | 72 |
|
72 |
/* |
|
73 |
* (non-Javadoc) |
|
74 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
75 |
*/ |
|
76 |
@SuppressWarnings("unchecked") |
|
77 |
public Class getFilterClassByID(String id) { |
|
73 |
public Class<?> getFilterClassByID(String id) { |
|
78 | 74 |
if(id.compareTo("enhanced_stretch") == 0) |
79 | 75 |
return LinearStretchEnhancementFilter.class; |
80 | 76 |
return null; |
... | ... | |
267 | 263 |
* @param band |
268 | 264 |
* @param stretch |
269 | 265 |
*/ |
270 |
@SuppressWarnings("unchecked") |
|
271 |
private void putStretchBand(ArrayList filterList, String band, DefaultStretch stretch) { |
|
266 |
private void putStretchBand(List<String> filterList, String band, DefaultStretch stretch) { |
|
272 | 267 |
filterList.add("filter.linearstretchenhancement." + band + ".maxValue=" + stretch.maxValue); |
273 | 268 |
filterList.add("filter.linearstretchenhancement." + band + ".minValue=" + stretch.minValue); |
274 | 269 |
if (stretch.offset != null) |
... | ... | |
291 | 286 |
* Obtiene un Array de Strings a partir de una pila de filtros. Cada elemento |
292 | 287 |
* del array tendr� la forma de elemento=valor. |
293 | 288 |
*/ |
294 |
@SuppressWarnings("unchecked") |
|
295 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
289 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
296 | 290 |
if (rf instanceof LinearStretchEnhancementFilter) { |
297 | 291 |
LinearStretchEnhancementFilter filter = (LinearStretchEnhancementFilter) rf; |
298 | 292 |
DefaultLinearStretchParams stretchs = (DefaultLinearStretchParams) filter.getParam("stretchs"); |
... | ... | |
379 | 373 |
* (non-Javadoc) |
380 | 374 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
381 | 375 |
*/ |
382 |
@SuppressWarnings("unchecked") |
|
383 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
376 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
384 | 377 |
String pkgBase = "filter.linearstretchenhancement."; |
385 | 378 |
if (fil.startsWith(pkgBase + "active")) { |
386 | 379 |
boolean exec = true; |
... | ... | |
429 | 422 |
return filteri; |
430 | 423 |
} |
431 | 424 |
|
432 |
/* |
|
433 |
* (non-Javadoc) |
|
434 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
435 |
*/ |
|
436 |
@SuppressWarnings("unchecked") |
|
437 |
public ArrayList getRasterFilterList() { |
|
438 |
ArrayList filters = new ArrayList(); |
|
425 |
public List<Class<?>> getRasterFilterList() { |
|
426 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
439 | 427 |
filters.add(LinearStretchEnhancementFilter.class); |
440 | 428 |
return filters; |
441 | 429 |
} |
442 | 430 |
|
443 |
/* |
|
444 |
* (non-Javadoc) |
|
445 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
|
446 |
*/ |
|
447 |
@SuppressWarnings("unchecked") |
|
448 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
431 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
449 | 432 |
if (LinearStretchEnhancementFilter.class.isAssignableFrom(classFilter)) { |
450 | 433 |
int[] renderBands = { 0, 1, 2 }; |
451 | 434 |
boolean removeEnds = false; |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/enhancement/BrightnessContrastListManager.java | ||
---|---|---|
22 | 22 |
package org.gvsig.raster.impl.grid.filter.enhancement; |
23 | 23 |
|
24 | 24 |
import java.util.ArrayList; |
25 |
import java.util.List; |
|
25 | 26 |
|
26 | 27 |
import org.gvsig.fmap.dal.coverage.datastruct.Params; |
27 | 28 |
import org.gvsig.fmap.dal.coverage.exception.FilterTypeException; |
... | ... | |
81 | 82 |
filterList.add(filter); |
82 | 83 |
} |
83 | 84 |
|
84 |
/* |
|
85 |
* (non-Javadoc) |
|
86 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterListManager#containsFilter(java.lang.String) |
|
87 |
*/ |
|
88 |
@SuppressWarnings("unchecked") |
|
89 |
public Class getFilterClassByID(String id) { |
|
85 |
public Class<?> getFilterClassByID(String id) { |
|
90 | 86 |
if(id.compareTo("brightness") == 0) |
91 | 87 |
return BrightnessFilter.class; |
92 | 88 |
if(id.compareTo("contrast") == 0) |
... | ... | |
127 | 123 |
return filter; |
128 | 124 |
} |
129 | 125 |
|
130 |
/* |
|
131 |
* (non-Javadoc) |
|
132 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getStringsFromFilterList(java.util.ArrayList, org.gvsig.raster.grid.filter.RasterFilter) |
|
133 |
*/ |
|
134 |
@SuppressWarnings("unchecked") |
|
135 |
public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) { |
|
126 |
public List<String> getStringsFromFilterList(List<String> filterList, RasterFilter rf) { |
|
136 | 127 |
|
137 | 128 |
if ((rf instanceof BrightnessFilter) || (rf instanceof ContrastFilter)) { |
138 | 129 |
filterList.add("filter.brightCont.active=true"); |
... | ... | |
149 | 140 |
return filterList; |
150 | 141 |
} |
151 | 142 |
|
152 |
/* |
|
153 |
* (non-Javadoc) |
|
154 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#createFilterListFromStrings(java.util.ArrayList, java.lang.String, int) |
|
155 |
*/ |
|
156 |
@SuppressWarnings("unchecked") |
|
157 |
public int createFilterListFromStrings(ArrayList filters, String fil, int filteri) throws FilterTypeException { |
|
143 |
public int createFilterListFromStrings(List<String> filters, String fil, int filteri) throws FilterTypeException { |
|
158 | 144 |
if ((fil.startsWith("filter.brightCont.active")) && (RasterFilterListManagerImpl.getValue(fil).equals("true"))) { |
159 | 145 |
|
160 | 146 |
int incrBrillo = 0; |
... | ... | |
182 | 168 |
return filteri; |
183 | 169 |
} |
184 | 170 |
|
185 |
/* |
|
186 |
* (non-Javadoc) |
|
187 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#getRasterFilterList() |
|
188 |
*/ |
|
189 |
@SuppressWarnings("unchecked") |
|
190 |
public ArrayList getRasterFilterList() { |
|
191 |
ArrayList filters = new ArrayList(); |
|
171 |
public List<Class<?>> getRasterFilterList() { |
|
172 |
List<Class<?>> filters = new ArrayList<Class<?>>(); |
|
192 | 173 |
filters.add(BrightnessFilter.class); |
193 | 174 |
filters.add(ContrastFilter.class); |
194 | 175 |
return filters; |
... | ... | |
198 | 179 |
* (non-Javadoc) |
199 | 180 |
* @see org.gvsig.raster.grid.filter.IRasterFilterListManager#addFilter(java.lang.Class, org.gvsig.raster.dataset.Params) |
200 | 181 |
*/ |
201 |
@SuppressWarnings("unchecked") |
|
202 |
public void addFilter(Class classFilter, Params params) throws FilterTypeException { |
|
182 |
public void addFilter(Class<?> classFilter, Params params) throws FilterTypeException { |
|
203 | 183 |
if (ContrastFilter.class.isAssignableFrom(classFilter)) { |
204 | 184 |
int contrast = 0; |
205 | 185 |
for (int i = 0; i < params.getNumParams(); i++) { |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/DefaultRasterFilterList.java | ||
---|---|---|
25 | 25 |
import java.lang.reflect.InvocationTargetException; |
26 | 26 |
import java.util.ArrayList; |
27 | 27 |
import java.util.Iterator; |
28 |
import java.util.List; |
|
28 | 29 |
import java.util.Stack; |
29 | 30 |
import java.util.TreeMap; |
30 | 31 |
|
... | ... | |
64 | 65 |
environment = new TreeMap<String, Object>(); |
65 | 66 |
|
66 | 67 |
// Pila de objetos Filter (Contiene un RasterFilter) |
67 |
private ArrayList<RasterFilter>
|
|
68 |
private List<RasterFilter> |
|
68 | 69 |
list = new ArrayList<RasterFilter>(); |
69 |
private Stack<ArrayList<RasterFilter>>
|
|
70 |
status = new Stack<ArrayList<RasterFilter>>();
|
|
70 |
private Stack<List<RasterFilter>> |
|
71 |
status = new Stack<List<RasterFilter>>(); |
|
71 | 72 |
/** |
72 | 73 |
* Array de listeners que ser?n informados cuando cambia la lista de filtros |
73 | 74 |
*/ |
74 |
private ArrayList<FilterListChangeListener>
|
|
75 |
private List<FilterListChangeListener> |
|
75 | 76 |
filterListListener = new ArrayList<FilterListChangeListener>(); |
76 | 77 |
private RasterFilterListManagerImpl |
77 | 78 |
manager = null; |
... | ... | |
505 | 506 |
* clonaci?n del original, asi no compartiran datos. |
506 | 507 |
* @return |
507 | 508 |
*/ |
508 |
public ArrayList<RasterFilter> getStatusCloned() {
|
|
509 |
ArrayList<RasterFilter> newArray = new ArrayList<RasterFilter>();
|
|
509 |
public List<RasterFilter> getStatusCloned() { |
|
510 |
List<RasterFilter> newArray = new ArrayList<RasterFilter>(); |
|
510 | 511 |
for (int i = 0; i < list.size(); i++) |
511 | 512 |
try { |
512 | 513 |
newArray.add((RasterFilter)(((BaseRasterFilter) list.get(i)).clone())); |
... | ... | |
520 | 521 |
* Define el estado actual de los filtros |
521 | 522 |
* @param newArray |
522 | 523 |
*/ |
523 |
public void setStatus(ArrayList<RasterFilter> newArray) {
|
|
524 |
public void setStatus(List<RasterFilter> newArray) { |
|
524 | 525 |
list.clear(); |
525 | 526 |
if(newArray == null) |
526 | 527 |
return; |
... | ... | |
536 | 537 |
if (status.size() <= 0) |
537 | 538 |
return; |
538 | 539 |
|
539 |
setStatus((ArrayList<RasterFilter>) status.pop());
|
|
540 |
setStatus((List<RasterFilter>) status.pop()); |
|
540 | 541 |
} |
541 | 542 |
|
542 | 543 |
/** |
... | ... | |
559 | 560 |
* (non-Javadoc) |
560 | 561 |
* @see org.gvsig.fmap.dal.coverage.grid.RasterFilterList#createFilterListFromStrings(java.util.ArrayList) |
561 | 562 |
*/ |
562 |
public void createFilterListFromStrings(ArrayList<String> f) throws FilterTypeException {
|
|
563 |
public void createFilterListFromStrings(List<String> f) throws FilterTypeException { |
|
563 | 564 |
RasterFilterListManagerImpl.createFilterListFromStrings(this, f); |
564 | 565 |
} |
565 | 566 |
|
... | ... | |
610 | 611 |
return (RasterFilterListManager)obj; |
611 | 612 |
} |
612 | 613 |
|
613 |
/** |
|
614 |
* Gets a filter class searching in the register managers by its identifier |
|
615 |
* @param id |
|
616 |
* @return |
|
617 |
*/ |
|
618 |
@SuppressWarnings("unchecked") |
|
619 |
public Class getFilterClassByID(String id) { |
|
614 |
public Class<?> getFilterClassByID(String id) { |
|
620 | 615 |
ExtensionPointManager extensionPoints = ToolsLocator.getExtensionPointManager(); |
621 | 616 |
ExtensionPoint point = extensionPoints.get("RasterFilter"); |
622 |
Iterator it = point.iterator(); |
|
617 |
Iterator<?> it = point.iterator();
|
|
623 | 618 |
while(it.hasNext()) { |
624 | 619 |
ExtensionPoint.Extension entry = (ExtensionPoint.Extension) it.next(); |
625 | 620 |
if (entry != null) { |
626 |
Class managerClass = entry.getExtension(); |
|
621 |
Class<?> managerClass = entry.getExtension();
|
|
627 | 622 |
RasterFilterListManager manager = getManagerByClass(managerClass); |
Also available in: Unified diff