/ - Diff - | gvSIG desktop 1 - gvSIG

trunk/libraries/libRaster/src/org/gvsig/raster/dataaccess/buffer/RasterMemoryBuffer.java
31	31	* @author Nacho Brodin (nachobrodin@gmail.com)
32	32	*
33	33	*/
34		public class RasterMemoryBuffer extends RasterBuffer implements IBuffer {
	34	public class RasterMemoryBuffer extends RasterBuffer {
35	35	private ByteBand[] byteBuf = null;
36	36	private ShortBand[] shortBuf = null;
37	37	private IntBand[] intBuf = null;
...	...
1269	1269	}
1270	1270	}
1271	1271
1272		/*
1273		* (non-Javadoc)
1274		* @see org.gvsig.raster.driver.datasetproperties.IHistogramable#getPercent()
1275		*/
1276		public int getPercent() {
1277		return super.percent;
1278		}
1279	1272
1280	1273	}

     			return null;
     		Histogram hist = new Histogram(getBandCount(), 256);
     		for (int iBand = 0; iBand < getBandCount(); iBand++)
     			for (int row = 0; row < getHeight(); row++)
     			for (int row = 0; row < getHeight(); row++) {
     				for (int col = 0; col < getWidth(); col++)
     					hist.incrementPxValue(iBand, (getElemByte(row, col, iBand) & 0xff));
     				percent = ((iBand*getHeight() + row) * 100) /(getHeight() * getBandCount());
+    			}
     		percent = 100;
     		return hist;
+    	}
-...
+    		}
     		return hist;
+    	}
     	public int getPercent() {
     		return percent;
+    	}
+    }

      * @author Nacho Brodin (nachobrodin@gmail.com)
+     *
      */
     public class RasterReadOnlyHugeBuffer extends RasterBuffer implements IBuffer {
     public class RasterReadOnlyHugeBuffer extends RasterBuffer {
     	private Cache 			cache = null;
     	private LRUAlgorithm  	lru = null;
-...
     	public void assignBandToNotValid(int iBand) {
+    	}
     	public int getPercent() {
     		return super.percent;
+    	}
+    }
+    }

trunk/libraries/libRaster/src/org/gvsig/raster/dataaccess/cache/RasterCache.java
47	47	* @author Nacho Brodin (nachobrodin@gmail.com)
48	48	*
49	49	*/
50		public class RasterCache extends RasterBuffer implements IBuffer {
	50	public class RasterCache extends RasterBuffer {
51	51
52	52	private Cache cache = null;
53	53	private LRUAlgorithm lru = null;
...	...
778	778	break;
779	779	}
780	780	}
781
782		public int getPercent() {
783		return super.percent;
784		}
785	781	}

     	 * Devuelve el histograma acumulado
     	 * @return
     	 */
     	public long[][] getAccumulatedHistogram() {
     		if(histogram != null){
     		if (histogram != null){
     			long[][] hist = new long[histogram.length][histogram[0].length];
     			for (int iBand = 0; iBand < hist.length; iBand++) {
     				for (int j = 0; j < hist[iBand].length; j++) {
     					if(j == 0)
     						hist[iBand][j] = histogram[iBand][j];
     					else
     						hist[iBand][j] += histogram[iBand][j - 1];
     				hist[iBand][0] = histogram[iBand][0];
     				for (int j = 1; j < hist[iBand].length; j++) {
     					hist[iBand][j] = hist[iBand][j - 1] + histogram[iBand][j];
+    				}
+    			}
     			return hist;
+    		}
     		return null;
+    	}

trunk/libraries/libRaster/src/org/gvsig/raster/dataset/RasterDataset.java
815	815	return histogram;
816	816	}
817	817
	818	public int getPercent() {
	819	return histogram.getPercent();
	820	}
818	821	}

     	 */
     	private RasterDataset				dataset = null;
     	private int percent = 0;
     	/**
     	 * Constructor
     	 * @param dataset
-...
     	 * @return histograma
     	 */
     	private Histogram getHistogramByValue() throws InvalidSetViewException, FileNotOpenException, RasterDriverException {
     		percent = 0;
     		if(dataset.getDataType() != IBuffer.TYPE_BYTE)
     			return null;
-...
     				byte[] bLine = (byte[])obj;
     				for (int k = 0; k < bLine.length; k++)
     					histogram.incrementPxValue(band, (bLine[k] & 0xff));
     				percent = ((band * dataset.getHeight() + line) * 100) / (dataset.getBandCount() * dataset.getHeight());
+    			}
+    		}
     		percent = 100;
     		return histogram;
+    	}
-...
+    		}
     		return histogram;
+    	}
     	public int getPercent() {
     		return percent;
+    	}
+    }

     	 * clases en las que se divide el histograma
     	 */
     	private DataClassList 				classes = null;
     	/**
     	 * Histograma de la imagen completa
     	 */
-...
     		return null;
+    	}
     	public int getPercent() {
     		int percent = 0;
     		for (int i = 0; i < multiDataset.getDatasetCount(); i++) {
     			percent += multiDataset.getDataset(i).getPercent();
+    		}
     		percent = percent / multiDataset.getDatasetCount();
     		return percent;
+    	}
+    }

     	private ArrayList					palettes = new ArrayList();
     	private DatasetListStatistics 		stats = null;
     	private DatasetListHistogram		histogram = null;
     	int percent = 0;
     	//TODO: FUNCIONALIDAD: Contructores igual a RasterDataset + String[] nameFiles
     	public RasterMultiDataset(String name){
-...
     	 * @see org.gvsig.raster.driver.datasetproperties.IHistogramable#getHistogram()
     	 */
     	public Histogram getHistogram() throws HistogramException {
     		percent = 0;
     		if(histogram == null)
     			histogram = new DatasetListHistogram(this);
     		try {
     			Histogram tmp = histogram.getHistogram();
     			percent = 100;
     			return tmp;
     		} catch (FileNotOpenException e) {
     			throw new HistogramException("FileNotOpenException");
-...
     	 * @see org.gvsig.raster.util.IHistogramable#getPercent()
     	 */
     	public int getPercent() {
     		return percent;
     		if (histogram != null)
     			return histogram.getPercent();
     		return 0;
+    	}
+    }

| gvSIG desktop 1