Revision 29785

View differences:

trunk/libraries/libRaster/src/org/gvsig/raster/grid/filter/enhancement/EnhancementStretchListManager.java
228 228
	public ArrayList getStringsFromFilterList(ArrayList filterList, RasterFilter rf) {
229 229
		if (rf instanceof LinearStretchEnhancementFilter) {
230 230
			LinearStretchEnhancementFilter filter = (LinearStretchEnhancementFilter) rf;
231

  
231
			LinearStretchParams stretchs = (LinearStretchParams) filter.getParam("stretchs");
232
			int [] renderBands = (int[]) filter.getParam("renderBands");
233
			
232 234
			filterList.add("filter.linearstretchenhancement.active=true");
233 235
			filterList.add("filter.linearstretchenhancement.removeends=" + filter.getRemoveEnds());
234
			putStretchBand(filterList, "red", filter.stretchs.red);
235
			putStretchBand(filterList, "green", filter.stretchs.green);
236
			putStretchBand(filterList, "blue", filter.stretchs.blue);
237
			filterList.add("filter.linearstretchenhancement.renderbands=" + convertArrayToString(filter.renderBands));
238
			filterList.add("filter.linearstretchenhancement.RGB=" + Boolean.valueOf(filter.stretchs.rgb).toString());
236
			putStretchBand(filterList, "red", stretchs.red);
237
			putStretchBand(filterList, "green", stretchs.green);
238
			putStretchBand(filterList, "blue", stretchs.blue);
239
			filterList.add("filter.linearstretchenhancement.renderbands=" + convertArrayToString(renderBands));
240
			filterList.add("filter.linearstretchenhancement.RGB=" + Boolean.valueOf(stretchs.rgb).toString());
239 241
		}
240 242

  
241 243
		return filterList;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/control/EnhancedControl.java
199 199
	private void setValuesFromFilterToPanel() {
200 200
		// BRILLO
201 201
		BrightnessFilter bFilter = (BrightnessFilter) filterList.getByName(BrightnessFilter.names[0]);
202
		if (bFilter != null)
203
			bcPanel.setBrightnessValue((double) bFilter.getBrightnessIncrease());
204
		else
202
		if (bFilter != null){
203
			int incr = ((Integer)bFilter.getParam("incrBrillo")).intValue();
204
			bcPanel.setBrightnessValue((double) incr);
205
		}else
205 206
			bcPanel.setBrightnessValue(0);
206 207

  
207 208
		// CONTRASTE
208 209
		ContrastFilter cFilter = (ContrastFilter) filterList.getByName(ContrastFilter.names[0]);
209
		if (cFilter != null)
210
			bcPanel.setContrastValue((double) cFilter.getContrastIncrease());
210
		if (cFilter != null){
211
			int incr = ((Integer)cFilter.getParam("incrContraste")).intValue();
212
			bcPanel.setContrastValue((double) incr);
213
		}
211 214
		else
212 215
			bcPanel.setContrastValue(0);
213 216

  
......
220 223
		LinearStretchEnhancementFilter eFilter = (LinearStretchEnhancementFilter) filterList.getByName(LinearStretchEnhancementFilter.names[0]);
221 224
		if (eFilter != null) {
222 225
			ePanel.setControlEnabled(true);
223
			ePanel.setRemoveEndsActive(eFilter.getRemoveEnds().booleanValue());
224
			if (eFilter.getTailTrim().doubleValue() != 0) {
226

  
227
			// Comprueba si esta activo eliminar extremos
228
			boolean removeEnds = false;
229
			if (eFilter.getParam("remove") != null)
230
				removeEnds = ((Boolean) eFilter.getParam("remove")).booleanValue();
231
			ePanel.setRemoveEndsActive(removeEnds);
232
			
233
			// Comprueba si hay recorte de colas
234
			LinearStretchParams stretchs = (LinearStretchParams) eFilter.getParam("stretchs");
235
			double[] tailTrimList;
236
			if (stretchs != null)
237
				tailTrimList = stretchs.getTailTrimList();
238
			else
239
				tailTrimList = new double[0];
240
			double median = 0;
241
			double nValues = tailTrimList.length;
242
			for (int i = 0; i < tailTrimList.length; i++) 
243
				median += tailTrimList[i];
244
			double tailTrim = new Double(nValues > 0 ? median / nValues : median).doubleValue();
245
			
246
			if (tailTrim != 0) {
225 247
				ePanel.setTailTrimCheckActive(true);
226
				ePanel.setTailTrimValue(eFilter.getTailTrim().doubleValue() * 100);
248
				ePanel.setTailTrimValue(tailTrim * 100);
227 249
			} else {
228 250
				ePanel.setTailTrimCheckActive(false);
229 251
				ePanel.setTailTrimValue(0);

Also available in: Unified diff