Revision 1724 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
33 33
import org.gvsig.gui.beans.buttonspanel.ButtonsPanel;
34 34
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelEvent;
35 35
import org.gvsig.i18n.Messages;
36
import org.gvsig.raster.georeferencing.app.georeferencingclient.GeoPointsPersistence;
36 37
import org.gvsig.raster.georeferencing.app.georeferencingclient.Georeferencing;
37 38
import org.gvsig.raster.georeferencing.app.georeferencingclient.TableWrapper;
38 39
import org.gvsig.raster.georeferencing.framework.GeoreferencingFrameworkLocator;
......
60 61
	private GeorefControlPanel                controlPanel        = null;
61 62
	private GeorefOptionsDialog               optionsDialog       = null;
62 63
	private GeoreferencingFrameworkManager    fManager            = null;
63
	//private GeoPointsPersistence              persistence         = null;
64
	private GeoPointsPersistence              persistence         = null;
64 65

  
65 66
	/**
66 67
	 * Flag que estar? a true despu?s de crear un nuevo punto de control. Volver? a false
......
80 81
		this.controlPanel = appMain.getGeorefControlPanel();
81 82
		this.controlPanel.setListener(this);
82 83
		this.fManager = GeoreferencingFrameworkLocator.getManager();
84
		this.persistence = new GeoPointsPersistence();
83 85
	}
84 86
	
85 87
	private SynchronizedViews getSyncViews() {
......
98 100
			return;
99 101
		
100 102
		Georeferencing.enableTableEvent = false;
101
		
102
		//-------------------------------------
103
		//Finalizaci?n de la georreferenciaci?n
104
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bEndGeoref)
105
			endGeoref();
103
		try {
104
			//-------------------------------------
105
			//Finalizaci?n de la georreferenciaci?n
106
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bEndGeoref)
107
				endGeoref();
106 108

  
107
		//-----------------------------------------
108
		//Centrar la vista en el punto seleccionado
109
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bCenterView) {
110
			getSyncViews().centerToPoint(tableWrapper.getTable().getSelectedRows()[0]);
111
		}
109
			//-----------------------------------------
110
			//Centrar la vista en el punto seleccionado
111
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bCenterView) {
112
				getSyncViews().centerToPoint(tableWrapper.getTable().getSelectedRows()[0]);
113
			}
112 114

  
113
		//---------------------------------
114
		//Selecci?n de una fila de la tabla
115
		if(e.getActionCommand().equals("SELECT_ROW")) {
116
			if(getDataModel().isCenterView() && !newPointCreated)
117
				getSyncViews().centerToPoint(e.getID());
118
			newPointCreated = false;
119
		}
115
			//---------------------------------
116
			//Selecci?n de una fila de la tabla
117
			if(e.getActionCommand().equals("SELECT_ROW")) {
118
				if(getDataModel().isCenterView() && !newPointCreated)
119
					getSyncViews().centerToPoint(e.getID());
120
				newPointCreated = false;
121
			}
120 122

  
121
		//----------------------------------------------------------
122
		//Seleccion de opciones. Se asignan las propiedades al abrir
123
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bOptions) {
124
			if(optionsDialog == null)
125
				optionsDialog = new GeorefOptionsDialog(Georeferencing.DEFAULT_DEGREE, this);
126
			optionsDialog.setDegree(getDataModel().getDegree());
127
			optionsDialog.setAlgorithm(getDataModel().getAlgorithm());
128
			optionsDialog.setBackGroundColor(getDataModel().getBackgroundColor());
129
			optionsDialog.setTextColor(getDataModel().getTextColor());
130
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().setSelected(getDataModel().isAddErrorsCSV());
131
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().setSelected(getDataModel().isCenterView());
132
			optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().setSelected(getDataModel().isShowNumber());
133
			optionsDialog.setThresholdError(getDataModel().getThreshold());
134
			optionsDialog.setInterpolationMethod(getDataModel().getInterpolationMethod());
135
			optionsDialog.setOutFile(getDataModel().getOutFile());
136
			optionsDialog.setXCellSize(getDataModel().getXCellSize());
137
			optionsDialog.setYCellSize(getDataModel().getYCellSize());
138
			fManager.showWindow(optionsDialog, 410, 440, Messages.getText("georeferencing"));
139
		}
123
			//----------------------------------------------------------
124
			//Seleccion de opciones. Se asignan las propiedades al abrir
125
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bOptions) {
126
				if(optionsDialog == null)
127
					optionsDialog = new GeorefOptionsDialog(Georeferencing.DEFAULT_DEGREE, this);
128
				optionsDialog.setDegree(getDataModel().getDegree());
129
				optionsDialog.setAlgorithm(getDataModel().getAlgorithm());
130
				optionsDialog.setBackGroundColor(getDataModel().getBackgroundColor());
131
				optionsDialog.setTextColor(getDataModel().getTextColor());
132
				optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().setSelected(getDataModel().isAddErrorsCSV());
133
				optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().setSelected(getDataModel().isCenterView());
134
				optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().setSelected(getDataModel().isShowNumber());
135
				optionsDialog.setThresholdError(getDataModel().getThreshold());
136
				optionsDialog.setInterpolationMethod(getDataModel().getInterpolationMethod());
137
				optionsDialog.setOutFile(getDataModel().getOutFile());
138
				optionsDialog.setXCellSize(getDataModel().getXCellSize());
139
				optionsDialog.setYCellSize(getDataModel().getYCellSize());
140
				fManager.showWindow(optionsDialog, 410, 440, Messages.getText("georeferencing"));
141
				System.out.println("----Open");
142
			}
140 143

  
141
		//------------------------------
142
		//Selecci?n de puntos de control
143
		if(e.getSource() == appMain.getGeorefControlPanel().getToolSelectPointButton()) {
144
			if(appMain.getGeorefControlPanel().getToolSelectPointButton().isSelected()) {
145
				if(appMain.getViewRaster().getToolSelected() != GeoreferencingSwingLibrary.SELECT_POINT_TOOL) {
146
					//No hay filas en la tabla
147
					if(tableWrapper.getTable().getRowCount() == 0) {
148
						RasterToolsUtil.messageBoxError("no_rows", tableWrapper.getTable());
149
						appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(false);
150
						return;
151
					}
144
			//------------------------------
145
			//Selecci?n de puntos de control
146
			if(e.getSource() == appMain.getGeorefControlPanel().getToolSelectPointButton()) {
147
				selectControlPoints();
148
			}
152 149

  
153
					//No hay filas seleccionadas en la tabla
154
					if(tableWrapper.getTable().getSelectedRows() == null) {
155
						RasterToolsUtil.messageBoxError("no_rows_selected", tableWrapper.getTable());
156
						appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(false);
157
						return;
158
					}
159
					getSyncViews().selectPointTool(true);
150
			//-------
151
			//Testear
152
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bTest) {
153
				try {
154
					appMain.getProcessActions().addTestRasterLayer(
155
							getDataModel().getDataStore(), 
156
							getDataModel().getAlgorithm(), 
157
							getDataModel().getInterpolationMethod(), 
158
							getDataModel().getDegree(), 
159
							getDataModel().getOutFile(),
160
							getDataModel().getXCellSize(),
161
							getDataModel().getYCellSize(),
162
							tableWrapper.getGeoTransformDataResult());
163
				} catch (LoadLayerException e1) {
164
					RasterToolsUtil.messageBoxError("error_loading_layer", tableWrapper.getTable(), e1);
160 165
				}
161
			} else {
162
				getSyncViews().selectPointTool(false);
163 166
			}
164
		}
165 167

  
166
		//-------
167
		//Testear
168
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bTest) {
169
			try {
170
				appMain.getProcessActions().addTestRasterLayer(
171
						appMain.getLayer(), 
172
						getDataModel().getAlgorithm(), 
173
						getDataModel().getInterpolationMethod(), 
174
						getDataModel().getDegree(), 
175
						getDataModel().getOutFile(),
176
						getDataModel().getXCellSize(),
177
						getDataModel().getYCellSize(),
178
						tableWrapper.getGeoTransformDataResult());
179
			} catch (LoadLayerException e1) {
180
				RasterToolsUtil.messageBoxError("error_loading_layer", tableWrapper.getTable(), e1);
168
			//------------
169
			//Fin del Test
170
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bEndTest) {
171
				if(appMain != null && appMain.getProcessActions().getLastTestLayer() != null) {
172
					appMain.getProcessActions().getLastTestLayer().setRemoveRasterFlag(false);
173
					appMain.getProcessActions().removeTestRasterLayer();
174
				}
181 175
			}
176

  
177
			//------------
178
			//Salvar a CSV
179
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bSaveToAscii) {
180
				persistence.exportToCSV(getDataModel().getGCPList(), getDataModel().isAddErrorsCSV());
181
			}
182

  
183
			//----------------
184
			//Cargar desde CSV
185
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bLoadFromAscii) {
186
				persistence.importFromCSV(getSyncViews(), tableWrapper);
187
			}
188

  
189
			//------------
190
			//Salvar a RMF
191
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bSaveToXml) {
192
				persistence.saveToRMF(getDataModel().getGCPList(), getDataModel().getDataStore());
193
			}
194

  
195
			//----------------
196
			//Cargar desde RMF
197
			if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bLoadFromXml) {
198
				persistence.loadFromRMF(getDataModel().getDataStore(), getSyncViews(), tableWrapper);
199
			}
200

  
201
		} finally {
202
			Georeferencing.enableTableEvent = true;	
182 203
		}
204
	}
205
	
206
	private void selectControlPoints() {
207
		if(appMain.getGeorefControlPanel().getToolSelectPointButton().isSelected()) {
208
			if(appMain.getViewRaster().getToolSelected() != GeoreferencingSwingLibrary.SELECT_POINT_TOOL) {
209
				//No hay filas en la tabla
210
				if(tableWrapper.getTable().getRowCount() == 0) {
211
					RasterToolsUtil.messageBoxError("no_rows", tableWrapper.getTable());
212
					appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(false);
213
					return;
214
				}
183 215

  
184
		//------------
185
		//Fin del Test
186
		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bEndTest) {
187
			if(appMain != null && appMain.getProcessActions().getLastTestLayer() != null) {
188
				appMain.getProcessActions().getLastTestLayer().setRemoveRasterFlag(false);
189
				appMain.getProcessActions().removeTestRasterLayer();
216
				//No hay filas seleccionadas en la tabla
217
				if(tableWrapper.getTable().getSelectedRows() == null) {
218
					RasterToolsUtil.messageBoxError("no_rows_selected", tableWrapper.getTable());
219
					appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(false);
220
					return;
221
				}
222
				getSyncViews().selectPointTool(true);
190 223
			}
224
		} else {
225
			getSyncViews().selectPointTool(false);
191 226
		}
192

  
193
		//------------
194
		//Salvar a CSV
195
//		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bSaveToAscii) {
196
//			getPersistence().exportToCSV(getPointManager().getPointList(), getOptions().isAddErrorsCSV());
197
//		}
198
//
199
//		//----------------
200
//		//Cargar desde CSV
201
//		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bLoadFromAscii) {
202
//			setEnableTableEvent(false);
203
//			getPersistence().importFromCSV(getPointManager(), tablePanel);
204
//			setEnableTableEvent(true);
205
//		}
206
//
207
//		//------------
208
//		//Salvar a RMF
209
//		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bSaveToXml) {
210
//			getPersistence().saveToRMF(getPointManager().getPointList(), appMain.getLayer().getDataSource());
211
//		}
212
//
213
//		//----------------
214
//		//Cargar desde RMF
215
//		if(controlPanel.getButtonIDPressed(e.getSource()) == GeorefControlPanel.bLoadFromXml) {
216
//			setEnableTableEvent(false);
217
//			getPersistence().loadFromRMF(appMain.getLayer().getDataSource(), getPointManager(), tablePanel);
218
//			setEnableTableEvent(true);
219
//		}
220
		Georeferencing.enableTableEvent = true;
221 227
	}
222 228

  
223 229
	/**
......
262 268
					if(getDataModel().getAlgorithm() == Georeferencing.AFFINE) {
263 269
						try {
264 270
							appMain.getProcessActions().addTestRasterLayer(
265
									appMain.getLayer(), 
271
									getDataModel().getDataStore(), 
266 272
									getDataModel().getAlgorithm(), 
267 273
									getDataModel().getInterpolationMethod(), 
268 274
									getDataModel().getDegree(), 
......
315 321
		if(!Georeferencing.enableTableEvent)
316 322
			return;
317 323
		Georeferencing.enableTableEvent = false;
318
		//-----------------------------------
319
		//Inserci?n de nueva fila en la tabla
320
		if(e.getEvent() == PagedTableEvent.EVENT_ADD_ENTRY) {
321
			long id = getSyncViews().addPoint(new Point2D.Double(0, 0), new Point2D.Double(0, 0));
322
			tableWrapper.initializeRow(e.getRows()[0], id);
323
			getSyncViews().calcPointsNumeration();
324
			
325
			//Activamos la herramienta de pinchar punto en la vista al a?adir punto
326
			appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(true);
327
			getSyncViews().selectPointTool(true);
328 324

  
329
			newPointCreated = true;
330
		}
325
		try {
326
			//-----------------------------------
327
			//Inserci?n de nueva fila en la tabla
328
			if(e.getEvent() == PagedTableEvent.EVENT_ADD_ENTRY) {
329
				long id = getSyncViews().addPoint(new Point2D.Double(0, 0), new Point2D.Double(0, 0));
330
				tableWrapper.initializeRow(e.getRows()[0], id);
331
				getSyncViews().calcPointsNumeration();
331 332

  
332
		//-----------------------------
333
		//Eliminado de fila de la tabla
334
		if(e.getEvent() == PagedTableEvent.EVENT_REMOVE_ENTRY) {
335
			for (int i = 0; i >= e.getRows().length; i--)
336
				appMain.getSyncViews().removePoint(e.getRows()[i]);
337
			getSyncViews().calcPointsNumeration();
338
			tableWrapper.updateErrors();
339
		}
333
				//Activamos la herramienta de pinchar punto en la vista al a?adir punto
334
				appMain.getGeorefControlPanel().getToolSelectPointButton().setSelected(true);
335
				getSyncViews().selectPointTool(true);
340 336

  
341
		//-------------------------------------
342
		//Actualizaci?n de una fila de la tabla
343
		if(e.getEvent() == PagedTableEvent.EVENT_MODIFY_ENTRY) {
344
			getSyncViews().calcPointsNumeration();
345
			//Revisamos el flag de activo de cada punto poniendo el valor que pone en la entrada de la tabla
346
			for (int i = 0; i < tableWrapper.getTable().getRowCount(); i++) {
347
				boolean active = ((Boolean) tableWrapper.getTable().getValueAt(i, 0)).booleanValue();
348
				int position = appMain.getSyncViews().getPointPositionByNumber(i);
349
				if (position < 0)
350
					return;
351
				GeoPoint pt = getDataModel().getGCPList().getGeoPoint(position);
352
				pt.setActive(active);
353
				getSyncViews().setVisiblePoint(active, position);
337
				newPointCreated = true;
338
			}
354 339

  
355
				//Para la funcionalidad de cambio de coordenadas desde la tabla: reasignamos el valor
356
				//de las coordenadas por si han cambiado estas
357
				double[] values = tableWrapper.getCoordinates(i);
340
			//-----------------------------
341
			//Eliminado de fila de la tabla
342
			if(e.getEvent() == PagedTableEvent.EVENT_REMOVE_ENTRY) {
343
				for (int i = 0; i >= e.getRows().length; i--)
344
					appMain.getSyncViews().removePoint(e.getRows()[i]);
345
				getSyncViews().calcPointsNumeration();
346
				tableWrapper.updateErrors();
347
			}
358 348

  
359
				getSyncViews().setCoordinates(position, values[0], values[1], values[2], values[3]);
349
			//-----------------------------
350
			//Eliminado todas las filas
351
			if(e.getEvent() == PagedTableEvent.EVENT_REMOVE_ALL) {
352
				getSyncViews().removeAllPoints();
360 353
			}
361
			tableWrapper.updateErrors();
354

  
355
			//-------------------------------------
356
			//Actualizaci?n de una fila de la tabla
357
			if(e.getEvent() == PagedTableEvent.EVENT_MODIFY_ENTRY) {
358
				getSyncViews().calcPointsNumeration();
359
				//Revisamos el flag de activo de cada punto poniendo el valor que pone en la entrada de la tabla
360
				for (int i = 0; i < tableWrapper.getTable().getRowCount(); i++) {
361
					boolean active = ((Boolean) tableWrapper.getTable().getValueAt(i, 0)).booleanValue();
362
					int position = appMain.getSyncViews().getPointPositionByNumber(i);
363
					if (position < 0)
364
						return;
365
					GeoPoint pt = getDataModel().getGCPList().getGeoPoint(position);
366
					pt.setActive(active);
367
					getSyncViews().setVisiblePoint(active, position);
368

  
369
					//Para la funcionalidad de cambio de coordenadas desde la tabla: reasignamos el valor
370
					//de las coordenadas por si han cambiado estas
371
					double[] values = tableWrapper.getCoordinates(i);
372

  
373
					getSyncViews().setCoordinates(position, values[0], values[1], values[2], values[3]);
374
				}
375
				tableWrapper.updateErrors();
376
			}
377

  
378
		} finally {
379
			Georeferencing.enableTableEvent = true;	
362 380
		}
363

  
364
		Georeferencing.enableTableEvent = true;
365 381
	}
366 382

  
367 383
	/**
......
369 385
	 */
370 386
	public void actionButtonPressed(ButtonsPanelEvent e) {
371 387
		Georeferencing.enableTableEvent = false;
372
		
373
		//---------------------------------------------------
374
		//Bot?n de Aplicar y Aceptar en el cuadro de opciones
375
		if (e.getButton() == ButtonsPanel.BUTTON_APPLY || e.getButton() == ButtonsPanel.BUTTON_ACCEPT) {
376
			if(optionsDialog != null) {
377 388

  
378
				//Asignamos las propiedades seleccionadas
379
				getDataModel().setAlgorithm(optionsDialog.getAlgorithm());
380
				getDataModel().setBackGroundColor(optionsDialog.getBackGroundColor());
381
				getDataModel().setTextColor(optionsDialog.getTextColor());
382
				getDataModel().setAddErrorsCSV(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().isSelected());
383
				getDataModel().setCenterView(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().isSelected());
384
				getDataModel().setShowNumber(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().isSelected());
385
				getDataModel().setInterpolationMethod(optionsDialog.getInterpolationMethod());
386
				getDataModel().setOutFile(optionsDialog.getOptionsPanel(this).getOutFileSelectionPanel().getOutFile());
389
		try {
390
			//---------------------------------------------------
391
			//Bot?n de Aplicar y Aceptar en el cuadro de opciones
392
			if (e.getButton() == ButtonsPanel.BUTTON_APPLY || e.getButton() == ButtonsPanel.BUTTON_ACCEPT) {
393
				if(optionsDialog != null) {
387 394

  
388
				//Recalculamos los errores si ha cambiado el grado
389
				if(optionsDialog.getDegree() != getDataModel().getDegree()) {
390
					getDataModel().setDegree(optionsDialog.getDegree());
391
					tableWrapper.updateErrors();
392
				}
395
					//Asignamos las propiedades seleccionadas
396
					getDataModel().setAlgorithm(optionsDialog.getAlgorithm());
397
					getDataModel().setBackGroundColor(optionsDialog.getBackGroundColor());
398
					getDataModel().setTextColor(optionsDialog.getTextColor());
399
					getDataModel().setAddErrorsCSV(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getAddErrorsCSVCheck().isSelected());
400
					getDataModel().setCenterView(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getCenterViewCheck().isSelected());
401
					getDataModel().setShowNumber(optionsDialog.getOptionsPanel(this).getCheckOptionsPanel().getShowNumberCheck().isSelected());
402
					getDataModel().setInterpolationMethod(optionsDialog.getInterpolationMethod());
403
					getDataModel().setOutFile(optionsDialog.getOptionsPanel(this).getOutFileSelectionPanel().getOutFile());
393 404

  
394
				try {
395
					getDataModel().setThreshold(optionsDialog.getThresholdError());
396
					getDataModel().setXCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getXCellSizeValue());
397
					getDataModel().setYCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getYCellSizeValue());
398
				} catch(NumberFormatException exc) {
399
					RasterToolsUtil.messageBoxError("error_numeric_format", null, exc);
400
				}
405
					//Recalculamos los errores si ha cambiado el grado
406
					if(optionsDialog.getDegree() != getDataModel().getDegree()) {
407
						getDataModel().setDegree(optionsDialog.getDegree());
408
						tableWrapper.updateErrors();
409
					}
401 410

  
402
				getSyncViews().setGraphicsColor(getDataModel().getTextColor());
403
				getSyncViews().setBackgroundColor(getDataModel().getBackgroundColor());
404
				getSyncViews().setActiveNumberPoint(getDataModel().isShowNumber());
411
					try {
412
						getDataModel().setThreshold(optionsDialog.getThresholdError());
413
						getDataModel().setXCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getXCellSizeValue());
414
						getDataModel().setYCellSize(optionsDialog.getOptionsPanel(this).getCellSizePanel().getYCellSizeValue());
415
					} catch(NumberFormatException exc) {
416
						RasterToolsUtil.messageBoxError("error_numeric_format", null, exc);
417
					}
405 418

  
419
					getSyncViews().setGraphicsColor(getDataModel().getTextColor());
420
					getSyncViews().setBackgroundColor(getDataModel().getBackgroundColor());
421
					getSyncViews().setActiveNumberPoint(getDataModel().isShowNumber());
422

  
423
				}
406 424
			}
407
		}
408 425

  
409
		//--------------------------------------------------
410
		// Bot?n de Cerrar y Aceptar en el cuadro de opciones
411
		if (e.getButton() == ButtonsPanel.BUTTON_CANCEL || e.getButton() == ButtonsPanel.BUTTON_ACCEPT) {
412
			if(optionsDialog != null) {
413
				fManager.closeWindow(optionsDialog);
426
			//--------------------------------------------------
427
			// Bot?n de Cerrar y Aceptar en el cuadro de opciones
428
			if (e.getButton() == ButtonsPanel.BUTTON_CANCEL || e.getButton() == ButtonsPanel.BUTTON_ACCEPT) {
429
				if(optionsDialog != null) {
430
					System.out.println("---Close");
431
					fManager.closeWindow(optionsDialog);
432
				}
414 433
			}
434

  
435
		} finally {
436
			Georeferencing.enableTableEvent = true;	
415 437
		}
416
		
417
		Georeferencing.enableTableEvent = true;
418 438
	}
419

  
420

  
421

  
422
	/**
423
	 * Obtiene una instancia del objeto que gestiona la
424
	 * persistencia en disco de los puntos de control
425
	 * @return GeoPointsPersistence
426
	 */
427
	/*public GeoPointsPersistence getPersistence() {
428
		if(persistence == null)
429
			persistence = new GeoPointsPersistence();
430
		return persistence;
431
	}*/
432 439
}

Also available in: Unified diff