Revision 1864

View differences:

org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/layer/FLyrWMS.java
437 437 
					Extent e = rManager.getDataStructFactory().createExtent(adjustedExtent.getLowerCorner().getX(),
438 438 
							adjustedExtent.getUpperCorner().getY(), adjustedExtent.getUpperCorner().getX(),
439 439 
							adjustedExtent.getLowerCorner().getY());
440 
					ViewPortData vp2 = rManager.createViewPortData(vp.getProjection(), e, vp.getImageSize() );
440 
					ViewPortData vp2 = rManager.getDataStructFactory().createViewPortData(vp.getProjection(), e, vp.getImageSize() );
441 441 
					vp2.setMat(vp.getAffineTransform());
442 442 
					getParameters().setExtent(ex.toRectangle2D());
443 443 
					getRender().drawTiledService(g, vp2, vp.getImageSize(), taskStatus);
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
371 371 
					Extent e = rManager.getDataStructFactory().createExtent(adjustedExtent.getLowerCorner().getX(),
372 372 
							adjustedExtent.getUpperCorner().getY(), adjustedExtent.getUpperCorner().getX(),
373 373 
							adjustedExtent.getLowerCorner().getY());
374 
					ViewPortData vp2 = rManager.createViewPortData(vp.getProjection(), e, vp.getImageSize() );
374 
					ViewPortData vp2 = rManager.getDataStructFactory().createViewPortData(vp.getProjection(), e, vp.getImageSize() );
375 375 
					vp2.setMat(vp.getAffineTransform());
376 376 
					getParameters().setExtent(ex.toRectangle2D());
377 377 
					getRender().drawTiledService(g, vp2, vp.getImageSize(), taskStatus);
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.algorithm/org.gvsig.raster.tools.algorithm.base/src/main/java/org/gvsig/raster/tools/algorithm/base/process/RasterProcess.java
550 550 
			if(alphaBuffer != null) {
551 551 
				writerBufferServer.setAlphaBuffer(alphaBuffer);
552 552 
				nBands ++;
553 
				colorInterpretation = RasterLocator.getManager().createColorInterpretation(
553 
				colorInterpretation = RasterLocator.getManager().getDataStructFactory().createColorInterpretation(
554 554 
						new String[] {
555 555 
								ColorInterpretation.RED_BAND,
556 556 
								ColorInterpretation.GREEN_BAND,
......
558 558 
								ColorInterpretation.ALPHA_BAND});
559 559 
			} else {
560 560 
				if(nBands == 1)
561 
					colorInterpretation = RasterLocator.getManager().createColorInterpretation(
561 
					colorInterpretation = RasterLocator.getManager().getDataStructFactory().createColorInterpretation(
562 562 
							new String[] { ColorInterpretation.GRAY_BAND });
563 563 
			}
564 564 
			final Params params = manager.createWriterParams(sFilename);
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/clip/ui/listener/ClippingPanelListener.java
663 663 
		clippingProcess.addParam("onelayerperband", new Boolean(getOptionsPanel().getCbOneLyrPerBand().isSelected()));
664 664 
		clippingProcess.addParam("interpolationmethod", new Integer(interpMethod));
665 665 
		clippingProcess.addParam("affinetransform", transf);
666 
		clippingProcess.addParam("colorInterpretation",  RasterLocator.getManager().createColorInterpretation(ci));
666 
		clippingProcess.addParam("colorInterpretation",  RasterLocator.getManager().getDataStructFactory().createColorInterpretation(ci));
667 667 
		clippingProcess.addParam("resolution", new int[]{(int) Math.round(data.getPxWidth()),
668 668 
														 (int) Math.round(data.getPxHeight())});
669 669 
		clippingProcess.start();
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/raster/process/FilterProcess.java
90 90 
		do {
91 91 
			// Si tiene una tabla de color asignamos las tres bandas
92 92 
			if (grid.getFilterList().isActive("colortable")) {
93 
				colorInterpretation = rManager.createColorInterpretation(new String[] { ColorInterpretation.RED_BAND, ColorInterpretation.GREEN_BAND, ColorInterpretation.BLUE_BAND });
93 
				colorInterpretation = rManager.getDataStructFactory().createColorInterpretation(
94 
						new String[] {
95 
								ColorInterpretation.RED_BAND,
96 
								ColorInterpretation.GREEN_BAND,
97 
								ColorInterpretation.BLUE_BAND
98 
								});
94 99 
				break;
95 100 
			}
96 101 

  		




  ......




  109
  114
  
    
				}


  		




  110
  115
  
    
				colorInterp[i] = rasterDataSource.getColorInterpretation().getValues()[i];


  		




  111
  116
  
    
			}


  		




  112
  
  
    
			colorInterpretation = rManager.createColorInterpretation(colorInterp);


  		




  
  117
  
    
			colorInterpretation = rManager.getDataStructFactory().createColorInterpretation(colorInterp);


  		




  113
  118
  
    
		} while (false);


  		




  114
  119
  
    

  		




  115
  120
  
    
		return colorInterpretation;


  		




  ......




  179
  184
  
    
			//Calculo de la interpretaci?n de color


  		




  180
  185
  
    
			ColorInterpretation colorInterpretation = null;


  		




  181
  186
  
    
			if(lyr.existColorTable() || buffer.getBandCount() > 1)


  		




  182
  
  
    
				colorInterpretation = rManager.createColorInterpretation(new String[] { ColorInterpretation.RED_BAND, ColorInterpretation.GREEN_BAND, ColorInterpretation.BLUE_BAND });


  		




  
  187
  
    
				colorInterpretation = rManager.getDataStructFactory().createColorInterpretation(


  		




  
  188
  
    
						new String[] { ColorInterpretation.RED_BAND, ColorInterpretation.GREEN_BAND, ColorInterpretation.BLUE_BAND });


  		




  183
  189
  
    
			else if(buffer.getBandCount() == 2) {


  		




  184
  190
  
    
				renderBands = lyr.getRender().getRenderBands();


  		




  185
  191
  
    
				String[] ci = new String[renderBands.length];


  		




  ......




  191
  197
  
    
					default: ci[i] = ColorInterpretation.UNDEF_BAND; 


  		




  192
  198
  
    
					}


  		




  193
  199
  
    
				}


  		




  194
  
  
    
				colorInterpretation = rManager.createColorInterpretation(ci);


  		




  
  200
  
    
				colorInterpretation = rManager.getDataStructFactory().createColorInterpretation(ci);


  		




  195
  201
  
    
			} else


  		




  196
  
  
    
				colorInterpretation = rManager.createColorInterpretation(new String[] { ColorInterpretation.GRAY_BAND });


  		




  
  202
  
    
				colorInterpretation = rManager.getDataStructFactory().createColorInterpretation(


  		




  
  203
  
    
						new String[] { ColorInterpretation.GRAY_BAND });


  		




  197
  204
  
    
			


  		




  198
  205
  
    
			//Si la imagen original ten?a una banda de transparencia se asignar? esta. Si los filtros generados


  		




  199
  206
  
    
			//crean una banda se mezclar? con la original. 


  		




  ......




  207
  214
  
    
					alpha = rManager.getColorConversion().mergeTransparencyBuffers(alpha, grid.getFilterList().getAlphaBand());


  		




  208
  215
  
    
				writerBufferServer.setAlphaBuffer(alpha);


  		




  209
  216
  
    
				//Asignamos la interpretaci?n de color de la banda alpha				


  		




  210
  
  
    
				ColorInterpretation alphaI = rManager.createColorInterpretation(new String[] { ColorInterpretation.ALPHA_BAND });


  		




  
  217
  
    
				ColorInterpretation alphaI = rManager.getDataStructFactory().createColorInterpretation(


  		




  
  218
  
    
						new String[] { ColorInterpretation.ALPHA_BAND });


  		




  211
  219
  
    
				colorInterpretation.addColorInterpretation(alphaI);


  		




  212
  220
  
    
				nbands ++;


  		




  213
  221
  
    
			} else if(grid.getFilterList().getAlphaBand() != null) {


  		




  214
  222
  
    
				writerBufferServer.setAlphaBuffer(grid.getFilterList().getAlphaBand());


  		




  215
  223
  
    
				//Asignamos la interpretaci?n de color de la banda alpha


  		




  216
  
  
    
				ColorInterpretation alphaI = rManager.createColorInterpretation(new String[] { ColorInterpretation.ALPHA_BAND });


  		




  
  224
  
    
				ColorInterpretation alphaI = rManager.getDataStructFactory().createColorInterpretation(


  		




  
  225
  
    
						new String[] { ColorInterpretation.ALPHA_BAND });


  		




  217
  226
  
    
				colorInterpretation.addColorInterpretation(alphaI);


  		




  218
  227
  
    
				nbands ++;


  		




  219
  228
  
    
			}


  		












Also available in:  Unified diff