Revision 1717 org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/GeoreferencingProcessActions.java

View differences:

GeoreferencingProcessActions.java
23 23

  
24 24
import org.gvsig.fmap.dal.coverage.RasterLocator;
25 25
import org.gvsig.fmap.dal.coverage.datastruct.GeoPointList;
26
import org.gvsig.fmap.dal.coverage.store.RasterDataStore;
26 27
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
27 28
import org.gvsig.i18n.Messages;
28 29
import org.gvsig.raster.fmap.layers.DefaultFLyrRaster;
......
50 51
	
51 52
	//?ltima capa procesada con los puntos de control. Al cerrar la aplicaci?n 
52 53
	//esta ser? la que se use como resultado 
53
	private FLyrRaster                        lastTestLayer                  = null;
54
	private FLyrRaster                        lastTestLyr                    = null;
54 55

  
55 56
	public void setViewMapRequest(ViewMapRequestManager vMap) {
56 57
		viewMapRequestManager = vMap;
......
68 69
	 * A?ade una capa en la vista del mapa para previsualizar el resultado
69 70
	 * @param lyr
70 71
	 * @param algorithm Algoritmo con el que se realiza la transformaci?n
72
	 * @throws LoadLayerException 
71 73
	 */
72
	public void addTestRasterLayer(	FLyrRaster lyr, 
74
	public void addTestRasterLayer(	RasterDataStore store, 
73 75
									int algorithm, 
74 76
									int method, 
75 77
									int order, 
76 78
									String file,
77 79
									double cellsizeX,
78 80
									double cellsizeY,
79
									GeoTransformDataResult result) {
81
									GeoTransformDataResult result) throws LoadLayerException {
80 82
		if(!testNumberOfPoints(order))
81 83
			return;
82 84
		
83 85
		fileName = file;
84
		FLyrRaster lyrClon = null;
86
		RasterDataStore storeClon = null;
85 87
		try {
86
			lyrClon = (FLyrRaster)lyr.cloneLayer();
88
			storeClon = store.cloneDataStore();
87 89
		} catch (Exception e1) {
88 90
			RasterToolsUtil.messageBoxError("error_clone_layer", this, e1);
89 91
			return;
......
95 97
				return;
96 98
			}
97 99

  
98
			AffineTransform at = new AffineTransform(	result.getPixelToMapCoefX()[1], 
100
			AffineTransform at = new AffineTransform(	
101
					result.getPixelToMapCoefX()[1], 
99 102
					result.getPixelToMapCoefY()[1], 
100 103
					result.getPixelToMapCoefX()[2], 
101 104
					result.getPixelToMapCoefY()[2], 
102 105
					result.getPixelToMapCoefX()[0], 
103 106
					result.getPixelToMapCoefY()[0]);
104
			lyrClon.setAffineTransform(at);
105
			lastTestLayer = lyrClon;
107
			storeClon.setAffineTransform(at);
108
			
106 109
		}
107
			
110
		
111
		DefaultFLyrRaster lyr = new DefaultFLyrRaster();
112
		lyr.setDataStore(storeClon);
113
		lastTestLyr = lyr;	
114
		
108 115
		if(algorithm == Georeferencing.POLYNOMIAL) {
109 116
			RasterProcess process;
110 117
			try {
......
127 134
		if(viewMapRequestManager != null) {
128 135
			if(algorithm == Georeferencing.AFFINE) {
129 136
				try {
130
					viewMapRequestManager.addTestRasterLayer(lyrClon);
137
					viewMapRequestManager.addTestRasterLayer(lyr);
131 138
				} catch (InvalidRequestException e) {
132 139
					GeoreferencingSwingImplLibrary.messageBoxError("error_setview_preview", null, e);
133 140
				}
......
143 150
	private boolean testNumberOfPoints(int order) {
144 151
		if (gpList != null) {
145 152
			if(gpList.size() <= 0) {
146
				GeoreferencingSwingImplLibrary.messageBoxError("no_selected_point", null);
153
				GeoreferencingSwingImplLibrary.messageBoxError("no_selected_points", null);
147 154
				return false;
148 155
			}
149 156
			
......
186 193
				String f = RasterLocator.getManager().getFileUtils().getLastPart(fileName, File.separator);
187 194
				FLyrRaster lyr = DefaultFLyrRaster.createLayer(fileName, new File(f));
188 195
				viewMapRequestManager.addTestRasterLayer(lyr);
189
				lastTestLayer = lyr;
196
				lastTestLyr = lyr;
190 197
			} catch (InvalidRequestException e) {
191 198
				GeoreferencingSwingImplLibrary.messageBoxError("error_setview_preview", null, e);
192 199
			} catch (LoadLayerException e) {
......
203 210
	 * @return FLyrRaterSE
204 211
	 */
205 212
	public FLyrRaster getLastTestLayer() {
206
		return lastTestLayer;
213
		return lastTestLyr;
207 214
	}
208 215
	
209 216
}

Also available in: Unified diff