CDMS/src/CDMS/ImageNavigatorII
diff -u -r1.5 -r1.6
--- Stitcher.java 30 Jul 2010 23:31:31 -0000 1.5
+++ Stitcher.java 3 Aug 2010 19:32:05 -0000 1.6
@@ -117,13 +117,10 @@
double sumR = toStoreRaster.getSample(drawXtoStore, drawYtoStore, 0);
double sumG = toStoreRaster.getSample(drawXtoStore, drawYtoStore, 1);
double sumB = toStoreRaster.getSample(drawXtoStore, drawYtoStore, 2);
- double multiplier = 1;
- //if (x<20) { multiplier = 1-x/20; }
- //if (x>(holderW-20)) { multiplier = (1/20)*(x-(imgW-20)); }
int z = layers[drawXtoStore][drawYtoStore];
- sumR = (z*sumR + multiplier*holderRaster.getSample(x, y, 0))/(z+1);
- sumG = (z*sumG + multiplier*holderRaster.getSample(x, y, 1))/(z+1);
- sumB = (z*sumB + multiplier*holderRaster.getSample(x, y, 2))/(z+1);
+ sumR = (z*sumR + holderRaster.getSample(x, y, 0))/(z+1);
+ sumG = (z*sumG + holderRaster.getSample(x, y, 1))/(z+1);
+ sumB = (z*sumB + holderRaster.getSample(x, y, 2))/(z+1);
layers[drawXtoStore][drawYtoStore]++;
if(sumR!=0 || sumG!=0 || sumB!=0) draw=true;
toStoreRaster.setSample(drawXtoStore, drawYtoStore, 0, sumR);
@@ -143,6 +140,7 @@
Date endDate = new Date();
System.out.println("\nRuntime: "+(endDate.getTime()-startDate.getTime())/1000/60);
+ //writes data needed for Tiler.java to info.txt
try {
BufferedWriter out = new BufferedWriter(new FileWriter(savePath+"/info.txt"));
out.write(Math.ceil(totalW/tileW)+"\n"+Math.ceil(totalH/tileH)+"\n"+tileW+"\n"+tileH+"\n"+savePath);