Revision 9700 branches/v10+Piloto/libraries/libCq_CMS_praster/src/org/cresques/px/PxRaster.java

View differences:

PxRaster.java
985 985
986 986 
            if ((geoFile != null) && geoFile[0] instanceof GdalFile &&
987 987 
                    (geoFile[0].getDataType() != DataBuffer.TYPE_BYTE)) {
988 
                RasterBuf raster = ((GdalFile) geoFile[0]).getRaster(wImg, hImg, rp);
989 
                t2 = new Date().getTime();
988 
            	RasterBuf raster = null;
989 
            	if (geoFile.length > 1) { // la imagen sale de distintos ficheros
990 
            		RasterBuf rasterG=null, rasterB=null;
991 
	                raster = ((GdalFile) bandSwitch.getBandR().getGeoRasterFile()).getRaster(wImg, hImg, rp);
992 
	                rasterG = ((GdalFile) bandSwitch.getBandG().getGeoRasterFile()).getRaster(wImg, hImg, rp);
993 
	                raster.copyBand(rasterG, 0, 1);
994 
	                rasterB = ((GdalFile) bandSwitch.getBandB().getGeoRasterFile()).getRaster(wImg, hImg, rp);
995 
	                raster.copyBand(rasterB, 0, 2);
996 
            	} else { // Toda la imagen est? en el mismo fichero
997 
            		raster = ((GdalFile) geoFile[0]).getRaster(wImg, hImg, rp);
998 
            	}
999 
            	t2 = new Date().getTime();
990 1000 

  		




  991
  1001
  
    
                System.out.println("Dibujando PxRaster: " + ((t2 - t1) / 1000D) + ", secs. Filtrando/Renderizando");


  		




  992
  1002
  
    
                t1 = t2;


  		




  ......




  1032
  1042
  
    
                //TODO:Soluci?n para que no se pinte si hay sharpening. Esto hay que pensarlo mejor


  		




  1033
  1043
  
    
                if (stackManager == null) 


  		




  1034
  1044
  
    
                    stackManager = new RasterFilterStackManager(filterStack);


  		




  1035
  
  
    
                if(!filterStack.isActive(stackManager.getTypeFilter("sharpening"))){


  		




  
  1045
  
    
                if (!filterStack.isActive(stackManager.getTypeFilter("sharpening"))){


  		




  1036
  1046
  
    
	                geoImage = bandSwitch.getBandR().getGeoRasterFile().updateImage(wImg, hImg, rp, null, 0, 0);


  		




  1037
  1047
  
    
	                geoImage = bandSwitch.getBandG().getGeoRasterFile().updateImage(wImg, hImg, rp, geoImage, 


  		




  1038
  1048
  
    
	                						bandSwitch.getBandG().getBand(), GeoRasterFile.GREEN_BAND);


  		












Also available in:  Unified diff