Revision 1752 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/listener/ApplicationControlsListener.java

View differences:

ApplicationControlsListener.java
180 180
			//------------
181 181
			//Fin del Test
182 182
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bEndTest) {
183
				if(appMain != null && appMain.getProcessActions().getLastTestLayer() != null) {
184
					appMain.getProcessActions().removeTestRasterLayer();
183
				if(getDataModel().getType() == Georeferencing.WITH_MAP) {
184
					if(appMain != null && appMain.getProcessActions().getLastTestLayer() != null) {
185
						appMain.getProcessActions().removeTestRasterLayer();
186
					}
187
				} else {
188
					RasterToolsUtil.messageBoxInfo("action_disable_without_view", null);
185 189
				}
186 190
			}
187 191

  
......
238 242
			if(getDataModel().getType() == Georeferencing.WITH_MAP) {
239 243
				if(appMain.getProcessActions().getLastTestLayer() != null)
240 244
					appMain.getProcessActions().getLastTestLayer().setRemoveRasterFlag(false);
241

  
242
				if(	appMain.getProcessActions().getLastTestLayer() != null && 
243
					RasterToolsUtil.messageBoxYesOrNot("ask_load_view", null)) {
244
					FLayers lyrs = appMain.getMapCtrl().getMapContext().getLayers();
245
			}
246
			
247
			if(	appMain.getProcessActions().getLastTestLayer() != null && 
248
					RasterToolsUtil.messageBoxYesOrNot(
249
							Messages.getText("ask_load_view") 
250
							+ " " + 
251
							appMain.getProcessActions().getLastTestLayer().getURI(), null)) {
252
				FLayers lyrs = null;
253
				if(appMain.getMapCtrl() != null) {
254
					lyrs = appMain.getMapCtrl().getMapContext().getLayers();
245 255
					if(lyrs != null) {
246 256
						try {
247 257
							if(appMain.getProcessActions().getLastTestLayer() != null){
......
252 262
							//No hay raster para eliminar
253 263
						}
254 264
					}
265
				}
255 266

  
256
					//Cargar en la vista
257
					if(getDataModel().getAlgorithm() == GeoreferencingLibrary.AFFINE) {
258
						try {
259
							appMain.getProcessActions().addTestRasterLayer(
260
									getDataModel().getDataStore(), 
261
									getDataModel().getAlgorithm(), 
262
									getDataModel().getInterpolationMethod(), 
263
									getDataModel().getDegree(), 
264
									getDataModel().getOutFile(),
265
									getDataModel().getXCellSize(),
266
									getDataModel().getYCellSize(),
267
									tableWrapper.getGeoTransformDataResult());
268
						} catch (LoadLayerException e) {
269
							RasterToolsUtil.messageBoxError("error_loading_layer", null, e);
270
						}
267
				//Cargar en la vista
268
				if(getDataModel().getAlgorithm() == GeoreferencingLibrary.AFFINE) {
269
					try {
270
						appMain.getProcessActions().addTestRasterLayer(
271
								getDataModel().getDataStore(), 
272
								getDataModel().getAlgorithm(), 
273
								getDataModel().getInterpolationMethod(), 
274
								getDataModel().getDegree(), 
275
								getDataModel().getOutFile(),
276
								getDataModel().getXCellSize(),
277
								getDataModel().getYCellSize(),
278
								tableWrapper.getGeoTransformDataResult());
279
					} catch (LoadLayerException e) {
280
						RasterToolsUtil.messageBoxError("error_loading_layer", null, e);
271 281
					}
272
					if(getDataModel().getAlgorithm() == GeoreferencingLibrary.POLYNOMIAL) {
273
						if(appMain.getProcessActions().getLastTestLayer() != null && lyrs != null) {
282
				}
283
				if(getDataModel().getAlgorithm() == GeoreferencingLibrary.POLYNOMIAL) {
284
					if(appMain.getProcessActions().getLastTestLayer() != null) {
285
						if(appMain.getMapCtrl() != null)
274 286
							appMain.getMapCtrl().getMapContext().getLayers().addLayer(appMain.getProcessActions().getLastTestLayer());
275
						} else {
276
							RasterToolsUtil.messageBoxInfo("raster_not_created", null);
277
							return;
278
						}
287
						else
288
							appMain.getFirstMapCtrl().getMapContext().getLayers().addLayer(appMain.getProcessActions().getLastTestLayer());
289
					} else {
290
						RasterToolsUtil.messageBoxInfo("raster_not_created", null);
291
						return;
279 292
					}
280
				} else {
281
					appMain.getProcessActions().removeTestRasterLayer();
282 293
				}
294
			} else {
295
				appMain.getProcessActions().removeTestRasterLayer();
283 296
			}
284 297

  
298

  
285 299
			if (saveTransform) {
286 300
				// Salvar transformaci?n
287 301
				if (appMain.getProcessActions().getLastTestLayer() == null) {

Also available in: Unified diff