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

View differences:

ApplicationControlsListener.java
23 23

  
24 24
import java.awt.event.ActionEvent;
25 25
import java.awt.geom.Point2D;
26
import java.io.IOException;
27 26

  
28 27
import javax.swing.event.TableModelEvent;
29 28

  
30 29
import org.gvsig.andami.PluginServices;
31
import org.gvsig.andami.ui.mdiManager.IWindow;
32 30
import org.gvsig.fmap.dal.coverage.datastruct.GeoPoint;
33 31
import org.gvsig.fmap.dal.coverage.exception.RmfSerializerException;
32
import org.gvsig.fmap.dal.coverage.store.RasterDataStore;
33
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
34 34
import org.gvsig.fmap.mapcontext.layers.FLayers;
35
import org.gvsig.gui.beans.buttonspanel.ButtonsPanel;
35 36
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelEvent;
36 37
import org.gvsig.i18n.Messages;
37 38
import org.gvsig.raster.georeferencing.app.georeferencingclient.Georeferencing;
39
import org.gvsig.raster.georeferencing.app.georeferencingclient.TableWrapper;
38 40
import org.gvsig.raster.georeferencing.framework.GeoreferencingFrameworkLocator;
39 41
import org.gvsig.raster.georeferencing.framework.GeoreferencingFrameworkManager;
42
import org.gvsig.raster.georeferencing.swing.GeoreferencingOptionsDataModel;
43
import org.gvsig.raster.georeferencing.swing.GeoreferencingSwingLibrary;
40 44
import org.gvsig.raster.georeferencing.swing.control.GeorefControlPanel;
41 45
import org.gvsig.raster.georeferencing.swing.control.GeorefControlPanelListener;
42 46
import org.gvsig.raster.georeferencing.swing.impl.option.GeorefOptionsDialog;
43
import org.gvsig.raster.swing.impl.pagedtable.NotInitializeException;
44
import org.gvsig.raster.swing.pagedtable.PagedTable;
47
import org.gvsig.raster.georeferencing.swing.view.SynchronizedViews;
45 48
import org.gvsig.raster.tools.app.basic.RasterToolsUtil;
46
import org.gvsig.gui.beans.buttonspanel.ButtonsPanel;
47 49

  
48 50
/**
49 51
 * Listener para los botones de control de la aplicaci?n de georreferenciaci?n.
......
54 56
 */
55 57
public class ApplicationControlsListener implements GeorefControlPanelListener {
56 58

  
57
	private PagedTable                tablePanel          = null;
59
	private TableWrapper              tableWrapper        = null;
58 60
	private Georeferencing            appMain             = null;
59 61
	private boolean                   enableTableEvent    = true;
60 62
	private GeorefControlPanel        controlPanel        = null;
......
74 76
	 * Constructor. Asigna el panel con los controles
75 77
	 * @param tablePanel
76 78
	 */
77
	public ApplicationControlsListener(PagedTable tablePanel, Georeferencing appMain) {
78
		this.tablePanel = tablePanel;
79
	public ApplicationControlsListener(TableWrapper tableWrapper, Georeferencing appMain) {
80
		this.tableWrapper = tableWrapper;
79 81
		this.appMain = appMain;
80 82
		this.controlPanel = appMain.getGeorefControlPanel();
81 83
		this.controlPanel.setListener(this);
82 84
		this.fManager = GeoreferencingFrameworkLocator.getManager();
83 85
	}
86
	
87
	private SynchronizedViews getSyncViews() {
88
		return appMain.getSyncViews();
89
	}
90
	
91
	private GeoreferencingOptionsDataModel getDataModel() {
92
		return appMain.getDataModel();
93
	}
84 94

  
85 95
	/**
86 96
	 * Eventos de los botones del cuadro de tabla y selecci?n de fila de tabla
......
94 104
		//-----------------------------------------
95 105
		//Centrar la vista en el punto seleccionado
96 106
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bCenterView) {
97
			try {
98
				appMain.getSyncViews().centerToPoint(tablePanel.getSelectedRows()[0]);
99
			} catch (NotInitializeException e1) {
100
				RasterToolsUtil.messageBoxYesOrNot("table_not_initialize", tablePanel, e1);
101
			}
107
			getSyncViews().centerToPoint(tableWrapper.getTable().getSelectedRows()[0]);
102 108
		}
103 109

  
104 110
		//---------------------------------
105 111
		//Selecci?n de una fila de la tabla
106 112
		if(e.getActionCommand().equals("SELECT_ROW")) {
107
			if(appMain.getOptionsDataModel().isCenterView() && !newPointCreated)
108
				appMain.getSyncViews().centerToPoint(e.getID());
113
			if(getDataModel().isCenterView() && !newPointCreated)
114
				getSyncViews().centerToPoint(e.getID());
109 115
			newPointCreated = false;
110 116
		}
111 117

  
......
114 120
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bOptions) {
115 121
			if(optionsDialog == null)
116 122
				optionsDialog = new GeorefOptionsDialog(Georeferencing.DEFAULT_DEGREE, this);
117
			optionsDialog.setDegree(appMain.getOptionsDataModel().getDegree());
118
			optionsDialog.setAlgorithm(appMain.getOptionsDataModel().getAlgorithm());
119
			optionsDialog.setBackGroundColor(appMain.getOptionsDataModel().getBackgroundColor());
120
			optionsDialog.setTextColor(appMain.getOptionsDataModel().getTextColor());
121
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().setSelected(getOptions().isAddErrorsCSV());
122
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().setSelected(getOptions().isCenterView());
123
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().setSelected(getOptions().isShowNumber());
124
			optionsDialog.setThresholdError(appMain.getOptionsDataModel().getThreshold());
125
			optionsDialog.setInterpolationMethod(appMain.getOptionsDataModel().getInterpolationMethod());
126
			optionsDialog.setOutFile(appMain.getOptionsDataModel().getOutFile());
127
			optionsDialog.setXCellSize(appMain.getOptionsDataModel().getXCellSize());
128
			optionsDialog.setYCellSize(appMain.getOptionsDataModel().getYCellSize());
123
			optionsDialog.setDegree(getDataModel().getDegree());
124
			optionsDialog.setAlgorithm(getDataModel().getAlgorithm());
125
			optionsDialog.setBackGroundColor(getDataModel().getBackgroundColor());
126
			optionsDialog.setTextColor(getDataModel().getTextColor());
127
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().setSelected(getDataModel().isAddErrorsCSV());
128
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().setSelected(getDataModel().isCenterView());
129
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().setSelected(getDataModel().isShowNumber());
130
			optionsDialog.setThresholdError(getDataModel().getThreshold());
131
			optionsDialog.setInterpolationMethod(getDataModel().getInterpolationMethod());
132
			optionsDialog.setOutFile(getDataModel().getOutFile());
133
			optionsDialog.setXCellSize(getDataModel().getXCellSize());
134
			optionsDialog.setYCellSize(getDataModel().getYCellSize());
129 135
			fManager.showWindow(optionsDialog, 400, 420, Messages.getText("georeferencing"));
130 136
		}
131 137

  
132 138
		//------------------------------
133 139
		//Selecci?n de puntos de control
134
		if(controlPanel.getButtonIDPressed(e.getSource()) == tablePanel.getToolSelectPointButton()) {
135
			if( tablePanel.getToolSelectPointButton().isSelected()) {
136
				try {
137
					if(!getPointManager().isSelectPointToolSelected()) {
138
						//No hay filas en la tabla
139
						if(tablePanel.getTable().getRowCount() == 0) {
140
							RasterToolsUtil.messageBoxError("no_rows", tablePanel);
141
							tablePanel.getToolSelectPointButton().setSelected(false);
142
							return;
143
						}
140
		if(e.getSource() == appMain.getGeorefControlPanel().getToolSelectPointButton()) {
141
			if(appMain.getGeorefControlPanel().getToolSelectPointButton().isSelected()) {
142
				if(appMain.getViewRaster().getToolSelected() != GeoreferencingSwingLibrary.SELECT_POINT_TOOL) {
143
					//No hay filas en la tabla
144
					if(tableWrapper.getTable().getRowCount() == 0) {
145
						RasterToolsUtil.messageBoxError("no_rows", tableWrapper.getTable());
146
						appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(false);
147
						return;
148
					}
144 149

  
145
						//No hay filas seleccionadas en la tabla
146
						if(tablePanel.getTable().getSelectedRow() == -1) {
147
							RasterToolsUtil.messageBoxError("no_rows_selected", tablePanel);
148
							tablePanel.getToolSelectPointButton().setSelected(false);
149
							return;
150
						}
151
						getViewsManager().selectPointTool(true);
150
					//No hay filas seleccionadas en la tabla
151
					if(tableWrapper.getTable().getSelectedRows() == null) {
152
						RasterToolsUtil.messageBoxError("no_rows_selected", tableWrapper.getTable());
153
						appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(false);
154
						return;
152 155
					}
153
				} catch (NotInitializeException e1) {
154
					RasterToolsUtil.messageBoxYesOrNot("table_not_initialize", tablePanel, e1);
156
					getSyncViews().selectPointTool(true);
155 157
				}
156 158
			} else {
157
				getViewsManager().selectPointTool(false);
159
				getSyncViews().selectPointTool(false);
158 160
			}
159 161
		}
160 162

  
161 163
		//-------
162 164
		//Testear
163 165
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bTest) {
164
			appMain.addTestRasterLayer(appMain.getLayer());
166
			try {
167
				appMain.getProcessActions().addTestRasterLayer(
168
						appMain.getLayer(), 
169
						getDataModel().getAlgorithm(), 
170
						getDataModel().getInterpolationMethod(), 
171
						getDataModel().getDegree(), 
172
						getDataModel().getOutFile(),
173
						getDataModel().getXCellSize(),
174
						getDataModel().getYCellSize(),
175
						tableWrapper.getGeoTransformDataResult());
176
			} catch (LoadLayerException e1) {
177
				RasterToolsUtil.messageBoxError("error_loading_layer", tableWrapper.getTable(), e1);
178
			}
165 179
		}
166 180

  
167 181
		//------------
168 182
		//Fin del Test
169 183
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bEndTest) {
170
			if(appMain != null && appMain.getLastTestLayer() != null) {
171
				appMain.getLastTestLayer().setRemoveRasterFlag(false);
172
				appMain.removeTestRasterLayer();
184
			if(appMain != null && appMain.getProcessActions().getLastTestLayer() != null) {
185
				appMain.getProcessActions().getLastTestLayer().setRemoveRasterFlag(false);
186
				appMain.getProcessActions().removeTestRasterLayer();
173 187
			}
174 188
		}
175 189

  
......
213 227
	private void endGeoref() {
214 228
		if(RasterToolsUtil.messageBoxYesOrNot("ask_end_georef", null)) {
215 229
			boolean saveTransform = false;
216
			if(appMain.getOptionsDataModel().getAlgorithm() == Georeferencing.AFFINE) {
230
			if(getDataModel().getAlgorithm() == Georeferencing.AFFINE) {
217 231
				if(RasterToolsUtil.messageBoxYesOrNot("ask_save_transformation", null))
218 232
					saveTransform = true;
219 233
				else {
220
					appMain.removeTestRasterLayer();
221
					appMain.closeAllWindows();
234
					appMain.getProcessActions().removeTestRasterLayer();
235
					fManager.closeAllWindows();
222 236
					return;
223 237
				}
224 238
			}
225 239

  
226
			if(appMain.getOptionsDataModel().getType() == Georeferencing.WITH_MAP) {
227
				if(appMain.getLastTestLayer() != null)
228
					appMain.getLastTestLayer().setRemoveRasterFlag(false);
240
			if(getDataModel().getType() == Georeferencing.WITH_MAP) {
241
				if(appMain.getProcessActions().getLastTestLayer() != null)
242
					appMain.getProcessActions().getLastTestLayer().setRemoveRasterFlag(false);
229 243

  
230 244
				if(RasterToolsUtil.messageBoxYesOrNot("ask_load_view", null)) {
231
					FLayers lyrs = appMain.getLayers();
245
					FLayers lyrs = appMain.getMapCtrl().getMapContext().getLayers();
232 246
					if(lyrs != null) {
233 247
						try {
234
							if(appMain.getLastTestLayer() != null){
235
								lyrs.removeLayer(appMain.getLastTestLayer());
248
							if(appMain.getProcessActions().getLastTestLayer() != null){
249
								lyrs.removeLayer(appMain.getProcessActions().getLastTestLayer());
236 250
								PluginServices.getMainFrame().enableControls();
237 251
							}
238 252
						} catch(NullPointerException ex){
......
241 255
					}
242 256

  
243 257
					//Cargar en la vista
244
					if(appMain.getOptionsDataModel().getAlgorithm() == Georeferencing.AFFINE) {
245
						appMain.addTestRasterLayer(appMain.getLayer());
258
					if(getDataModel().getAlgorithm() == Georeferencing.AFFINE) {
259
						try {
260
							appMain.getProcessActions().addTestRasterLayer(
261
									appMain.getLayer(), 
262
									getDataModel().getAlgorithm(), 
263
									getDataModel().getInterpolationMethod(), 
264
									getDataModel().getDegree(), 
265
									getDataModel().getOutFile(),
266
									getDataModel().getXCellSize(),
267
									getDataModel().getYCellSize(),
268
									tableWrapper.getGeoTransformDataResult());
269
						} catch (LoadLayerException e) {
270
							RasterToolsUtil.messageBoxError("error_loading_layer", null, e);
271
						}
246 272
					}
247
					if(appMain.getOptionsDataModel().getAlgorithm() == Georeferencing.POLYNOMIAL) {
248
						if(appMain.getLastTestLayer() != null && lyrs != null) {
249
							appMain.getLayers().addLayer(appMain.getLastTestLayer());
273
					if(getDataModel().getAlgorithm() == Georeferencing.POLYNOMIAL) {
274
						if(appMain.getProcessActions().getLastTestLayer() != null && lyrs != null) {
275
							appMain.getMapCtrl().getMapContext().getLayers().addLayer(appMain.getProcessActions().getLastTestLayer());
250 276
						} else {
251 277
							RasterToolsUtil.messageBoxInfo("raster_not_created", null);
252 278
							return;
253 279
						}
254 280
					}
255 281
				} else {
256
					appMain.removeTestRasterLayer();
282
					appMain.getProcessActions().removeTestRasterLayer();
257 283
				}
258 284
			}
259 285

  
260 286
			if (saveTransform) {
261 287
				// Salvar transformaci?n
262
				if (appMain.getLastTestLayer() == null) {
288
				if (appMain.getProcessActions().getLastTestLayer() == null) {
263 289
					RasterToolsUtil.messageBoxInfo("raster_not_created", null);
264 290
					return;
265 291
				}
266 292

  
267
				// Guardamos la GeoReferenciacion de cada dataset
268
				IRasterDataSource dataSource = appMain.getLastTestLayer().getDataSource();
293
				RasterDataStore store = appMain.getProcessActions().getLastTestLayer().getDataStore();
269 294
				try {
270
					for (int i = 0; i < dataSource.getDatasetCount(); i++) {
271
						dataSource.saveObjectToRmf(i, RasterDataset.class, dataSource.getDataset(i)[0]);
272
						RasterUtilities.createWorldFile(dataSource.getNameDatasetStringList(0, 0)[i], dataSource.getAffineTransform(0), (int)dataSource.getWidth(), (int)dataSource.getHeight());
273
					}
295
					store.saveGeoreferencingToRmf();
274 296
				} catch (RmfSerializerException e) {
275 297
					RasterToolsUtil.messageBoxError("error_salvando_rmf", null, e);
276
				} catch (IOException e) {
277
					RasterToolsUtil.messageBoxError("error_salvando_rmf", null, e);
278
				}
298
				} 
279 299
			}
280 300
			
281
			appMain.closeAllWindows();
301
			fManager.closeAllWindows();
282 302
		}
283 303
	}
284 304

  
......
291 311
		if(!enableTableEvent)
292 312
			return;
293 313
		setEnableTableEvent(false);
294
		try{
314
		//-----------------------------------
315
		//Inserci?n de nueva fila en la tabla
316
		if(e.getType() == TableModelEvent.INSERT) {
317
			long id = getSyncViews().addPoint(new Point2D.Double(0, 0), new Point2D.Double(0, 0));
318
			tableWrapper.initializeRow(e.getFirstRow(), id);
319
			getSyncViews().calcPointsNumeration();
295 320

  
296
			//-----------------------------------
297
			//Inserci?n de nuevo fila en la tabla
298
			if(e.getType() == TableModelEvent.INSERT) {
299
				long id = appMain.getSyncViews().addPoint(new Point2D.Double(0, 0), new Point2D.Double(0, 0));
300
				tablePanel.initializeRow(e.getFirstRow(), id);
301
				appMain.getSyncViews().calcPointsNumeration();
321
			//Activamos la herramienta de pinchar punto en la vista al a?adir punto
322
			appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(true);
323
			getSyncViews().selectPointTool(true);
302 324

  
303
				//Activamos la herramienta de pinchar punto en la vista al a?adir punto
304
				tablePanel.getToolSelectPointButton().setSelected(true);
305
				appMain.getSyncViews().selectPointTool(true);
325
			newPointCreated = true;
326
		}
306 327

  
307
				newPointCreated = true;
308
			}
328
		//-----------------------------
329
		//Eliminado de fila de la tabla
330
		if(e.getType() == TableModelEvent.DELETE) {
331
			for (int i = e.getLastRow(); i >= e.getFirstRow(); i--)
332
				appMain.getSyncViews().removePoint(i);
333
			getSyncViews().calcPointsNumeration();
334
			tableWrapper.updateErrors();
335
		}
309 336

  
310
			//-----------------------------
311
			//Eliminado de fila de la tabla
312
			if(e.getType() == TableModelEvent.DELETE) {
313
				for (int i = e.getLastRow(); i >= e.getFirstRow(); i--)
314
					appMain.getSyncViews().removePoint(i);
315
				appMain.getSyncViews().calcPointsNumeration();
316
				tablePanel.updateErrors();
317
			}
337
		//-------------------------------------
338
		//Actualizaci?n de una fila de la tabla
339
		if(e.getType() == TableModelEvent.UPDATE) {
340
			getSyncViews().calcPointsNumeration();
341
			//Revisamos el flag de activo de cada punto poniendo el valor que pone en la entrada de la tabla
342
			for (int i = 0; i < tableWrapper.getTable().getRowCount(); i++) {
343
				boolean active = ((Boolean) tableWrapper.getTable().getValueAt(i, 0)).booleanValue();
344
				int position = appMain.getSyncViews().getPointPositionByNumber(i);
345
				if (position < 0)
346
					return;
347
				GeoPoint pt = appMain.getGeoPointList().get(position);
348
				pt.setActive(active);
349
				getSyncViews().setVisiblePoint(active, position);
318 350

  
319
			//-------------------------------------
320
			//Actualizaci?n de una fila de la tabla
321
			if(e.getType() == TableModelEvent.UPDATE) {
322
				appMain.getSyncViews().calcPointsNumeration();
323
				//Revisamos el flag de activo de cada punto poniendo el valor que pone en la entrada de la tabla
324
				for (int i = 0; i < tablePanel.getRowCount(); i++) {
325
					boolean active = ((Boolean) tablePanel.getValueAt(i, 0)).booleanValue();
326
					int position = appMain.getSyncViews().getPointPositionByNumber(i);
327
					if (position < 0)
328
						return;
329
					GeoPoint pt = appMain.getGeoPointList().get(position);
330
					pt.setActive(active);
331
					appMain.getSyncViews().setVisiblePoint(active, position);
351
				//Para la funcionalidad de cambio de coordenadas desde la tabla: reasignamos el valor
352
				//de las coordenadas por si han cambiado estas
353
				double[] values = tableWrapper.getCoordinates(i);
332 354

  
333
					//Para la funcionalidad de cambio de coordenadas desde la tabla: reasignamos el valor
334
					//de las coordenadas por si han cambiado estas
335
					double[] values = tablePanel.getCoordinates(i);
336

  
337
					appMain.getSyncViews().setCoordinates(position, values[0], values[1], values[2], values[3]);
338
				}
339
				tablePanel.updateErrors();
355
				getSyncViews().setCoordinates(position, values[0], values[1], values[2], values[3]);
340 356
			}
357
			tableWrapper.updateErrors();
358
		}
341 359

  
342
		}catch (NotInitializeException ex) {
343
			RasterToolsUtil.messageBoxError("table_not_initialize", tablePanel, ex);
344
		}
345 360
		setEnableTableEvent(true);
346 361
	}
347 362

  
......
356 371
			if(optionsDialog != null) {
357 372

  
358 373
				//Asignamos las propiedades seleccionadas
359
				appMain.getOptionsDataModel().setAlgorithm(optionsDialog.getAlgorithm());
360
				appMain.getOptionsDataModel().setBackGroundColor(optionsDialog.getBackGroundColor());
361
				appMain.getOptionsDataModel().setTextColor(optionsDialog.getTextColor());
362
				appMain.getOptionsDataModel().setAddErrorsCSV(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().isSelected());
363
				appMain.getOptionsDataModel().setCenterView(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().isSelected());
364
				appMain.getOptionsDataModel().setShowNumber(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().isSelected());
365
				appMain.getOptionsDataModel().setInterpolationMethod(optionsDialog.getInterpolationMethod());
366
				appMain.getOptionsDataModel().setOutFile(optionsDialog.getOptionsPanel(this).getOutFileSelectionPanel().getOutFile());
374
				getDataModel().setAlgorithm(optionsDialog.getAlgorithm());
375
				getDataModel().setBackGroundColor(optionsDialog.getBackGroundColor());
376
				getDataModel().setTextColor(optionsDialog.getTextColor());
377
				getDataModel().setAddErrorsCSV(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().isSelected());
378
				getDataModel().setCenterView(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().isSelected());
379
				getDataModel().setShowNumber(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().isSelected());
380
				getDataModel().setInterpolationMethod(optionsDialog.getInterpolationMethod());
381
				getDataModel().setOutFile(optionsDialog.getOptionsPanel(this).getOutFileSelectionPanel().getOutFile());
367 382

  
368 383
				//Recalculamos los errores si ha cambiado el grado
369
				if(optionsDialog.getDegree() != appMain.getOptionsDataModel().getDegree()) {
370
					appMain.getOptionsDataModel().setDegree(optionsDialog.getDegree());
371
					tablePanel.updateErrors();
384
				if(optionsDialog.getDegree() != getDataModel().getDegree()) {
385
					getDataModel().setDegree(optionsDialog.getDegree());
386
					tableWrapper.updateErrors();
372 387
				}
373 388

  
374 389
				try {
375
					appMain.getOptionsDataModel().setThreshold(Double.valueOf(optionsDialog.getThresholdError().getValue()).doubleValue());
376
					appMain.getOptionsDataModel().setXCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getXCellSizeValue());
377
					appMain.getOptionsDataModel().setYCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getYCellSizeValue());
390
					getDataModel().setThreshold(optionsDialog.getThresholdError());
391
					getDataModel().setXCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getXCellSizeValue());
392
					getDataModel().setYCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getYCellSizeValue());
378 393
				} catch(NumberFormatException exc) {
379 394
					RasterToolsUtil.messageBoxError("error_numeric_format", null, exc);
380 395
				}
381 396

  
382
				appMain.getSyncViews().setGraphicsColor(appMain.getOptionsDataModel().getTextColor());
383
				appMain.getSyncViews().setBackgroundColor(appMain.getOptionsDataModel().getBackGroundColor());
384
				appMain.getSyncViews().setActiveNumberPoint(appMain.getOptionsDataModel().isShowNumber());
397
				getSyncViews().setGraphicsColor(getDataModel().getTextColor());
398
				getSyncViews().setBackgroundColor(getDataModel().getBackgroundColor());
399
				getSyncViews().setActiveNumberPoint(getDataModel().isShowNumber());
385 400

  
386 401
			}
387 402
		}
......
395 410
		}
396 411
	}
397 412

  
398
	/*private GeorefOptionsDialog getOptions() {
399
		if(georefOptions == null)
400
			georefOptions = GeoreferencingSwingLocator.getSwingManager().createWindowOptions(appMain.getOptionsDataModel().getDegree(), this);
401
		return georefOptions;
402
	}*/
403

  
404 413
	/**
405 414
	 * Consulta si est?n activos los eventos de tabla o no
406 415
	 * @return true si est?n activos y false si no lo est?n

Also available in: Unified diff